From e7a09c07f9bda9c66421804e97ef6645e5f67d4b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 11 Oct 2016 10:24:02 +0200
Subject: [PATCH] Sync and clean language files

---
 dev/tools/fixduplicatelangkey.sh              |    1 +
 ...icatelines.sh => fixduplicatelanglines.sh} |    2 +
 dev/translation/txpull.sh                     |    2 +-
 htdocs/accountancy/admin/card.php             |    2 +-
 ...terface_50_modAgenda_ActionsAuto.class.php |   72 +-
 htdocs/exports/export.php                     |    1 +
 htdocs/langs/ar_SA/accountancy.lang           |  115 +-
 htdocs/langs/ar_SA/admin.lang                 |   90 +-
 htdocs/langs/ar_SA/banks.lang                 |   19 +-
 htdocs/langs/ar_SA/bills.lang                 |   17 +-
 htdocs/langs/ar_SA/boxes.lang                 |    9 +-
 htdocs/langs/ar_SA/cashdesk.lang              |    3 +-
 htdocs/langs/ar_SA/categories.lang            |    7 +-
 htdocs/langs/ar_SA/companies.lang             |   22 +-
 htdocs/langs/ar_SA/compta.lang                |    2 +
 htdocs/langs/ar_SA/cron.lang                  |    7 +-
 htdocs/langs/ar_SA/errors.lang                |    4 +-
 htdocs/langs/ar_SA/install.lang               |    8 +
 htdocs/langs/ar_SA/interventions.lang         |    1 +
 htdocs/langs/ar_SA/ldap.lang                  |    2 +
 htdocs/langs/ar_SA/mails.lang                 |    5 +-
 htdocs/langs/ar_SA/main.lang                  |   24 +
 htdocs/langs/ar_SA/margins.lang               |    1 +
 htdocs/langs/ar_SA/oauth.lang                 |   19 +-
 htdocs/langs/ar_SA/orders.lang                |    1 +
 htdocs/langs/ar_SA/printing.lang              |    4 -
 htdocs/langs/ar_SA/productbatch.lang          |    7 +-
 htdocs/langs/ar_SA/products.lang              |   12 +-
 htdocs/langs/ar_SA/projects.lang              |   15 +-
 htdocs/langs/ar_SA/salaries.lang              |    4 +-
 htdocs/langs/ar_SA/stocks.lang                |    9 +
 htdocs/langs/ar_SA/supplier_proposal.lang     |    1 +
 htdocs/langs/ar_SA/suppliers.lang             |   14 +-
 htdocs/langs/ar_SA/users.lang                 |    3 +
 htdocs/langs/ar_SA/website.lang               |    5 +-
 htdocs/langs/ar_SA/withdrawals.lang           |   76 +-
 htdocs/langs/ar_SA/workflow.lang              |    4 +-
 htdocs/langs/bg_BG/accountancy.lang           |  113 +-
 htdocs/langs/bg_BG/admin.lang                 |   90 +-
 htdocs/langs/bg_BG/banks.lang                 |   19 +-
 htdocs/langs/bg_BG/bills.lang                 |   17 +-
 htdocs/langs/bg_BG/boxes.lang                 |    9 +-
 htdocs/langs/bg_BG/cashdesk.lang              |    3 +-
 htdocs/langs/bg_BG/categories.lang            |    7 +-
 htdocs/langs/bg_BG/companies.lang             |   22 +-
 htdocs/langs/bg_BG/compta.lang                |    2 +
 htdocs/langs/bg_BG/cron.lang                  |    7 +-
 htdocs/langs/bg_BG/errors.lang                |    4 +-
 htdocs/langs/bg_BG/install.lang               |    8 +
 htdocs/langs/bg_BG/interventions.lang         |    1 +
 htdocs/langs/bg_BG/ldap.lang                  |    2 +
 htdocs/langs/bg_BG/mails.lang                 |    5 +-
 htdocs/langs/bg_BG/main.lang                  |   24 +
 htdocs/langs/bg_BG/margins.lang               |    1 +
 htdocs/langs/bg_BG/oauth.lang                 |   19 +-
 htdocs/langs/bg_BG/orders.lang                |    1 +
 htdocs/langs/bg_BG/printing.lang              |    4 -
 htdocs/langs/bg_BG/productbatch.lang          |    7 +-
 htdocs/langs/bg_BG/products.lang              |   12 +-
 htdocs/langs/bg_BG/projects.lang              |   15 +-
 htdocs/langs/bg_BG/salaries.lang              |    4 +-
 htdocs/langs/bg_BG/stocks.lang                |    9 +
 htdocs/langs/bg_BG/supplier_proposal.lang     |    1 +
 htdocs/langs/bg_BG/suppliers.lang             |   14 +-
 htdocs/langs/bg_BG/users.lang                 |    3 +
 htdocs/langs/bg_BG/website.lang               |    5 +-
 htdocs/langs/bg_BG/withdrawals.lang           |   76 +-
 htdocs/langs/bg_BG/workflow.lang              |    4 +-
 htdocs/langs/bn_BD/accountancy.lang           |  113 +-
 htdocs/langs/bn_BD/admin.lang                 |   90 +-
 htdocs/langs/bn_BD/banks.lang                 |   19 +-
 htdocs/langs/bn_BD/bills.lang                 |   17 +-
 htdocs/langs/bn_BD/boxes.lang                 |    9 +-
 htdocs/langs/bn_BD/cashdesk.lang              |    3 +-
 htdocs/langs/bn_BD/categories.lang            |    7 +-
 htdocs/langs/bn_BD/companies.lang             |   22 +-
 htdocs/langs/bn_BD/compta.lang                |    2 +
 htdocs/langs/bn_BD/cron.lang                  |    7 +-
 htdocs/langs/bn_BD/errors.lang                |    4 +-
 htdocs/langs/bn_BD/install.lang               |    8 +
 htdocs/langs/bn_BD/interventions.lang         |    1 +
 htdocs/langs/bn_BD/ldap.lang                  |    2 +
 htdocs/langs/bn_BD/mails.lang                 |    5 +-
 htdocs/langs/bn_BD/main.lang                  |   24 +
 htdocs/langs/bn_BD/margins.lang               |    1 +
 htdocs/langs/bn_BD/oauth.lang                 |   19 +-
 htdocs/langs/bn_BD/orders.lang                |    1 +
 htdocs/langs/bn_BD/printing.lang              |    4 -
 htdocs/langs/bn_BD/productbatch.lang          |    7 +-
 htdocs/langs/bn_BD/products.lang              |   12 +-
 htdocs/langs/bn_BD/projects.lang              |   15 +-
 htdocs/langs/bn_BD/salaries.lang              |    4 +-
 htdocs/langs/bn_BD/stocks.lang                |    9 +
 htdocs/langs/bn_BD/supplier_proposal.lang     |    1 +
 htdocs/langs/bn_BD/suppliers.lang             |   14 +-
 htdocs/langs/bn_BD/users.lang                 |    3 +
 htdocs/langs/bn_BD/website.lang               |    5 +-
 htdocs/langs/bn_BD/withdrawals.lang           |   76 +-
 htdocs/langs/bn_BD/workflow.lang              |    4 +-
 htdocs/langs/bs_BA/accountancy.lang           |  113 +-
 htdocs/langs/bs_BA/admin.lang                 |   90 +-
 htdocs/langs/bs_BA/banks.lang                 |   19 +-
 htdocs/langs/bs_BA/bills.lang                 |   17 +-
 htdocs/langs/bs_BA/boxes.lang                 |    9 +-
 htdocs/langs/bs_BA/cashdesk.lang              |    3 +-
 htdocs/langs/bs_BA/categories.lang            |    7 +-
 htdocs/langs/bs_BA/companies.lang             |   22 +-
 htdocs/langs/bs_BA/compta.lang                |    2 +
 htdocs/langs/bs_BA/cron.lang                  |    7 +-
 htdocs/langs/bs_BA/errors.lang                |    4 +-
 htdocs/langs/bs_BA/install.lang               |    8 +
 htdocs/langs/bs_BA/interventions.lang         |    1 +
 htdocs/langs/bs_BA/ldap.lang                  |    2 +
 htdocs/langs/bs_BA/mails.lang                 |    5 +-
 htdocs/langs/bs_BA/main.lang                  |   24 +
 htdocs/langs/bs_BA/margins.lang               |    1 +
 htdocs/langs/bs_BA/oauth.lang                 |   19 +-
 htdocs/langs/bs_BA/orders.lang                |    1 +
 htdocs/langs/bs_BA/printing.lang              |    4 -
 htdocs/langs/bs_BA/productbatch.lang          |    7 +-
 htdocs/langs/bs_BA/products.lang              |   12 +-
 htdocs/langs/bs_BA/projects.lang              |   15 +-
 htdocs/langs/bs_BA/salaries.lang              |    4 +-
 htdocs/langs/bs_BA/stocks.lang                |    9 +
 htdocs/langs/bs_BA/supplier_proposal.lang     |    1 +
 htdocs/langs/bs_BA/suppliers.lang             |   14 +-
 htdocs/langs/bs_BA/users.lang                 |    3 +
 htdocs/langs/bs_BA/website.lang               |    5 +-
 htdocs/langs/bs_BA/withdrawals.lang           |   76 +-
 htdocs/langs/bs_BA/workflow.lang              |    4 +-
 htdocs/langs/ca_ES/accountancy.lang           |  115 +-
 htdocs/langs/ca_ES/admin.lang                 |  110 +-
 htdocs/langs/ca_ES/banks.lang                 |   37 +-
 htdocs/langs/ca_ES/bills.lang                 |   65 +-
 htdocs/langs/ca_ES/boxes.lang                 |    9 +-
 htdocs/langs/ca_ES/cashdesk.lang              |    3 +-
 htdocs/langs/ca_ES/categories.lang            |    7 +-
 htdocs/langs/ca_ES/companies.lang             |   28 +-
 htdocs/langs/ca_ES/compta.lang                |   14 +-
 htdocs/langs/ca_ES/cron.lang                  |    7 +-
 htdocs/langs/ca_ES/errors.lang                |    8 +-
 htdocs/langs/ca_ES/holiday.lang               |    2 +-
 htdocs/langs/ca_ES/install.lang               |    8 +
 htdocs/langs/ca_ES/interventions.lang         |    1 +
 htdocs/langs/ca_ES/ldap.lang                  |    2 +
 htdocs/langs/ca_ES/mails.lang                 |    5 +-
 htdocs/langs/ca_ES/main.lang                  |   30 +-
 htdocs/langs/ca_ES/margins.lang               |    1 +
 htdocs/langs/ca_ES/members.lang               |    4 +-
 htdocs/langs/ca_ES/oauth.lang                 |   21 +-
 htdocs/langs/ca_ES/orders.lang                |    5 +-
 htdocs/langs/ca_ES/other.lang                 |    6 +-
 htdocs/langs/ca_ES/printing.lang              |    4 -
 htdocs/langs/ca_ES/productbatch.lang          |    7 +-
 htdocs/langs/ca_ES/products.lang              |   12 +-
 htdocs/langs/ca_ES/projects.lang              |   25 +-
 htdocs/langs/ca_ES/salaries.lang              |    4 +-
 htdocs/langs/ca_ES/stocks.lang                |    9 +
 htdocs/langs/ca_ES/supplier_proposal.lang     |    1 +
 htdocs/langs/ca_ES/suppliers.lang             |   14 +-
 htdocs/langs/ca_ES/users.lang                 |    7 +-
 htdocs/langs/ca_ES/website.lang               |    5 +-
 htdocs/langs/ca_ES/withdrawals.lang           |   76 +-
 htdocs/langs/ca_ES/workflow.lang              |    4 +-
 htdocs/langs/cs_CZ/accountancy.lang           |  115 +-
 htdocs/langs/cs_CZ/admin.lang                 |   90 +-
 htdocs/langs/cs_CZ/banks.lang                 |   19 +-
 htdocs/langs/cs_CZ/bills.lang                 |   17 +-
 htdocs/langs/cs_CZ/boxes.lang                 |    9 +-
 htdocs/langs/cs_CZ/cashdesk.lang              |    3 +-
 htdocs/langs/cs_CZ/categories.lang            |    7 +-
 htdocs/langs/cs_CZ/companies.lang             |   22 +-
 htdocs/langs/cs_CZ/compta.lang                |    2 +
 htdocs/langs/cs_CZ/cron.lang                  |    7 +-
 htdocs/langs/cs_CZ/errors.lang                |    4 +-
 htdocs/langs/cs_CZ/install.lang               |    8 +
 htdocs/langs/cs_CZ/interventions.lang         |    1 +
 htdocs/langs/cs_CZ/ldap.lang                  |    2 +
 htdocs/langs/cs_CZ/mails.lang                 |    5 +-
 htdocs/langs/cs_CZ/main.lang                  |   24 +
 htdocs/langs/cs_CZ/margins.lang               |    1 +
 htdocs/langs/cs_CZ/oauth.lang                 |   19 +-
 htdocs/langs/cs_CZ/orders.lang                |    1 +
 htdocs/langs/cs_CZ/printing.lang              |    4 -
 htdocs/langs/cs_CZ/productbatch.lang          |    7 +-
 htdocs/langs/cs_CZ/products.lang              |   12 +-
 htdocs/langs/cs_CZ/projects.lang              |   15 +-
 htdocs/langs/cs_CZ/salaries.lang              |    4 +-
 htdocs/langs/cs_CZ/stocks.lang                |    9 +
 htdocs/langs/cs_CZ/supplier_proposal.lang     |    1 +
 htdocs/langs/cs_CZ/suppliers.lang             |   14 +-
 htdocs/langs/cs_CZ/users.lang                 |    3 +
 htdocs/langs/cs_CZ/website.lang               |    5 +-
 htdocs/langs/cs_CZ/withdrawals.lang           |   76 +-
 htdocs/langs/cs_CZ/workflow.lang              |    4 +-
 htdocs/langs/da_DK/accountancy.lang           |  115 +-
 htdocs/langs/da_DK/admin.lang                 |   90 +-
 htdocs/langs/da_DK/banks.lang                 |   19 +-
 htdocs/langs/da_DK/bills.lang                 |   17 +-
 htdocs/langs/da_DK/boxes.lang                 |    9 +-
 htdocs/langs/da_DK/cashdesk.lang              |    3 +-
 htdocs/langs/da_DK/categories.lang            |    7 +-
 htdocs/langs/da_DK/companies.lang             |   22 +-
 htdocs/langs/da_DK/compta.lang                |    2 +
 htdocs/langs/da_DK/cron.lang                  |    7 +-
 htdocs/langs/da_DK/errors.lang                |    4 +-
 htdocs/langs/da_DK/install.lang               |    8 +
 htdocs/langs/da_DK/interventions.lang         |    1 +
 htdocs/langs/da_DK/ldap.lang                  |    2 +
 htdocs/langs/da_DK/mails.lang                 |    5 +-
 htdocs/langs/da_DK/main.lang                  |   24 +
 htdocs/langs/da_DK/margins.lang               |    1 +
 htdocs/langs/da_DK/oauth.lang                 |   19 +-
 htdocs/langs/da_DK/orders.lang                |    1 +
 htdocs/langs/da_DK/printing.lang              |    4 -
 htdocs/langs/da_DK/productbatch.lang          |    7 +-
 htdocs/langs/da_DK/products.lang              |   12 +-
 htdocs/langs/da_DK/projects.lang              |   15 +-
 htdocs/langs/da_DK/salaries.lang              |    4 +-
 htdocs/langs/da_DK/stocks.lang                |    9 +
 htdocs/langs/da_DK/supplier_proposal.lang     |    1 +
 htdocs/langs/da_DK/suppliers.lang             |   14 +-
 htdocs/langs/da_DK/users.lang                 |    3 +
 htdocs/langs/da_DK/website.lang               |    5 +-
 htdocs/langs/da_DK/withdrawals.lang           |   76 +-
 htdocs/langs/da_DK/workflow.lang              |    4 +-
 htdocs/langs/de_AT/admin.lang                 |    5 -
 htdocs/langs/de_AT/bills.lang                 |   24 +-
 htdocs/langs/de_AT/companies.lang             |    1 -
 htdocs/langs/de_AT/compta.lang                |    1 -
 htdocs/langs/de_AT/orders.lang                |    2 -
 htdocs/langs/de_AT/products.lang              |    2 -
 htdocs/langs/de_AT/withdrawals.lang           |    1 -
 htdocs/langs/de_CH/admin.lang                 |   11 +-
 htdocs/langs/de_CH/banks.lang                 |    5 +
 htdocs/langs/de_CH/bills.lang                 |    6 +-
 htdocs/langs/de_CH/boxes.lang                 |    1 -
 htdocs/langs/de_CH/categories.lang            |    8 +-
 htdocs/langs/de_CH/companies.lang             |   16 +-
 htdocs/langs/de_CH/compta.lang                |    7 +
 htdocs/langs/de_CH/errors.lang                |    1 -
 htdocs/langs/de_CH/install.lang               |    1 +
 htdocs/langs/de_CH/ldap.lang                  |    2 +
 htdocs/langs/de_CH/main.lang                  |   19 +-
 htdocs/langs/de_CH/members.lang               |    1 -
 htdocs/langs/de_CH/oauth.lang                 |    1 -
 htdocs/langs/de_CH/products.lang              |   16 +-
 htdocs/langs/de_CH/projects.lang              |    1 -
 htdocs/langs/de_CH/stocks.lang                |    2 +
 htdocs/langs/de_CH/suppliers.lang             |    4 -
 htdocs/langs/de_CH/website.lang               |    2 +-
 htdocs/langs/de_CH/withdrawals.lang           |    3 -
 htdocs/langs/de_CH/workflow.lang              |    1 +
 htdocs/langs/de_DE/accountancy.lang           |  115 +-
 htdocs/langs/de_DE/admin.lang                 |  104 +-
 htdocs/langs/de_DE/banks.lang                 |   29 +-
 htdocs/langs/de_DE/bills.lang                 |   25 +-
 htdocs/langs/de_DE/boxes.lang                 |    7 +-
 htdocs/langs/de_DE/cashdesk.lang              |    3 +-
 htdocs/langs/de_DE/categories.lang            |   15 +-
 htdocs/langs/de_DE/commercial.lang            |    2 +-
 htdocs/langs/de_DE/companies.lang             |   42 +-
 htdocs/langs/de_DE/compta.lang                |   18 +-
 htdocs/langs/de_DE/contracts.lang             |    4 +-
 htdocs/langs/de_DE/cron.lang                  |    7 +-
 htdocs/langs/de_DE/deliveries.lang            |    2 +-
 htdocs/langs/de_DE/errors.lang                |    4 +-
 htdocs/langs/de_DE/help.lang                  |    8 +-
 htdocs/langs/de_DE/install.lang               |   10 +-
 htdocs/langs/de_DE/interventions.lang         |    3 +-
 htdocs/langs/de_DE/ldap.lang                  |    4 +-
 htdocs/langs/de_DE/mails.lang                 |    7 +-
 htdocs/langs/de_DE/main.lang                  |   80 +-
 htdocs/langs/de_DE/margins.lang               |    1 +
 htdocs/langs/de_DE/members.lang               |    4 +-
 htdocs/langs/de_DE/oauth.lang                 |   19 +-
 htdocs/langs/de_DE/opensurvey.lang            |    2 +-
 htdocs/langs/de_DE/orders.lang                |    1 +
 htdocs/langs/de_DE/printing.lang              |    4 -
 htdocs/langs/de_DE/productbatch.lang          |    7 +-
 htdocs/langs/de_DE/products.lang              |   42 +-
 htdocs/langs/de_DE/projects.lang              |   15 +-
 htdocs/langs/de_DE/resource.lang              |    2 +-
 htdocs/langs/de_DE/stocks.lang                |   25 +-
 htdocs/langs/de_DE/supplier_proposal.lang     |    3 +-
 htdocs/langs/de_DE/suppliers.lang             |   14 +-
 htdocs/langs/de_DE/users.lang                 |    5 +-
 htdocs/langs/de_DE/website.lang               |    9 +-
 htdocs/langs/de_DE/withdrawals.lang           |   76 +-
 htdocs/langs/de_DE/workflow.lang              |    2 +
 htdocs/langs/el_GR/accountancy.lang           |  121 +-
 htdocs/langs/el_GR/admin.lang                 |  156 +-
 htdocs/langs/el_GR/banks.lang                 |   25 +-
 htdocs/langs/el_GR/bills.lang                 |   61 +-
 htdocs/langs/el_GR/boxes.lang                 |   11 +-
 htdocs/langs/el_GR/cashdesk.lang              |    3 +-
 htdocs/langs/el_GR/categories.lang            |    7 +-
 htdocs/langs/el_GR/commercial.lang            |   24 +-
 htdocs/langs/el_GR/companies.lang             |   34 +-
 htdocs/langs/el_GR/compta.lang                |   44 +-
 htdocs/langs/el_GR/contracts.lang             |   34 +-
 htdocs/langs/el_GR/cron.lang                  |    9 +-
 htdocs/langs/el_GR/errors.lang                |   50 +-
 htdocs/langs/el_GR/exports.lang               |    4 +-
 htdocs/langs/el_GR/holiday.lang               |    2 +-
 htdocs/langs/el_GR/hrm.lang                   |    4 +-
 htdocs/langs/el_GR/install.lang               |   24 +-
 htdocs/langs/el_GR/interventions.lang         |    3 +-
 htdocs/langs/el_GR/ldap.lang                  |    2 +
 htdocs/langs/el_GR/mails.lang                 |    5 +-
 htdocs/langs/el_GR/main.lang                  |  118 +-
 htdocs/langs/el_GR/margins.lang               |    1 +
 htdocs/langs/el_GR/members.lang               |    8 +-
 htdocs/langs/el_GR/oauth.lang                 |   19 +-
 htdocs/langs/el_GR/opensurvey.lang            |    2 +-
 htdocs/langs/el_GR/orders.lang                |    1 +
 htdocs/langs/el_GR/printing.lang              |    4 -
 htdocs/langs/el_GR/productbatch.lang          |    7 +-
 htdocs/langs/el_GR/products.lang              |   30 +-
 htdocs/langs/el_GR/projects.lang              |   27 +-
 htdocs/langs/el_GR/salaries.lang              |    6 +-
 htdocs/langs/el_GR/sendings.lang              |    2 +-
 htdocs/langs/el_GR/stocks.lang                |   11 +-
 htdocs/langs/el_GR/supplier_proposal.lang     |    3 +-
 htdocs/langs/el_GR/suppliers.lang             |   14 +-
 htdocs/langs/el_GR/trips.lang                 |   18 +-
 htdocs/langs/el_GR/users.lang                 |    7 +-
 htdocs/langs/el_GR/website.lang               |    7 +-
 htdocs/langs/el_GR/withdrawals.lang           |   76 +-
 htdocs/langs/el_GR/workflow.lang              |    4 +-
 htdocs/langs/en_AU/accountancy.lang           |    2 +
 htdocs/langs/en_AU/admin.lang                 |    5 -
 htdocs/langs/en_AU/companies.lang             |    1 -
 htdocs/langs/en_AU/mails.lang                 |    2 -
 htdocs/langs/en_AU/stocks.lang                |    4 -
 htdocs/langs/en_AU/withdrawals.lang           |    1 +
 htdocs/langs/en_CA/accountancy.lang           |    2 +
 htdocs/langs/en_CA/admin.lang                 |    4 -
 htdocs/langs/en_CA/companies.lang             |    1 -
 htdocs/langs/en_CA/mails.lang                 |    2 -
 htdocs/langs/en_CA/stocks.lang                |    4 -
 htdocs/langs/en_CA/withdrawals.lang           |    2 +
 htdocs/langs/en_GB/accountancy.lang           |    2 +
 htdocs/langs/en_GB/admin.lang                 |    4 -
 htdocs/langs/en_GB/banks.lang                 |    2 -
 htdocs/langs/en_GB/companies.lang             |    1 -
 htdocs/langs/en_GB/mails.lang                 |    2 -
 htdocs/langs/en_GB/products.lang              |    1 -
 htdocs/langs/en_GB/stocks.lang                |    4 -
 htdocs/langs/en_GB/withdrawals.lang           |    2 +
 htdocs/langs/en_IN/accountancy.lang           |    2 +
 htdocs/langs/en_IN/admin.lang                 |    4 -
 htdocs/langs/en_IN/companies.lang             |    2 -
 htdocs/langs/en_IN/mails.lang                 |    2 -
 htdocs/langs/en_IN/stocks.lang                |    4 -
 htdocs/langs/en_IN/withdrawals.lang           |    2 +
 htdocs/langs/en_US/accountancy.lang           |   14 +-
 htdocs/langs/en_US/admin.lang                 |    1 -
 htdocs/langs/en_US/agenda.lang                |   23 +-
 htdocs/langs/en_US/banks.lang                 |    2 +-
 htdocs/langs/en_US/compta.lang                |    2 +-
 htdocs/langs/en_US/ecm.lang                   |    1 -
 htdocs/langs/en_US/exports.lang               |    2 -
 htdocs/langs/en_US/install.lang               |    1 -
 htdocs/langs/en_US/main.lang                  |    6 +-
 htdocs/langs/en_US/members.lang               |    1 -
 htdocs/langs/en_US/oauth.lang                 |    1 -
 htdocs/langs/en_US/other.lang                 |   26 +-
 htdocs/langs/es_AR/admin.lang                 |    4 -
 htdocs/langs/es_AR/companies.lang             |    2 -
 htdocs/langs/es_AR/mails.lang                 |    2 -
 htdocs/langs/es_AR/stocks.lang                |    4 -
 htdocs/langs/es_AR/withdrawals.lang           |    2 +
 htdocs/langs/es_BO/admin.lang                 |    4 -
 htdocs/langs/es_BO/companies.lang             |    2 -
 htdocs/langs/es_BO/mails.lang                 |    2 -
 htdocs/langs/es_BO/stocks.lang                |    4 -
 htdocs/langs/es_BO/withdrawals.lang           |    2 +
 htdocs/langs/es_CL/admin.lang                 |    4 -
 htdocs/langs/es_CL/boxes.lang                 |    1 -
 htdocs/langs/es_CL/companies.lang             |    1 -
 htdocs/langs/es_CL/mails.lang                 |    2 -
 htdocs/langs/es_CL/stocks.lang                |    4 -
 htdocs/langs/es_CL/withdrawals.lang           |    2 +
 htdocs/langs/es_CO/admin.lang                 |    4 -
 htdocs/langs/es_CO/companies.lang             |    2 -
 htdocs/langs/es_CO/mails.lang                 |    2 -
 htdocs/langs/es_CO/salaries.lang              |    2 -
 htdocs/langs/es_CO/stocks.lang                |    4 -
 htdocs/langs/es_CO/withdrawals.lang           |    2 +
 htdocs/langs/es_DO/admin.lang                 |    4 -
 htdocs/langs/es_DO/companies.lang             |    2 -
 htdocs/langs/es_DO/mails.lang                 |    2 -
 htdocs/langs/es_DO/stocks.lang                |    4 -
 htdocs/langs/es_DO/withdrawals.lang           |    2 +
 htdocs/langs/es_EC/admin.lang                 |    4 -
 htdocs/langs/es_EC/companies.lang             |    2 -
 htdocs/langs/es_EC/mails.lang                 |    2 -
 htdocs/langs/es_EC/stocks.lang                |    4 -
 htdocs/langs/es_EC/withdrawals.lang           |    2 +
 htdocs/langs/es_ES/accountancy.lang           |  129 +-
 htdocs/langs/es_ES/admin.lang                 |   86 +-
 htdocs/langs/es_ES/banks.lang                 |   19 +-
 htdocs/langs/es_ES/bills.lang                 |   11 +-
 htdocs/langs/es_ES/boxes.lang                 |    9 +-
 htdocs/langs/es_ES/cashdesk.lang              |    3 +-
 htdocs/langs/es_ES/categories.lang            |    7 +-
 htdocs/langs/es_ES/companies.lang             |   22 +-
 htdocs/langs/es_ES/compta.lang                |   14 +-
 htdocs/langs/es_ES/cron.lang                  |    7 +-
 htdocs/langs/es_ES/errors.lang                |    4 +-
 htdocs/langs/es_ES/holiday.lang               |    4 +-
 htdocs/langs/es_ES/install.lang               |    8 +
 htdocs/langs/es_ES/interventions.lang         |    5 +-
 htdocs/langs/es_ES/ldap.lang                  |    2 +
 htdocs/langs/es_ES/mails.lang                 |    5 +-
 htdocs/langs/es_ES/main.lang                  |   24 +
 htdocs/langs/es_ES/margins.lang               |    1 +
 htdocs/langs/es_ES/oauth.lang                 |   19 +-
 htdocs/langs/es_ES/orders.lang                |    1 +
 htdocs/langs/es_ES/printing.lang              |    8 +-
 htdocs/langs/es_ES/productbatch.lang          |    7 +-
 htdocs/langs/es_ES/products.lang              |   26 +-
 htdocs/langs/es_ES/projects.lang              |   15 +-
 htdocs/langs/es_ES/salaries.lang              |    4 +-
 htdocs/langs/es_ES/stocks.lang                |    9 +
 htdocs/langs/es_ES/supplier_proposal.lang     |    7 +-
 htdocs/langs/es_ES/suppliers.lang             |   10 +-
 htdocs/langs/es_ES/users.lang                 |    3 +
 htdocs/langs/es_ES/website.lang               |    5 +-
 htdocs/langs/es_ES/withdrawals.lang           |   30 +-
 htdocs/langs/es_ES/workflow.lang              |    4 +-
 htdocs/langs/es_MX/accountancy.lang           |   26 -
 htdocs/langs/es_MX/admin.lang                 |    9 +-
 htdocs/langs/es_MX/banks.lang                 |    7 +-
 htdocs/langs/es_MX/companies.lang             |    8 -
 htdocs/langs/es_MX/cron.lang                  |    1 -
 htdocs/langs/es_MX/mails.lang                 |    2 -
 htdocs/langs/es_MX/main.lang                  |    1 +
 htdocs/langs/es_MX/stocks.lang                |    3 -
 htdocs/langs/es_MX/users.lang                 |    1 -
 htdocs/langs/es_MX/withdrawals.lang           |    1 +
 htdocs/langs/es_PA/admin.lang                 |    4 -
 htdocs/langs/es_PA/companies.lang             |    2 -
 htdocs/langs/es_PA/mails.lang                 |    2 -
 htdocs/langs/es_PA/stocks.lang                |    4 -
 htdocs/langs/es_PA/withdrawals.lang           |    2 +
 htdocs/langs/es_PE/accountancy.lang           |    3 -
 htdocs/langs/es_PE/admin.lang                 |    4 -
 htdocs/langs/es_PE/companies.lang             |    1 -
 htdocs/langs/es_PE/mails.lang                 |    2 -
 htdocs/langs/es_PE/stocks.lang                |    4 -
 htdocs/langs/es_PE/withdrawals.lang           |    2 +
 htdocs/langs/es_PY/admin.lang                 |    4 -
 htdocs/langs/es_PY/companies.lang             |    1 -
 htdocs/langs/es_PY/mails.lang                 |    2 -
 htdocs/langs/es_PY/stocks.lang                |    4 -
 htdocs/langs/es_PY/withdrawals.lang           |    2 +
 htdocs/langs/es_VE/admin.lang                 |    2 -
 htdocs/langs/es_VE/boxes.lang                 |    2 +
 htdocs/langs/es_VE/companies.lang             |    1 -
 htdocs/langs/es_VE/mails.lang                 |    2 -
 htdocs/langs/es_VE/stocks.lang                |    4 -
 htdocs/langs/es_VE/withdrawals.lang           |    2 +
 htdocs/langs/et_EE/accountancy.lang           |  113 +-
 htdocs/langs/et_EE/admin.lang                 |   90 +-
 htdocs/langs/et_EE/banks.lang                 |   19 +-
 htdocs/langs/et_EE/bills.lang                 |   47 +-
 htdocs/langs/et_EE/boxes.lang                 |    9 +-
 htdocs/langs/et_EE/cashdesk.lang              |    3 +-
 htdocs/langs/et_EE/categories.lang            |    7 +-
 htdocs/langs/et_EE/companies.lang             |   22 +-
 htdocs/langs/et_EE/compta.lang                |    2 +
 htdocs/langs/et_EE/cron.lang                  |    7 +-
 htdocs/langs/et_EE/errors.lang                |    4 +-
 htdocs/langs/et_EE/install.lang               |    5 +
 htdocs/langs/et_EE/interventions.lang         |    1 +
 htdocs/langs/et_EE/ldap.lang                  |    2 +
 htdocs/langs/et_EE/mails.lang                 |    5 +-
 htdocs/langs/et_EE/main.lang                  |   24 +
 htdocs/langs/et_EE/margins.lang               |    1 +
 htdocs/langs/et_EE/oauth.lang                 |   19 +-
 htdocs/langs/et_EE/orders.lang                |    1 +
 htdocs/langs/et_EE/printing.lang              |    4 -
 htdocs/langs/et_EE/productbatch.lang          |    7 +-
 htdocs/langs/et_EE/products.lang              |   12 +-
 htdocs/langs/et_EE/projects.lang              |   15 +-
 htdocs/langs/et_EE/salaries.lang              |    4 +-
 htdocs/langs/et_EE/stocks.lang                |    9 +
 htdocs/langs/et_EE/supplier_proposal.lang     |    1 +
 htdocs/langs/et_EE/suppliers.lang             |   14 +-
 htdocs/langs/et_EE/users.lang                 |    3 +
 htdocs/langs/et_EE/website.lang               |    5 +-
 htdocs/langs/et_EE/withdrawals.lang           |   76 +-
 htdocs/langs/et_EE/workflow.lang              |    4 +-
 htdocs/langs/eu_ES/accountancy.lang           |  113 +-
 htdocs/langs/eu_ES/admin.lang                 |   90 +-
 htdocs/langs/eu_ES/banks.lang                 |   19 +-
 htdocs/langs/eu_ES/bills.lang                 |   17 +-
 htdocs/langs/eu_ES/boxes.lang                 |    9 +-
 htdocs/langs/eu_ES/cashdesk.lang              |    3 +-
 htdocs/langs/eu_ES/categories.lang            |    7 +-
 htdocs/langs/eu_ES/companies.lang             |   22 +-
 htdocs/langs/eu_ES/compta.lang                |    2 +
 htdocs/langs/eu_ES/cron.lang                  |    7 +-
 htdocs/langs/eu_ES/errors.lang                |    4 +-
 htdocs/langs/eu_ES/install.lang               |    8 +
 htdocs/langs/eu_ES/interventions.lang         |    1 +
 htdocs/langs/eu_ES/ldap.lang                  |    2 +
 htdocs/langs/eu_ES/mails.lang                 |    5 +-
 htdocs/langs/eu_ES/main.lang                  |   24 +
 htdocs/langs/eu_ES/margins.lang               |    1 +
 htdocs/langs/eu_ES/oauth.lang                 |   19 +-
 htdocs/langs/eu_ES/orders.lang                |    1 +
 htdocs/langs/eu_ES/printing.lang              |    4 -
 htdocs/langs/eu_ES/productbatch.lang          |    7 +-
 htdocs/langs/eu_ES/products.lang              |   12 +-
 htdocs/langs/eu_ES/projects.lang              |   15 +-
 htdocs/langs/eu_ES/salaries.lang              |    4 +-
 htdocs/langs/eu_ES/stocks.lang                |    9 +
 htdocs/langs/eu_ES/supplier_proposal.lang     |    1 +
 htdocs/langs/eu_ES/suppliers.lang             |   14 +-
 htdocs/langs/eu_ES/users.lang                 |    3 +
 htdocs/langs/eu_ES/website.lang               |    5 +-
 htdocs/langs/eu_ES/withdrawals.lang           |   76 +-
 htdocs/langs/eu_ES/workflow.lang              |    4 +-
 htdocs/langs/fa_IR/accountancy.lang           |  113 +-
 htdocs/langs/fa_IR/admin.lang                 |   90 +-
 htdocs/langs/fa_IR/banks.lang                 |   19 +-
 htdocs/langs/fa_IR/bills.lang                 |   17 +-
 htdocs/langs/fa_IR/boxes.lang                 |    9 +-
 htdocs/langs/fa_IR/cashdesk.lang              |    3 +-
 htdocs/langs/fa_IR/categories.lang            |    7 +-
 htdocs/langs/fa_IR/companies.lang             |   22 +-
 htdocs/langs/fa_IR/compta.lang                |    2 +
 htdocs/langs/fa_IR/cron.lang                  |    7 +-
 htdocs/langs/fa_IR/errors.lang                |    4 +-
 htdocs/langs/fa_IR/install.lang               |    8 +
 htdocs/langs/fa_IR/interventions.lang         |    1 +
 htdocs/langs/fa_IR/ldap.lang                  |    2 +
 htdocs/langs/fa_IR/mails.lang                 |    5 +-
 htdocs/langs/fa_IR/main.lang                  |   24 +
 htdocs/langs/fa_IR/margins.lang               |    1 +
 htdocs/langs/fa_IR/oauth.lang                 |   19 +-
 htdocs/langs/fa_IR/orders.lang                |    1 +
 htdocs/langs/fa_IR/printing.lang              |    4 -
 htdocs/langs/fa_IR/productbatch.lang          |    7 +-
 htdocs/langs/fa_IR/products.lang              |   12 +-
 htdocs/langs/fa_IR/projects.lang              |   15 +-
 htdocs/langs/fa_IR/salaries.lang              |    4 +-
 htdocs/langs/fa_IR/stocks.lang                |    9 +
 htdocs/langs/fa_IR/supplier_proposal.lang     |    1 +
 htdocs/langs/fa_IR/suppliers.lang             |   14 +-
 htdocs/langs/fa_IR/users.lang                 |    3 +
 htdocs/langs/fa_IR/website.lang               |    5 +-
 htdocs/langs/fa_IR/withdrawals.lang           |   76 +-
 htdocs/langs/fa_IR/workflow.lang              |    4 +-
 htdocs/langs/fi_FI/accountancy.lang           |  113 +-
 htdocs/langs/fi_FI/admin.lang                 |   90 +-
 htdocs/langs/fi_FI/banks.lang                 |   19 +-
 htdocs/langs/fi_FI/bills.lang                 |   17 +-
 htdocs/langs/fi_FI/boxes.lang                 |    9 +-
 htdocs/langs/fi_FI/cashdesk.lang              |    3 +-
 htdocs/langs/fi_FI/categories.lang            |    7 +-
 htdocs/langs/fi_FI/companies.lang             |   22 +-
 htdocs/langs/fi_FI/compta.lang                |    2 +
 htdocs/langs/fi_FI/cron.lang                  |    7 +-
 htdocs/langs/fi_FI/errors.lang                |    4 +-
 htdocs/langs/fi_FI/install.lang               |    8 +
 htdocs/langs/fi_FI/interventions.lang         |    1 +
 htdocs/langs/fi_FI/ldap.lang                  |    2 +
 htdocs/langs/fi_FI/mails.lang                 |    5 +-
 htdocs/langs/fi_FI/main.lang                  |   24 +
 htdocs/langs/fi_FI/margins.lang               |    1 +
 htdocs/langs/fi_FI/oauth.lang                 |   19 +-
 htdocs/langs/fi_FI/orders.lang                |    1 +
 htdocs/langs/fi_FI/printing.lang              |    4 -
 htdocs/langs/fi_FI/productbatch.lang          |    7 +-
 htdocs/langs/fi_FI/products.lang              |   12 +-
 htdocs/langs/fi_FI/projects.lang              |   15 +-
 htdocs/langs/fi_FI/salaries.lang              |    4 +-
 htdocs/langs/fi_FI/stocks.lang                |    9 +
 htdocs/langs/fi_FI/supplier_proposal.lang     |    1 +
 htdocs/langs/fi_FI/suppliers.lang             |   14 +-
 htdocs/langs/fi_FI/users.lang                 |    3 +
 htdocs/langs/fi_FI/website.lang               |    5 +-
 htdocs/langs/fi_FI/withdrawals.lang           |   76 +-
 htdocs/langs/fi_FI/workflow.lang              |    4 +-
 htdocs/langs/fr_BE/accountancy.lang           |   11 +-
 htdocs/langs/fr_BE/admin.lang                 |    2 -
 htdocs/langs/fr_BE/boxes.lang                 |   29 -
 htdocs/langs/fr_BE/mails.lang                 |    2 -
 htdocs/langs/fr_BE/stocks.lang                |    4 -
 htdocs/langs/fr_BE/withdrawals.lang           |    2 +
 htdocs/langs/fr_CA/accountancy.lang           |    5 +-
 htdocs/langs/fr_CA/admin.lang                 |    4 +-
 htdocs/langs/fr_CA/banks.lang                 |    6 +
 htdocs/langs/fr_CA/bills.lang                 |    1 +
 htdocs/langs/fr_CA/boxes.lang                 |    3 +-
 htdocs/langs/fr_CA/categories.lang            |    1 -
 htdocs/langs/fr_CA/mails.lang                 |    1 -
 htdocs/langs/fr_CA/products.lang              |    2 -
 htdocs/langs/fr_CA/salaries.lang              |    2 -
 htdocs/langs/fr_CA/stocks.lang                |    4 -
 htdocs/langs/fr_CA/suppliers.lang             |    6 +-
 htdocs/langs/fr_CA/withdrawals.lang           |    2 +
 htdocs/langs/fr_CH/accountancy.lang           |    2 +
 htdocs/langs/fr_CH/admin.lang                 |    2 -
 htdocs/langs/fr_CH/mails.lang                 |    2 -
 htdocs/langs/fr_CH/stocks.lang                |    4 -
 htdocs/langs/fr_CH/withdrawals.lang           |    2 +
 htdocs/langs/fr_FR/accountancy.lang           |  107 +-
 htdocs/langs/fr_FR/admin.lang                 |   82 +-
 htdocs/langs/fr_FR/banks.lang                 |   27 +-
 htdocs/langs/fr_FR/bills.lang                 |   17 +-
 htdocs/langs/fr_FR/boxes.lang                 |    9 +-
 htdocs/langs/fr_FR/cashdesk.lang              |    3 +-
 htdocs/langs/fr_FR/categories.lang            |    7 +-
 htdocs/langs/fr_FR/companies.lang             |   18 +-
 htdocs/langs/fr_FR/compta.lang                |    2 +
 htdocs/langs/fr_FR/cron.lang                  |    7 +-
 htdocs/langs/fr_FR/errors.lang                |    6 +-
 htdocs/langs/fr_FR/holiday.lang               |    4 +-
 htdocs/langs/fr_FR/hrm.lang                   |    2 +-
 htdocs/langs/fr_FR/install.lang               |    8 +
 htdocs/langs/fr_FR/interventions.lang         |    1 +
 htdocs/langs/fr_FR/ldap.lang                  |    2 +
 htdocs/langs/fr_FR/loan.lang                  |    4 +-
 htdocs/langs/fr_FR/mails.lang                 |    3 +-
 htdocs/langs/fr_FR/main.lang                  |   26 +-
 htdocs/langs/fr_FR/margins.lang               |    1 +
 htdocs/langs/fr_FR/oauth.lang                 |   19 +-
 htdocs/langs/fr_FR/orders.lang                |    1 +
 htdocs/langs/fr_FR/other.lang                 |    2 +-
 htdocs/langs/fr_FR/printing.lang              |    4 -
 htdocs/langs/fr_FR/productbatch.lang          |    8 +-
 htdocs/langs/fr_FR/products.lang              |   22 +-
 htdocs/langs/fr_FR/projects.lang              |    9 +-
 htdocs/langs/fr_FR/salaries.lang              |    4 +-
 htdocs/langs/fr_FR/stocks.lang                |   11 +-
 htdocs/langs/fr_FR/supplier_proposal.lang     |    3 +-
 htdocs/langs/fr_FR/suppliers.lang             |   10 +-
 htdocs/langs/fr_FR/users.lang                 |    2 +
 htdocs/langs/fr_FR/website.lang               |    5 +-
 htdocs/langs/fr_FR/withdrawals.lang           |   38 +-
 htdocs/langs/fr_FR/workflow.lang              |    4 +-
 htdocs/langs/he_IL/accountancy.lang           |  113 +-
 htdocs/langs/he_IL/admin.lang                 |   90 +-
 htdocs/langs/he_IL/banks.lang                 |   19 +-
 htdocs/langs/he_IL/bills.lang                 |   17 +-
 htdocs/langs/he_IL/boxes.lang                 |    9 +-
 htdocs/langs/he_IL/cashdesk.lang              |    3 +-
 htdocs/langs/he_IL/categories.lang            |    7 +-
 htdocs/langs/he_IL/companies.lang             |   22 +-
 htdocs/langs/he_IL/compta.lang                |    2 +
 htdocs/langs/he_IL/cron.lang                  |    7 +-
 htdocs/langs/he_IL/errors.lang                |    4 +-
 htdocs/langs/he_IL/install.lang               |    8 +
 htdocs/langs/he_IL/interventions.lang         |    1 +
 htdocs/langs/he_IL/ldap.lang                  |    2 +
 htdocs/langs/he_IL/mails.lang                 |    5 +-
 htdocs/langs/he_IL/main.lang                  |   24 +
 htdocs/langs/he_IL/margins.lang               |    1 +
 htdocs/langs/he_IL/oauth.lang                 |   19 +-
 htdocs/langs/he_IL/orders.lang                |    1 +
 htdocs/langs/he_IL/printing.lang              |    4 -
 htdocs/langs/he_IL/productbatch.lang          |    7 +-
 htdocs/langs/he_IL/products.lang              |   12 +-
 htdocs/langs/he_IL/projects.lang              |   15 +-
 htdocs/langs/he_IL/salaries.lang              |    4 +-
 htdocs/langs/he_IL/stocks.lang                |    9 +
 htdocs/langs/he_IL/supplier_proposal.lang     |    1 +
 htdocs/langs/he_IL/suppliers.lang             |   14 +-
 htdocs/langs/he_IL/users.lang                 |    3 +
 htdocs/langs/he_IL/website.lang               |    5 +-
 htdocs/langs/he_IL/withdrawals.lang           |   76 +-
 htdocs/langs/he_IL/workflow.lang              |    4 +-
 htdocs/langs/hr_HR/accountancy.lang           |  207 +-
 htdocs/langs/hr_HR/admin.lang                 | 2440 +++++++++--------
 htdocs/langs/hr_HR/agenda.lang                |   96 +-
 htdocs/langs/hr_HR/banks.lang                 |  243 +-
 htdocs/langs/hr_HR/bills.lang                 |  321 +--
 htdocs/langs/hr_HR/bookmarks.lang             |    4 +-
 htdocs/langs/hr_HR/boxes.lang                 |  153 +-
 htdocs/langs/hr_HR/cashdesk.lang              |   67 +-
 htdocs/langs/hr_HR/categories.lang            |  165 +-
 htdocs/langs/hr_HR/commercial.lang            |   96 +-
 htdocs/langs/hr_HR/companies.lang             |  332 +--
 htdocs/langs/hr_HR/compta.lang                |  402 +--
 htdocs/langs/hr_HR/contracts.lang             |   22 +-
 htdocs/langs/hr_HR/cron.lang                  |  135 +-
 htdocs/langs/hr_HR/deliveries.lang            |   12 +-
 htdocs/langs/hr_HR/dict.lang                  |   18 +-
 htdocs/langs/hr_HR/donations.lang             |   64 +-
 htdocs/langs/hr_HR/ecm.lang                   |   82 +-
 htdocs/langs/hr_HR/errors.lang                |   18 +-
 htdocs/langs/hr_HR/externalsite.lang          |    2 +-
 htdocs/langs/hr_HR/ftp.lang                   |   26 +-
 htdocs/langs/hr_HR/help.lang                  |   50 +-
 htdocs/langs/hr_HR/holiday.lang               |  194 +-
 htdocs/langs/hr_HR/hrm.lang                   |   26 +-
 htdocs/langs/hr_HR/incoterm.lang              |    2 +-
 htdocs/langs/hr_HR/install.lang               |   14 +-
 htdocs/langs/hr_HR/interventions.lang         |  115 +-
 htdocs/langs/hr_HR/languages.lang             |   24 +-
 htdocs/langs/hr_HR/ldap.lang                  |   44 +-
 htdocs/langs/hr_HR/link.lang                  |   19 +-
 htdocs/langs/hr_HR/loan.lang                  |   90 +-
 htdocs/langs/hr_HR/mailmanspip.lang           |   50 +-
 htdocs/langs/hr_HR/mails.lang                 |   21 +-
 htdocs/langs/hr_HR/main.lang                  | 1368 ++++-----
 htdocs/langs/hr_HR/margins.lang               |   75 +-
 htdocs/langs/hr_HR/members.lang               |  316 +--
 htdocs/langs/hr_HR/oauth.lang                 |   37 +-
 htdocs/langs/hr_HR/opensurvey.lang            |  116 +-
 htdocs/langs/hr_HR/orders.lang                |  227 +-
 htdocs/langs/hr_HR/other.lang                 |   22 +-
 htdocs/langs/hr_HR/paybox.lang                |   42 +-
 htdocs/langs/hr_HR/paypal.lang                |   42 +-
 htdocs/langs/hr_HR/printing.lang              |   80 +-
 htdocs/langs/hr_HR/productbatch.lang          |   43 +-
 htdocs/langs/hr_HR/products.lang              |  358 +--
 htdocs/langs/hr_HR/projects.lang              |  351 +--
 htdocs/langs/hr_HR/propal.lang                |   66 +-
 htdocs/langs/hr_HR/receiptprinter.lang        |   78 +-
 htdocs/langs/hr_HR/resource.lang              |   48 +-
 htdocs/langs/hr_HR/salaries.lang              |   26 +-
 htdocs/langs/hr_HR/sendings.lang              |   68 +-
 htdocs/langs/hr_HR/sms.lang                   |   98 +-
 htdocs/langs/hr_HR/stocks.lang                |  275 +-
 htdocs/langs/hr_HR/supplier_proposal.lang     |  105 +-
 htdocs/langs/hr_HR/suppliers.lang             |   84 +-
 htdocs/langs/hr_HR/trips.lang                 |  136 +-
 htdocs/langs/hr_HR/users.lang                 |  111 +-
 htdocs/langs/hr_HR/website.lang               |   51 +-
 htdocs/langs/hr_HR/withdrawals.lang           |  186 +-
 htdocs/langs/hr_HR/workflow.lang              |   24 +-
 htdocs/langs/hu_HU/accountancy.lang           |  113 +-
 htdocs/langs/hu_HU/admin.lang                 |  308 ++-
 htdocs/langs/hu_HU/banks.lang                 |   63 +-
 htdocs/langs/hu_HU/bills.lang                 |   17 +-
 htdocs/langs/hu_HU/boxes.lang                 |    9 +-
 htdocs/langs/hu_HU/cashdesk.lang              |    3 +-
 htdocs/langs/hu_HU/categories.lang            |    7 +-
 htdocs/langs/hu_HU/companies.lang             |   46 +-
 htdocs/langs/hu_HU/compta.lang                |    2 +
 htdocs/langs/hu_HU/cron.lang                  |    7 +-
 htdocs/langs/hu_HU/deliveries.lang            |   12 +-
 htdocs/langs/hu_HU/dict.lang                  |   20 +-
 htdocs/langs/hu_HU/errors.lang                |    4 +-
 htdocs/langs/hu_HU/install.lang               |    8 +
 htdocs/langs/hu_HU/interventions.lang         |    1 +
 htdocs/langs/hu_HU/languages.lang             |   30 +-
 htdocs/langs/hu_HU/ldap.lang                  |    2 +
 htdocs/langs/hu_HU/mails.lang                 |    5 +-
 htdocs/langs/hu_HU/main.lang                  |  352 +--
 htdocs/langs/hu_HU/margins.lang               |    1 +
 htdocs/langs/hu_HU/oauth.lang                 |   19 +-
 htdocs/langs/hu_HU/orders.lang                |    1 +
 htdocs/langs/hu_HU/printing.lang              |    4 -
 htdocs/langs/hu_HU/productbatch.lang          |    7 +-
 htdocs/langs/hu_HU/products.lang              |  116 +-
 htdocs/langs/hu_HU/projects.lang              |   15 +-
 htdocs/langs/hu_HU/resource.lang              |   48 +-
 htdocs/langs/hu_HU/salaries.lang              |    4 +-
 htdocs/langs/hu_HU/stocks.lang                |   15 +-
 htdocs/langs/hu_HU/supplier_proposal.lang     |    1 +
 htdocs/langs/hu_HU/suppliers.lang             |   14 +-
 htdocs/langs/hu_HU/users.lang                 |   13 +-
 htdocs/langs/hu_HU/website.lang               |    5 +-
 htdocs/langs/hu_HU/withdrawals.lang           |   76 +-
 htdocs/langs/hu_HU/workflow.lang              |    4 +-
 htdocs/langs/id_ID/accountancy.lang           |  113 +-
 htdocs/langs/id_ID/admin.lang                 |   90 +-
 htdocs/langs/id_ID/banks.lang                 |   19 +-
 htdocs/langs/id_ID/bills.lang                 |   17 +-
 htdocs/langs/id_ID/boxes.lang                 |    9 +-
 htdocs/langs/id_ID/cashdesk.lang              |    3 +-
 htdocs/langs/id_ID/categories.lang            |    7 +-
 htdocs/langs/id_ID/companies.lang             |   22 +-
 htdocs/langs/id_ID/compta.lang                |    2 +
 htdocs/langs/id_ID/cron.lang                  |    7 +-
 htdocs/langs/id_ID/errors.lang                |    4 +-
 htdocs/langs/id_ID/install.lang               |    8 +
 htdocs/langs/id_ID/interventions.lang         |    1 +
 htdocs/langs/id_ID/ldap.lang                  |    2 +
 htdocs/langs/id_ID/mails.lang                 |    5 +-
 htdocs/langs/id_ID/main.lang                  |   24 +
 htdocs/langs/id_ID/margins.lang               |    1 +
 htdocs/langs/id_ID/oauth.lang                 |   19 +-
 htdocs/langs/id_ID/orders.lang                |    1 +
 htdocs/langs/id_ID/printing.lang              |    4 -
 htdocs/langs/id_ID/productbatch.lang          |    7 +-
 htdocs/langs/id_ID/products.lang              |   12 +-
 htdocs/langs/id_ID/projects.lang              |   15 +-
 htdocs/langs/id_ID/salaries.lang              |    4 +-
 htdocs/langs/id_ID/stocks.lang                |    9 +
 htdocs/langs/id_ID/supplier_proposal.lang     |    1 +
 htdocs/langs/id_ID/suppliers.lang             |   14 +-
 htdocs/langs/id_ID/users.lang                 |    3 +
 htdocs/langs/id_ID/website.lang               |    5 +-
 htdocs/langs/id_ID/withdrawals.lang           |   76 +-
 htdocs/langs/id_ID/workflow.lang              |    4 +-
 htdocs/langs/is_IS/accountancy.lang           |  113 +-
 htdocs/langs/is_IS/admin.lang                 |   90 +-
 htdocs/langs/is_IS/banks.lang                 |   19 +-
 htdocs/langs/is_IS/bills.lang                 |   17 +-
 htdocs/langs/is_IS/boxes.lang                 |    9 +-
 htdocs/langs/is_IS/cashdesk.lang              |    3 +-
 htdocs/langs/is_IS/categories.lang            |    7 +-
 htdocs/langs/is_IS/companies.lang             |   22 +-
 htdocs/langs/is_IS/compta.lang                |    2 +
 htdocs/langs/is_IS/cron.lang                  |    7 +-
 htdocs/langs/is_IS/errors.lang                |    4 +-
 htdocs/langs/is_IS/install.lang               |    8 +
 htdocs/langs/is_IS/interventions.lang         |    1 +
 htdocs/langs/is_IS/ldap.lang                  |    2 +
 htdocs/langs/is_IS/mails.lang                 |    5 +-
 htdocs/langs/is_IS/main.lang                  |   24 +
 htdocs/langs/is_IS/margins.lang               |    1 +
 htdocs/langs/is_IS/oauth.lang                 |   19 +-
 htdocs/langs/is_IS/orders.lang                |    1 +
 htdocs/langs/is_IS/printing.lang              |    4 -
 htdocs/langs/is_IS/productbatch.lang          |    7 +-
 htdocs/langs/is_IS/products.lang              |   12 +-
 htdocs/langs/is_IS/projects.lang              |   15 +-
 htdocs/langs/is_IS/salaries.lang              |    4 +-
 htdocs/langs/is_IS/stocks.lang                |    9 +
 htdocs/langs/is_IS/supplier_proposal.lang     |    1 +
 htdocs/langs/is_IS/suppliers.lang             |   14 +-
 htdocs/langs/is_IS/users.lang                 |    3 +
 htdocs/langs/is_IS/website.lang               |    5 +-
 htdocs/langs/is_IS/withdrawals.lang           |   76 +-
 htdocs/langs/is_IS/workflow.lang              |    4 +-
 htdocs/langs/it_IT/accountancy.lang           |  121 +-
 htdocs/langs/it_IT/admin.lang                 |  176 +-
 htdocs/langs/it_IT/agenda.lang                |    4 +-
 htdocs/langs/it_IT/banks.lang                 |   21 +-
 htdocs/langs/it_IT/bills.lang                 |   19 +-
 htdocs/langs/it_IT/bookmarks.lang             |    2 +-
 htdocs/langs/it_IT/boxes.lang                 |    9 +-
 htdocs/langs/it_IT/cashdesk.lang              |    3 +-
 htdocs/langs/it_IT/categories.lang            |    7 +-
 htdocs/langs/it_IT/commercial.lang            |    4 +-
 htdocs/langs/it_IT/companies.lang             |   46 +-
 htdocs/langs/it_IT/compta.lang                |    2 +
 htdocs/langs/it_IT/cron.lang                  |    7 +-
 htdocs/langs/it_IT/errors.lang                |    4 +-
 htdocs/langs/it_IT/holiday.lang               |   38 +-
 htdocs/langs/it_IT/install.lang               |    8 +
 htdocs/langs/it_IT/interventions.lang         |   23 +-
 htdocs/langs/it_IT/ldap.lang                  |    2 +
 htdocs/langs/it_IT/loan.lang                  |    8 +-
 htdocs/langs/it_IT/mails.lang                 |    5 +-
 htdocs/langs/it_IT/main.lang                  |   24 +
 htdocs/langs/it_IT/margins.lang               |    1 +
 htdocs/langs/it_IT/oauth.lang                 |   19 +-
 htdocs/langs/it_IT/orders.lang                |    1 +
 htdocs/langs/it_IT/printing.lang              |   14 +-
 htdocs/langs/it_IT/productbatch.lang          |    7 +-
 htdocs/langs/it_IT/products.lang              |   28 +-
 htdocs/langs/it_IT/projects.lang              |   15 +-
 htdocs/langs/it_IT/resource.lang              |   12 +-
 htdocs/langs/it_IT/salaries.lang              |    4 +-
 htdocs/langs/it_IT/stocks.lang                |    9 +
 htdocs/langs/it_IT/supplier_proposal.lang     |   31 +-
 htdocs/langs/it_IT/suppliers.lang             |   14 +-
 htdocs/langs/it_IT/users.lang                 |    3 +
 htdocs/langs/it_IT/website.lang               |    5 +-
 htdocs/langs/it_IT/withdrawals.lang           |   76 +-
 htdocs/langs/it_IT/workflow.lang              |    2 +
 htdocs/langs/ja_JP/accountancy.lang           |  113 +-
 htdocs/langs/ja_JP/admin.lang                 |   90 +-
 htdocs/langs/ja_JP/banks.lang                 |   19 +-
 htdocs/langs/ja_JP/bills.lang                 |   17 +-
 htdocs/langs/ja_JP/boxes.lang                 |    9 +-
 htdocs/langs/ja_JP/cashdesk.lang              |    3 +-
 htdocs/langs/ja_JP/categories.lang            |    7 +-
 htdocs/langs/ja_JP/companies.lang             |   22 +-
 htdocs/langs/ja_JP/compta.lang                |    2 +
 htdocs/langs/ja_JP/cron.lang                  |    7 +-
 htdocs/langs/ja_JP/errors.lang                |    4 +-
 htdocs/langs/ja_JP/install.lang               |    8 +
 htdocs/langs/ja_JP/interventions.lang         |    1 +
 htdocs/langs/ja_JP/ldap.lang                  |    2 +
 htdocs/langs/ja_JP/mails.lang                 |    5 +-
 htdocs/langs/ja_JP/main.lang                  |   24 +
 htdocs/langs/ja_JP/margins.lang               |    1 +
 htdocs/langs/ja_JP/oauth.lang                 |   19 +-
 htdocs/langs/ja_JP/orders.lang                |    1 +
 htdocs/langs/ja_JP/printing.lang              |    4 -
 htdocs/langs/ja_JP/productbatch.lang          |    7 +-
 htdocs/langs/ja_JP/products.lang              |   12 +-
 htdocs/langs/ja_JP/projects.lang              |   15 +-
 htdocs/langs/ja_JP/salaries.lang              |    4 +-
 htdocs/langs/ja_JP/stocks.lang                |    9 +
 htdocs/langs/ja_JP/supplier_proposal.lang     |    1 +
 htdocs/langs/ja_JP/suppliers.lang             |   14 +-
 htdocs/langs/ja_JP/users.lang                 |    3 +
 htdocs/langs/ja_JP/website.lang               |    5 +-
 htdocs/langs/ja_JP/withdrawals.lang           |   76 +-
 htdocs/langs/ja_JP/workflow.lang              |    4 +-
 htdocs/langs/ka_GE/accountancy.lang           |  113 +-
 htdocs/langs/ka_GE/admin.lang                 |   90 +-
 htdocs/langs/ka_GE/banks.lang                 |   19 +-
 htdocs/langs/ka_GE/bills.lang                 |   17 +-
 htdocs/langs/ka_GE/boxes.lang                 |    9 +-
 htdocs/langs/ka_GE/cashdesk.lang              |    3 +-
 htdocs/langs/ka_GE/categories.lang            |    7 +-
 htdocs/langs/ka_GE/companies.lang             |   22 +-
 htdocs/langs/ka_GE/compta.lang                |    2 +
 htdocs/langs/ka_GE/cron.lang                  |    7 +-
 htdocs/langs/ka_GE/errors.lang                |    4 +-
 htdocs/langs/ka_GE/install.lang               |    8 +
 htdocs/langs/ka_GE/interventions.lang         |    1 +
 htdocs/langs/ka_GE/ldap.lang                  |    2 +
 htdocs/langs/ka_GE/mails.lang                 |    5 +-
 htdocs/langs/ka_GE/main.lang                  |   24 +
 htdocs/langs/ka_GE/margins.lang               |    1 +
 htdocs/langs/ka_GE/oauth.lang                 |   19 +-
 htdocs/langs/ka_GE/orders.lang                |    1 +
 htdocs/langs/ka_GE/printing.lang              |    4 -
 htdocs/langs/ka_GE/productbatch.lang          |    7 +-
 htdocs/langs/ka_GE/products.lang              |   12 +-
 htdocs/langs/ka_GE/projects.lang              |   15 +-
 htdocs/langs/ka_GE/salaries.lang              |    4 +-
 htdocs/langs/ka_GE/stocks.lang                |    9 +
 htdocs/langs/ka_GE/supplier_proposal.lang     |    1 +
 htdocs/langs/ka_GE/suppliers.lang             |   14 +-
 htdocs/langs/ka_GE/users.lang                 |    3 +
 htdocs/langs/ka_GE/website.lang               |    5 +-
 htdocs/langs/ka_GE/withdrawals.lang           |   76 +-
 htdocs/langs/ka_GE/workflow.lang              |    4 +-
 htdocs/langs/kn_IN/accountancy.lang           |  113 +-
 htdocs/langs/kn_IN/admin.lang                 |   90 +-
 htdocs/langs/kn_IN/banks.lang                 |   19 +-
 htdocs/langs/kn_IN/bills.lang                 |   17 +-
 htdocs/langs/kn_IN/boxes.lang                 |    9 +-
 htdocs/langs/kn_IN/cashdesk.lang              |    3 +-
 htdocs/langs/kn_IN/categories.lang            |    7 +-
 htdocs/langs/kn_IN/companies.lang             |   22 +-
 htdocs/langs/kn_IN/compta.lang                |    2 +
 htdocs/langs/kn_IN/cron.lang                  |    7 +-
 htdocs/langs/kn_IN/errors.lang                |    4 +-
 htdocs/langs/kn_IN/install.lang               |    8 +
 htdocs/langs/kn_IN/interventions.lang         |    1 +
 htdocs/langs/kn_IN/ldap.lang                  |    2 +
 htdocs/langs/kn_IN/mails.lang                 |    5 +-
 htdocs/langs/kn_IN/main.lang                  |   24 +
 htdocs/langs/kn_IN/margins.lang               |    1 +
 htdocs/langs/kn_IN/oauth.lang                 |   19 +-
 htdocs/langs/kn_IN/orders.lang                |    1 +
 htdocs/langs/kn_IN/printing.lang              |    4 -
 htdocs/langs/kn_IN/productbatch.lang          |    7 +-
 htdocs/langs/kn_IN/products.lang              |   12 +-
 htdocs/langs/kn_IN/projects.lang              |   15 +-
 htdocs/langs/kn_IN/salaries.lang              |    4 +-
 htdocs/langs/kn_IN/stocks.lang                |    9 +
 htdocs/langs/kn_IN/supplier_proposal.lang     |    1 +
 htdocs/langs/kn_IN/suppliers.lang             |   14 +-
 htdocs/langs/kn_IN/users.lang                 |    3 +
 htdocs/langs/kn_IN/website.lang               |    5 +-
 htdocs/langs/kn_IN/withdrawals.lang           |   76 +-
 htdocs/langs/kn_IN/workflow.lang              |    4 +-
 htdocs/langs/ko_KR/accountancy.lang           |  113 +-
 htdocs/langs/ko_KR/admin.lang                 |   90 +-
 htdocs/langs/ko_KR/banks.lang                 |   19 +-
 htdocs/langs/ko_KR/bills.lang                 |   17 +-
 htdocs/langs/ko_KR/boxes.lang                 |    9 +-
 htdocs/langs/ko_KR/cashdesk.lang              |    3 +-
 htdocs/langs/ko_KR/categories.lang            |    7 +-
 htdocs/langs/ko_KR/companies.lang             |   22 +-
 htdocs/langs/ko_KR/compta.lang                |    2 +
 htdocs/langs/ko_KR/cron.lang                  |    7 +-
 htdocs/langs/ko_KR/errors.lang                |    4 +-
 htdocs/langs/ko_KR/install.lang               |    8 +
 htdocs/langs/ko_KR/interventions.lang         |    1 +
 htdocs/langs/ko_KR/ldap.lang                  |    2 +
 htdocs/langs/ko_KR/mails.lang                 |    5 +-
 htdocs/langs/ko_KR/main.lang                  |   24 +
 htdocs/langs/ko_KR/margins.lang               |    1 +
 htdocs/langs/ko_KR/oauth.lang                 |   19 +-
 htdocs/langs/ko_KR/orders.lang                |    1 +
 htdocs/langs/ko_KR/printing.lang              |    4 -
 htdocs/langs/ko_KR/productbatch.lang          |    7 +-
 htdocs/langs/ko_KR/products.lang              |   12 +-
 htdocs/langs/ko_KR/projects.lang              |   15 +-
 htdocs/langs/ko_KR/salaries.lang              |    4 +-
 htdocs/langs/ko_KR/stocks.lang                |    9 +
 htdocs/langs/ko_KR/supplier_proposal.lang     |    1 +
 htdocs/langs/ko_KR/suppliers.lang             |   14 +-
 htdocs/langs/ko_KR/users.lang                 |    3 +
 htdocs/langs/ko_KR/website.lang               |    5 +-
 htdocs/langs/ko_KR/withdrawals.lang           |   76 +-
 htdocs/langs/ko_KR/workflow.lang              |    4 +-
 htdocs/langs/lo_LA/accountancy.lang           |  113 +-
 htdocs/langs/lo_LA/admin.lang                 |   90 +-
 htdocs/langs/lo_LA/banks.lang                 |   19 +-
 htdocs/langs/lo_LA/bills.lang                 |   17 +-
 htdocs/langs/lo_LA/boxes.lang                 |    9 +-
 htdocs/langs/lo_LA/cashdesk.lang              |    3 +-
 htdocs/langs/lo_LA/categories.lang            |    7 +-
 htdocs/langs/lo_LA/companies.lang             |   22 +-
 htdocs/langs/lo_LA/compta.lang                |    2 +
 htdocs/langs/lo_LA/cron.lang                  |    7 +-
 htdocs/langs/lo_LA/errors.lang                |    4 +-
 htdocs/langs/lo_LA/install.lang               |    8 +
 htdocs/langs/lo_LA/interventions.lang         |    1 +
 htdocs/langs/lo_LA/ldap.lang                  |    2 +
 htdocs/langs/lo_LA/mails.lang                 |    5 +-
 htdocs/langs/lo_LA/main.lang                  |   24 +
 htdocs/langs/lo_LA/margins.lang               |    1 +
 htdocs/langs/lo_LA/oauth.lang                 |   19 +-
 htdocs/langs/lo_LA/orders.lang                |    1 +
 htdocs/langs/lo_LA/printing.lang              |    4 -
 htdocs/langs/lo_LA/productbatch.lang          |    7 +-
 htdocs/langs/lo_LA/products.lang              |   12 +-
 htdocs/langs/lo_LA/projects.lang              |   15 +-
 htdocs/langs/lo_LA/salaries.lang              |    4 +-
 htdocs/langs/lo_LA/stocks.lang                |    9 +
 htdocs/langs/lo_LA/supplier_proposal.lang     |    1 +
 htdocs/langs/lo_LA/suppliers.lang             |   14 +-
 htdocs/langs/lo_LA/users.lang                 |    3 +
 htdocs/langs/lo_LA/website.lang               |    5 +-
 htdocs/langs/lo_LA/withdrawals.lang           |   76 +-
 htdocs/langs/lo_LA/workflow.lang              |    4 +-
 htdocs/langs/lt_LT/accountancy.lang           |  113 +-
 htdocs/langs/lt_LT/admin.lang                 |   90 +-
 htdocs/langs/lt_LT/banks.lang                 |   19 +-
 htdocs/langs/lt_LT/bills.lang                 |   17 +-
 htdocs/langs/lt_LT/boxes.lang                 |    9 +-
 htdocs/langs/lt_LT/cashdesk.lang              |    3 +-
 htdocs/langs/lt_LT/categories.lang            |    7 +-
 htdocs/langs/lt_LT/companies.lang             |   22 +-
 htdocs/langs/lt_LT/compta.lang                |    2 +
 htdocs/langs/lt_LT/cron.lang                  |    7 +-
 htdocs/langs/lt_LT/errors.lang                |    4 +-
 htdocs/langs/lt_LT/install.lang               |    8 +
 htdocs/langs/lt_LT/interventions.lang         |    1 +
 htdocs/langs/lt_LT/ldap.lang                  |    2 +
 htdocs/langs/lt_LT/mails.lang                 |    5 +-
 htdocs/langs/lt_LT/main.lang                  |   24 +
 htdocs/langs/lt_LT/margins.lang               |    1 +
 htdocs/langs/lt_LT/oauth.lang                 |   19 +-
 htdocs/langs/lt_LT/orders.lang                |    1 +
 htdocs/langs/lt_LT/printing.lang              |    4 -
 htdocs/langs/lt_LT/productbatch.lang          |    7 +-
 htdocs/langs/lt_LT/products.lang              |   12 +-
 htdocs/langs/lt_LT/projects.lang              |   15 +-
 htdocs/langs/lt_LT/salaries.lang              |    4 +-
 htdocs/langs/lt_LT/stocks.lang                |    9 +
 htdocs/langs/lt_LT/supplier_proposal.lang     |    1 +
 htdocs/langs/lt_LT/suppliers.lang             |   14 +-
 htdocs/langs/lt_LT/users.lang                 |    3 +
 htdocs/langs/lt_LT/website.lang               |    5 +-
 htdocs/langs/lt_LT/withdrawals.lang           |   76 +-
 htdocs/langs/lt_LT/workflow.lang              |    4 +-
 htdocs/langs/lv_LV/accountancy.lang           |  113 +-
 htdocs/langs/lv_LV/admin.lang                 |   90 +-
 htdocs/langs/lv_LV/banks.lang                 |   19 +-
 htdocs/langs/lv_LV/bills.lang                 |   17 +-
 htdocs/langs/lv_LV/boxes.lang                 |    9 +-
 htdocs/langs/lv_LV/cashdesk.lang              |    3 +-
 htdocs/langs/lv_LV/categories.lang            |    7 +-
 htdocs/langs/lv_LV/companies.lang             |   22 +-
 htdocs/langs/lv_LV/compta.lang                |    2 +
 htdocs/langs/lv_LV/cron.lang                  |    7 +-
 htdocs/langs/lv_LV/errors.lang                |    4 +-
 htdocs/langs/lv_LV/install.lang               |    8 +
 htdocs/langs/lv_LV/interventions.lang         |    1 +
 htdocs/langs/lv_LV/ldap.lang                  |    2 +
 htdocs/langs/lv_LV/mails.lang                 |    5 +-
 htdocs/langs/lv_LV/main.lang                  |   24 +
 htdocs/langs/lv_LV/margins.lang               |    1 +
 htdocs/langs/lv_LV/oauth.lang                 |   19 +-
 htdocs/langs/lv_LV/orders.lang                |    1 +
 htdocs/langs/lv_LV/printing.lang              |    4 -
 htdocs/langs/lv_LV/productbatch.lang          |    7 +-
 htdocs/langs/lv_LV/products.lang              |   12 +-
 htdocs/langs/lv_LV/projects.lang              |   15 +-
 htdocs/langs/lv_LV/salaries.lang              |    4 +-
 htdocs/langs/lv_LV/stocks.lang                |    9 +
 htdocs/langs/lv_LV/supplier_proposal.lang     |    1 +
 htdocs/langs/lv_LV/suppliers.lang             |   14 +-
 htdocs/langs/lv_LV/users.lang                 |    3 +
 htdocs/langs/lv_LV/website.lang               |    5 +-
 htdocs/langs/lv_LV/withdrawals.lang           |   76 +-
 htdocs/langs/lv_LV/workflow.lang              |    4 +-
 htdocs/langs/mk_MK/accountancy.lang           |  113 +-
 htdocs/langs/mk_MK/admin.lang                 |   90 +-
 htdocs/langs/mk_MK/banks.lang                 |   19 +-
 htdocs/langs/mk_MK/bills.lang                 |   17 +-
 htdocs/langs/mk_MK/boxes.lang                 |    9 +-
 htdocs/langs/mk_MK/cashdesk.lang              |    3 +-
 htdocs/langs/mk_MK/categories.lang            |    7 +-
 htdocs/langs/mk_MK/companies.lang             |   22 +-
 htdocs/langs/mk_MK/compta.lang                |    2 +
 htdocs/langs/mk_MK/cron.lang                  |    7 +-
 htdocs/langs/mk_MK/errors.lang                |    4 +-
 htdocs/langs/mk_MK/install.lang               |    8 +
 htdocs/langs/mk_MK/interventions.lang         |    1 +
 htdocs/langs/mk_MK/ldap.lang                  |    2 +
 htdocs/langs/mk_MK/mails.lang                 |    5 +-
 htdocs/langs/mk_MK/main.lang                  |   24 +
 htdocs/langs/mk_MK/margins.lang               |    1 +
 htdocs/langs/mk_MK/oauth.lang                 |   19 +-
 htdocs/langs/mk_MK/orders.lang                |    1 +
 htdocs/langs/mk_MK/printing.lang              |    4 -
 htdocs/langs/mk_MK/productbatch.lang          |    7 +-
 htdocs/langs/mk_MK/products.lang              |   12 +-
 htdocs/langs/mk_MK/projects.lang              |   15 +-
 htdocs/langs/mk_MK/salaries.lang              |    4 +-
 htdocs/langs/mk_MK/stocks.lang                |    9 +
 htdocs/langs/mk_MK/supplier_proposal.lang     |    1 +
 htdocs/langs/mk_MK/suppliers.lang             |   14 +-
 htdocs/langs/mk_MK/users.lang                 |    3 +
 htdocs/langs/mk_MK/website.lang               |    5 +-
 htdocs/langs/mk_MK/withdrawals.lang           |   76 +-
 htdocs/langs/mk_MK/workflow.lang              |    4 +-
 htdocs/langs/mn_MN/accountancy.lang           |  113 +-
 htdocs/langs/mn_MN/admin.lang                 |   92 +-
 htdocs/langs/mn_MN/banks.lang                 |   19 +-
 htdocs/langs/mn_MN/bills.lang                 |   17 +-
 htdocs/langs/mn_MN/boxes.lang                 |    9 +-
 htdocs/langs/mn_MN/cashdesk.lang              |    3 +-
 htdocs/langs/mn_MN/categories.lang            |    7 +-
 htdocs/langs/mn_MN/companies.lang             |   22 +-
 htdocs/langs/mn_MN/compta.lang                |    2 +
 htdocs/langs/mn_MN/cron.lang                  |    7 +-
 htdocs/langs/mn_MN/errors.lang                |    4 +-
 htdocs/langs/mn_MN/install.lang               |    8 +
 htdocs/langs/mn_MN/interventions.lang         |    1 +
 htdocs/langs/mn_MN/ldap.lang                  |    2 +
 htdocs/langs/mn_MN/mails.lang                 |    5 +-
 htdocs/langs/mn_MN/main.lang                  |   24 +
 htdocs/langs/mn_MN/margins.lang               |    1 +
 htdocs/langs/mn_MN/oauth.lang                 |   19 +-
 htdocs/langs/mn_MN/orders.lang                |    1 +
 htdocs/langs/mn_MN/printing.lang              |    4 -
 htdocs/langs/mn_MN/productbatch.lang          |    7 +-
 htdocs/langs/mn_MN/products.lang              |   12 +-
 htdocs/langs/mn_MN/projects.lang              |   15 +-
 htdocs/langs/mn_MN/salaries.lang              |    4 +-
 htdocs/langs/mn_MN/stocks.lang                |    9 +
 htdocs/langs/mn_MN/supplier_proposal.lang     |    1 +
 htdocs/langs/mn_MN/suppliers.lang             |   14 +-
 htdocs/langs/mn_MN/users.lang                 |    3 +
 htdocs/langs/mn_MN/website.lang               |    5 +-
 htdocs/langs/mn_MN/withdrawals.lang           |   76 +-
 htdocs/langs/mn_MN/workflow.lang              |    2 +
 htdocs/langs/nb_NO/accountancy.lang           |  125 +-
 htdocs/langs/nb_NO/admin.lang                 |  118 +-
 htdocs/langs/nb_NO/banks.lang                 |   23 +-
 htdocs/langs/nb_NO/bills.lang                 |   23 +-
 htdocs/langs/nb_NO/boxes.lang                 |    9 +-
 htdocs/langs/nb_NO/cashdesk.lang              |    3 +-
 htdocs/langs/nb_NO/categories.lang            |    7 +-
 htdocs/langs/nb_NO/companies.lang             |   24 +-
 htdocs/langs/nb_NO/compta.lang                |    8 +-
 htdocs/langs/nb_NO/cron.lang                  |    7 +-
 htdocs/langs/nb_NO/errors.lang                |   16 +-
 htdocs/langs/nb_NO/holiday.lang               |    4 +-
 htdocs/langs/nb_NO/install.lang               |   10 +-
 htdocs/langs/nb_NO/interventions.lang         |    5 +-
 htdocs/langs/nb_NO/ldap.lang                  |    2 +
 htdocs/langs/nb_NO/mails.lang                 |   11 +-
 htdocs/langs/nb_NO/main.lang                  |   32 +-
 htdocs/langs/nb_NO/margins.lang               |    1 +
 htdocs/langs/nb_NO/oauth.lang                 |   19 +-
 htdocs/langs/nb_NO/orders.lang                |    1 +
 htdocs/langs/nb_NO/printing.lang              |    8 +-
 htdocs/langs/nb_NO/productbatch.lang          |    7 +-
 htdocs/langs/nb_NO/products.lang              |   28 +-
 htdocs/langs/nb_NO/projects.lang              |   25 +-
 htdocs/langs/nb_NO/salaries.lang              |    2 +-
 htdocs/langs/nb_NO/stocks.lang                |   19 +-
 htdocs/langs/nb_NO/supplier_proposal.lang     |    3 +-
 htdocs/langs/nb_NO/suppliers.lang             |   14 +-
 htdocs/langs/nb_NO/users.lang                 |    3 +
 htdocs/langs/nb_NO/website.lang               |    7 +-
 htdocs/langs/nb_NO/withdrawals.lang           |   76 +-
 htdocs/langs/nb_NO/workflow.lang              |    4 +-
 htdocs/langs/nl_BE/accountancy.lang           |   14 -
 htdocs/langs/nl_BE/bills.lang                 |   22 +
 htdocs/langs/nl_BE/bookmarks.lang             |    2 +
 htdocs/langs/nl_BE/boxes.lang                 |    2 -
 htdocs/langs/nl_BE/dict.lang                  |    2 +
 htdocs/langs/nl_BE/mails.lang                 |    1 -
 htdocs/langs/nl_BE/margins.lang               |    1 +
 htdocs/langs/nl_NL/accountancy.lang           |  113 +-
 htdocs/langs/nl_NL/admin.lang                 |   90 +-
 htdocs/langs/nl_NL/banks.lang                 |   19 +-
 htdocs/langs/nl_NL/bills.lang                 |   17 +-
 htdocs/langs/nl_NL/boxes.lang                 |    9 +-
 htdocs/langs/nl_NL/cashdesk.lang              |    3 +-
 htdocs/langs/nl_NL/categories.lang            |    7 +-
 htdocs/langs/nl_NL/companies.lang             |   22 +-
 htdocs/langs/nl_NL/compta.lang                |    2 +
 htdocs/langs/nl_NL/cron.lang                  |    7 +-
 htdocs/langs/nl_NL/errors.lang                |    4 +-
 htdocs/langs/nl_NL/install.lang               |    8 +
 htdocs/langs/nl_NL/interventions.lang         |    1 +
 htdocs/langs/nl_NL/ldap.lang                  |    2 +
 htdocs/langs/nl_NL/mails.lang                 |    5 +-
 htdocs/langs/nl_NL/main.lang                  |   24 +
 htdocs/langs/nl_NL/margins.lang               |    1 +
 htdocs/langs/nl_NL/oauth.lang                 |   19 +-
 htdocs/langs/nl_NL/orders.lang                |    1 +
 htdocs/langs/nl_NL/printing.lang              |    4 -
 htdocs/langs/nl_NL/productbatch.lang          |    7 +-
 htdocs/langs/nl_NL/products.lang              |   12 +-
 htdocs/langs/nl_NL/projects.lang              |   15 +-
 htdocs/langs/nl_NL/salaries.lang              |    4 +-
 htdocs/langs/nl_NL/stocks.lang                |    9 +
 htdocs/langs/nl_NL/supplier_proposal.lang     |    1 +
 htdocs/langs/nl_NL/suppliers.lang             |   14 +-
 htdocs/langs/nl_NL/users.lang                 |    3 +
 htdocs/langs/nl_NL/website.lang               |    5 +-
 htdocs/langs/nl_NL/withdrawals.lang           |   76 +-
 htdocs/langs/nl_NL/workflow.lang              |    4 +-
 htdocs/langs/pl_PL/accountancy.lang           |  127 +-
 htdocs/langs/pl_PL/admin.lang                 |   94 +-
 htdocs/langs/pl_PL/banks.lang                 |   19 +-
 htdocs/langs/pl_PL/bills.lang                 |   17 +-
 htdocs/langs/pl_PL/boxes.lang                 |   61 +-
 htdocs/langs/pl_PL/cashdesk.lang              |    3 +-
 htdocs/langs/pl_PL/categories.lang            |    7 +-
 htdocs/langs/pl_PL/companies.lang             |   22 +-
 htdocs/langs/pl_PL/compta.lang                |    2 +
 htdocs/langs/pl_PL/contracts.lang             |   36 +-
 htdocs/langs/pl_PL/cron.lang                  |   13 +-
 htdocs/langs/pl_PL/deliveries.lang            |    2 +-
 htdocs/langs/pl_PL/errors.lang                |    4 +-
 htdocs/langs/pl_PL/holiday.lang               |    8 +-
 htdocs/langs/pl_PL/hrm.lang                   |    4 +-
 htdocs/langs/pl_PL/install.lang               |   10 +-
 htdocs/langs/pl_PL/interventions.lang         |    1 +
 htdocs/langs/pl_PL/ldap.lang                  |    2 +
 htdocs/langs/pl_PL/mails.lang                 |    5 +-
 htdocs/langs/pl_PL/main.lang                  |   32 +-
 htdocs/langs/pl_PL/margins.lang               |    7 +-
 htdocs/langs/pl_PL/oauth.lang                 |   19 +-
 htdocs/langs/pl_PL/orders.lang                |    1 +
 htdocs/langs/pl_PL/printing.lang              |    4 -
 htdocs/langs/pl_PL/productbatch.lang          |    7 +-
 htdocs/langs/pl_PL/products.lang              |   16 +-
 htdocs/langs/pl_PL/projects.lang              |   15 +-
 htdocs/langs/pl_PL/resource.lang              |    4 +-
 htdocs/langs/pl_PL/salaries.lang              |    4 +-
 htdocs/langs/pl_PL/stocks.lang                |    9 +
 htdocs/langs/pl_PL/supplier_proposal.lang     |    1 +
 htdocs/langs/pl_PL/suppliers.lang             |   14 +-
 htdocs/langs/pl_PL/users.lang                 |    5 +-
 htdocs/langs/pl_PL/website.lang               |    5 +-
 htdocs/langs/pl_PL/withdrawals.lang           |   76 +-
 htdocs/langs/pl_PL/workflow.lang              |    4 +-
 htdocs/langs/pt_BR/accountancy.lang           |   49 +-
 htdocs/langs/pt_BR/admin.lang                 |   37 +-
 htdocs/langs/pt_BR/agenda.lang                |   19 +-
 htdocs/langs/pt_BR/banks.lang                 |    9 +-
 htdocs/langs/pt_BR/bills.lang                 |    6 +-
 htdocs/langs/pt_BR/bookmarks.lang             |    2 +-
 htdocs/langs/pt_BR/boxes.lang                 |   64 +-
 htdocs/langs/pt_BR/cashdesk.lang              |    8 +-
 htdocs/langs/pt_BR/categories.lang            |   30 +-
 htdocs/langs/pt_BR/companies.lang             |   33 +-
 htdocs/langs/pt_BR/contracts.lang             |    1 +
 htdocs/langs/pt_BR/cron.lang                  |   58 +-
 htdocs/langs/pt_BR/errors.lang                |    1 -
 htdocs/langs/pt_BR/exports.lang               |   20 +-
 htdocs/langs/pt_BR/holiday.lang               |    9 +-
 htdocs/langs/pt_BR/incoterm.lang              |    3 +-
 htdocs/langs/pt_BR/interventions.lang         |    3 +
 htdocs/langs/pt_BR/ldap.lang                  |    1 +
 htdocs/langs/pt_BR/main.lang                  |    1 -
 htdocs/langs/pt_BR/margins.lang               |   29 +-
 htdocs/langs/pt_BR/members.lang               |    6 +-
 htdocs/langs/pt_BR/oauth.lang                 |    1 +
 htdocs/langs/pt_BR/orders.lang                |   30 +-
 htdocs/langs/pt_BR/printing.lang              |    6 +-
 htdocs/langs/pt_BR/productbatch.lang          |    4 +-
 htdocs/langs/pt_BR/products.lang              |   16 +-
 htdocs/langs/pt_BR/projects.lang              |   53 +-
 htdocs/langs/pt_BR/propal.lang                |    8 +-
 htdocs/langs/pt_BR/salaries.lang              |    4 +-
 htdocs/langs/pt_BR/sms.lang                   |    7 +-
 htdocs/langs/pt_BR/stocks.lang                |   83 +-
 htdocs/langs/pt_BR/suppliers.lang             |    9 +-
 htdocs/langs/pt_BR/users.lang                 |   11 +-
 htdocs/langs/pt_BR/website.lang               |    1 +
 htdocs/langs/pt_BR/withdrawals.lang           |   22 -
 htdocs/langs/pt_BR/workflow.lang              |    4 +
 htdocs/langs/pt_PT/accountancy.lang           |  115 +-
 htdocs/langs/pt_PT/admin.lang                 |   98 +-
 htdocs/langs/pt_PT/banks.lang                 |   19 +-
 htdocs/langs/pt_PT/bills.lang                 |   17 +-
 htdocs/langs/pt_PT/boxes.lang                 |    9 +-
 htdocs/langs/pt_PT/cashdesk.lang              |    3 +-
 htdocs/langs/pt_PT/categories.lang            |    7 +-
 htdocs/langs/pt_PT/companies.lang             |   22 +-
 htdocs/langs/pt_PT/compta.lang                |    2 +
 htdocs/langs/pt_PT/cron.lang                  |    7 +-
 htdocs/langs/pt_PT/errors.lang                |    4 +-
 htdocs/langs/pt_PT/help.lang                  |    6 +-
 htdocs/langs/pt_PT/install.lang               |   10 +-
 htdocs/langs/pt_PT/interventions.lang         |    1 +
 htdocs/langs/pt_PT/ldap.lang                  |    2 +
 htdocs/langs/pt_PT/mails.lang                 |    5 +-
 htdocs/langs/pt_PT/main.lang                  |   26 +-
 htdocs/langs/pt_PT/margins.lang               |    1 +
 htdocs/langs/pt_PT/oauth.lang                 |   19 +-
 htdocs/langs/pt_PT/orders.lang                |    1 +
 htdocs/langs/pt_PT/printing.lang              |    4 -
 htdocs/langs/pt_PT/productbatch.lang          |    7 +-
 htdocs/langs/pt_PT/products.lang              |   12 +-
 htdocs/langs/pt_PT/projects.lang              |   15 +-
 htdocs/langs/pt_PT/salaries.lang              |    4 +-
 htdocs/langs/pt_PT/stocks.lang                |   13 +-
 htdocs/langs/pt_PT/supplier_proposal.lang     |    1 +
 htdocs/langs/pt_PT/suppliers.lang             |   14 +-
 htdocs/langs/pt_PT/users.lang                 |    3 +
 htdocs/langs/pt_PT/website.lang               |    7 +-
 htdocs/langs/pt_PT/withdrawals.lang           |   76 +-
 htdocs/langs/pt_PT/workflow.lang              |    4 +-
 htdocs/langs/ro_RO/accountancy.lang           |  115 +-
 htdocs/langs/ro_RO/admin.lang                 |   90 +-
 htdocs/langs/ro_RO/banks.lang                 |   19 +-
 htdocs/langs/ro_RO/bills.lang                 |   23 +-
 htdocs/langs/ro_RO/boxes.lang                 |    9 +-
 htdocs/langs/ro_RO/cashdesk.lang              |    3 +-
 htdocs/langs/ro_RO/categories.lang            |    7 +-
 htdocs/langs/ro_RO/companies.lang             |   28 +-
 htdocs/langs/ro_RO/compta.lang                |    2 +
 htdocs/langs/ro_RO/contracts.lang             |    2 +-
 htdocs/langs/ro_RO/cron.lang                  |    7 +-
 htdocs/langs/ro_RO/errors.lang                |    4 +-
 htdocs/langs/ro_RO/install.lang               |    8 +
 htdocs/langs/ro_RO/interventions.lang         |    1 +
 htdocs/langs/ro_RO/ldap.lang                  |    2 +
 htdocs/langs/ro_RO/mails.lang                 |    5 +-
 htdocs/langs/ro_RO/main.lang                  |   24 +
 htdocs/langs/ro_RO/margins.lang               |    1 +
 htdocs/langs/ro_RO/oauth.lang                 |   19 +-
 htdocs/langs/ro_RO/opensurvey.lang            |    2 +-
 htdocs/langs/ro_RO/orders.lang                |    1 +
 htdocs/langs/ro_RO/printing.lang              |    4 -
 htdocs/langs/ro_RO/productbatch.lang          |    7 +-
 htdocs/langs/ro_RO/products.lang              |   12 +-
 htdocs/langs/ro_RO/projects.lang              |   15 +-
 htdocs/langs/ro_RO/salaries.lang              |    4 +-
 htdocs/langs/ro_RO/stocks.lang                |    9 +
 htdocs/langs/ro_RO/supplier_proposal.lang     |    1 +
 htdocs/langs/ro_RO/suppliers.lang             |   14 +-
 htdocs/langs/ro_RO/users.lang                 |   13 +-
 htdocs/langs/ro_RO/website.lang               |    5 +-
 htdocs/langs/ro_RO/withdrawals.lang           |   76 +-
 htdocs/langs/ro_RO/workflow.lang              |    2 +
 htdocs/langs/ru_RU/accountancy.lang           |  123 +-
 htdocs/langs/ru_RU/admin.lang                 |   92 +-
 htdocs/langs/ru_RU/banks.lang                 |   19 +-
 htdocs/langs/ru_RU/bills.lang                 |   17 +-
 htdocs/langs/ru_RU/boxes.lang                 |    9 +-
 htdocs/langs/ru_RU/cashdesk.lang              |    3 +-
 htdocs/langs/ru_RU/categories.lang            |    7 +-
 htdocs/langs/ru_RU/companies.lang             |   22 +-
 htdocs/langs/ru_RU/compta.lang                |    2 +
 htdocs/langs/ru_RU/cron.lang                  |    7 +-
 htdocs/langs/ru_RU/errors.lang                |    4 +-
 htdocs/langs/ru_RU/install.lang               |    8 +
 htdocs/langs/ru_RU/interventions.lang         |    1 +
 htdocs/langs/ru_RU/ldap.lang                  |    2 +
 htdocs/langs/ru_RU/mails.lang                 |    5 +-
 htdocs/langs/ru_RU/main.lang                  |   24 +
 htdocs/langs/ru_RU/margins.lang               |    1 +
 htdocs/langs/ru_RU/oauth.lang                 |   19 +-
 htdocs/langs/ru_RU/orders.lang                |    1 +
 htdocs/langs/ru_RU/printing.lang              |    4 -
 htdocs/langs/ru_RU/productbatch.lang          |    7 +-
 htdocs/langs/ru_RU/products.lang              |   12 +-
 htdocs/langs/ru_RU/projects.lang              |   15 +-
 htdocs/langs/ru_RU/salaries.lang              |    4 +-
 htdocs/langs/ru_RU/stocks.lang                |    9 +
 htdocs/langs/ru_RU/supplier_proposal.lang     |    1 +
 htdocs/langs/ru_RU/suppliers.lang             |   14 +-
 htdocs/langs/ru_RU/users.lang                 |    3 +
 htdocs/langs/ru_RU/website.lang               |    5 +-
 htdocs/langs/ru_RU/withdrawals.lang           |   76 +-
 htdocs/langs/ru_RU/workflow.lang              |    4 +-
 htdocs/langs/sk_SK/accountancy.lang           |  181 +-
 htdocs/langs/sk_SK/admin.lang                 |  524 ++--
 htdocs/langs/sk_SK/agenda.lang                |   74 +-
 htdocs/langs/sk_SK/banks.lang                 |   65 +-
 htdocs/langs/sk_SK/bills.lang                 |  109 +-
 htdocs/langs/sk_SK/bookmarks.lang             |    2 +-
 htdocs/langs/sk_SK/boxes.lang                 |    9 +-
 htdocs/langs/sk_SK/cashdesk.lang              |    7 +-
 htdocs/langs/sk_SK/categories.lang            |    7 +-
 htdocs/langs/sk_SK/commercial.lang            |   24 +-
 htdocs/langs/sk_SK/companies.lang             |   22 +-
 htdocs/langs/sk_SK/compta.lang                |    2 +
 htdocs/langs/sk_SK/contracts.lang             |   24 +-
 htdocs/langs/sk_SK/cron.lang                  |    7 +-
 htdocs/langs/sk_SK/dict.lang                  |    4 +-
 htdocs/langs/sk_SK/ecm.lang                   |    6 +-
 htdocs/langs/sk_SK/errors.lang                |    4 +-
 htdocs/langs/sk_SK/exports.lang               |   32 +-
 htdocs/langs/sk_SK/ftp.lang                   |    4 +-
 htdocs/langs/sk_SK/install.lang               |   24 +-
 htdocs/langs/sk_SK/interventions.lang         |    1 +
 htdocs/langs/sk_SK/languages.lang             |   22 +-
 htdocs/langs/sk_SK/ldap.lang                  |    2 +
 htdocs/langs/sk_SK/mailmanspip.lang           |    8 +-
 htdocs/langs/sk_SK/mails.lang                 |    5 +-
 htdocs/langs/sk_SK/main.lang                  |   24 +
 htdocs/langs/sk_SK/margins.lang               |    1 +
 htdocs/langs/sk_SK/members.lang               |   20 +-
 htdocs/langs/sk_SK/oauth.lang                 |   19 +-
 htdocs/langs/sk_SK/orders.lang                |    1 +
 htdocs/langs/sk_SK/paybox.lang                |    6 +-
 htdocs/langs/sk_SK/printing.lang              |    4 -
 htdocs/langs/sk_SK/productbatch.lang          |    7 +-
 htdocs/langs/sk_SK/products.lang              |  268 +-
 htdocs/langs/sk_SK/projects.lang              |   15 +-
 htdocs/langs/sk_SK/propal.lang                |   20 +-
 htdocs/langs/sk_SK/resource.lang              |   48 +-
 htdocs/langs/sk_SK/salaries.lang              |    4 +-
 htdocs/langs/sk_SK/sms.lang                   |    2 +-
 htdocs/langs/sk_SK/stocks.lang                |    9 +
 htdocs/langs/sk_SK/supplier_proposal.lang     |    1 +
 htdocs/langs/sk_SK/suppliers.lang             |   14 +-
 htdocs/langs/sk_SK/users.lang                 |   15 +-
 htdocs/langs/sk_SK/website.lang               |    5 +-
 htdocs/langs/sk_SK/withdrawals.lang           |   76 +-
 htdocs/langs/sk_SK/workflow.lang              |   16 +-
 htdocs/langs/sl_SI/accountancy.lang           |  115 +-
 htdocs/langs/sl_SI/admin.lang                 |   90 +-
 htdocs/langs/sl_SI/banks.lang                 |   19 +-
 htdocs/langs/sl_SI/bills.lang                 |   17 +-
 htdocs/langs/sl_SI/boxes.lang                 |    9 +-
 htdocs/langs/sl_SI/cashdesk.lang              |    3 +-
 htdocs/langs/sl_SI/categories.lang            |    7 +-
 htdocs/langs/sl_SI/companies.lang             |   22 +-
 htdocs/langs/sl_SI/compta.lang                |    2 +
 htdocs/langs/sl_SI/cron.lang                  |    7 +-
 htdocs/langs/sl_SI/errors.lang                |    4 +-
 htdocs/langs/sl_SI/install.lang               |    8 +
 htdocs/langs/sl_SI/interventions.lang         |    1 +
 htdocs/langs/sl_SI/ldap.lang                  |    2 +
 htdocs/langs/sl_SI/mails.lang                 |    5 +-
 htdocs/langs/sl_SI/main.lang                  |   24 +
 htdocs/langs/sl_SI/margins.lang               |    1 +
 htdocs/langs/sl_SI/oauth.lang                 |   19 +-
 htdocs/langs/sl_SI/orders.lang                |    1 +
 htdocs/langs/sl_SI/printing.lang              |    4 -
 htdocs/langs/sl_SI/productbatch.lang          |    7 +-
 htdocs/langs/sl_SI/products.lang              |   12 +-
 htdocs/langs/sl_SI/projects.lang              |   15 +-
 htdocs/langs/sl_SI/salaries.lang              |    4 +-
 htdocs/langs/sl_SI/stocks.lang                |    9 +
 htdocs/langs/sl_SI/supplier_proposal.lang     |    1 +
 htdocs/langs/sl_SI/suppliers.lang             |   14 +-
 htdocs/langs/sl_SI/users.lang                 |    3 +
 htdocs/langs/sl_SI/website.lang               |    5 +-
 htdocs/langs/sl_SI/withdrawals.lang           |   76 +-
 htdocs/langs/sl_SI/workflow.lang              |    4 +-
 htdocs/langs/sq_AL/accountancy.lang           |  113 +-
 htdocs/langs/sq_AL/admin.lang                 |   90 +-
 htdocs/langs/sq_AL/banks.lang                 |   19 +-
 htdocs/langs/sq_AL/bills.lang                 |   17 +-
 htdocs/langs/sq_AL/boxes.lang                 |    9 +-
 htdocs/langs/sq_AL/cashdesk.lang              |    3 +-
 htdocs/langs/sq_AL/categories.lang            |    7 +-
 htdocs/langs/sq_AL/companies.lang             |   82 +-
 htdocs/langs/sq_AL/compta.lang                |    2 +
 htdocs/langs/sq_AL/cron.lang                  |    7 +-
 htdocs/langs/sq_AL/errors.lang                |    4 +-
 htdocs/langs/sq_AL/holiday.lang               |   28 +-
 htdocs/langs/sq_AL/hrm.lang                   |    6 +-
 htdocs/langs/sq_AL/install.lang               |    8 +
 htdocs/langs/sq_AL/interventions.lang         |    1 +
 htdocs/langs/sq_AL/ldap.lang                  |    2 +
 htdocs/langs/sq_AL/mails.lang                 |    5 +-
 htdocs/langs/sq_AL/main.lang                  |   24 +
 htdocs/langs/sq_AL/margins.lang               |    1 +
 htdocs/langs/sq_AL/oauth.lang                 |   19 +-
 htdocs/langs/sq_AL/orders.lang                |    1 +
 htdocs/langs/sq_AL/printing.lang              |    4 -
 htdocs/langs/sq_AL/productbatch.lang          |    7 +-
 htdocs/langs/sq_AL/products.lang              |   12 +-
 htdocs/langs/sq_AL/projects.lang              |   15 +-
 htdocs/langs/sq_AL/salaries.lang              |    4 +-
 htdocs/langs/sq_AL/stocks.lang                |    9 +
 htdocs/langs/sq_AL/supplier_proposal.lang     |    1 +
 htdocs/langs/sq_AL/suppliers.lang             |   14 +-
 htdocs/langs/sq_AL/users.lang                 |   17 +-
 htdocs/langs/sq_AL/website.lang               |    5 +-
 htdocs/langs/sq_AL/withdrawals.lang           |   76 +-
 htdocs/langs/sq_AL/workflow.lang              |    4 +-
 htdocs/langs/sr_RS/accountancy.lang           |  115 +-
 htdocs/langs/sr_RS/admin.lang                 |   90 +-
 htdocs/langs/sr_RS/banks.lang                 |   19 +-
 htdocs/langs/sr_RS/bills.lang                 |   17 +-
 htdocs/langs/sr_RS/boxes.lang                 |    9 +-
 htdocs/langs/sr_RS/cashdesk.lang              |    3 +-
 htdocs/langs/sr_RS/categories.lang            |    7 +-
 htdocs/langs/sr_RS/companies.lang             |   22 +-
 htdocs/langs/sr_RS/compta.lang                |    2 +
 htdocs/langs/sr_RS/cron.lang                  |    7 +-
 htdocs/langs/sr_RS/errors.lang                |    4 +-
 htdocs/langs/sr_RS/install.lang               |    8 +
 htdocs/langs/sr_RS/interventions.lang         |    1 +
 htdocs/langs/sr_RS/ldap.lang                  |    2 +
 htdocs/langs/sr_RS/mails.lang                 |    5 +-
 htdocs/langs/sr_RS/main.lang                  |   24 +
 htdocs/langs/sr_RS/margins.lang               |    1 +
 htdocs/langs/sr_RS/orders.lang                |    1 +
 htdocs/langs/sr_RS/printing.lang              |    4 -
 htdocs/langs/sr_RS/productbatch.lang          |    7 +-
 htdocs/langs/sr_RS/products.lang              |   12 +-
 htdocs/langs/sr_RS/projects.lang              |   15 +-
 htdocs/langs/sr_RS/salaries.lang              |    4 +-
 htdocs/langs/sr_RS/stocks.lang                |    9 +
 htdocs/langs/sr_RS/suppliers.lang             |   14 +-
 htdocs/langs/sr_RS/users.lang                 |    3 +
 htdocs/langs/sr_RS/withdrawals.lang           |   76 +-
 htdocs/langs/sr_RS/workflow.lang              |    4 +-
 htdocs/langs/sv_SE/accountancy.lang           |  115 +-
 htdocs/langs/sv_SE/admin.lang                 |   90 +-
 htdocs/langs/sv_SE/banks.lang                 |   19 +-
 htdocs/langs/sv_SE/bills.lang                 |   17 +-
 htdocs/langs/sv_SE/boxes.lang                 |    9 +-
 htdocs/langs/sv_SE/cashdesk.lang              |    3 +-
 htdocs/langs/sv_SE/categories.lang            |    7 +-
 htdocs/langs/sv_SE/companies.lang             |   22 +-
 htdocs/langs/sv_SE/compta.lang                |    2 +
 htdocs/langs/sv_SE/cron.lang                  |    7 +-
 htdocs/langs/sv_SE/errors.lang                |    4 +-
 htdocs/langs/sv_SE/install.lang               |    8 +
 htdocs/langs/sv_SE/interventions.lang         |    1 +
 htdocs/langs/sv_SE/ldap.lang                  |    2 +
 htdocs/langs/sv_SE/mails.lang                 |    5 +-
 htdocs/langs/sv_SE/main.lang                  |   24 +
 htdocs/langs/sv_SE/margins.lang               |    1 +
 htdocs/langs/sv_SE/oauth.lang                 |   19 +-
 htdocs/langs/sv_SE/orders.lang                |    1 +
 htdocs/langs/sv_SE/printing.lang              |    4 -
 htdocs/langs/sv_SE/productbatch.lang          |    7 +-
 htdocs/langs/sv_SE/products.lang              |   12 +-
 htdocs/langs/sv_SE/projects.lang              |   15 +-
 htdocs/langs/sv_SE/salaries.lang              |    4 +-
 htdocs/langs/sv_SE/stocks.lang                |    9 +
 htdocs/langs/sv_SE/supplier_proposal.lang     |    1 +
 htdocs/langs/sv_SE/suppliers.lang             |   14 +-
 htdocs/langs/sv_SE/users.lang                 |    3 +
 htdocs/langs/sv_SE/website.lang               |    5 +-
 htdocs/langs/sv_SE/withdrawals.lang           |   76 +-
 htdocs/langs/sv_SE/workflow.lang              |    4 +-
 htdocs/langs/sw_SW/accountancy.lang           |  113 +-
 htdocs/langs/sw_SW/admin.lang                 |   90 +-
 htdocs/langs/sw_SW/banks.lang                 |   19 +-
 htdocs/langs/sw_SW/bills.lang                 |   17 +-
 htdocs/langs/sw_SW/boxes.lang                 |    9 +-
 htdocs/langs/sw_SW/cashdesk.lang              |    3 +-
 htdocs/langs/sw_SW/categories.lang            |    7 +-
 htdocs/langs/sw_SW/companies.lang             |   22 +-
 htdocs/langs/sw_SW/compta.lang                |    2 +
 htdocs/langs/sw_SW/cron.lang                  |    7 +-
 htdocs/langs/sw_SW/errors.lang                |    4 +-
 htdocs/langs/sw_SW/install.lang               |    8 +
 htdocs/langs/sw_SW/interventions.lang         |    1 +
 htdocs/langs/sw_SW/ldap.lang                  |    2 +
 htdocs/langs/sw_SW/mails.lang                 |    5 +-
 htdocs/langs/sw_SW/main.lang                  |   24 +
 htdocs/langs/sw_SW/margins.lang               |    1 +
 htdocs/langs/sw_SW/orders.lang                |    1 +
 htdocs/langs/sw_SW/printing.lang              |    4 -
 htdocs/langs/sw_SW/productbatch.lang          |    7 +-
 htdocs/langs/sw_SW/products.lang              |   12 +-
 htdocs/langs/sw_SW/projects.lang              |   15 +-
 htdocs/langs/sw_SW/salaries.lang              |    4 +-
 htdocs/langs/sw_SW/stocks.lang                |    9 +
 htdocs/langs/sw_SW/suppliers.lang             |   14 +-
 htdocs/langs/sw_SW/users.lang                 |    3 +
 htdocs/langs/sw_SW/withdrawals.lang           |   76 +-
 htdocs/langs/sw_SW/workflow.lang              |    4 +-
 htdocs/langs/th_TH/accountancy.lang           |  115 +-
 htdocs/langs/th_TH/admin.lang                 |   90 +-
 htdocs/langs/th_TH/banks.lang                 |   19 +-
 htdocs/langs/th_TH/bills.lang                 |   17 +-
 htdocs/langs/th_TH/boxes.lang                 |    9 +-
 htdocs/langs/th_TH/cashdesk.lang              |    3 +-
 htdocs/langs/th_TH/categories.lang            |    7 +-
 htdocs/langs/th_TH/companies.lang             |   22 +-
 htdocs/langs/th_TH/compta.lang                |    2 +
 htdocs/langs/th_TH/cron.lang                  |    7 +-
 htdocs/langs/th_TH/errors.lang                |    4 +-
 htdocs/langs/th_TH/install.lang               |    8 +
 htdocs/langs/th_TH/interventions.lang         |    1 +
 htdocs/langs/th_TH/ldap.lang                  |    2 +
 htdocs/langs/th_TH/mails.lang                 |    5 +-
 htdocs/langs/th_TH/main.lang                  |   24 +
 htdocs/langs/th_TH/margins.lang               |    1 +
 htdocs/langs/th_TH/oauth.lang                 |   19 +-
 htdocs/langs/th_TH/orders.lang                |    1 +
 htdocs/langs/th_TH/printing.lang              |    4 -
 htdocs/langs/th_TH/productbatch.lang          |    7 +-
 htdocs/langs/th_TH/products.lang              |   12 +-
 htdocs/langs/th_TH/projects.lang              |   15 +-
 htdocs/langs/th_TH/salaries.lang              |    4 +-
 htdocs/langs/th_TH/stocks.lang                |    9 +
 htdocs/langs/th_TH/supplier_proposal.lang     |    1 +
 htdocs/langs/th_TH/suppliers.lang             |   14 +-
 htdocs/langs/th_TH/users.lang                 |    3 +
 htdocs/langs/th_TH/website.lang               |    5 +-
 htdocs/langs/th_TH/withdrawals.lang           |   76 +-
 htdocs/langs/th_TH/workflow.lang              |    4 +-
 htdocs/langs/tr_TR/accountancy.lang           |  115 +-
 htdocs/langs/tr_TR/admin.lang                 |   96 +-
 htdocs/langs/tr_TR/banks.lang                 |   19 +-
 htdocs/langs/tr_TR/bills.lang                 |   17 +-
 htdocs/langs/tr_TR/boxes.lang                 |    9 +-
 htdocs/langs/tr_TR/cashdesk.lang              |    3 +-
 htdocs/langs/tr_TR/categories.lang            |    7 +-
 htdocs/langs/tr_TR/companies.lang             |   22 +-
 htdocs/langs/tr_TR/compta.lang                |    2 +
 htdocs/langs/tr_TR/cron.lang                  |    3 +-
 htdocs/langs/tr_TR/errors.lang                |    4 +-
 htdocs/langs/tr_TR/install.lang               |    8 +
 htdocs/langs/tr_TR/interventions.lang         |    1 +
 htdocs/langs/tr_TR/ldap.lang                  |    2 +
 htdocs/langs/tr_TR/mails.lang                 |    9 +-
 htdocs/langs/tr_TR/main.lang                  |   24 +
 htdocs/langs/tr_TR/margins.lang               |    1 +
 htdocs/langs/tr_TR/oauth.lang                 |   19 +-
 htdocs/langs/tr_TR/orders.lang                |    1 +
 htdocs/langs/tr_TR/printing.lang              |    4 -
 htdocs/langs/tr_TR/productbatch.lang          |    7 +-
 htdocs/langs/tr_TR/products.lang              |   10 +-
 htdocs/langs/tr_TR/projects.lang              |   15 +-
 htdocs/langs/tr_TR/stocks.lang                |    9 +
 htdocs/langs/tr_TR/supplier_proposal.lang     |    3 +-
 htdocs/langs/tr_TR/suppliers.lang             |   14 +-
 htdocs/langs/tr_TR/users.lang                 |    3 +
 htdocs/langs/tr_TR/website.lang               |    5 +-
 htdocs/langs/tr_TR/withdrawals.lang           |   76 +-
 htdocs/langs/tr_TR/workflow.lang              |    2 +
 htdocs/langs/uk_UA/accountancy.lang           |  113 +-
 htdocs/langs/uk_UA/admin.lang                 |   90 +-
 htdocs/langs/uk_UA/banks.lang                 |   19 +-
 htdocs/langs/uk_UA/bills.lang                 |   17 +-
 htdocs/langs/uk_UA/boxes.lang                 |    9 +-
 htdocs/langs/uk_UA/cashdesk.lang              |    3 +-
 htdocs/langs/uk_UA/categories.lang            |    7 +-
 htdocs/langs/uk_UA/companies.lang             |   22 +-
 htdocs/langs/uk_UA/compta.lang                |    2 +
 htdocs/langs/uk_UA/cron.lang                  |    7 +-
 htdocs/langs/uk_UA/errors.lang                |    4 +-
 htdocs/langs/uk_UA/install.lang               |    8 +
 htdocs/langs/uk_UA/interventions.lang         |    1 +
 htdocs/langs/uk_UA/ldap.lang                  |    2 +
 htdocs/langs/uk_UA/mails.lang                 |    5 +-
 htdocs/langs/uk_UA/main.lang                  |  106 +-
 htdocs/langs/uk_UA/margins.lang               |    1 +
 htdocs/langs/uk_UA/oauth.lang                 |   19 +-
 htdocs/langs/uk_UA/orders.lang                |    1 +
 htdocs/langs/uk_UA/printing.lang              |    4 -
 htdocs/langs/uk_UA/productbatch.lang          |    7 +-
 htdocs/langs/uk_UA/products.lang              |   12 +-
 htdocs/langs/uk_UA/projects.lang              |   15 +-
 htdocs/langs/uk_UA/salaries.lang              |    4 +-
 htdocs/langs/uk_UA/stocks.lang                |    9 +
 htdocs/langs/uk_UA/supplier_proposal.lang     |    1 +
 htdocs/langs/uk_UA/suppliers.lang             |   14 +-
 htdocs/langs/uk_UA/users.lang                 |    3 +
 htdocs/langs/uk_UA/website.lang               |    5 +-
 htdocs/langs/uk_UA/withdrawals.lang           |   76 +-
 htdocs/langs/uk_UA/workflow.lang              |    4 +-
 htdocs/langs/uz_UZ/accountancy.lang           |  113 +-
 htdocs/langs/uz_UZ/admin.lang                 |   90 +-
 htdocs/langs/uz_UZ/banks.lang                 |   19 +-
 htdocs/langs/uz_UZ/bills.lang                 |   17 +-
 htdocs/langs/uz_UZ/boxes.lang                 |    9 +-
 htdocs/langs/uz_UZ/cashdesk.lang              |    3 +-
 htdocs/langs/uz_UZ/categories.lang            |    7 +-
 htdocs/langs/uz_UZ/companies.lang             |   22 +-
 htdocs/langs/uz_UZ/compta.lang                |    2 +
 htdocs/langs/uz_UZ/cron.lang                  |    7 +-
 htdocs/langs/uz_UZ/errors.lang                |    4 +-
 htdocs/langs/uz_UZ/install.lang               |    8 +
 htdocs/langs/uz_UZ/interventions.lang         |    1 +
 htdocs/langs/uz_UZ/ldap.lang                  |    2 +
 htdocs/langs/uz_UZ/mails.lang                 |    5 +-
 htdocs/langs/uz_UZ/main.lang                  |   24 +
 htdocs/langs/uz_UZ/margins.lang               |    1 +
 htdocs/langs/uz_UZ/orders.lang                |    1 +
 htdocs/langs/uz_UZ/printing.lang              |    4 -
 htdocs/langs/uz_UZ/productbatch.lang          |    7 +-
 htdocs/langs/uz_UZ/products.lang              |   12 +-
 htdocs/langs/uz_UZ/projects.lang              |   15 +-
 htdocs/langs/uz_UZ/salaries.lang              |    4 +-
 htdocs/langs/uz_UZ/stocks.lang                |    9 +
 htdocs/langs/uz_UZ/suppliers.lang             |   14 +-
 htdocs/langs/uz_UZ/users.lang                 |    3 +
 htdocs/langs/uz_UZ/withdrawals.lang           |   76 +-
 htdocs/langs/uz_UZ/workflow.lang              |    4 +-
 htdocs/langs/vi_VN/accountancy.lang           |  119 +-
 htdocs/langs/vi_VN/admin.lang                 |   90 +-
 htdocs/langs/vi_VN/banks.lang                 |   19 +-
 htdocs/langs/vi_VN/bills.lang                 |   17 +-
 htdocs/langs/vi_VN/boxes.lang                 |    9 +-
 htdocs/langs/vi_VN/cashdesk.lang              |    3 +-
 htdocs/langs/vi_VN/categories.lang            |    7 +-
 htdocs/langs/vi_VN/companies.lang             |   22 +-
 htdocs/langs/vi_VN/compta.lang                |    2 +
 htdocs/langs/vi_VN/cron.lang                  |    7 +-
 htdocs/langs/vi_VN/errors.lang                |    4 +-
 htdocs/langs/vi_VN/install.lang               |    8 +
 htdocs/langs/vi_VN/interventions.lang         |    1 +
 htdocs/langs/vi_VN/ldap.lang                  |    2 +
 htdocs/langs/vi_VN/mails.lang                 |    5 +-
 htdocs/langs/vi_VN/main.lang                  |   24 +
 htdocs/langs/vi_VN/margins.lang               |    1 +
 htdocs/langs/vi_VN/members.lang               |   16 +-
 htdocs/langs/vi_VN/oauth.lang                 |   19 +-
 htdocs/langs/vi_VN/orders.lang                |    1 +
 htdocs/langs/vi_VN/printing.lang              |    4 -
 htdocs/langs/vi_VN/productbatch.lang          |    7 +-
 htdocs/langs/vi_VN/products.lang              |   12 +-
 htdocs/langs/vi_VN/projects.lang              |   15 +-
 htdocs/langs/vi_VN/salaries.lang              |    4 +-
 htdocs/langs/vi_VN/stocks.lang                |    9 +
 htdocs/langs/vi_VN/supplier_proposal.lang     |    1 +
 htdocs/langs/vi_VN/suppliers.lang             |   14 +-
 htdocs/langs/vi_VN/users.lang                 |    3 +
 htdocs/langs/vi_VN/website.lang               |    5 +-
 htdocs/langs/vi_VN/withdrawals.lang           |   76 +-
 htdocs/langs/vi_VN/workflow.lang              |    4 +-
 htdocs/langs/zh_CN/accountancy.lang           |  227 +-
 htdocs/langs/zh_CN/admin.lang                 |  862 +++---
 htdocs/langs/zh_CN/agenda.lang                |  102 +-
 htdocs/langs/zh_CN/banks.lang                 |   95 +-
 htdocs/langs/zh_CN/bills.lang                 |  191 +-
 htdocs/langs/zh_CN/bookmarks.lang             |    4 +-
 htdocs/langs/zh_CN/boxes.lang                 |  125 +-
 htdocs/langs/zh_CN/cashdesk.lang              |   13 +-
 htdocs/langs/zh_CN/categories.lang            |  133 +-
 htdocs/langs/zh_CN/commercial.lang            |   40 +-
 htdocs/langs/zh_CN/companies.lang             |  356 +--
 htdocs/langs/zh_CN/compta.lang                |  150 +-
 htdocs/langs/zh_CN/contracts.lang             |   70 +-
 htdocs/langs/zh_CN/cron.lang                  |  115 +-
 htdocs/langs/zh_CN/deliveries.lang            |   36 +-
 htdocs/langs/zh_CN/dict.lang                  |   46 +-
 htdocs/langs/zh_CN/donations.lang             |   32 +-
 htdocs/langs/zh_CN/ecm.lang                   |   30 +-
 htdocs/langs/zh_CN/errors.lang                |  130 +-
 htdocs/langs/zh_CN/exports.lang               |   78 +-
 htdocs/langs/zh_CN/externalsite.lang          |    2 +-
 htdocs/langs/zh_CN/ftp.lang                   |   10 +-
 htdocs/langs/zh_CN/help.lang                  |    6 +-
 htdocs/langs/zh_CN/holiday.lang               |  110 +-
 htdocs/langs/zh_CN/hrm.lang                   |   24 +-
 htdocs/langs/zh_CN/incoterm.lang              |    6 +-
 htdocs/langs/zh_CN/install.lang               |  136 +-
 htdocs/langs/zh_CN/interventions.lang         |   69 +-
 htdocs/langs/zh_CN/languages.lang             |    2 +-
 htdocs/langs/zh_CN/ldap.lang                  |    6 +-
 htdocs/langs/zh_CN/link.lang                  |   19 +-
 htdocs/langs/zh_CN/loan.lang                  |   24 +-
 htdocs/langs/zh_CN/mailmanspip.lang           |   50 +-
 htdocs/langs/zh_CN/mails.lang                 |  117 +-
 htdocs/langs/zh_CN/main.lang                  |  596 ++--
 htdocs/langs/zh_CN/margins.lang               |   71 +-
 htdocs/langs/zh_CN/members.lang               |  122 +-
 htdocs/langs/zh_CN/oauth.lang                 |   31 +-
 htdocs/langs/zh_CN/opensurvey.lang            |   74 +-
 htdocs/langs/zh_CN/orders.lang                |  133 +-
 htdocs/langs/zh_CN/other.lang                 |  222 +-
 htdocs/langs/zh_CN/paybox.lang                |   16 +-
 htdocs/langs/zh_CN/paypal.lang                |   12 +-
 htdocs/langs/zh_CN/printing.lang              |   90 +-
 htdocs/langs/zh_CN/productbatch.lang          |   41 +-
 htdocs/langs/zh_CN/products.lang              |  286 +-
 htdocs/langs/zh_CN/projects.lang              |  239 +-
 htdocs/langs/zh_CN/propal.lang                |   42 +-
 htdocs/langs/zh_CN/receiptprinter.lang        |   66 +-
 htdocs/langs/zh_CN/resource.lang              |   42 +-
 htdocs/langs/zh_CN/salaries.lang              |   22 +-
 htdocs/langs/zh_CN/sendings.lang              |   80 +-
 htdocs/langs/zh_CN/sms.lang                   |   10 +-
 htdocs/langs/zh_CN/stocks.lang                |  137 +-
 htdocs/langs/zh_CN/supplier_proposal.lang     |   97 +-
 htdocs/langs/zh_CN/suppliers.lang             |   38 +-
 htdocs/langs/zh_CN/trips.lang                 |  110 +-
 htdocs/langs/zh_CN/users.lang                 |   73 +-
 htdocs/langs/zh_CN/website.lang               |   43 +-
 htdocs/langs/zh_CN/withdrawals.lang           |   88 +-
 htdocs/langs/zh_CN/workflow.lang              |   22 +-
 htdocs/langs/zh_TW/accountancy.lang           |  113 +-
 htdocs/langs/zh_TW/admin.lang                 |  104 +-
 htdocs/langs/zh_TW/banks.lang                 |   29 +-
 htdocs/langs/zh_TW/bills.lang                 |   19 +-
 htdocs/langs/zh_TW/boxes.lang                 |    9 +-
 htdocs/langs/zh_TW/cashdesk.lang              |    3 +-
 htdocs/langs/zh_TW/categories.lang            |    7 +-
 htdocs/langs/zh_TW/companies.lang             |   22 +-
 htdocs/langs/zh_TW/compta.lang                |    2 +
 htdocs/langs/zh_TW/cron.lang                  |    7 +-
 htdocs/langs/zh_TW/errors.lang                |    4 +-
 htdocs/langs/zh_TW/install.lang               |    8 +
 htdocs/langs/zh_TW/interventions.lang         |    1 +
 htdocs/langs/zh_TW/ldap.lang                  |    2 +
 htdocs/langs/zh_TW/mails.lang                 |    5 +-
 htdocs/langs/zh_TW/main.lang                  |   24 +
 htdocs/langs/zh_TW/margins.lang               |    1 +
 htdocs/langs/zh_TW/oauth.lang                 |   19 +-
 htdocs/langs/zh_TW/orders.lang                |   17 +-
 htdocs/langs/zh_TW/printing.lang              |    4 -
 htdocs/langs/zh_TW/productbatch.lang          |    7 +-
 htdocs/langs/zh_TW/products.lang              |   12 +-
 htdocs/langs/zh_TW/projects.lang              |   15 +-
 htdocs/langs/zh_TW/salaries.lang              |    4 +-
 htdocs/langs/zh_TW/sendings.lang              |    6 +-
 htdocs/langs/zh_TW/stocks.lang                |    9 +
 htdocs/langs/zh_TW/supplier_proposal.lang     |    1 +
 htdocs/langs/zh_TW/suppliers.lang             |   14 +-
 htdocs/langs/zh_TW/users.lang                 |    3 +
 htdocs/langs/zh_TW/website.lang               |    5 +-
 htdocs/langs/zh_TW/withdrawals.lang           |   76 +-
 htdocs/langs/zh_TW/workflow.lang              |    4 +-
 1830 files changed, 26908 insertions(+), 18270 deletions(-)
 rename dev/tools/{fixduplicatelines.sh => fixduplicatelanglines.sh} (90%)
 create mode 100644 htdocs/langs/de_CH/ldap.lang
 create mode 100644 htdocs/langs/en_AU/accountancy.lang
 delete mode 100644 htdocs/langs/en_AU/mails.lang
 delete mode 100644 htdocs/langs/en_AU/stocks.lang
 create mode 100644 htdocs/langs/en_CA/accountancy.lang
 delete mode 100644 htdocs/langs/en_CA/mails.lang
 delete mode 100644 htdocs/langs/en_CA/stocks.lang
 create mode 100644 htdocs/langs/en_CA/withdrawals.lang
 create mode 100644 htdocs/langs/en_GB/accountancy.lang
 delete mode 100644 htdocs/langs/en_GB/mails.lang
 delete mode 100644 htdocs/langs/en_GB/stocks.lang
 create mode 100644 htdocs/langs/en_GB/withdrawals.lang
 create mode 100644 htdocs/langs/en_IN/accountancy.lang
 delete mode 100644 htdocs/langs/en_IN/companies.lang
 delete mode 100644 htdocs/langs/en_IN/mails.lang
 delete mode 100644 htdocs/langs/en_IN/stocks.lang
 create mode 100644 htdocs/langs/en_IN/withdrawals.lang
 delete mode 100644 htdocs/langs/es_AR/companies.lang
 delete mode 100644 htdocs/langs/es_AR/mails.lang
 delete mode 100644 htdocs/langs/es_AR/stocks.lang
 create mode 100644 htdocs/langs/es_AR/withdrawals.lang
 delete mode 100644 htdocs/langs/es_BO/companies.lang
 delete mode 100644 htdocs/langs/es_BO/mails.lang
 delete mode 100644 htdocs/langs/es_BO/stocks.lang
 create mode 100644 htdocs/langs/es_BO/withdrawals.lang
 delete mode 100644 htdocs/langs/es_CL/mails.lang
 delete mode 100644 htdocs/langs/es_CL/stocks.lang
 create mode 100644 htdocs/langs/es_CL/withdrawals.lang
 delete mode 100644 htdocs/langs/es_CO/mails.lang
 delete mode 100644 htdocs/langs/es_CO/stocks.lang
 create mode 100644 htdocs/langs/es_CO/withdrawals.lang
 delete mode 100644 htdocs/langs/es_DO/companies.lang
 delete mode 100644 htdocs/langs/es_DO/mails.lang
 delete mode 100644 htdocs/langs/es_DO/stocks.lang
 create mode 100644 htdocs/langs/es_DO/withdrawals.lang
 delete mode 100644 htdocs/langs/es_EC/companies.lang
 delete mode 100644 htdocs/langs/es_EC/mails.lang
 delete mode 100644 htdocs/langs/es_EC/stocks.lang
 create mode 100644 htdocs/langs/es_EC/withdrawals.lang
 delete mode 100644 htdocs/langs/es_MX/mails.lang
 delete mode 100644 htdocs/langs/es_PA/companies.lang
 delete mode 100644 htdocs/langs/es_PA/mails.lang
 delete mode 100644 htdocs/langs/es_PA/stocks.lang
 create mode 100644 htdocs/langs/es_PA/withdrawals.lang
 delete mode 100644 htdocs/langs/es_PE/mails.lang
 delete mode 100644 htdocs/langs/es_PE/stocks.lang
 create mode 100644 htdocs/langs/es_PE/withdrawals.lang
 delete mode 100644 htdocs/langs/es_PY/mails.lang
 delete mode 100644 htdocs/langs/es_PY/stocks.lang
 create mode 100644 htdocs/langs/es_PY/withdrawals.lang
 delete mode 100644 htdocs/langs/es_VE/mails.lang
 delete mode 100644 htdocs/langs/es_VE/stocks.lang
 create mode 100644 htdocs/langs/es_VE/withdrawals.lang
 delete mode 100644 htdocs/langs/fr_BE/mails.lang
 delete mode 100644 htdocs/langs/fr_BE/stocks.lang
 create mode 100644 htdocs/langs/fr_BE/withdrawals.lang
 delete mode 100644 htdocs/langs/fr_CA/stocks.lang
 create mode 100644 htdocs/langs/fr_CA/withdrawals.lang
 create mode 100644 htdocs/langs/fr_CH/accountancy.lang
 delete mode 100644 htdocs/langs/fr_CH/mails.lang
 delete mode 100644 htdocs/langs/fr_CH/stocks.lang
 create mode 100644 htdocs/langs/fr_CH/withdrawals.lang
 create mode 100644 htdocs/langs/nl_BE/bookmarks.lang
 delete mode 100644 htdocs/langs/nl_BE/boxes.lang
 create mode 100644 htdocs/langs/nl_BE/dict.lang

diff --git a/dev/tools/fixduplicatelangkey.sh b/dev/tools/fixduplicatelangkey.sh
index ae0be750646..2090f8a3504 100755
--- a/dev/tools/fixduplicatelangkey.sh
+++ b/dev/tools/fixduplicatelangkey.sh
@@ -14,6 +14,7 @@ fi
 
 if [ "x$1" = "xlist" ]
 then
+	echo "Search duplicate keys into en_US lang files (there is no cross file check)"
 	for file in `find htdocs/langs/en_US -name *.lang -type f`
 	do
 	    dupes=$(
diff --git a/dev/tools/fixduplicatelines.sh b/dev/tools/fixduplicatelanglines.sh
similarity index 90%
rename from dev/tools/fixduplicatelines.sh
rename to dev/tools/fixduplicatelanglines.sh
index 18f9707169e..0c0e2eecb4b 100755
--- a/dev/tools/fixduplicatelines.sh
+++ b/dev/tools/fixduplicatelanglines.sh
@@ -16,6 +16,7 @@ fi
 # To detect
 if [ "x$1" = "xlist" ]
 then
+	echo "Search duplicate line for lang en_US"
     for file in `find htdocs/langs/en_US -type f -name *.lang`
     do
         if [ `sort "$file" | grep -v '^$' | uniq -d | wc -l` -gt 0 ]
@@ -29,6 +30,7 @@ fi
 # To fix
 if [ "x$1" = "xfix" ]
 then
+	echo "Fix duplicate line for lang en_US"
     for file in `find htdocs/langs/en_US -type f -name *.lang`
     do
     	awk -i inplace ' !x[$0]++' "$file"
diff --git a/dev/translation/txpull.sh b/dev/translation/txpull.sh
index 71e03cf522e..4156daf7674 100755
--- a/dev/translation/txpull.sh
+++ b/dev/translation/txpull.sh
@@ -42,4 +42,4 @@ else
 fi
 
 echo Think to launch also: 
-echo "> dev/fixaltlanguages.sh fix all"
+echo "> dev/tools/fixaltlanguages.sh fix all"
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index ec41611a4cd..1b3943ebd82 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -188,7 +188,7 @@ $formaccounting = new FormAccounting($db);
 
 // Create mode
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans('NewAccount'));
+	print load_fiche_titre($langs->trans('NewAccountingAccount'));
 	
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
 	print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 72760e7e72f..61db64e8c97 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -79,6 +79,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		// Actions
 		if ($action == 'COMPANY_CREATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("companies");
 
@@ -93,6 +94,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'COMPANY_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -105,6 +107,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
         elseif ($action == 'CONTRACT_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("contracts");
 
@@ -117,8 +120,9 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
-        	$langs->load("propal");
+            $langs->load("propal");
 
 			$object->actiontypecode='AC_OTH_AUTO';
             if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
@@ -129,6 +133,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
         elseif ($action == 'PROPAL_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("propal");
 
@@ -145,6 +150,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("propal");
 
@@ -157,6 +163,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("propal");
 
@@ -169,6 +176,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("propal");
 
@@ -181,6 +189,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("orders");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -192,6 +201,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_CLOSE')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -204,6 +214,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -216,6 +227,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_CANCEL')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -228,6 +240,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -244,6 +257,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'BILL_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -256,6 +270,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'BILL_UNVALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -268,6 +283,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
         elseif ($action == 'BILL_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -284,6 +300,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'BILL_PAYED')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -297,6 +314,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'BILL_CANCEL')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -309,7 +327,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'FICHINTER_CREATE')
         {
-        	$langs->load("other");
+            $langs->load("agenda");
+            $langs->load("other");
             $langs->load("interventions");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -323,6 +342,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'FICHINTER_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("interventions");
 
@@ -337,7 +357,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'FICHINTER_MODIFY')
         {
-        	$langs->load("other");
+            $langs->load("agenda");
+            $langs->load("other");
             $langs->load("interventions");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -351,7 +372,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
-        	$langs->load("other");
+            $langs->load("agenda");
+            $langs->load("other");
             $langs->load("interventions");
 
             $object->actiontypecode='AC_OTH_AUTO';
@@ -363,6 +385,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("interventions");
 
@@ -375,6 +398,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
 	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("interventions");
 
@@ -387,6 +411,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'FICHINTER_DELETE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("interventions");
 
@@ -401,7 +426,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
         elseif ($action == 'SHIPPING_VALIDATE')
         {
-        	$langs->load("other");
+            $langs->load("agenda");
+            $langs->load("other");
         	$langs->load("sendings");
 
         	$object->actiontypecode='AC_OTH_AUTO';
@@ -417,6 +443,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
 		elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("sendings");
 
@@ -433,6 +460,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -445,6 +473,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -457,7 +486,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
-            $langs->load("other");
+            $langs->load("agenda");
+		    $langs->load("other");
 			$langs->load("orders");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -469,7 +499,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
-            $langs->load("other");
+            $langs->load("agenda");
+		    $langs->load("other");
 			$langs->load("orders");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -481,6 +512,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -493,6 +525,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
+            $langs->load("agenda");
             $langs->load("other");
         	$langs->load("orders");
 
@@ -505,6 +538,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
             $langs->load("orders");
@@ -522,6 +556,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
 		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
             $langs->load("orders");
@@ -538,6 +573,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
 		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -550,6 +586,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -562,6 +599,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
         elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
             $langs->load("orders");
@@ -579,6 +617,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
 		elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -591,6 +630,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 		elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("bills");
 
@@ -605,6 +645,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         // Members
         elseif ($action == 'MEMBER_VALIDATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("members");
 
@@ -619,6 +660,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("members");
 
@@ -635,6 +677,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'MEMBER_RESILIATE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("members");
 
@@ -649,6 +692,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         elseif ($action == 'MEMBER_DELETE')
         {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("members");
 
@@ -665,7 +709,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
         // Projects
         elseif ($action == 'PROJECT_CREATE')
         {
-        	$langs->load("other");
+            $langs->load("agenda");
+            $langs->load("other");
         	$langs->load("projects");
 
         	$object->actiontypecode='AC_OTH_AUTO';
@@ -677,6 +722,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         	$object->sendtoid=0;
         }
         elseif($action == 'PROJECT_CREATE') {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("projects");
         
@@ -691,6 +737,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
         }
         
         elseif($action == 'PROJECT_MODIFY') {
+            $langs->load("agenda");
             $langs->load("other");
             $langs->load("projects");
         
@@ -705,7 +752,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
         
 		// Project tasks
 		elseif($action == 'TASK_CREATE') {
-			$langs->load("other");
+            $langs->load("agenda");
+		    $langs->load("other");
 			$langs->load("projects");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -719,7 +767,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 
 		elseif($action == 'TASK_MODIFY') {
-			$langs->load("other");
+            $langs->load("agenda");
+		    $langs->load("other");
 			$langs->load("projects");
 
 			$object->actiontypecode='AC_OTH_AUTO';
@@ -732,7 +781,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		}
 
 		elseif($action == 'TASK_DELETE') {
-			$langs->load("other");
+            $langs->load("agenda");
+		    $langs->load("other");
 			$langs->load("projects");
 
 			$object->actiontypecode='AC_OTH_AUTO';
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 02a650a2e10..09a2ffe56f3 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/export/modules_export.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $langs->load("exports");
+$langs->load("other");
 $langs->load("users");
 $langs->load("companies");
 $langs->load("projects");
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index f9311e1edbb..c7b3e193f23 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=دفاتر اليومية
 JournalFinancial=دفاتر اليومية المالية
 BackToChartofaccounts=العودة لشجرة الحسابات
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=اختر شجرة الحسابات
 Addanaccount=إضافة حساب محاسبي
 AccountAccounting=حساب محاسبي
 AccountAccountingShort=Account
 AccountAccountingSuggest=اقتراح حساب محاسبي
-Ventilation=تحليل
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=تصنيف العملاء
-SuppliersVentilation=تصنيف الموردين
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=تقارير
 NewAccount=حساب محاسبي جديد
 Create=إنشاء
-CreateMvts=إنشاء حركة
-UpdateMvts=تعديل حركة
-WriteBookKeeping=سجل الحسابات في دفتر الأستاذ العام
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=دفتر الأستاذ العام
 AccountBalance=Account balance
 
 CAHTF=إجمالي شراء المورد قبل الضريبة
-InvoiceLines=خطوط الفاتورة الجاهزة للإعلان
-InvoiceLinesDone=خطوط الفاتورة المعلنة
-IntoAccount=الإعلان في الحساب المحاسبي
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=أعلن عن
+Ventilate=Bind
 
 Processing=معالجة
 EndProcessing=نهاية المعالجة
-AnyLineVentilate=أي خطوط للإعلان
+AnyLineVentilate=Any lines to bind
 SelectedLines=الخطوط المحددة
 Lineofinvoice=خط الفاتورة
-VentilatedinAccount=المعلن عنها في الحساب المحاسبي
-NotVentilatedinAccount=لم يتم الاعلان عنها في الحساب المحاسبي
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=عدد العناصر الظاهرة في الصفحة ليتم احلالها (العدد الأقصى الموصى به : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=بدء الفرز للصفحات المحللة "يجب ان تحل" بناء على احدث العناصر
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=بدء الفرز للصفحات المحللة "إحلال" بناء على أحدث العناصر
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=الطول المستخدم لعرض وصف المنتجات والخدمات في القوائم. (المفضل = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=الطول المستخدم لعرض وصف نماذج المنتجات والخدمات في القوائم. (المفضل = 50)
-ACCOUNTING_LENGTH_GACCOUNT=طول الحسابات العامة
-ACCOUNTING_LENGTH_AACCOUNT=طول حسابات الطرف ثالث
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
 ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=دفتر اليومية
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=حذف السجلات من دفتر الأستاذ العام
-
 DescSellsJournal=دفتر المبيعات اليومية
 DescPurchasesJournal=دفتر المشتريات اليومية
 FinanceJournal=دفتر المالية اليومي
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=دفعة فاتورة العميل
-
 ThirdPartyAccount=حساب طرف ثالث
-
-NewAccountingMvt=حركة جديدة
-NumMvts=رقم الحركة
-ListeMvts=قائمة الحركة
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=الدائن والمدين لا يمكن أن يكون لهم قيمة في الوقت نفسه
 
-ReportThirdParty=قائمة حساب الطرف الثالث
-DescThirdPartyReport=استشر هنا قائمة للعملاء والموردين وحساباتهم المحاسبية
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=قائمة الحسابات المحاسبية
 
@@ -114,22 +134,29 @@ Pcgtype=فئة الحساب
 Pcgsubtype=تحت فئة الحساب
 Accountparent=أصل الحساب
 
-DescVentilCustomer=استشر هنا الإحلال السنوي المحاسبي لفواتير العملاء
 TotalVente=المبيعات الإجمالية قبل الضريبة
 TotalMarge=إجمالي هامش المبيعات
-DescVentilDoneCustomer=استشر هنا لائحة خطوط الفواتير للعملاء وحساب المحاسبية
-DescVentilTodoCustomer=إعلان الخطوط الخاصة بك من فاتورة العميل مع حساب المحاسبة
-ChangeAccount=تغيير حساب المحاسبية للخطوط التي اختارها الحساب:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=استشر هنا الإحلال السنوي المحاسبي لفواتير الموردين
-DescVentilDoneSupplier=استشر هنا لائحة خطوط فواتير الموردين وحساب المحاسبية
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=تحقق تلقائيا
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
 MvtNotCorrectlyBalanced=الحركة غير متوازنة\nالدائن =%s\nالمدين =%s
-FicheVentilation=بطاقة الإحلال
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=العمليات مسجلة في دفتر الاستاذ العام
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index b92401e009e..55f9e0fb383 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=تجريبية
 VersionDevelopment=تطويرية
 VersionUnknown=غير معروف
 VersionRecommanded=موصى بها
-FileCheck=النزاهة ملفات
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=الملفات المفقودة
 FilesUpdated=الملفات التي تم تحديثها
-FileCheckDolibarr=تحقق Dolibarr ملفات النزاهة
-XmlNotFound=ملف XML من Dolibarr النزاهة لم يتم العثور على
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=معالج لحفظ الجلسات
 SessionSavePath=جلسة التخزين المحلية
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=خطأ, برنامج دوليبار <b>%s</b>
 DictionarySetup=إعداد القاموس
 Dictionary=قواميس
 Chartofaccounts=جدول الحسابات
-Fiscalyear=السنوات المالية
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك
 ErrorCodeCantContainZero=الكود لا يمكن أن يحتوي على القيمة 0
 DisableJavascript=تعطيل جافا سكريبت واياكس وظائف (مستحسن للأعمى شخص أو النص المتصفحات)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=الانتظار تضغط على مفتاح قب
 DelaiedFullListToSelectContact=الانتظار تضغط على مفتاح قبل تحميل المحتوى من قائمة التحرير والسرد الاتصال (وهذا قد يزيد من الأداء إذا كان لديك عدد كبير من الاتصال)
 NumberOfKeyToSearch=عدد الحروف لبدء البحث: %s
 NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس معطلاً
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=ترميز البيانات الأحادية لستة عش
 IgnoreDuplicateRecords=تجاهل الأخطاء في السجلات المكررة (تجاهل الإدراج)
 AutoDetectLang=اكتشاف تلقائي (لغة المتصفح)
 FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=الصلاحيات
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
-ModulesDesc=نماذج دوليبار تحدد اي الوظائف سيتم تفعيلها في البرنامج. بعض النماذج تتطلب بعض التصاريح يجب عليك اعطائها للمستخدمين، بعد تفعيل النموذج. اضغط على زر on/off في عمود الحالة لتفعيل النموذج/الميزة
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=مزيد من وحدات...
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
@@ -273,9 +279,10 @@ YouCanSubmitFile=لهذه الخطوة، يمكنك إرسال حزمة باست
 CurrentVersion=Dolibarr النسخة الحالية
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=خادم التحديث متواجد حاليا
 GenericMaskCodes=يمكنك إدخال أي قناع الترقيم. في هذا القناع ، وبعد ويمكن استخدام العلامات : <br> <b>(000000)</b> يطابق عدد الذي سيكون على كل يزداد ٪ s. كما تدخل العديد من أصفار على النحو المنشود طول المضادة. المضاد وسيتم الانتهاء من اصفار من اليسار من أجل الحصول على أكبر عدد اصفار كما القناع. <br> <b>000000 +000) (نفس</b> السابقة ولكن يقابل المقابلة لعدد للحق من علامة + يطبق اعتبارا من أول ٪ s. <br> <b>000000 @ (س)</b> نفس السابقة ولكن المضاد هو إعادة الصفر عندما يتم التوصل إلى الشهر خ خ ما بين 1 و 12). إذا كان هذا الخيار هو المستخدمة وس 2 أو أعلى ، ثم تسلسل (ذ ذ م م)) ((سنة أو ملم)) (مطلوب أيضا. <br> <b>(ب)</b> اليوم (01 الى 31). <br> <b>() ملم</b> في الشهر (01 الى 12). <br> <b>(كذا)</b> ، <b>(سنة))</b> أو <b>(ذ</b> السنة أكثر من 2 أو 4 أو 1 الأرقام. <br>
-GenericMaskCodes2=<b>{CCCC}</b> رمز العميل على أحرف ن <br> <b>{cccc000}</b> يتبع رمز العميل على الأحرف التي كتبها ن عداد مخصصة للعملاء. تتم إعادة تعيين هذا العداد مخصصة للعملاء في الوقت نفسه من عداد العالمية. <br> <b>{TTTT} رمز</b> من نوع مرشحين عن على أحرف ن (انظر أنواع-القاموس مرشحين عن). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <br>
 GenericMaskCodes4a=<u>ومثال على 99th %s من طرف ثالث TheCompany عمله 2007-01-31 :</u> <br>
 GenericMaskCodes4b=<u>ومثال على طرف ثالث على إنشاء 2007-03-01 :</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=المعلمات لتأمين عناوين المواق
 SecurityTokenIsUnique=استخدام معلمة securekey فريدة لكل URL
 EnterRefToBuildUrl=أدخل مرجع لكائن %s
 GetSecuredUrl=الحصول على عنوان محسوب
-ButtonHideUnauthorized=إخفاء أزرار لإجراءات غير مصرح بها بدلا من إظهار أزرار ذوي الاحتياجات الخاصة
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=معدل ضريبة القيمة المضافة القديم
 NewVATRates=معدل ضريبة القيمة المضافة الجديد
 PriceBaseTypeToChange=تعديل على الأسعار مع القيمة المرجعية قاعدة المعرفة على
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= مربع من الجدول
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=& مجموعات المستخدمين
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcodes إدارة
 Module56Name=الخدمات الهاتفية
 Module56Desc=تكامل الخدمات الهاتفية
-Module57Name=أوامر دائمة
-Module57Desc=يقف أوامر وإدارة الانسحاب. ويشمل أيضا جيل من ملف المصلحة للبلدان الأوروبية.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=انقر للاتصال
 Module58Desc=ClickToDial التكامل
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=التكامل Webcalendar
 Module500Name=المصروفات الخاصة
 Module500Desc=إدارة المصروفات الخاصة (الضرائب، الضرائب الاجتماعية أو المالية وتوزيعات الأرباح)
-Module510Name=الرواتب
-Module510Desc=إدارة رواتب الموظفين والمدفوعات
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=قرض
 Module520Desc=إدارة القروض
 Module600Name=الإخطارات
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
 Module770Name=تقارير المصاريف
@@ -606,10 +617,10 @@ Permission142=إنشاء / تعديل كافة المشاريع والمهام (
 Permission144=حذف جميع المشاريع والمهام (أيضا مشاريع خاصة وأنا لا اتصال لل)
 Permission146=قراءة موفري
 Permission147=قراءة احصائيات
-Permission151=قراءة أوامر دائمة
-Permission152=إعداد أوامر دائمة
-Permission153=قراءة أوامر دائمة إيصالات
-Permission154=الائتمان / ورفض أوامر دائمة ايصالات
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=قراءة العقود / الاشتراكات
 Permission162=إنشاء / تعديل العقود / الاشتراكات
 Permission163=تفعيل خدمة / الاشتراك عقد
@@ -747,6 +758,7 @@ Permission1236=تصدير فواتير الموردين والصفات والم
 Permission1237=أوامر المورد التصدير وتفاصيلها
 Permission1251=ادارة الدمار الواردات الخارجية البيانات في قاعدة البيانات (بيانات تحميل)
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
+Permission1322=Reopen a paid bill
 Permission1421=التصدير طلبات الزبائن وصفاته
 Permission20001=قراءة طلبات الإجازة (لك والمرؤوسين لديك)
 Permission20002=إنشاء / تعديل طلبات الإجازات الخاصة بك
@@ -780,6 +792,10 @@ Permission55002=إنشاء / تعديل استطلاعات الرأي
 Permission59001=قراءة الهوامش التجارية
 Permission59002=تحديد هوامش التجارية
 Permission59003=قراءة كل الهامش المستخدم
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=احتمال المستوى المحتمل
@@ -853,6 +869,7 @@ LabelUsedByDefault=العلامة التي يستخدمها التقصير إذ
 LabelOnDocuments=علامة على وثائق
 NbOfDays=ملاحظة : من الأيام
 AtEndOfMonth=في نهاية الشهر
+CurrentNext=Current/Next
 Offset=ويقابل
 AlwaysActive=حركة دائمة
 Upgrade=ترقية
@@ -950,7 +967,7 @@ LogEventDesc=هنا يمكنك تمكين قطع الأشجار لDolibarr ال
 AreaForAdminOnly=هذه الميزات يمكن أن تستخدم من قبل <b>مدير المستخدمين</b> فقط.
 SystemInfoDesc=نظام المعلومات المتنوعة المعلومات التقنية تحصل في قراءة فقط وواضحة للمشرفين فقط.
 SystemAreaForAdminOnly=هذا المجال المتاح لمدير المستخدمين فقط. أيا من Dolibarr أذونات يمكن أن تقلل من هذا الحد.
-CompanyFundationDesc=تعديل على هذه الصفحة كل المعلومات المعروفة للشركة أو مؤسسة تحتاج لإدارة
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=يمكنك ان تختار كل معلمة إلى Dolibarr هنا الشكل والمظهر
 AvailableModules=تتوفر وحدات
 ToActivateModule=لتفعيل وحدات ، على الإعداد منطقة الصفحة الرئيسية&gt; الإعداد -> الوحدات).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=تحذير، في بعض أنظمة لينكس، لإ
 PathToDocuments=الطريق إلى وثائق
 PathDirectory=دليل
 SendmailOptionMayHurtBuggedMTA=ميزة لإرسال رسائل باستخدام طريقة "البريد PHP مباشرة" سيتم إنشاء رسالة البريد الإلكتروني التي قد لا تحليل بشكل صحيح من قبل بعض ملقمات البريد المستقبلة. النتيجة هي أن بعض رسائل لا يمكن قراءتها من قبل الشعب الذي استضافته تلك البرامج تنصتت. انها حالة لبعض مزودي الانترنت (مثال: أورانج في فرنسا). هذه ليست مشكلة في Dolibarr ولا في PHP ولكن على استقبال خادم البريد. ولكن هل يمكن أن تضيف MAIN_FIX_FOR_BUGGED_MTA الخيار ل1 إلى الإعداد - البعض لتعديل Dolibarr لتجنب ذلك. ومع ذلك، قد تواجه مشكلة مع خوادم أخرى تحترم بدقة المعيار SMTP. الحل الآخر (موصى به) هو استخدام طريقة "مكتبة مأخذ SMTP" الذي لا يوجد لديه عيوب.
-TranslationSetup=التكوين دي لا TRADUCTION
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=يجب على الأقل تمكين 1 وحدة
 ClassNotFoundIntoPathWarning=لم يتم العثور على  %s في مسار PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=استخدام TLS
 LDAPServerUseTLSExample=خادم LDAP الخاص بك استخدام TLS
 LDAPServerDn=خادم DN
 LDAPAdminDn=مدير DN
-LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=DN الكامل (مثلا : cn= adminldap العاصمة= المجتمع ، العاصمة= كوم)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=مدير البرنامج كلمة السر
 LDAPUserDn=المستخدمين DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=DN الكامل (مثلا : où= المستخدمين ، العاصمة= المجتمع ، العاصمة= كوم)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=على سبيل المثال : س
 LDAPFieldSid=سيد
 LDAPFieldSidExample=مثال ذلك : objectsid
 LDAPFieldEndLastSubscription=تاريخ انتهاء الاكتتاب
-LDAPFieldTitle=وظيفة / وظيفة
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=مثال: اللقب
 LDAPSetupNotComplete=LDAP الإعداد غير كاملة (على آخرين علامات التبويب)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=أي مدير أو كلمة السر. LDAP الوصول مجهولة وسيكون في قراءة فقط.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=منتجات وخدمات إعداد وحدات
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=الحد الأقصى لعدد من المنتجات في اختيار قوائم المجموعات (0= لا حدود)
 ViewProductDescInFormAbility=تصور وصف المنتج في أشكال (ما المنبثقة tooltip)
 MergePropalProductCard=في تنشيط المنتج / الخدمة المرفقة التبويب ملفات خيار دمج المستند المنتج PDF إلى اقتراح PDF دازور إذا كان المنتج / الخدمة في الاقتراح
-ViewProductDescInThirdpartyLanguageAbility=تصور من أوصاف المنتجات في لغة مرشحين عن
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=أيضا إذا كان لديك عدد كبير من المنتجات (> 100 000)، يمكنك زيادة السرعة عن طريق وضع PRODUCT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 UseSearchToSelectProduct=استخدام نموذج البحث لاختيار المنتج (بدلا من القائمة المنسدلة).
 SetDefaultBarcodeTypeProducts=النوع الافتراضي لاستخدام الباركود للمنتجات
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=شريط أدوات سطر الأوامر رمز جيل (ال
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=مدير لصناعة السيارات تحديد أرقام الباركود
 ##### Prelevements #####
-WithdrawalsSetup=انسحاب وحدة الإعداد
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=RSS الواردات الخارجية الإعداد <textarea></textarea>
 NewRSS=الجديد تغذية RSS
@@ -1506,6 +1531,7 @@ OpenFiscalYear=السنة المالية المفتوحة
 CloseFiscalYear=السنة المالية وثيق
 DeleteFiscalYear=حذف السنة المالية
 ConfirmDeleteFiscalYear=هل أنت متأكد من حذف هذه السنة المالية؟
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=يمكن دائما أن تعدل
 MAIN_APPLICATION_TITLE=إجبار اسم المرئي من التطبيق (تحذير: وضع اسمك هنا قد كسر ميزة تسجيل الدخول التدوين الآلي عند استخدام تطبيقات الهاتف المتحرك DoliDroid)
 NbMajMin=الحد الأدنى لعدد الأحرف الكبيرة
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=قائمة الإشعارات ثابت
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=الذهاب على علامة التبويب "التبليغات" من جهة اتصال مرشحين عن إضافة أو إزالة إخطارات للاتصالات / عناوين
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=عتبة
 BackupDumpWizard=المعالج لبناء قاعدة بيانات النسخ الاحتياطي ملف تفريغ
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=تسليط الضوء على لون الخط عند تمري
 TextTitleColor=Color of page title
 LinkColor=لون الروابط
 PressF5AfterChangingThis=اضغط F5 على لوحة المفاتيح بعد تغيير هذه القيمة أن يكون ذلك فعالا
-NotSupportedByAllThemes=الإرادة يعمل مع موضوع eldy لكن غير معتمد من قبل جميع المواضيع
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=لون الخلفية
 TopMenuBackgroundColor=لون الخلفية لقائمة الأعلى
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=لون الخلفية القائمة اليمنى
 BackgroundTableTitleColor=لون الخلفية لخط عنوان الجدول
 BackgroundTableLineOddColor=لون الخلفية لخطوط الجدول غريبة
@@ -1569,7 +1596,7 @@ MailToSendIntervention=لإرسال التدخل
 MailToSendSupplierRequestForQuotation=لإرسال طلب الاقتباس إلى المورد
 MailToSendSupplierOrder=لإرسال المورد أجل
 MailToSendSupplierInvoice=لإرسال فاتورة المورد
-MailToThirdparty=لإرسال البريد الإلكتروني من صفحة مرشحين عن
+MailToThirdparty=To send email from third party page
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
 YouUseLastStableVersion=كنت تستخدم إصدار مستقر الماضي
 TitleExampleForMajorRelease=مثال على رسالة يمكنك استخدامها ليعلن هذا الإصدار الرئيسي (لا تتردد في استخدامها على مواقع الويب الخاص بك)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index fe551fb2c86..75ae9c0aeb6 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -27,13 +27,9 @@ AllTime=من البداية
 Reconciliation=المصالحة
 RIB=رقم الحساب المصرفي
 IBAN=عدد إيبان
-IbanValid=IBAN غير صالح
-IbanNotValid=IBAN غير صالح
 BIC=بيك / سويفت عدد
-SwiftValid=BIC / SWIFT غير صالح
-SwiftNotValid=BIC / SWIFT غير صالح
-StandingOrders=أوامر دائمة
-StandingOrder=من أجل الوقوف
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=كشف حساب
 AccountStatementShort=بيان
 AccountStatements=بيانات الحساب
@@ -78,6 +74,7 @@ AccountToCredit=الحساب على الائتمان
 AccountToDebit=لحساب الخصم
 DisableConciliation=تعطيل ميزة التوفيق لهذا الحساب
 ConciliationDisabled=توفيق سمة المعوقين
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=فتح
 StatusAccountClosed=مغلقة
 AccountIdShort=عدد
@@ -87,6 +84,8 @@ AddBankRecordLong=إضافة المعاملات يدويا
 ConciliatedBy=طريق التصالح
 DateConciliating=التوفيق التاريخ
 BankLineConciliated=صفقة التصالح
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=عملاء الدفع
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=انسحاب الدفع
 SocialContributionPayment=اجتماعي / دفع الضرائب المالية
 BankTransfer=حوالة مصرفية
 BankTransfers=التحويلات المصرفية
-TransferDesc=التحويل من حساب إلى آخر واحد ، وسوف يكتب Dolibarr اثنين من السجلات (أ مصدر في حساب الخصم والائتمان في الاعتبار الهدف من نفس المبلغ. العلامة نفسها وحتى الآن وسيتم استخدام هذه الصفقة)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=من
 TransferTo=إلى
 TransferFromToDone=ونقل من هناك إلى ٪ <b>%s ق %s</b> ٪ وقد سجلت ق.
@@ -129,7 +129,7 @@ FutureTransaction=الصفقة في أجل المستقبل. أي وسيلة ل
 SelectChequeTransactionAndGenerate=حدد / تصفية الشيكات لتشمل في الاختيار استلام الودائع وانقر على &quot;إنشاء&quot;.
 InputReceiptNumber=اختيار كشف حساب مصرفي ذات الصلة مع التوفيق. استخدام قيمة رقمية للفرز: YYYYMM أو YYYYMMDD
 EventualyAddCategory=في نهاية المطاف، حدد الفئة التي لتصنيف السجلات
-ToConciliate=التوفيق؟
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=ثم، والتحقق من خطوط الحالية في بيان البنك وانقر
 DefaultRIB=BAN الافتراضي
 AllRIB=جميع BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=هل أنت متأكد أنك تريد وضع علامة هذ
 RejectCheckDate=تاريخ أعيد الاختيار
 CheckRejected=تحقق عاد
 CheckRejectedAndInvoicesReopened=تحقق عاد والفواتير فتح
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index df2af148a3d..bc350477674 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغا
 BillFrom=من
 BillTo=مشروع قانون ل
 ActionsOnBill=الإجراءات على فاتورة
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=عرض الخصم (الدفع قبل الأجل)
 EscompteOfferedShort=Discount
 SendBillRef=تقديم فاتورة%s
 SendReminderBillRef=تقديم فاتورة%s (تذكير)
-StandingOrders=أوامر دائمة
-StandingOrder=من أجل الوقوف
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=أي مشروع الفواتير
 NoOtherDraftBills=أي مشروع الفواتير
 NoDraftInvoices=لا يوجد مسودة فواتير
@@ -351,8 +351,8 @@ VarAmount=مقدار متغير (٪٪ TOT).
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=البنك بغية
-PaymentTypeShortPRE=البنك بغية
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=نقدا
 PaymentTypeShortLIQ=نقدا
 PaymentTypeCB=بطاقة الائتمان
@@ -381,6 +381,7 @@ ExtraInfos=معلومات اضافية
 RegulatedOn=وتنظم على
 ChequeNumber=رقم الشيك
 ChequeOrTransferNumber=شيك / نقل رقم
+ChequeBordereau=Check schedule
 ChequeMaker=الاختيار / الارسال نقل
 ChequeBank=الشيكات المصرفية
 CheckBank=الاختيار
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=سيولي هذا الدفع
 ClosePaidInvoicesAutomatically=تصنيف "مدفوع" كل مستوى، حالة أو الفواتير استبدال دفعت بالكامل.
 ClosePaidCreditNotesAutomatically=تصنيف "مدفوع" كل الملاحظات الائتمان تدفع بالكامل مرة أخرى.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى &quot;فياض&quot; الوضع.
 ToMakePayment=دفع
 ToMakePaymentBack=تسديد
 ListOfYourUnpaidInvoices=قائمة الفواتير غير المسددة
 NoteListOfYourUnpaidInvoices=ملاحظة: تحتوي هذه القائمة على الفواتير الوحيدة لأطراف ثالثة ترتبط لك كممثل بيع.
 RevenueStamp=طوابع الواردات
-YouMustCreateInvoiceFromThird=يتوفر هذا الخيار فقط عند إنشاء الفاتورة من علامة التبويب "العملاء" من مرشحين عن
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=نموذج فاتورة Crabe. نموذج الفاتورة كاملة (دعم الخيار الضريبة على القيمة المضافة ، والخصومات ، وشروط الدفع ، والشعار ، الخ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index 38b74f61a89..01ee9c87524 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=أقدم خدمات منتهية الصلاحية النشطة
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=النشاط العالمي (الفواتير والمقترحات والطلبات)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=مقترحات شهريا
 NoTooLowStockProducts=أي منتج في إطار الحد الأقصى الأسهم منخفضة
 BoxProductDistribution=منتجات / خدمات توزيع
 BoxProductDistributionFor=توزيع من %s لـ %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=عملاء الفواتير
 ForCustomersOrders=أوامر العملاء
 ForProposals=اقتراحات
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index dbb1ae62e4f..110fd1951af 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=في
 CashDeskThirdParty=طرف ثالث
 ShoppingCart=عربة التسوق
 NewSell=بيع جديد
-BackOffice=المكتب الخلفي
 AddThisArticle=إضافة هذا المقال
 RestartSelling=بالعدول عن بيع
-SellFinished=بيع الانتهاء
+SellFinished=Sale complete
 PrintTicket=طباعة تذكرة
 NoProductFound=لا مادة وجدت
 ProductFound=العثور على المنتج
diff --git a/htdocs/langs/ar_SA/categories.lang b/htdocs/langs/ar_SA/categories.lang
index 8674fcd04db..f87883ec498 100644
--- a/htdocs/langs/ar_SA/categories.lang
+++ b/htdocs/langs/ar_SA/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=العملاء العلامات / المنطقة الف
 MembersCategoriesArea=به أعضاء / المنطقة الفئات
 ContactsCategoriesArea=اتصالات به / المنطقة الفئات
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=الفئات الفرعية
 CatList=قائمة العلامات / فئات
 NewCategory=علامة جديدة / فئة
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=ويرتبط هذا الطرف الثالث لي
 MemberIsInCategories=ويرتبط هذا العضو ليلي أعضاء علامات / فئات
 ContactIsInCategories=ويرتبط هذا الاتصال بعد اتصالات به / فئات
 ProductHasNoCategory=هذا المنتج / الخدمة ليست في أية علامات / فئات
-CompanyHasNoCategory=هذه مرشحين عن ليس في أية علامات / فئات
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=هذا العضو ليس في أية علامات / فئات
 ContactHasNoCategory=هذا الاتصال ليست في أية علامات / فئات
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=إضافة إلى علامة / فئة
 NotCategorized=من دون سمة / فئة
 CategoryExistsAtSameLevel=هذه الفئة موجودة بالفعل في نفس المكان
@@ -56,12 +58,14 @@ ProductsCategoriesShort=منتجات العلامات / فئات
 MembersCategoriesShort=به أعضاء / فئات
 ContactCategoriesShort=اتصالات به / فئات
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=هذه الفئة لا تحتوي على أي منتج.
 ThisCategoryHasNoSupplier=هذه الفئة لا تحتوي على أي مورد.
 ThisCategoryHasNoCustomer=هذه الفئة لا تحتوي على أي عميل.
 ThisCategoryHasNoMember=هذا التصنيف لا يحتوي على أي عضو.
 ThisCategoryHasNoContact=لا تحتوي هذه الفئة أي اتصال.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=العلامة / فئة معرف
 CatSupList=قائمة المورد به / فئات
 CatCusList=قائمة العملاء / احتمال علامات / فئات
@@ -71,6 +75,7 @@ CatContactList=قائمة الاتصال به / فئات
 CatSupLinks=الروابط بين الموردين والعلامات / فئات
 CatCusLinks=الروابط بين العملاء / آفاق والعلامات / فئات
 CatProdLinks=الروابط بين المنتجات / الخدمات والعلامات / فئات
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=إزالة من العلامات / فئة
 ExtraFieldsCategories=سمات التكميلية
 CategoriesSetup=الكلمات / فئات الإعداد
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index 6e738cf66c6..7dc956c2062 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=فرد جديد
 NewCompany=الشركة الجديدة (آفاق ، والعملاء ، والموردين)
 NewThirdParty=طرف ثالث جديد (آفاق ، والعملاء ، والموردين)
 CreateDolibarrThirdPartySupplier=إنشاء طرف ثالث (المورد)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=مجال التنقيب
 IdThirdParty=هوية الطرف الثالث
 IdCompany=رقم تعريف الشركة
@@ -38,7 +40,7 @@ ThirdPartySuppliers=الموردين
 ThirdPartyType=طرف ثالث من نوع
 Company/Fundation=الشركة / المؤسسة
 Individual=فرد
-ToCreateContactWithSameName=سيتم تلقائيا إنشاء نفس معلومات الاتصال
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=الشركة الأم
 Subsidiaries=الشركات التابعة
 ReportByCustomers=تقرير للعملاء
@@ -47,7 +49,7 @@ CivilityCode=قانون الكياسة
 RegisteredOffice=المكتب المسجل
 Lastname=اللقب
 Firstname=Firstname
-PostOrFunction=وظيفة / وظيفة
+PostOrFunction=Job position
 UserTitle=العنوان
 Address=عنوان
 State=الولاية / المقاطعة
@@ -64,7 +66,7 @@ Chat=دردشة
 PhonePro=الأستاذ الهاتف
 PhonePerso=عدد الأفراد. الهاتف
 PhoneMobile=الجوال
-No_Email=لا ترسل الرسائل الإلكترونية الجماعية
+No_Email=Refuse mass e-mailings
 Fax=الفاكس
 Zip=الرمز البريدي
 Town=مدينة
@@ -73,7 +75,7 @@ Poste= موقف
 DefaultLang=اللغة افتراضيا
 VATIsUsed=وتستخدم ضريبة القيمة المضافة
 VATIsNotUsed=ضريبة القيمة المضافة لا يستخدم
-CopyAddressFromSoc=ملء العنوان مع عنوان مرشحين عن
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=استخدام الضرائب الثانية
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=رقم الضريبة على القيمة المضافة
 VATIntraShort=رقم الضريبة على القيمة المضافة
 VATIntraSyntaxIsValid=تركيب صالحة
-VATIntraValueIsValid=قيمة صالحة
 ProspectCustomer=احتمال / العملاء
 Prospect=احتمال
 CustomerCard=بطاقة الزبون
@@ -261,7 +262,9 @@ AddContactAddress=إنشاء الاتصال / عنوان
 EditContact=تحرير الاتصال / عنوان
 EditContactAddress=تحرير الاتصال / عنوان
 Contact=جهة اتصال
+ContactId=Contact id
 ContactsAddresses=اتصالات / عناوين
+FromContactName=Name:
 NoContactDefinedForThirdParty=أي اتصال محددة لهذا الطرف الثالث
 NoContactDefined=لا يوجد اتصال محددة لهذا الطرف الثالث
 DefaultContact=الاتصال الافتراضية
@@ -284,7 +287,7 @@ CompanyDeleted=شركة "٪ ل" حذفها من قاعدة البيانات.
 ListOfContacts=قائمة الاتصالات
 ListOfContactsAddresses=قائمة الأسماء / عناوين
 ListOfThirdParties=قائمة أطراف ثالثة
-ShowCompany=مشاهدة مرشحين عن
+ShowCompany=Show third party
 ShowContact=وتظهر الاتصال
 ContactsAllShort=جميع (بدون فلتر)
 ContactType=نوع الاتصال
@@ -294,6 +297,7 @@ ContactForProposals=مقترحات اتصال
 ContactForContracts=عقود اتصال
 ContactForInvoices=فواتير اتصال
 NoContactForAnyOrder=هذا الاتصال ليس من أجل أي اتصال
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=هذا الاتصال ليست على اتصال في أي اقتراح التجارية
 NoContactForAnyContract=هذا الاتصال ليس أي عقد للاتصال
 NoContactForAnyInvoice=هذا الاتصال ليست على اتصال في أي فاتورة
@@ -352,9 +356,9 @@ ExportCardToFormat=تصدير بطاقة شكل
 ContactNotLinkedToCompany=اتصالات ليست مرتبطة بطرف ثالث
 DolibarrLogin=ادخل Dolibarr
 NoDolibarrAccess=لا Dolibarr الوصول
-ExportDataset_company_1=أطراف ثالثة (الشركات / المؤسسات / الناس البدني) وخصائص
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=الاتصالات والعقارات
-ImportDataset_company_1=أطراف ثالثة (الشركات / المؤسسات / الناس البدني) وخصائص
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=اتصالات / عناوين (من thirdparties أو لا) وسمات
 ImportDataset_company_3=التفاصيل المصرفية
 ImportDataset_company_4=الأطراف الثالث / مندوبي المبيعات (على مستخدمي مندوبي المبيعات للشركات)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=تم دمج Thirdparties
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ar_SA/compta.lang b/htdocs/langs/ar_SA/compta.lang
index b4c1ad567b8..d75013825c0 100644
--- a/htdocs/langs/ar_SA/compta.lang
+++ b/htdocs/langs/ar_SA/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=الضريبة الاجتماعية أو المالية
 SocialContributions=الضرائب الاجتماعية أو المالية
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=المصروفات الخاصة
 MenuTaxAndDividends=الضرائب وعوائد
 MenuSocialContributions=الضرائب الاجتماعية / المالية
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 17d603762be..7357976d5ea 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = حذف مهمة مجدولة
 Permission23104 = تنفيذ مهمة مجدولة
 # Admin
 CronSetup= من المقرر إعداد إدارة العمل
-URLToLaunchCronJobs=URL لفحص وإطلاق كرون الوظائف إذا لزم الأمر
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=أو لفحص وإطلاق وظيفة محددة
 KeyForCronAccess=مفتاح أمان للURL لإطلاق كرون الوظائف
 FileToLaunchCronJobs=سطر الأوامر لإطلاق كرون الوظائف
@@ -23,7 +23,7 @@ CronCommand=أمر
 CronList=المهام المجدولة
 CronDelete=حذف المهام المجدولة
 CronConfirmDelete=هل أنت متأكد أنك تريد حذف هذه المهام المجدولة؟
-CronExecute=إطلاق المهام المجدولة
+CronExecute=Launch scheduled job
 CronConfirmExecute=هل أنت متأكد أنك تريد تنفيذ هذه المهام المجدولة الآن؟
 CronInfo=وحدة مهمة مجدولة تسمح لتنفيذ المهمة التي تم التخطيط لها
 CronTask=وظيفة
@@ -39,7 +39,7 @@ CronMethod=الطريقة
 CronModule=وحدة
 CronNoJobs=أي وظيفة سجلت
 CronPriority=الأولوية
-CronLabel=وصف
+CronLabel=Label
 CronNbRun=ملحوظة. إطلاق
 CronMaxRun=Max nb. launch
 CronEach=كل
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 4547d52e82a..332ed109447 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=خطأ، يجب PHP الخاص بتثبيت <b>وحدة٪ s 
 ErrorOpenIDSetupNotComplete=يمكنك إعداد Dolibarr ملف التكوين للسماح بالمصادقة رض، ولكن لم يتم تعريف URL الخدمة رض إلى المستمر٪ الصورة
 ErrorWarehouseMustDiffers=يجب المصدر والهدف يختلف المستودعات
 ErrorBadFormat=شكل سيئة!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطأ، لا يرتبط هذا العضو حتى الآن أي مرشحين عن. عضو تصل إلى طرف ثالث القائمة أو إنشاء مرشحين عن الجديد قبل إنشاء الاشتراك مع الفاتورة.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=خطأ، وهناك بعض الولادات ترتبط هذه الشحنة. رفض الحذف.
 ErrorCantDeletePaymentReconciliated=لا يمكنك حذف الدفع التي قد ولدت المعاملات المصرفية التي تم التصالح
 ErrorCantDeletePaymentSharedWithPayedInvoice=لا يمكنك حذف دفع تتقاسمها فاتورة واحدة على الأقل مع وضع سيولي
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 462dd73e7f0..164231e39f4 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمن
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و GET.
 PHPSupportPOSTGETKo=من المحتمل أن نسخة الـ PHP لديك لاتدعم وظائف POST - GET. تحقق من <b>variables_order</b> في ملف php.ini
 PHPSupportGD=يدعم اصدار الـ PHP هذا وظائف GD الرسومية.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=يدعم هذاا الاصدار من PHP وظائف الترميز UTF8.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة في  PHP الى <b>%s</b> . من المفترض ان تكون كافية.
 PHPMemoryTooLow=الحد الأقصى الخاص بك PHP دورة الذاكرة ومن المقرر <b>٪ ق</b> بايت. لهذا ينبغي أن يكون منخفضا جدا. تغيير <b>php.ini</b> وضع <b>memory_limit</b> المعلم إلى ما لا يقل عن <b>٪ ق</b> بايت.
 Recheck=اضغط هنا لمزيد من الاختبار ذو معنى
 ErrorPHPDoesNotSupportSessions=PHP تركيب الخاص بك لا يدعم الدورات. هذه الميزة هو مطلوب لجعل العمل Dolibarr. التحقق من اتصالك PHP الإعداد.
 ErrorPHPDoesNotSupportGD=PHP تركيب الخاص بك لا يدعم وظيفة بيانية ش ج. لا الرسم البياني سيكون متاحا.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=PHP تركيب الخاص بك لا يدعم UTF8 المهام. Dolibarr لا يمكن أن تعمل بشكل صحيح. لحل هذه قبل تثبيت Dolibarr.
 ErrorDirDoesNotExists=دليل ٪ ق لا يوجد.
 ErrorGoBackAndCorrectParameters=العودة إلى الوراء وتصحيح الخطأ البارامترات.
@@ -133,6 +135,10 @@ ActivateModule=تفعيل وحدة %s
 ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
 WarningUpgrade=تحذير: \n\nهل قمت بأخذ النسخة الاحتياطية لقاعدة البيانات أولا؟ \n\nينصح به بشدة: على سبيل المثال، بسبب بعض الخلل في نظام قاعدة البيانات (على سبيل المثال MySQL النسخة 5.5.40 / 41/42/43)، وبعض البيانات أو الجداول قد تفقد خلال هذه العملية، لذلك الأفضل لك أن يكون هنالك نسخ احتياطي كامل لقاعدة البيانات الخاصة بك قبل البدء الترحيل.\n\n\nانقر فوق موافق لبدء عملية الترحيل...
 ErrorDatabaseVersionForbiddenForMigration=إصدار قاعدة البيانات الخاصة بك هي%s.   يوجد بعض الخلل أدى لفقدان بعض البيانات إذا قمت بإجراء تغيير هيكلي على قاعدة البيانات الخاصة بك، مثل كان مطلوبا خلال عملية ترحيل البيانات. لن يسمح لك بترحيل البيانات حتى تقوم بترقية قاعدة البيانات الخاصة بك إلى إصدار أعلى موثوق  (قائمة الاصدارات الموثوقة : %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=تحديث البيانات على الإجراءات
 MigrationPaymentMode=بيانات الهجرة لطريقة الدفع
 MigrationCategorieAssociation=تحديث الفئات
 MigrationEvents=الترحيل من الأحداث لإضافة مالك الحدث في جدول الاحالة
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=إعادة تحديث الوحدات %s
 ShowNotAvailableOptions=عرض خيارات غير متوفرة
 HideNotAvailableOptions=إخفاء خيارات غير متوفرة
diff --git a/htdocs/langs/ar_SA/interventions.lang b/htdocs/langs/ar_SA/interventions.lang
index bb06fbc648f..eb68898ecd0 100644
--- a/htdocs/langs/ar_SA/interventions.lang
+++ b/htdocs/langs/ar_SA/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=متابعة العملاء الاتصا
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=التدخلات المتولدة من أوامر
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/ar_SA/ldap.lang b/htdocs/langs/ar_SA/ldap.lang
index bdb09bac3b5..5640b60302a 100644
--- a/htdocs/langs/ar_SA/ldap.lang
+++ b/htdocs/langs/ar_SA/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=أول موعد الاكتتاب
 LDAPFieldFirstSubscriptionAmount=قبضة مبلغ الاشتراك
 LDAPFieldLastSubscriptionDate=آخر موعد الاكتتاب
 LDAPFieldLastSubscriptionAmount=الاكتتاب المبلغ الأخير
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=وتزامن المستخدم
 GroupSynchronized=مجموعة متزامنة
 MemberSynchronized=عضو متزامنة
diff --git a/htdocs/langs/ar_SA/mails.lang b/htdocs/langs/ar_SA/mails.lang
index 64e0086bc6f..d2cf33fbb00 100644
--- a/htdocs/langs/ar_SA/mails.lang
+++ b/htdocs/langs/ar_SA/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=قرأ
 YourMailUnsubcribeOK=البريد <b>الإلكتروني٪ s غير</b> unsubcribe بشكل صحيح من القائمة البريدية
 ActivateCheckReadKey=المفتاح المستخدم في تشفير URL المستخدمة ل "اقرأ استلام" و "Unsubcribe" ميزة
 EMailSentToNRecipients=البريد الإلكتروني المرسلة إلى المستلمين٪ الصورة.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=وأضاف <b>المتلقين٪ الصورة</b> إلى قائمة المستهدفين
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=جميع thirdparties اختيار وإذا تم تعيين بالبريد.
 ResultOfMailSending=نتيجة لإرسال البريد الإلكتروني الشامل
 NbSelected=ملحوظة مختارة
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index d8f838269ee..8babc726902 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -67,6 +67,7 @@ SelectDate=تحديد تاريخ
 SeeAlso=See also %s
 SeeHere=انظر هنا
 BackgroundColorByDefault=لون الخلفية الافتراضية
+FileRenamed=The file was successfully renamed
 FileUploaded=تم تحميل الملف بنجاح
 FileWasNotUploaded=يتم اختيار ملف لمرفق ولكن لم تحميلها بعد. انقر على "إرفاق ملف" لهذا الغرض.
 NbOfEntries=ملحوظة من إدخالات
@@ -245,6 +246,10 @@ DateBuild=تقرير تاريخ الإنشاء
 DatePayment=تاريخ الدفع
 DateApprove=تاريخ الموافقة
 DateApprove2=تاريخ الموافقة (موافقة الثانية)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=سنة
 DurationMonth=شهر
 DurationWeek=أسبوع
@@ -256,6 +261,7 @@ DurationDays=أيام
 Year=سنة
 Month=شهر
 Week=أسبوع
+WeekShort=Week
 Day=يوم
 Hour=ساعة
 Minute=دقيقة
@@ -278,6 +284,7 @@ MonthOfDay=شهر من اليوم
 HourShort=H
 MinuteShort=مليون
 Rate=معدل
+CurrencyRate=Currency conversion rate
 UseLocalTax=يشمل الضرائب
 Bytes=بايت
 KiloBytes=كيلو بايت
@@ -565,8 +572,11 @@ BackToList=العودة إلى قائمة
 GoBack=العودة
 CanBeModifiedIfOk=يمكن تعديلها إذا كان صحيحا
 CanBeModifiedIfKo=يمكن تعديلها إذا لم يكن صحيحا
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=سجل تعديل بنجاح
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=مدونة الآلي
 FeatureDisabled=سمة المعوقين
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=ليس لديك إذن لهذا العمل
 SessionName=اسم الدورة
 Method=الطريقة
 Receive=استقبال
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=جزئي
 TotalWoman=المجموع
 NeverReceived=لم يتلق
@@ -598,6 +609,7 @@ DisabledModules=والمعوقين وحدات
 For=لأجل
 ForCustomer=الزبون
 Signature=التوقيع
+DateOfSignature=Date of signature
 HidePassword=وتبين للقيادة مع كلمة السر الخفي
 UnHidePassword=وتظهر واضحة للقيادة حقيقية كلمة السر
 Root=جذور
@@ -641,6 +653,15 @@ NewAttribute=جديد السمة
 AttributeCode=السمة رمز
 URLPhoto=للتسجيل من الصورة / الشعار
 SetLinkToAnotherThirdParty=تصل إلى طرف ثالث آخر
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=إنشاء مشروع
 SetToDraft=العودة إلى مشروع
 ClickToEdit=انقر للتحرير
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=يوم الاثنين
 Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index 31ad457c461..91c7af69359 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=سعر يجب أن تكون قيمة رقمية
 markRateShouldBeLesserThan100=وينبغي أن يكون معدل علامة أقل من 100
 ShowMarginInfos=عرض بقية المقال الهامش
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/ar_SA/oauth.lang b/htdocs/langs/ar_SA/oauth.lang
index 7ac9cf3ada0..53e6306cbde 100644
--- a/htdocs/langs/ar_SA/oauth.lang
+++ b/htdocs/langs/ar_SA/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=تكوين أوث
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=لا رمز وصول حفظها في قاعدة البيانات المحلية
 HasAccessToken=تم إنشاء رمز مميز وحفظها في قاعدة البيانات المحلية
 NewTokenStored=الجواب تلقى رمزية حفظ
@@ -9,7 +11,16 @@ RequestAccess=انقر هنا لطلب / تجديد الوصول والحصول
 DeleteAccess=انقر هنا لحذف رمز
 UseTheFollowingUrlAsRedirectURI=استخدام URL التالية باعتبارها إعادة توجيه URI عند إنشاء الاعتماد الخاص على مزود أوث الخاص بك:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=جوجل API
-OAUTH_GOOGLE_ID=جوجل API معرف
-OAUTH_GOOGLE_SECRET=جوجل API السرية
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index 8e95c5afacf..8113a4b12c4 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=وقد تم إنشاء طلباتكم
 OrderFail=حدث خطأ أثناء إنشاء طلباتكم
 CreateOrders=إنشاء أوامر
 ToBillSeveralOrderSelectCustomer=لإنشاء فاتورة لعدة أوامر، انقر أولا على العملاء، ثم اختر "٪ الصورة".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ar_SA/printing.lang b/htdocs/langs/ar_SA/printing.lang
index 70d4f7f9da7..b442bc44bea 100644
--- a/htdocs/langs/ar_SA/printing.lang
+++ b/htdocs/langs/ar_SA/printing.lang
@@ -18,10 +18,6 @@ UserConf=الإعداد لكل مستخدم
 PRINTGCP_INFO=جوجل أوث الإعداد API
 PRINTGCP_AUTHLINK=المصادقة
 PRINTGCP_TOKEN_ACCESS=جوجل الغيمة طباعة أوث رمز
-PRINTGCP_TOKEN_REFRESH=رمزي تحميل الحاضر
-PRINTGCP_TOKEN_EXPIRED=رمز منتهي الصلاحية
-PRINTGCP_TOKEN_EXPIRE_AT=رمز تنتهي في
-PRINTGCP_DELETE_TOKEN=حذف رمز المحفوظة
 PrintGCPDesc=برنامج التشغيل هذا يسمح لإرسال المستندات مباشرة إلى طابعة مع جوجل الغيمة طباعة.
 GCP_Name=اسم
 GCP_displayName=اسم العرض
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 8466f1ddbef..0f395771e03 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -8,8 +8,8 @@ Batch=الكثير / المسلسل
 atleast1batchfield=أكل حسب التاريخ أو بيع حسب التاريخ أو لوط / الرقم التسلسلي
 batch_number=الكثير / الرقم التسلسلي
 BatchNumberShort=الكثير / المسلسل
-l_eatby=أكل حسب التاريخ
-l_sellby=بيع من قبل التاريخ
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=الكثير / تفاصيل المسلسل
 DetailBatchFormat=الكثير / المسلسل:٪ ق - تناول بواسطة:٪ ق - للبيع عن طريق:٪ ق (الكمية:٪ د)
 printBatch=الكثير / التسلسلي:٪ الصورة
@@ -19,3 +19,6 @@ printQty=الكمية:٪ د
 AddDispatchBatchLine=إضافة سطر لالصلاحية إيفاد
 WhenProductBatchModuleOnOptionAreForced=عندما وحدة لوط / المسلسل على، وزيادة / نقصان تضطر وضع الأسهم إلى الخيار الاخير ولا يمكن تحريرها. خيارات أخرى يمكن تعريفها على النحو الذي تريد.
 ProductDoesNotUseBatchSerial=هذا المنتج لا يستخدم الكثير / الرقم التسلسلي
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 315f6ca43fb..7825e90a877 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=تغيير VAT الشامل
 ProductVatMassChangeDesc=هذه الصفحة يمكن استخدامها لتعديل نسبة الضريبة على القيمة المضافة المحددة على المنتجات أو الخدمات من قيمة إلى أخرى. تحذير، ويتم هذا التغيير على كل قاعدة البيانات.
 MassBarcodeInit=الحرف الأول الباركود الشامل
 MassBarcodeInitDesc=هذه الصفحة يمكن استخدامها لتهيئة الباركود على الكائنات التي لا يكون الباركود تعريف. تحقق قبل أن الإعداد وحدة الباركود كاملة.
-ProductAccountancyBuyCode=المحاسبة الرمز (شراء)
-ProductAccountancySellCode=المحاسبة الرمز (بيع)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=المنتج أو الخدمة
 ProductsAndServices=المنتجات والخدمات
 ProductsOrServices=منتجات أو خدمات
@@ -59,6 +59,8 @@ SellingPriceHT=سعر البيع (صافي الضرائب)
 SellingPriceTTC=سعر البيع (شركة الضريبية)
 CostPriceDescription=هذا السعر (صافية من الضرائب) يمكن استخدامها لتخزين متوسط ​​كمية هذا تكلفة المنتج لشركتك. قد يكون بأي ثمن على حساب نفسك، على سبيل المثال من متوسط ​​سعر الشراء بالإضافة إلى متوسط ​​إنتاج وتوزيع التكاليف.
 CostPriceUsage=في النسخة المقبلة، ويمكن استخدام هذه القيمة لحساب الهامش.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=السعر الجديد
 MinPrice=دقيقة. سعر البيع
 CantBeLessThanMinPrice=سعر البيع لا يمكن أن يكون أقل من الحد الأدنى المسموح لهذا المنتج (٪ ق بدون الضرائب)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=طباعة عدة ملصقات لالباركود واح
 BuildPageToPrint=توليد الصفحة لطباعة
 FillBarCodeTypeAndValueManually=ملء نوع الباركود والقيمة يدويا.
 FillBarCodeTypeAndValueFromProduct=ملء نوع الباركود وقيمة من الباركود للمنتج.
-FillBarCodeTypeAndValueFromThirdParty=ملء نوع الباركود وقيمة من الباركود لمرشحين عن.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=تعريف نوع أو قيمة الرمز الشريطي يست كاملة للمنتج٪ الصورة.
-DefinitionOfBarCodeForThirdpartyNotComplete=تعريف نوع أو قيمة الرمز الشريطي غير كامل للمرشحين عن٪ الصورة.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=معلومات الباركود من الناتج٪ الصورة:
-BarCodeDataForThirdparty=معلومات الباركود من مرشحين عن٪ الصورة:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=تحديد قيمة الباركود لكافة السجلات (هذه القيمة الباركود سيتم إعادة تعيين أيضا يعرف بالفعل مع القيم الجديدة)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 1cf3bed8155..7965ad9a36f 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=قائمة المقترحات التجارية المرتبطة بالمشروع.
-ListOrdersAssociatedProject=قائمة الزبائن المرتبطة بالمشروع.
-ListInvoicesAssociatedProject=قائمة العملاء والفواتير المرتبطة بالمشروع
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=قائمة الموردين الأوامر المرتبطة بالمشروع
-ListSupplierInvoicesAssociatedProject=قائمة الموردين المرتبطة بالمشروع.
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
 ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
 ListExpenseReportsAssociatedProject=قائمة تقارير المصاريف المرتبطة بالمشروع
@@ -123,6 +123,7 @@ ProjectReportDate=تغيير موعد المهمة وفقا المشروع تا
 ErrorShiftTaskDate=من المستحيل تحويل التاريخ المهمة وفقا لتاريخ بدء المشروع الجديد
 ProjectsAndTasksLines=المشاريع والمهام
 ProjectCreatedInDolibarr=مشروع٪ الصورة التي تم إنشاؤها
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=مهمة٪ الصورة التي تم إنشاؤها
 TaskModifiedInDolibarr=مهمة٪ الصورة المعدلة
 TaskDeletedInDolibarr=مهمة٪ الصورة حذف
@@ -153,7 +154,7 @@ PlannedWorkload=عبء العمل المخطط لها
 PlannedWorkloadShort=عبء العمل
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=يجب التحقق من صحة المشروع أولا
-FirstAddRessourceToAllocateTime=ربط الموارد إلى تخصيص وقت
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=إدخال يوميا
 InputPerWeek=مساهمة في الأسبوع
 InputPerAction=مساهمة في عمل
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=إحصاءات عن المشاريع / يؤدي
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
-YouCanCompleteRef=إذا كنت ترغب في استكمال المرجع مع بعض المعلومات (لاستخدامه بمثابة مرشحات البحث)، وريكومانديد لإضافة - شخصية لفصلها، وبالتالي فإن الترقيم التلقائي سوف لا تزال تعمل بشكل صحيح للمشاريع المقبلة. على سبيل المثال٪ S-ABC. قد تفضل أيضا لإضافة مفاتيح البحث في التسمية.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index 3fdb7791334..487b94c4aa2 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=دفع الرواتب جديد
 SalaryPayment=دفع الرواتب
 SalariesPayments=مدفوعات الرواتب
 ShowSalaryPayment=مشاهدة دفع الرواتب
-THM=متوسط ​​سعر ساعة
-TJM=متوسط ​​السعر اليومي
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=الراتب الحالي
 THMDescription=يمكن استخدام هذه القيمة لحساب تكلفة الوقت المستهلك في المشروع المدخل من قبل المستخدمين إذا تم استخدام وحدة مشروع 
 TJMDescription=هذه القيمة هي حاليا فقط كمعلومات وليس لاستخدامها في أي حساب
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 40492035ff0..d046abbbaca 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=حذف ارسال
 Stock=الأسهم
 Stocks=الاسهم
 StocksByLotSerial=الأسهم عن طريق القرعة / المسلسل
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=حركات
 ErrorWarehouseRefRequired=مستودع الاشارة اسم مطلوب
 ListOfWarehouses=لائحة المخازن
@@ -43,6 +45,7 @@ PMPValue=المتوسط المرجح لسعر
 PMPValueShort=الواب
 EnhancedValueOfWarehouses=قيمة المستودعات
 UserWarehouseAutoCreate=إنشاء مخزون تلقائيا عند إنشاء مستخدم
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=الأسهم المنتجات والأوراق المالية subproduct ومستقل
 QtyDispatched=ارسال كمية
 QtyDispatchedShort=أرسل الكمية
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/ar_SA/supplier_proposal.lang b/htdocs/langs/ar_SA/supplier_proposal.lang
index 0e67e84dfba..ea69e16fe2d 100644
--- a/htdocs/langs/ar_SA/supplier_proposal.lang
+++ b/htdocs/langs/ar_SA/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=إنشاء نموذج افتراضي
 DefaultModelSupplierProposalToBill=القالب الافتراضي عند إغلاق طلب السعر (مقبول)
 DefaultModelSupplierProposalClosed=القالب الافتراضي عند إغلاق طلب السعر (رفض)
 ListOfSupplierProposal=قائمة الطلبات اقتراح المورد
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 022eeab9115..1df16c8d0e3 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -7,13 +7,13 @@ History=التاريخ
 ListOfSuppliers=قائمة الموردين
 ShowSupplier=وتظهر المورد
 OrderDate=من أجل التاريخ
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=بعض المنتجات الفرعية التي لا تعرف السعر
-AddSupplierPrice=إضافة مورد الأسعار
-ChangeSupplierPrice=تغيير سعر المورد
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=ويرتبط هذا المورد بالفعل مرجع مع مرجع : %s
 NoRecordedSuppliers=لم تسجل الموردين
 SupplierPayment=المورد الدفع
@@ -36,8 +36,8 @@ ListOfSupplierOrders=قائمة الطلبات المورد
 MenuOrdersSupplierToBill=أوامر مورد للفاتورة
 NbDaysToDelivery=تأخير التسليم في أيام
 DescNbDaysToDelivery=أكبر تسليم تأخير من المنتجات من هذا النظام
-UseDoubleApproval=استخدام موافقة مزدوجة عندما مبلغ (بدون ضريبة) أعلى من (ويمكن أن يتم الموافقة الثانية من قبل أي مستخدم بإذن مخصص. تعيين إلى 0 من دون موافقة مزدوجة)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/ar_SA/users.lang b/htdocs/langs/ar_SA/users.lang
index a5724281b3d..dd8cd142022 100644
--- a/htdocs/langs/ar_SA/users.lang
+++ b/htdocs/langs/ar_SA/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=الساعات الأسبوعية
 ColorUser=اللون المستخدم
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ar_SA/website.lang b/htdocs/langs/ar_SA/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/ar_SA/website.lang
+++ b/htdocs/langs/ar_SA/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ar_SA/withdrawals.lang b/htdocs/langs/ar_SA/withdrawals.lang
index 1e422ad6802..cb395aa5ec2 100644
--- a/htdocs/langs/ar_SA/withdrawals.lang
+++ b/htdocs/langs/ar_SA/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=أوامر دائمة منطقة العملاء
-StandingOrders=أوامر دائمة
-StandingOrder=أوامر دائمة
-NewStandingOrder=دائمة جديدة من أجل
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=لعملية
-WithdrawalsReceipts=إيصالات السحب
-WithdrawalReceipt=انسحاب ورود
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=خطوط السحب
-RequestStandingOrderToTreat=طلب لأوامر إلى معالجة دائمة
-RequestStandingOrderTreated=طلب الأوامر الدائمة معالجة
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=لم يكن ممكنا حتى الآن. سحب يجب أن يتم تعيين الحالة إلى "الفضل" قبل أن يعلن رفض على خطوط محددة.
-NbOfInvoiceToWithdraw=ملحوظة. من فاتورة مع سحب الطلب
-NbOfInvoiceToWithdrawWithInfo=ملحوظة. من فاتورة مع سحب الطلب للعملاء الحصول على معلومات الحساب المصرفي المحدد
-InvoiceWaitingWithdraw=فاتورة انتظار الانسحاب
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=سحب المبلغ
-WithdrawsRefused=ورفض سحب
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=فاتورة العميل في أي طريقة الدفع "سحب" تنتظر. على 'سحب' تبويبة على فاتورة بطاقة لتقديم الطلب.
 ResponsibleUser=مسؤولة المستخدم
-WithdrawalsSetup=الإعداد للانسحاب
-WithdrawStatistics=تسحب 'إحصاءات
-WithdrawRejectStatistics=وترفض الانسحاب 'إحصاءات
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=تقديم طلب سحب
 ThirdPartyBankCode=طرف ثالث بنك مدونة
 NoInvoiceCouldBeWithdrawed=أي فاتورة withdrawed بالنجاح. تأكد من أن الفاتورة على الشركات الحظر ساري المفعول.
@@ -46,7 +47,7 @@ StatusRefused=رفض
 StatusMotif0=غير محدد
 StatusMotif1=توفير insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=لا من أجل الانسحاب
+StatusMotif3=No direct debit payment order
 StatusMotif4=طلب العملاء
 StatusMotif5=الضلع inexploitable
 StatusMotif6=حساب بدون رصيد
@@ -61,28 +62,43 @@ NotifyCredit=انسحاب الائتمان
 NumeroNationalEmetter=رقم المرسل وطنية
 WithBankUsingRIB=عن الحسابات المصرفية باستخدام RIB
 WithBankUsingBANBIC=عن الحسابات المصرفية باستخدام IBAN / BIC / SWIFT
-BankToReceiveWithdraw=حساب مصرفي لتلقي تنسحب
+BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=الائتمان على
 WithdrawalFileNotCapable=غير قادر على توليد ملف استلام الانسحاب لبلدكم٪ الصورة (لا يتم اعتماد البلد)
 ShowWithdraw=وتظهر سحب
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ومع ذلك، إذا فاتورة واحدة على الأقل دفع انسحاب لا تتم معالجتها حتى الآن، فإنه لن يكون كما سيولي للسماح لإدارة الانسحاب قبل.
-DoStandingOrdersBeforePayments=هذا التبويب يسمح لك لطلب أمر مستديم. وبمجرد القيام به، انتقل إلى القائمة Bank-> سحب لإدارة النظام واقفا. عندما أمر يقف مغلق، سيتم تسجيلها تلقائيا الدفع على الفاتورة، وأغلقت الفاتورة إذا تبقى لدفع فارغة.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=تعيين إلى حالة "المرسلة ملف"
 ThisWillAlsoAddPaymentOnInvoice=وهذا أيضا ينطبق على الفواتير والمدفوعات وتصنيفها على أنها "تدفع"
 StatisticsByLineStatus=إحصاءات عن طريق وضع خطوط
-RUM=رم
-RUMWillBeGenerated=سيتم إنشاء عدد رم مرة واحدة يتم حفظ معلومات الحساب المصرفي
-WithdrawMode=وضع (FRST أو تتكرر) سحب
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=سحب طلب كمية:
 WithdrawRequestErrorNilAmount=غير قادر على إنشاء سحب طلب مبلغ لا شيء.
+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
 
 ### Notifications
-InfoCreditSubject=دفع %s النظام الدائمة من قبل البنك
-InfoCreditMessage=تم دفع %s النظام وقوفه الى جانب البنك <br> بيانات الدفع: %s
-InfoTransSubject=انتقال %s ترتيب دائمة للبنك
-InfoTransMessage=وقد transmited في %s أجل الوقوف على البنك من قبل %s %s. <br><br>
+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>
 InfoTransData=المبلغ: %s <br> Metode: %s <br> تاريخ: %s
-InfoRejectSubject=ورفض النظام واقفا
-InfoRejectMessage=أهلا، <br><br> وقد رفض النظام مكانة فاتورة%s المتعلقة بالشركة٪ الصورة، مع مبلغ٪ الصورة من قبل البنك. <br><br> - <br> ٪ الصورة
+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
 ModeWarning=لم يتم تعيين خيار الوضع الحقيقي، ونحن بعد توقف هذه المحاكاة
diff --git a/htdocs/langs/ar_SA/workflow.lang b/htdocs/langs/ar_SA/workflow.lang
index 349bcf7403c..66cd07762b0 100644
--- a/htdocs/langs/ar_SA/workflow.lang
+++ b/htdocs/langs/ar_SA/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=سير العمل وحدة الإعداد
 WorkflowDesc=تم تصميم هذه الوحدة لتعديل السلوك من الإجراءات الآلية إلى التطبيق. افتراضيا، سير العمل مفتوح (يمكنك أن تفعل أشياء في النظام الذي تريد). يمكنك تفعيل الإجراءات الآلية كنت مهتما في.
 ThereIsNoWorkflowToModify=لا يوجد أي تعديلات سير العمل المتاحة مع وحدات تفعيلها.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=إنشاء فاتورة العميل تل
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=تصنيف مقترح مصدر على صلة وصفت عند تعيين النظام العميل لدفع
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=تصنيف المصدر المرتبط النظام العميل (ق) إلى المنقار عند تعيين فاتورة العملاء لدفع
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=تصنيف ربط مصدر النظام العميل (ق) إلى المنقار عند التحقق من صحة الفاتورة العملاء
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 455c5edf30a..410b07085f3 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Журнали
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Отчети
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Дневник
 NumPiece=Номер на част
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Валидирайте автоматично
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Възникна грешка, вие не можете да изтриете тази счетоводна сметка, защото се използва.
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 9b158ca8a6d..c20fcc8f1a5 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Експериментален
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестен
 VersionRecommanded=Препоръчва се
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID на сесията
 SessionSaveHandler=Handler за да запазите сесията
 SessionSavePath=Място за съхранение на сесията
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Грешка, точност по-висок
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Стойност 'система' и 'автосистема' за типа са запазени. Може да използвате за стойност 'потребител' при добавяне на ваш личен запис.
 ErrorCodeCantContainZero=Кода не може да съдържа стойност 0
 DisableJavascript=Изключете функциите JavaScript и Ajax (Препоръчва се за незрящи и при текстови браузъри)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=NBR от знаци, за да предизвика търсене: %s
 NotAvailableWhenAjaxDisabled=Не е налично, когато Аякс инвалиди
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Java скрипт е забранен
 UsePreviewTabs=Използвайте Преглед раздели
 ShowPreview=Покажи преглед
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Автоматично (език на браузъра)
 FeatureDisabledInDemo=Feature инвалиди в демо
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Права
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Показани са само елементи от <a href="%s">активирани модули</a>.
-ModulesDesc=Модулите на Dolibarr определят, кои функции са активирани в софтуера. Някои модули изискват да бъдат зададени права на потребителите, след активирането им. Кликнете върху бутона за включване/изключване в колона "Състояние" за да се включи модула/функцията.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Повече модули ...
 DoliStoreDesc=DoliStore, официалният пазар за външни модули за Dolibarr ERP/CRM
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Текуща версия на Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Можете да въведете всяка маска за номериране. В тази маска, могат да се използват следните тагове: <br> <b>{000000}</b> съответства на номер, който се увеличава на всеки %s. Влез като много нули като желаната дължина на брояча. Броячът ще бъде завършен с нули от ляво, за да има колкото се може повече нули като маска. <br> <b>{000000 000}</b> същата като предишната, но компенсира, съответстваща на броя на правото на знака + се прилага започва на първи %s. <br> <b>{000000 @}</b> същата като предишната, но броячът се нулира, когато месеца Х е достигнал (Х между 1 и 12, или 0, за да използвате началото на месеца на фискалната година, определени в вашата конфигурация). Ако тази опция се използва и х е 2 или по-висока, тогава последователност {гг} {mm} или {гггг} {mm} също е задължително. <br> <b>{DD}</b> ден (01 до 31). <br> <b>{Mm}</b> месец (01 до 12). <br> <b>{Гг} {гггг}</b> или <b>{Y}</b> година над 2, 4 или 1 брой. <br>
-GenericMaskCodes2=<b>{cccc}</b> клиентския код в знака n <br><b>{cccc000}</b>клиентския код в знак n се следва от брояч предназначен за клиента. Този брояч предназначен за клиента се нулира в същото време в което и глобалния брояч.<br><b>{tttt}</b> Кодът на типа контрагенти в знака n (погледнете речник-типове контрагенти).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Всички други символи на маската ще останат непокътнати. <br> Интервалите не са разрешени. <br>
 GenericMaskCodes4a=<u>Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример за контрагент е създаден на 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Параметри за осигуряване на URL
 SecurityTokenIsUnique=Използвайте уникална параметър securekey за всеки URL
 EnterRefToBuildUrl=Въведете справка за обект %s
 GetSecuredUrl=Изчислява URL
-ButtonHideUnauthorized=Скриване на бутоните за неправомерни действия, вместо да се показва с увреждания бутони
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old ставка на ДДС
 NewVATRates=Нов ставка на ДДС
 PriceBaseTypeToChange=Промяна на цените с база референтна стойност, определена на
@@ -349,6 +356,7 @@ ExtrafieldMail = Имейл
 ExtrafieldSelect = Избор лист
 ExtrafieldSelectList = Избор от таблица
 ExtrafieldSeparator=Разделител
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Отметка
 ExtrafieldRadio=Радио бутон
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Пусни кеширането на файла
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Потребители и групи
@@ -428,8 +439,8 @@ Module55Name=Баркодове
 Module55Desc=Управление на баркод
 Module56Name=Телефония
 Module56Desc=Телефония интеграция
-Module57Name=Постоянните поръчки
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Интеграция на ClickToDial система (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграция
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Известия
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Дарения
 Module700Desc=Управление на дарения
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Прочети доставчици
 Permission147=Прочети статистиката
-Permission151=Нареждания за периодични преводи
-Permission152=Създаване / промяна на постоянни нареждания, искане
-Permission153=Кутия постоянни нареждания разписки
-Permission154=Кредит / отказват постоянни постъпления поръчки
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Експорт на доставни фактури, атрибу
 Permission1237=Експорт на доставни поръчки и техните детайли
 Permission1251=Пусни масов внос на външни данни в базата данни (данни товара)
 Permission1321=Износ на клиентите фактури, атрибути и плащания
+Permission1322=Reopen a paid bill
 Permission1421=Износ на клиентски поръчки и атрибути
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Етикет на документи
 NbOfDays=Nb дни
 AtEndOfMonth=В края на месеца
+CurrentNext=Current/Next
 Offset=Офсет
 AlwaysActive=Винаги активна
 Upgrade=Обновяване
@@ -950,7 +967,7 @@ LogEventDesc=Можете да разрешите тук сеч за събит
 AreaForAdminOnly=Тези функции могат да се използват само от <b>администратори</b>.
 SystemInfoDesc=Информационна система Разни техническа информация можете да получите в режим само за четене и видими само за администратори.
 SystemAreaForAdminOnly=Тази област е достъпна само за администратори. Никой не може да промени това ограничение.
-CompanyFundationDesc=От тази страница се редактира цялата информация на фирмата или организацията (За тази цел кликнете на бутона "Промяна" в долната част на страницата).
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=От тук можете да изберете параметрите свързани с външния вид на Dolibar
 AvailableModules=Налични модули
 ToActivateModule=За да активирате модули, отидете на настройка пространство (Начало-> Setup-> модули).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Внимание, на някои системи Linux
 PathToDocuments=Път до документи
 PathDirectory=Директория
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Конфигурация на превода
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Общ брой на активираните модули: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да даде възможност на най-малко 1 модул
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Използване на TLS
 LDAPServerUseTLSExample=LDAP сървъра използване TLS
 LDAPServerDn=Сървър DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Пълна DN (напр.: CN = adminldap, DC = общество, DC = COM)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Администраторската парола
 LDAPUserDn=Потребителя DN
 LDAPUserDnExample=Пълна DN (EX: OU = потребители, DC = общество, DC = COM)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Пример: о
 LDAPFieldSid=SID
 LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата на абонамент края
-LDAPFieldTitle=Мнение / Функция
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP настройка не е пълна (отидете на други раздели)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Не администратор или парола. LDAP достъп ще бъдат анонимни и в режим само за четене.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Продукти и услуги модули за наст
 NumberOfProductShowInSelect=Максимален брой продукти в комбинации изберете списъци (0 = без ограничение)
 ViewProductDescInFormAbility=Визуализация на описания на продукти във формите (в противен случай като изскачащ прозорец подсказка)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Визуализация на продукти, описания в thirdparty език
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Тип баркод по подразбиране за продукти
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Баркод генериране с инструмент о
 BarcodeInternalEngine=Вътрешен генератор
 BarCodeNumberManager=Менажер за автоматично дефиниране на баркод номера
 ##### Prelevements #####
-WithdrawalsSetup=Настройка Оттегляне модул
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Настройки на внасянето на външен RSS
 NewRSS=Нова RSS хранилка
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Цвят за подчертаване на линията,
 TextTitleColor=Цвят на заглавието на страницата
 LinkColor=Цвят на връзките
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Показване по подразбиране при показа на списък
 YouUseLastStableVersion=Използвате последната стабилна версия
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index 3c41d33b2e3..797ce13428a 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -27,13 +27,9 @@ AllTime=От начало
 Reconciliation=Помирение
 RIB=Номер на банкова сметка
 IBAN=IBAN номер
-IbanValid=IBAN e Валиден
-IbanNotValid=IBAN е Невалиден
 BIC=BIC / SWIFT номер
-SwiftValid=BIC/SWIFT е Валиден
-SwiftNotValid=BIC/SWIFT е Невалиден
-StandingOrders=Постоянни поръчки
-StandingOrder=Постоянна поръчка
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Отчет по сметка
 AccountStatementShort=Отчет
 AccountStatements=Извлечения по сметки
@@ -78,6 +74,7 @@ AccountToCredit=Профил на кредитен
 AccountToDebit=Сметка за дебитиране
 DisableConciliation=Деактивирате функцията помирение за тази сметка
 ConciliationDisabled=Помирение функция инвалиди
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Отворен
 StatusAccountClosed=Затворен
 AccountIdShort=Номер
@@ -87,6 +84,8 @@ AddBankRecordLong=Ръчно добавяне на транзакция
 ConciliatedBy=Съгласуват от
 DateConciliating=Reconcile дата
 BankLineConciliated=Transaction примири
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Клиентско плащане
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Оттегляне плащане
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Банков превод
 BankTransfers=Банкови преводи
-TransferDesc=Се прехвърля от една сметка в друга, Dolibarr ще напиша два записа (дебит в източник сметка и кредит в целева сметка, в същия размер. Същия етикет и дата ще бъдат използвани за тази сделка)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=От
 TransferTo=За
 TransferFromToDone=Прехвърлянето от <b>%s</b> на <b>%s</b> на %s <b>%s</b> беше записано.
@@ -129,7 +129,7 @@ FutureTransaction=Транзакция в FUTUR. Няма начин за пом
 SelectChequeTransactionAndGenerate=Изберете / филтрирате проверки, за да се включи в проверка за получаването на депозит и кликнете върху &quot;Създаване&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи
-ToConciliate=За помирение?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=След това проверете линии в отчета на банката и кликнете
 DefaultRIB=По подразбиране BAN
 AllRIB=Всички BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Дата на която чека е върнат
 CheckRejected=Върнат Чек
 CheckRejectedAndInvoicesReopened=Върнат Чек и отворена фактура
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index a639dac36ed..5569ea618d2 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Грешка, не може да
 BillFrom=От
 BillTo=За
 ActionsOnBill=Действия по фактура
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Предложена отстъпка (плащане преди
 EscompteOfferedShort=Discount
 SendBillRef=Изпращане на фактура %s
 SendReminderBillRef=Изпращане на фактура %s (напомняне)
-StandingOrders=Стоящи поръчки
-StandingOrder=Стояща поръчка
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Няма чернови фактури
 NoOtherDraftBills=Няма други чернови фактури
 NoDraftInvoices=Няма чернови фактури
@@ -351,8 +351,8 @@ VarAmount=Променлива сума (%% общ.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Банков превод
-PaymentTypeShortPRE=Банков превод
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Касово плащане в брой
 PaymentTypeShortLIQ=В брой
 PaymentTypeCB=Плащане с карта
@@ -381,6 +381,7 @@ ExtraInfos=Допълнителна информация
 RegulatedOn=Регулация на
 ChequeNumber=Чек NВ°
 ChequeOrTransferNumber=Чек/трансфер NВ°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Банка на чека
 CheckBank=Чек
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Плаща от това плащане
 ClosePaidInvoicesAutomatically=Класифицирай "Платени" всички стандартни, ситуирани или заменящи фактури изцяло платени.
 ClosePaidCreditNotesAutomatically=Класифицирай "Платени" всички кредитни известия изцяло обратно платени.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Всички фактура без остатък за плащане, ще бъдат затворени автоматично със статус "Платени".
 ToMakePayment=Плати
 ToMakePaymentBack=Плати обратно
 ListOfYourUnpaidInvoices=Списък с неплатени фактури
 NoteListOfYourUnpaidInvoices=Бележка: Този списък съдържа само фактури за контрагенти, които са свързани като търговски представители.
 RevenueStamp=Приходен печат
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Фактурен PDF шаблон. Пълен шаблон за фактура (препоръчителен шаблон)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 60681531576..58530b680ae 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Най-старите действащи изтекли услуги
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Обща активност (фактури, предложения, поръчки)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Предложения за месец
 NoTooLowStockProducts=Няма продукт в наличност под минималната
 BoxProductDistribution=Продукти/Услуги разпределение
 BoxProductDistributionFor=Разпределение на %s за %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Клиента фактури
 ForCustomersOrders=Клиентски поръчки
 ForProposals=Предложения
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index a8c9d49294b..f9d72b2259c 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=на
 CashDeskThirdParty=Контрагент
 ShoppingCart=Кошница
 NewSell=Нова продажба
-BackOffice=Бек офис
 AddThisArticle=Добави артикула
 RestartSelling=Обратно към продажбите
-SellFinished=Пазаруването приключи
+SellFinished=Sale complete
 PrintTicket=Отпечатване на билет
 NoProductFound=Няма открит артикул
 ProductFound=открит продукт
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index 7efe5da15f4..777d0f64920 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Зона етикети/категории Клиент
 MembersCategoriesArea=Зона етикети/категории Членове
 ContactsCategoriesArea=Зона етикети/категории Контакти
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Подкатегории
 CatList=Списък на етикети/категории
 NewCategory=Нов етикет/категория
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Това трето лице е свързано
 MemberIsInCategories=Този член е в следните етикети/категории Членове
 ContactIsInCategories=Този конктакт не в етикети/категории Контакти
 ProductHasNoCategory=Този продукт/услуга не е в нито един етикет/категория
-CompanyHasNoCategory=Този контрагент не е в нито един етикет/категория
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Този член не е в нито един етикет/категория
 ContactHasNoCategory=Този контакт не е в никои етикети/категории
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Добавяне в етикет/категория
 NotCategorized=Без етикет/категория
 CategoryExistsAtSameLevel=Тази категория вече съществува с този код
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Етикети/категории Продукти
 MembersCategoriesShort=Етикети/категории Членове
 ContactCategoriesShort=Етикети/категории Контакти
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Тази категория не съдържа никакъв продукт.
 ThisCategoryHasNoSupplier=Тази категория не съдържа никакъв доставчик.
 ThisCategoryHasNoCustomer=Тази категория не съдържа никакъв клиент.
 ThisCategoryHasNoMember=Тази категория не съдържа никакъв член.
 ThisCategoryHasNoContact=Тази категория не съдържа никакъв контакт
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Етикет/категория id
 CatSupList=Списък на етикети/категории Доставчици
 CatCusList=Списък на етикети/категории Клиенти/Потенциални Клиенти
@@ -71,6 +75,7 @@ CatContactList=Списък на етикети/категории Контак
 CatSupLinks=Връзки между доставчици и етикети/категории
 CatCusLinks=Връзки между клиенти/потенциални клиенти и етикети/категории
 CatProdLinks=Връзки между продукти/услуги и етикети/категории
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Изтриване от етикети/категории
 ExtraFieldsCategories=Допълнителни атрибути
 CategoriesSetup=Етикети/категории настройка
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 4073410f638..21345bc2ea7 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Ново физическо лице
 NewCompany=Нова фирма (потенциален, клиент, доставчик)
 NewThirdParty=Нов контрагент (потенциален, клиент, доставчик)
 CreateDolibarrThirdPartySupplier=Създаване на контрагент (доставчик)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Област потенциални
 IdThirdParty=ID на контрагент
 IdCompany=ID на фирма
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Доставчици
 ThirdPartyType=Вид на контрагент
 Company/Fundation=Фирма/Организация
 Individual=Частно лице
-ToCreateContactWithSameName=Автоматично ще създаде физически контакт със същата информация
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Фирма майка
 Subsidiaries=Филиали
 ReportByCustomers=Отчет по клиенти
@@ -47,7 +49,7 @@ CivilityCode=Граждански код
 RegisteredOffice=Седалище
 Lastname=Фамилия
 Firstname=Собствено име
-PostOrFunction=Пост/длъжност
+PostOrFunction=Job position
 UserTitle=Звание
 Address=Адрес
 State=Област
@@ -64,7 +66,7 @@ Chat=Чат
 PhonePro=Сл. телефон
 PhonePerso=Дом. телефон
 PhoneMobile=Моб. телефон
-No_Email=Да не се изпращат масови електронни писма
+No_Email=Refuse mass e-mailings
 Fax=Факс
 Zip=Пощенски код
 Town=Град
@@ -73,7 +75,7 @@ Poste= Позиция
 DefaultLang=Език по подразбиране
 VATIsUsed=ДДС се използва
 VATIsNotUsed=ДДС не се използва
-CopyAddressFromSoc=Попълнете адреса на контрагента
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Използване на втора такса
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Номер по ДДС
 VATIntraShort=ДДС номер
 VATIntraSyntaxIsValid=Синтаксиса е валиден
-VATIntraValueIsValid=Стойността е валидна
 ProspectCustomer=Потенциален / Клиент
 Prospect=Потенциален
 CustomerCard=Клиентска карта
@@ -261,7 +262,9 @@ AddContactAddress=Създй контакт/адрес
 EditContact=Редактиране на контакт
 EditContactAddress=Редактиране на контакт/адрес
 Contact=Контакт
+ContactId=Contact id
 ContactsAddresses=Контакти/Адреси
+FromContactName=Name:
 NoContactDefinedForThirdParty=Няма зададен контакт за тази контрагент
 NoContactDefined=Няма зададен контакт
 DefaultContact=Контакт/адрес по подразбиране
@@ -284,7 +287,7 @@ CompanyDeleted=Фирма "%s" е изтрита от базата данни.
 ListOfContacts=Списък на контакти/адреси
 ListOfContactsAddresses=Списък на контакти/адреси
 ListOfThirdParties=Списък на контрагенти
-ShowCompany=Позване на трето лице
+ShowCompany=Show third party
 ShowContact=Покажи контакт
 ContactsAllShort=Всички (без филтър)
 ContactType=Тип на контакт
@@ -294,6 +297,7 @@ ContactForProposals=Контакт за предложение
 ContactForContracts=Контакт за договор
 ContactForInvoices=Контакт за фактура
 NoContactForAnyOrder=Този контакт не е контакт за поръчка
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Този контакт не е контакт за търговско предложение
 NoContactForAnyContract=Този контакт не е контакт за договор
 NoContactForAnyInvoice=Този контакт не е контакт за фактура
@@ -352,9 +356,9 @@ ExportCardToFormat=Износна карта формат
 ContactNotLinkedToCompany=Контактът не е свързан с никой контрагент
 DolibarrLogin=Dolibarr вход
 NoDolibarrAccess=Няма Dolibarr достъп
-ExportDataset_company_1=Контрагенти (Компании/организации/физически лица) и имущество
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Контакти и свойства
-ImportDataset_company_1=Контрагенти (Компании/организации/физически лица) и имущество
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Контакти/адреси (на контрагенти или не) и атрибути
 ImportDataset_company_3=Банкови данни
 ImportDataset_company_4=Контрагети/Търговски представители (Засяга потребителите, търговски представители на фирми)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Контрагентите бяха обединени
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bg_BG/compta.lang b/htdocs/langs/bg_BG/compta.lang
index 156ec0a3e84..ace19640af0 100644
--- a/htdocs/langs/bg_BG/compta.lang
+++ b/htdocs/langs/bg_BG/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Социални или фискални данъци
 SocialContributions=Социални или фискални данъци
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Специални разходи
 MenuTaxAndDividends=Данъци и дивиденти
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 49e5ce1be92..b47ad375d7d 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Изтриване на Планирана задача
 Permission23104 = Изпълнение на Планирана задача
 # Admin
 CronSetup= Настройки за управление на Планирани задачи
-URLToLaunchCronJobs=URL за проверка и зареждане на cron задачи ако е нужно
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Или за проверка и зареждане на специфична задача
 KeyForCronAccess=Защитен ключ на URL за зареждане на cron задачи
 FileToLaunchCronJobs=Команден ред за изпъление на cron задача
@@ -23,7 +23,7 @@ CronCommand=Команда
 CronList=Планирани задачи
 CronDelete=Изтриване на планирани задачи
 CronConfirmDelete=Сигурни ли сте, че искате да изтриете тези планирани задачи ?
-CronExecute=Зареждане на планирани задачи
+CronExecute=Launch scheduled job
 CronConfirmExecute=Сигурни ли сте, че искате да се изпълнят тези планирани задачи сега ?
 CronInfo=Модул Планирана задача позволява да се изпълни задача, която е била планирана
 CronTask=Задача
@@ -39,7 +39,7 @@ CronMethod=Метод
 CronModule=Модул
 CronNoJobs=Няма регистрирани задачи
 CronPriority=Приоритет
-CronLabel=Описание
+CronLabel=Label
 CronNbRun=Nb. зареждане
 CronMaxRun=Max nb. launch
 CronEach=Всеки
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index ad7d85f521f..73e3c8aa61d 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Грешка, вашето PHP трябва да им инс
 ErrorOpenIDSetupNotComplete=Задали сте в конфирурационния файл на Dolibarr да се позволява OpenID удостоверяване, но URL на OpenID услугата не е зададено в константата %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Неправилен формат!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Грешка, има някои доставки свързани към тази пратка. Изтриването е отказано.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Не може да се изтрие плащане споделено от поне една фактура със статус Платена
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Парола е зададено за този член. Обаче, няма създаден потребителски акаунт. Следователно тази парола е записана, но не може да бъде използвана за влизане в Dolibarr. Може да бъде използвана от външен модул/интерфейс, но ако нямате нужда да определите нито потребителско име нито парола за член, можете да деактивирате тази опция. Ако имате нужда да управлявате потребителско име, но нямата нужда от парола, можете да оставите това поле празно, за да избегнете това предупреждение. Забележка: Имейл също може да бъде използван като потребителско име ако члена с свързан към потребител.
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 8ed505ab84a..bfeb89a5b45 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP поддържа сесии.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
 PHPSupportPOSTGETKo=Възможно е PHP настройките Ви да не поддържат променливи POST и / или GET. Проверете параметър <b>variables_order</b> в php.ini.
 PHPSupportGD=PHP поддържа GD графични функции.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=PHP поддържа UTF8 функции.
 PHPMemoryOK=PHP макс сесия памет е <b>%s.</b> Това трябва да бъде достатъчно.
 PHPMemoryTooLow=PHP макс сесия памет е настроен на <b>%s</b> байта. Това може да бъде прекалено ниско. Променете <b>php.ini</b> като настроите параметър <b>memory_limit</b> най-малко <b>%s</b> байта.
 Recheck=Кликнете тук за по-значим тест
 ErrorPHPDoesNotSupportSessions=Вашата PHP инсталация не поддържа сесии. Тази функция е нужна за правилата работа на Dolibarr. Проверете PHP настройките.
 ErrorPHPDoesNotSupportGD=Вашата PHP инсталация не поддържа графична функция GD. Графиките няма да бъдат достъпни.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Вашата PHP инсталация не поддържа UTF8 функции. Dolibarr не може да работи правилно. Преконфигурирайте преди да инсталирате Dolibarr.
 ErrorDirDoesNotExists=Директорията %s не съществува.
 ErrorGoBackAndCorrectParameters=Върни се назад и коригирайте грешните параметри.
@@ -133,6 +135,10 @@ ActivateModule=Активиране на модул %s
 ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
 WarningUpgrade=Внимание:\nНаправихте ли резервно копие на базата данни първо?\nТова е силно препоръчително: например, поради някой бъгове в системите на базата данни (например mysql версия 5.5.40/41/42/43), част от информацията или таблиците може да бъдат изгубени по-време на този процес, за това е много препоръчително да имате пълен dump на вашата база данни преди започването на миграцията.\n\nКликнете OK за започване на миграционния процес...
 ErrorDatabaseVersionForbiddenForMigration=Вашата база данни е с версия %s. Тя има критичен бъг, причинявайки загуба на информация ако направите структурна промяна на вашата база данни, а подобна е задължителна при миграционния процес. Поради тази причина, миграцията не е позволена, докато не обновите вашата база данни до по-нова коригирана версия (списък на познати версии с бъгове: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Актуализиране на данните за 
 MigrationPaymentMode=Миграция на данни за начин на плащане
 MigrationCategorieAssociation=Миграция на категории
 MigrationEvents=Миграция на събития за добавяне на собственик на събитие в таблицата за възлагане
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Презареждане на модула %s
 ShowNotAvailableOptions=Показване на недостъпните опции
 HideNotAvailableOptions=Скриване на недостъпните опции
diff --git a/htdocs/langs/bg_BG/interventions.lang b/htdocs/langs/bg_BG/interventions.lang
index ea630838b66..e15c5968d7c 100644
--- a/htdocs/langs/bg_BG/interventions.lang
+++ b/htdocs/langs/bg_BG/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Проследяване на конта
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=намеси генерирани от поръчки
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/bg_BG/ldap.lang b/htdocs/langs/bg_BG/ldap.lang
index 88142b6e02b..6ed3e9c1786 100644
--- a/htdocs/langs/bg_BG/ldap.lang
+++ b/htdocs/langs/bg_BG/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Първа абонамент дата
 LDAPFieldFirstSubscriptionAmount=Първа размера
 LDAPFieldLastSubscriptionDate=Последно абонамент дата
 LDAPFieldLastSubscriptionAmount=Последно размера
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Потребителят синхронизирани
 GroupSynchronized=Група синхронизирани
 MemberSynchronized=Държавите-синхронизирани
diff --git a/htdocs/langs/bg_BG/mails.lang b/htdocs/langs/bg_BG/mails.lang
index d7b631b7eee..cc860f14e03 100644
--- a/htdocs/langs/bg_BG/mails.lang
+++ b/htdocs/langs/bg_BG/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Чета
 YourMailUnsubcribeOK=От пощенския списък на <b>%s</b> имейл е правилно unsubcribe
 ActivateCheckReadKey=Ключ използван за криптиране на URL използван за опция "Прочитане на Обратна разписка" и "Отписване"
 EMailSentToNRecipients=Имейл изпратен до %s получатели.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=Всички трети лица и ако имейл е зададен.
 ResultOfMailSending=Резултат от масово изпращане на Имейл
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 6b1479b83d3..3b6daef3229 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -67,6 +67,7 @@ SelectDate=Изберете дата
 SeeAlso=Вижте също %s
 SeeHere=Вижте тук
 BackgroundColorByDefault=Стандартен цвят на фона
+FileRenamed=The file was successfully renamed
 FileUploaded=Файлът е качен успешно
 FileWasNotUploaded=Файлът е избран за прикачване, но все още не е качен. Кликнете върху &quot;Прикачи файл&quot;.
 NbOfEntries=Брой записи
@@ -245,6 +246,10 @@ DateBuild=Дата на създаване на справката
 DatePayment=Дата на плащане
 DateApprove=Дата на одобрение
 DateApprove2=Дата на одобрение (повторно одобрение)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=година
 DurationMonth=месец
 DurationWeek=седмица
@@ -256,6 +261,7 @@ DurationDays=дни
 Year=Година
 Month=Месец
 Week=Седмица
+WeekShort=Week
 Day=Ден
 Hour=Час
 Minute=Минута
@@ -278,6 +284,7 @@ MonthOfDay=Месец на деня
 HourShort=ч
 MinuteShort=мин
 Rate=Курс
+CurrencyRate=Currency conversion rate
 UseLocalTax=Включи данъци
 Bytes=Байта
 KiloBytes=Килобайта
@@ -565,8 +572,11 @@ BackToList=Назад към списъка
 GoBack=Назад
 CanBeModifiedIfOk=Може да се променя ако е валидно
 CanBeModifiedIfKo=Може да се променя ако е невалидно
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Записът е променен успешно
 RecordsModified=Променени са %s записа
+RecordsDeleted=%s records deleted
 AutomaticCode=Автоматичен код
 FeatureDisabled=Функцията е изключена
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Вие нямате разрешение за това де
 SessionName=Име на сесията
 Method=Метод
 Receive=Получавам
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Частична
 TotalWoman=Обща
 NeverReceived=Никога не получено
@@ -598,6 +609,7 @@ DisabledModules=Деактивирани модули
 For=За
 ForCustomer=За клиента
 Signature=Подпис
+DateOfSignature=Date of signature
 HidePassword=Покажи със скрита парола
 UnHidePassword=Покажи с видима парола
 Root=Корен
@@ -641,6 +653,15 @@ NewAttribute=Нов атрибут
 AttributeCode=Код на атрибут
 URLPhoto=URL на снимка/лого
 SetLinkToAnotherThirdParty=Свързване към друго трето лице
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Създай чернова
 SetToDraft=Назад към черновата
 ClickToEdit=Кликнете, за да редактирате
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Понеделник
 Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
index 7c48fb963d8..87dbd9d73b8 100644
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/bg_BG/oauth.lang b/htdocs/langs/bg_BG/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/bg_BG/oauth.lang
+++ b/htdocs/langs/bg_BG/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 1db388d9dff..7d97bf40be3 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Поръчките ви бяха създадени
 OrderFail=Възникна грешка при създаването на поръчките ви
 CreateOrders=Създай поръчки
 ToBillSeveralOrderSelectCustomer=За да създадете фактура по няколко поръчки, кликнете първо на клиент, след това изберете "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/bg_BG/printing.lang b/htdocs/langs/bg_BG/printing.lang
index e67a4d685af..61687ef6dd8 100644
--- a/htdocs/langs/bg_BG/printing.lang
+++ b/htdocs/langs/bg_BG/printing.lang
@@ -18,10 +18,6 @@ UserConf=Настройка по потребител
 PRINTGCP_INFO=Google OAuth API настройка
 PRINTGCP_AUTHLINK=Удостоверяване
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Този драйвер позволява изпращането на документи директно към принтер с Google Cloud Print.
 GCP_Name=Име
 GCP_displayName=Показвано Име
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 73c00d1b72d..09492d6743e 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Партида/сериен
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Партида/сериен номер
 BatchNumberShort=Партида/сериен
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Кол: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 37b54dafa6d..ab4a3ce5417 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Масова ДДС промяна
 ProductVatMassChangeDesc=Тази страница може да се използва за промяна на ДДС процент определен на продукти или услуги от една стойност на друга. Предупреждение, тази промяна се извършва на всички база данни.
 MassBarcodeInit=Масова инициализация на бар кодове
 MassBarcodeInitDesc=Тази страница може да се използва да се инициализира бар код на обекти, които нямат определен бар код. Проверете преди това дали настройката на модул баркод е завършена.
-ProductAccountancyBuyCode=Счетоводен код (покупка)
-ProductAccountancySellCode=Счетоводен код (продажба)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Продукт или Услуга
 ProductsAndServices=Продукти и Услуги
 ProductsOrServices=Продукти или Услуги
@@ -59,6 +59,8 @@ SellingPriceHT=Продажна цена (без ДДС)
 SellingPriceTTC=Продажна цена (с ДДС)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Нова цена
 MinPrice=Мин. продажна цена
 CantBeLessThanMinPrice=Продажната цена не може да бъде по-ниска от максимално допустимата за този продукт (%s без ДДС). Това съобщение може да се появи, ако въведете твърде важна отстъпка.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Принтиране на няколко стикери
 BuildPageToPrint=Генериране на страница за принтиране
 FillBarCodeTypeAndValueManually=Попълнете тип на бар код и стойност ръчно.
 FillBarCodeTypeAndValueFromProduct=Попълнете тип на бар код и стойност от бар кода на продукт
-FillBarCodeTypeAndValueFromThirdParty=Попълнете тип на бар кода или стойност от бар кода на трето лице.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Определяне на тип или стойност на бар код е завършено за продукт %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Определяне на тип или стойност на бар код не е завършено за трето лице %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Информация за бар код на продукт %s:
-BarCodeDataForThirdparty=Информация за бар код на трето лице %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Определяне на стойност на бар код за всички записи (това също така ще ресетира стойността на определен вече бар код с нова стойност)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index 23d39627ac8..3d5796c5d1e 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Списък на търговските предложения, свързани с проекта
-ListOrdersAssociatedProject=Списък на клиентски поръчки, свързани с проекта
-ListInvoicesAssociatedProject=Списък на фактури на клиентите, свързани с проекта
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Списък на поръчките на доставчика, свързана с проекта
-ListSupplierInvoicesAssociatedProject=Списък на фактурите на доставчика, свързана с проекта
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Списък на договори, свързани с проекта
 ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Промяна задача дата според началн
 ErrorShiftTaskDate=Невъзможно е да се смени датата на задача в съответствие с нова дата за началото на проекта
 ProjectsAndTasksLines=Проекти и задачи
 ProjectCreatedInDolibarr=Проект %s е създаден
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Задача %s е създадена
 TaskModifiedInDolibarr=Задача %s е променена
 TaskDeletedInDolibarr=Задача %s е изтрита
@@ -153,7 +154,7 @@ PlannedWorkload=Планирана работна натовареност
 PlannedWorkloadShort=Работна натовареност
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Проектът трябва да бъде валидиран първо
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Статистики за проекти/инициативи
 TaskAssignedToEnterTime=Задачата е възложена. Въвеждането на време на тази задача би трябвало да е възможно
 IdTaskTime=Ид. време на задача
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index 9aad1ceca7a..7c8c02543ac 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Ново заплащане на заплата
 SalaryPayment=Плащане на заплата
 SalariesPayments=Заплащания заплати
 ShowSalaryPayment=Показване заплащане на заплата
-THM=Средна цена на час
-TJM=Средна цена на ден
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=Сегашна заплата
 THMDescription=Тази стойност може да използва за изчисляване на отнето време по проект отделено от потребителите ако модул проект се използва
 TJMDescription=Тази стойност е само сега като информация и не се използва за никакво изчисление
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index b274927f3f8..d20bbd4275a 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Изтриване на изпращане
 Stock=Наличност
 Stocks=Наличности
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Движения
 ErrorWarehouseRefRequired=Изисква се референтно име на склад
 ListOfWarehouses=Списък на складовете
@@ -43,6 +45,7 @@ PMPValue=Средна цена
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Създаване на склада автоматично при създаването на потребителя
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Брой изпратени
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/bg_BG/supplier_proposal.lang b/htdocs/langs/bg_BG/supplier_proposal.lang
index 710faaf8f7e..b0495dd7a95 100644
--- a/htdocs/langs/bg_BG/supplier_proposal.lang
+++ b/htdocs/langs/bg_BG/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Създаване на модел по по
 DefaultModelSupplierProposalToBill=Шаблон по подразбиране, когато се затваря запитване за цена (прието)
 DefaultModelSupplierProposalClosed=Шаблон по подразбиране, когато се затваря запитване за цена (отказано)
 ListOfSupplierProposal=Списък на запитвания за цени към доставчици
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 144b543a8da..a7443012348 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -7,13 +7,13 @@ History=Исторически
 ListOfSuppliers=Списък на доставчиците
 ShowSupplier=Вижте доставчик
 OrderDate=Дата на поръчката
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Някои под-продукти нямата определена цена
-AddSupplierPrice=Добави награда доставчик
-ChangeSupplierPrice=Промяна доставчик цена
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Този референтен доставчик вече е свързана с референтното: %s
 NoRecordedSuppliers=Не регистриран доставчик
 SupplierPayment=Доставчика на платежни услуги
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Списък на нарежданията за доста
 MenuOrdersSupplierToBill=Поръчки на доставчика за фактуриране
 NbDaysToDelivery=Закъснение на доставка в дни
 DescNbDaysToDelivery=Най-голямото закъснение на доставка за продукти от тази поръчка
-UseDoubleApproval=Използване на двойно одобрение, когато сумата (без такса) е по-висока от (Повторното одобрение може да се извърши от всеки потребител с подходящи права. Задайте 0 за без двойно одобрение)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 8a7a76d558b..6d316dc77f4 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Часове седмично
 ColorUser=Цвят на потребителя
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/bg_BG/website.lang b/htdocs/langs/bg_BG/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/bg_BG/website.lang
+++ b/htdocs/langs/bg_BG/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/bg_BG/withdrawals.lang b/htdocs/langs/bg_BG/withdrawals.lang
index fb6f947e23f..36b6f248f3e 100644
--- a/htdocs/langs/bg_BG/withdrawals.lang
+++ b/htdocs/langs/bg_BG/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Клиентите постоянни нареждания област
-StandingOrders=Постоянните поръчки
-StandingOrder=Постоянните поръчки
-NewStandingOrder=Нов постоянно нареждане
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=За обработка
-WithdrawalsReceipts=Отнемане постъпления
-WithdrawalReceipt=Оттегляне получаването
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Отнемане линии
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Фактура чака оттегли
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Сума за оттегляне
-WithdrawsRefused=Отказа Тегления
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Нито един клиент фактура в режим на плащане &quot;се оттегли&quot; чака. Отидете на раздела &quot;Теглене&quot; във фактурата карта, за да отправят искане.
 ResponsibleUser=Отговорност на потребителя
-WithdrawalsSetup=Оттегляне настройка
-WithdrawStatistics=Теглене на статистически данни
-WithdrawRejectStatistics=Изтеглете отхвърлят статистически данни
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Уверете се оттегли искането
 ThirdPartyBankCode=Банков код на контрагента
 NoInvoiceCouldBeWithdrawed=Не теглене фактура с успех. Уверете се, че фактура са дружества с валиден БАН.
@@ -46,7 +47,7 @@ StatusRefused=Отказ
 StatusMotif0=Неуточнен
 StatusMotif1=Предоставяне insuffisante
 StatusMotif2=Тиражен conteste
-StatusMotif3=Не Оттегляне за
+StatusMotif3=No direct debit payment order
 StatusMotif4=Поръчка на клиента
 StatusMotif5=RIB inexploitable
 StatusMotif6=Сметка без баланс
@@ -61,28 +62,43 @@ NotifyCredit=Оттегляне кредит
 NumeroNationalEmetter=Националната предавател номер
 WithBankUsingRIB=За банкови сметки с помощта на RIB
 WithBankUsingBANBIC=За банкови сметки с IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Банкова сметка за получаване оттегли
+BankToReceiveWithdraw=Bank account to receive direct debit
 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 standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Зададен към статус "Файл Изпратен"
 ThisWillAlsoAddPaymentOnInvoice=Това също ще приложи заплащания към фактури и ще ги класифицира като "Платени"
 StatisticsByLineStatus=Статистики по статуса на линиите
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Плащане на постоянно нареждане %s от банката
-InfoCreditMessage=Постоянната за %s е била платена от банката <br> Данни на плащане: %s
-InfoTransSubject=Предаване на %s постоянно нареждане до банката
-InfoTransMessage=Постоянната за %s е предавана до банката от %s %s. <br><br>
+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>
 InfoTransData=Размер: %s <br> Metode: %s <br> Дата: %s
-InfoRejectSubject=Постоянния за отказа
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Възможност за реален режим не е създаден, спираме след тази симулация
diff --git a/htdocs/langs/bg_BG/workflow.lang b/htdocs/langs/bg_BG/workflow.lang
index 9e6f2cebbad..22f675f6b25 100644
--- a/htdocs/langs/bg_BG/workflow.lang
+++ b/htdocs/langs/bg_BG/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Настройки на модул Workflow
 WorkflowDesc=Този модул е проектиран да редактира поведението на автоматичните действия в приложението. По подразбиране, работния процес е отворен (можете да правите неща в реда, в който желаете). Можете да активирате автоматичните действия, които ви интересуват.
 ThereIsNoWorkflowToModify=Няма налични промени на работния процес с активираните модули.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматично създаване
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Класифицира свързан източник на предложение за Плоскоклюн при поръчка на клиента на платен
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index af313850ba1..9967530b1d2 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/bn_BD/banks.lang b/htdocs/langs/bn_BD/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/bn_BD/banks.lang
+++ b/htdocs/langs/bn_BD/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/bn_BD/boxes.lang b/htdocs/langs/bn_BD/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/bn_BD/boxes.lang
+++ b/htdocs/langs/bn_BD/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/bn_BD/cashdesk.lang b/htdocs/langs/bn_BD/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/bn_BD/cashdesk.lang
+++ b/htdocs/langs/bn_BD/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/bn_BD/categories.lang b/htdocs/langs/bn_BD/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/bn_BD/categories.lang
+++ b/htdocs/langs/bn_BD/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bn_BD/compta.lang b/htdocs/langs/bn_BD/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/bn_BD/compta.lang
+++ b/htdocs/langs/bn_BD/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/bn_BD/cron.lang b/htdocs/langs/bn_BD/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/bn_BD/cron.lang
+++ b/htdocs/langs/bn_BD/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/bn_BD/interventions.lang b/htdocs/langs/bn_BD/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/bn_BD/interventions.lang
+++ b/htdocs/langs/bn_BD/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/bn_BD/ldap.lang b/htdocs/langs/bn_BD/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/bn_BD/ldap.lang
+++ b/htdocs/langs/bn_BD/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/bn_BD/mails.lang b/htdocs/langs/bn_BD/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/bn_BD/mails.lang
+++ b/htdocs/langs/bn_BD/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 18b0a7f14b8..040fe8d4e82 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/bn_BD/margins.lang
+++ b/htdocs/langs/bn_BD/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/bn_BD/oauth.lang b/htdocs/langs/bn_BD/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/bn_BD/oauth.lang
+++ b/htdocs/langs/bn_BD/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/bn_BD/orders.lang b/htdocs/langs/bn_BD/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/bn_BD/orders.lang
+++ b/htdocs/langs/bn_BD/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/bn_BD/printing.lang b/htdocs/langs/bn_BD/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/bn_BD/printing.lang
+++ b/htdocs/langs/bn_BD/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/bn_BD/productbatch.lang b/htdocs/langs/bn_BD/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/bn_BD/productbatch.lang
+++ b/htdocs/langs/bn_BD/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/bn_BD/salaries.lang b/htdocs/langs/bn_BD/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/bn_BD/salaries.lang
+++ b/htdocs/langs/bn_BD/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/bn_BD/supplier_proposal.lang b/htdocs/langs/bn_BD/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/bn_BD/supplier_proposal.lang
+++ b/htdocs/langs/bn_BD/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/bn_BD/suppliers.lang b/htdocs/langs/bn_BD/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/bn_BD/suppliers.lang
+++ b/htdocs/langs/bn_BD/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/bn_BD/users.lang b/htdocs/langs/bn_BD/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/bn_BD/users.lang
+++ b/htdocs/langs/bn_BD/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/bn_BD/website.lang b/htdocs/langs/bn_BD/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/bn_BD/website.lang
+++ b/htdocs/langs/bn_BD/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/bn_BD/withdrawals.lang b/htdocs/langs/bn_BD/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/bn_BD/withdrawals.lang
+++ b/htdocs/langs/bn_BD/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/bn_BD/workflow.lang b/htdocs/langs/bn_BD/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/bn_BD/workflow.lang
+++ b/htdocs/langs/bn_BD/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 66732bca8db..89adcc260ca 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
 VersionRecommanded=Preporučeno
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID sesije
 SessionSaveHandler=Rukovatelj snimanje sesija
 SessionSavePath=Lokalizacija snimanja sesije
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Automatsko otkrivanje (browser jezik)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Pročitajte komercijalne margine
 Permission59002=Definirajte komercijalne margine
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Vizualizacija opisa proizvoda u jeziku treće stranke
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Menadžer za automatsko određivanje barkod brojeva
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 45e801d8870..0e9ce20aff6 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -27,13 +27,9 @@ AllTime=Od početka
 Reconciliation=Izmirenje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT broj
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Trajni nalozi
-StandingOrder=Trajni nalog
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Izvod računa
 AccountStatementShort=Izvod
 AccountStatements=Izvodi računa
@@ -78,6 +74,7 @@ AccountToCredit=Račun za potraživanja
 AccountToDebit=Račun za zaduživanje
 DisableConciliation=Isključi opciju podmirenja za ovaj račun
 ConciliationDisabled=Opcija podmirivanja isključena
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Zatvoreno
 AccountIdShort=Broj
@@ -87,6 +84,8 @@ AddBankRecordLong=Dodaj transakciju ručno
 ConciliatedBy=Izmireno od strane
 DateConciliating=Datum izmirivanja
 BankLineConciliated=Transakcija izmirena
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Uplata mušterije
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Povlačenje uplate
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankovna transakcija
 BankTransfers=Bankovne transakcije
-TransferDesc=Transfer sa jednog računa na drugi, Dolibarr će napraviti dva zapisa (zaduživanje na izvorni račun i potraživanja u ciljani računu, na isti iznos. Isti naziv i datum će se koristiti za ovu transakciju)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od strane
 TransferTo=Prema
 TransferFromToDone=Transfer sa <b>%s</b> na <b>%s</b> u iznosu od <b>%s</b> %s je zapisan.
@@ -129,7 +129,7 @@ FutureTransaction=Transakcije u budućnosti. Nema šanse da se izmiri.
 SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
-ToConciliate=Izmiriti?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite
 DefaultRIB=Uobičajeni BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 49fb3a1a58e..b12c31a228d 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na fakturi
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Popust ponuđen (uplata prije roka)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Trajni nalozi
-StandingOrder=Trajni nalog
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nema uzoraka faktura
 NoOtherDraftBills=Nema drugih uzoraka faktura
 NoDraftInvoices=Nema uzoraka faktura
@@ -351,8 +351,8 @@ VarAmount=Varijabilni iznos (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Prijenos banke
-PaymentTypeShortPRE=Prijenos banke
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Gotovina
 PaymentTypeShortLIQ=Gotovina
 PaymentTypeCB=Kreditna kartica
@@ -381,6 +381,7 @@ ExtraInfos=Dodatne informacije
 RegulatedOn=Uređen na
 ChequeNumber=Ček N°
 ChequeOrTransferNumber=Ček/Prenos N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Banka izdatog čeka
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Plaćeno ovom uplatom
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Sve fakture bez preostalog iznosa za uplatu će atuomatski biti zatvorene uz status "Plaćeno".
 ToMakePayment=Platiti
 ToMakePaymentBack=Povrat uplate
 ListOfYourUnpaidInvoices=Lista neplaćenih faktura
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Carinski pečat
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora PDV opcije, popusti, pogoji plačila, logo, itd...)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/bs_BA/boxes.lang b/htdocs/langs/bs_BA/boxes.lang
index 0be30a3e75b..223f383bb2e 100644
--- a/htdocs/langs/bs_BA/boxes.lang
+++ b/htdocs/langs/bs_BA/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Najstarije aktivne zastarjele usluge
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Globalne aktivnosti (fakture, prijedlozi, narudžbe)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Prijedlozi po mjesecu
 NoTooLowStockProducts=Nema proizvoda ispod granice za upozorenje
 BoxProductDistribution=Distribucija proizvoda/usluga
 BoxProductDistributionFor=Distribucija %s za %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Fakture kupaca
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/bs_BA/cashdesk.lang b/htdocs/langs/bs_BA/cashdesk.lang
index 546d1fe3cf9..af88678aff6 100644
--- a/htdocs/langs/bs_BA/cashdesk.lang
+++ b/htdocs/langs/bs_BA/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=uključen u
 CashDeskThirdParty=Subjekt
 ShoppingCart=Korpa
 NewSell=Nova prodaja
-BackOffice=Administracija
 AddThisArticle=Dodaj ovaj proizvod
 RestartSelling=Nazad na prodaju
-SellFinished=Prodaja završena
+SellFinished=Sale complete
 PrintTicket=Isprintaj račun
 NoProductFound=Nema pronađenih proizvoda
 ProductFound=proizvod pronađen
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index a68bb0dc77e..c9eb96b11ff 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Podkategorije
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Već postoji kategorija sa ovom referencom
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Ova kategorija ne sadrži nijedan proizvod.
 ThisCategoryHasNoSupplier=Ova kategorija ne sadrži nijednog dobavljača.
 ThisCategoryHasNoCustomer=Ova kategorija ne sadrži nijednog kupca.
 ThisCategoryHasNoMember=Ova kategorija ne sadrži nijednog člana.
 ThisCategoryHasNoContact=Ova kategorija ne sadrži nijednog kontakta.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 842628d9d34..941e4689903 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Novo fizičko lice
 NewCompany=Nova kompanija (mogući klijent, kupac, dobavljač)
 NewThirdParty=Novi subjekt (mogući klijent, kupac, dobavljač)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Područje za moguće kupce
 IdThirdParty=ID subjekta
 IdCompany=ID kompanije
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Dobavljači
 ThirdPartyType=Tip subjekta
 Company/Fundation=Kompanija/Fondacija
 Individual=Fizičko lice
-ToCreateContactWithSameName=Ovo će automatski kreirati fizički kontakt sa istim informacijama
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Matična kompanija
 Subsidiaries=Podružnice
 ReportByCustomers=Izvještaj po kupcima
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registrovan ured
 Lastname=Prezime
 Firstname=Ime
-PostOrFunction=Položaj/Funkcija
+PostOrFunction=Job position
 UserTitle=Titula
 Address=Adresa
 State=Država/Provincija
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Službeni telefon
 PhonePerso=Privatni telefon
 PhoneMobile=Mobitel
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
@@ -73,7 +75,7 @@ Poste= Pozicija
 DefaultLang=Defaultni jezik
 VATIsUsed=Oporeziva osoba
 VATIsNotUsed=Neoporeziva osoba
-CopyAddressFromSoc=Popuni adresu sa adresom subjekta
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=PDV broj
 VATIntraShort=PDV broj
 VATIntraSyntaxIsValid=Sintaksa je nevažeća
-VATIntraValueIsValid=Vrijednost je važeća
 ProspectCustomer=Mogući klijent / Kupac
 Prospect=Mogući klijent
 CustomerCard=Kartica kupca
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakti/Adrese
+FromContactName=Name:
 NoContactDefinedForThirdParty=Nema definiranih kontakata za ovaj subjekt
 NoContactDefined=Nijedan kontakt definiran
 DefaultContact=Defaultni kontakt/adresa
@@ -284,7 +287,7 @@ CompanyDeleted=Kompanija"%s" obrisana iz baze podataka
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
 ListOfThirdParties=Lista subjekata
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Svi (bez filtera)
 ContactType=Tip kontakta
@@ -294,6 +297,7 @@ ContactForProposals=Kontakt prijedloga
 ContactForContracts=Kontakt ugovora
 ContactForInvoices=Kontakt fakture
 NoContactForAnyOrder=Ovaj kontakt nije kontakt za bilo koju narudžbu
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koji poslovni prijedlog
 NoContactForAnyContract=Ovaj kontakt nije kontakt za bilo koji ugovor
 NoContactForAnyInvoice=Ovaj kontakt nije kontakt za bilo koju fakturu
@@ -352,9 +356,9 @@ ExportCardToFormat=Izvod podataka u formatu
 ContactNotLinkedToCompany=Kontakt nije povezan sa nekim od subjekata
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nema Dolibarr pristupa
-ExportDataset_company_1=Subjekti (Kompanije/fondacije/fizička lica) i svojstva
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti i osobine
-ImportDataset_company_1=Subjekti (Kompanije/fondacije/fizička lica) i svojstva
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakti/Adrese (od subjekata ili ne) i atributi
 ImportDataset_company_3=Detalji banke
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/bs_BA/compta.lang b/htdocs/langs/bs_BA/compta.lang
index a7f10c0ca84..f72d73c08fc 100644
--- a/htdocs/langs/bs_BA/compta.lang
+++ b/htdocs/langs/bs_BA/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 175cbc53c96..b075c2cb8bd 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron poslova
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Komanda
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Nema registrovanih poslova
 CronPriority=Prioritet
-CronLabel=Opis
+CronLabel=Label
 CronNbRun=Broj pokretanja
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/bs_BA/interventions.lang b/htdocs/langs/bs_BA/interventions.lang
index a6b8e2177e2..a711a34c847 100644
--- a/htdocs/langs/bs_BA/interventions.lang
+++ b/htdocs/langs/bs_BA/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Kontakt kupca za kontrolu
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/bs_BA/ldap.lang b/htdocs/langs/bs_BA/ldap.lang
index 35ea491128e..63edec03342 100644
--- a/htdocs/langs/bs_BA/ldap.lang
+++ b/htdocs/langs/bs_BA/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/bs_BA/mails.lang b/htdocs/langs/bs_BA/mails.lang
index e55207b294c..6984bc0eedd 100644
--- a/htdocs/langs/bs_BA/mails.lang
+++ b/htdocs/langs/bs_BA/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Pročitaj
 YourMailUnsubcribeOK=E-pošta <b>%s</b> je uspješno ispisana sa liste e-pošte
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-pošta poslana %s primaocima
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index cf37ef890c7..4eceb2c1d32 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/bs_BA/oauth.lang b/htdocs/langs/bs_BA/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/bs_BA/oauth.lang
+++ b/htdocs/langs/bs_BA/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/bs_BA/printing.lang b/htdocs/langs/bs_BA/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/bs_BA/printing.lang
+++ b/htdocs/langs/bs_BA/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index c94cc66ebc8..b04677d6f75 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Šifra računovodstva (kupovanje)
-ProductAccountancySellCode=Šifra računovodstva (prodaja)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi i usluge
 ProductsOrServices=Proizvodi ili usluge
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 00736f99449..57af98953e0 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista poslovnih prijedloga u vezi s projektom
-ListOrdersAssociatedProject=Lista narudžbi kupca u vezi s projektom
-ListInvoicesAssociatedProject=Lista faktura kupca u vezi s projektom
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Lista narudžbi dobavljača u vezi s projektom
-ListSupplierInvoicesAssociatedProject=Lista faktura dobavljača u vezi s projektom
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista ugovora u vezi s projektom
 ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 3e474700969..62171fcacf0 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Obriši slanje
 Stock=Zaliha
 Stocks=Zalihe
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Kretanja
 ErrorWarehouseRefRequired=Referentno ime skladište je potrebno
 ListOfWarehouses=Lista skladišta
@@ -43,6 +45,7 @@ PMPValue=Ponderirana/vagana aritmetička sredina - PAS
 PMPValueShort=PAS
 EnhancedValueOfWarehouses=Skladišna vrijednost
 UserWarehouseAutoCreate=Kreiraj skladište automatski prilikom kreiranja korisnika
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Otpremljena količina
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/bs_BA/supplier_proposal.lang b/htdocs/langs/bs_BA/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/bs_BA/supplier_proposal.lang
+++ b/htdocs/langs/bs_BA/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index 8a014bb2d4c..12ca6c6af1b 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -7,13 +7,13 @@ History=Historija
 ListOfSuppliers=Lista dobavljača
 ShowSupplier=Prikaži dobavljača
 OrderDate=Datum narudžbe
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki podproizvodi nemaju definisanu cijenu
-AddSupplierPrice=Dodaj dobavljačevu cijene
-ChangeSupplierPrice=Promjena dobavljačeve cijene
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova referentni dobavljač je već povezan sa referencom: %s
 NoRecordedSuppliers=Nijedan dobavljač snimljen
 SupplierPayment=Plaćanje dobavljača
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/bs_BA/users.lang b/htdocs/langs/bs_BA/users.lang
index a085b2e1491..aef1c9effac 100644
--- a/htdocs/langs/bs_BA/users.lang
+++ b/htdocs/langs/bs_BA/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/bs_BA/website.lang b/htdocs/langs/bs_BA/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/bs_BA/website.lang
+++ b/htdocs/langs/bs_BA/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/bs_BA/withdrawals.lang b/htdocs/langs/bs_BA/withdrawals.lang
index f3c53ad7618..43fc6098415 100644
--- a/htdocs/langs/bs_BA/withdrawals.lang
+++ b/htdocs/langs/bs_BA/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Područje za trajne naloge kupaca
-StandingOrders=Trajni nalozi
-StandingOrder=Trajni nalozi
-NewStandingOrder=Novi trajni nalog
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obradu
-WithdrawalsReceipts=Priznanice podizanja
-WithdrawalReceipt=Priznanica podizanja
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Tekst podizanja
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Fakture koje čekaju povlačenje
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Iznos za podizanje
-WithdrawsRefused=Podizanje odbijeno
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nijedna fakture kupca u modu plaćanje "podizanje" nema na čekanju. Idi na tab "Podizanje" na kartici fakture da napravite zahtjev.
 ResponsibleUser=Odgovorni korisnik
-WithdrawalsSetup=Postavke podizanja
-WithdrawStatistics=Statistika podizanja
-WithdrawRejectStatistics=Statistika odbijenih podizanja
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Napravite zahtjev za podizanje
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=Nihje faktura nije podignuta sa uspjehom. Provjerite da li su fakture na kompanijama sa važećim BAN.
@@ -46,7 +47,7 @@ StatusRefused=Odbijeno
 StatusMotif0=Neodređeno
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=Nema naloga za podizanje
+StatusMotif3=No direct debit payment order
 StatusMotif4=Narudžba za kupca
 StatusMotif5=RIB unusable
 StatusMotif6=Račun bez stanja
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke
-InfoCreditMessage=Stalni nalog %s je plaćen od strane banke <br> Podaci od plaćanju: %s
-InfoTransSubject=Prenos trajnog naloga %s na banku
-InfoTransMessage=Stalni nalog %s je poslan na banku od strane %s %s. <br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Trajni nalog odbijen
-InfoRejectMessage=Zdravo, <br><br> trajni nalog fakture %s se odnosi na kompaniju %s, u iznosu od %s je odbijen od strane banke. <br><br> -- <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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/bs_BA/workflow.lang b/htdocs/langs/bs_BA/workflow.lang
index d54fd97a380..bb7df46eeb2 100644
--- a/htdocs/langs/bs_BA/workflow.lang
+++ b/htdocs/langs/bs_BA/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Postavke workflow modula
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označiti povezani izvorni prijedlog kao naplaćen odmah nakon plaćanja narudžbe za kupca
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označiti povezanu izvornu narudžbu(e) kao plaćene kada je faktura za kupca postavljena kao plaćena.
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označiti povezanu izvornu narudžbu(e) kao plaćene kada je faktura za kupca postavljena kao potvrđena.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index ca1a896d315..19c22caae6d 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Diaris
 JournalFinancial=Diaris financers
 BackToChartofaccounts=Tornar al Pla comptable
 
+AccountancyArea=Àrea de comptabilitat
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Seleccionar el Pla comptable
 Addanaccount=Afegir un compte comptable
 AccountAccounting=Compte comptable
 AccountAccountingShort=Compte
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Desglossament
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Comptabilitat
-CustomersVentilation=Desglossament de clients
-SuppliersVentilation=Desglossament de proveïdors
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Informes
 NewAccount=Nou compte comptable
 Create=Crear
-CreateMvts=Crear moviment
-UpdateMvts=Modificació d'un moviment
-WriteBookKeeping=Registre de comptabilitat en el llibre major
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Llibre major
 AccountBalance=Compte saldo
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Línies de factura per ser ventilades
-InvoiceLinesDone=Línies de factura ventilades
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilar
+Ventilate=Bind
 
 Processing=Processant
 EndProcessing=Final del procés
-AnyLineVentilate=Qualsevol línia per ventilar
+AnyLineVentilate=Any lines to bind
 SelectedLines=Línies seleccionades
 Lineofinvoice=Línia de factura
-VentilatedinAccount=Ventilat satisfactòriament en els comptes comptables
-NotVentilatedinAccount=No ventilat en el compte comptable
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número d'elements per visualitzar el desglossament per pàgina (màxim recomanat : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comença la classificació de les pàgines de desglossament "S'ha de desglossar" pels elements més recents
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comença la classificació de les pàgines de desglossament "Desglossar" pels elements més recents
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Longitud per mostrar la descripció de productes i serveis en llistats (Recomanat = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longitud per mostrar la el formulari de descripció comptes de productes i serveis en llistats (Recomanat = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Mida dels comptes generals
-ACCOUNTING_LENGTH_AACCOUNT=Mida dels comptes de tercers
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Gestiona els zeros al final d'un compte comptable, És necessari per alguns països. Deshabilitat per defecte. Ves en compte amb la funció "longitud dels comptes".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
@@ -81,32 +102,31 @@ Sens=Significat
 Codejournal=Diari
 NumPiece=Número de peça
 AccountingCategory=Categoria de comptabilitat
-
 NotMatch=No definit
-
 DeleteMvt=Elimina línies del llibre major
 DelYear=Any a eliminar
 DelJournal=Diari per esborrar
-ConfirmDeleteMvt=Això eliminarà totes les línies del llibre major de l'any i/o des d'un diari específic
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Eliminar els registres del llibre major
-
 DescSellsJournal=Diari de vendes
 DescPurchasesJournal=Diari de compres
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Pagament de factura de client
-
 ThirdPartyAccount=Compte de tercer
-
-NewAccountingMvt=Nou moviment
-NumMvts=Nombre de moviment
-ListeMvts=Llistat del moviment
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=El dèbit i el crèdit no poden tenir valors alhora
 
-ReportThirdParty=Llitat de comptes de tercers
-DescThirdPartyReport=Consulta aquí el llistat dels tercers clients i proveïdors i els seus comptes comptables
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Llistat dels comptes comptables
 
@@ -114,22 +134,29 @@ Pcgtype=Classe de compte
 Pcgsubtype=Sota la classe de compte
 Accountparent=Arrel del compte
 
-DescVentilCustomer=Consulta aquí el desglossament anual comptable de les teves factures de clients
 TotalVente=Total turnover before tax
 TotalMarge=Marge total de vendes
-DescVentilDoneCustomer=Consulta aquí el llistat de línies de factures de clients i els seus comptes comptables
-DescVentilTodoCustomer=Ventila les teves línies de factures de client amb un compte comptable
-ChangeAccount=Canvia el compte comptable per les línies seleccionades pel compte:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consulta aquí el desglossament anual comptable de les teves factures de proveïdors
-DescVentilDoneSupplier=Consulta aquí el llistat de línies de factures de proveïdors i els seus comptes comptables
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Valida automàticament
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no pots eliminar aquest compte comptable perquè està en ús
 MvtNotCorrectlyBalanced=Moviment no balancejat correctament. Crèdit = %s. Dèbit = %s
-FicheVentilation=Desglossament de targetes
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Aplica categories massives
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Exporta cap a Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inicialitza la comptabilitat
-InitAccountancyDesc=Aquesta pàgina es pot utilitzar per inicialitzar un compte comptable en productes i serveis que no tenen compte comptable definit per compres i vendes. Comprova abans que la configuració del mòdul de comptabilitat està completada.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Opcions
 OptionModeProductSell=En mode vendes
 OptionModeProductBuy=En mode compres
 OptionModeProductSellDesc=Mostra tots els productes sense compte comptable definit per vendes.
 OptionModeProductBuyDesc=Mostra tots els productes sense compte comptable definit per compres.
+CleanFixHistory=Elimina el codi comptable de les línies que no existeixen en Plans comptables
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Rang de compte comptable
@@ -167,3 +196,9 @@ Formula=Fórmula
 ErrorNoAccountingCategoryForThisCountry=Sense categoria contable per aquest pais
 ExportNotSupported=El format d'exportació configurat no està suportat en aquesta pàgina
 BookeppingLineAlreayExists=Les línies ja existeixen en la comptabilitat
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 7cb8f45783a..35234207a46 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Desenvolupament
 VersionUnknown=Desconeguda
 VersionRecommanded=Recomanada
-FileCheck=Arxius d'Integritat
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Arxius que falten
 FilesUpdated=Arxius actualitzats
-FileCheckDolibarr=Comproveu arxius de Dolibarr
-XmlNotFound=Arxiu XML de Dolibarr no trobat
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID de sessió
 SessionSaveHandler=Modalitat de desar sessions
 SessionSavePath=Emmagatzema la localització de les sessions
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, les precisions superiors a <b>%s</b> n
 DictionarySetup=Configuració de Diccionari
 Dictionary=Diccionaris
 Chartofaccounts=Pla comptable
-Fiscalyear=Anys fiscals
+Fiscalyear=Any fiscal
 ErrorReservedTypeSystemSystemAuto=L'ús del tipus 'system' i 'systemauto' està reservat. Podeu utilitzar 'user' com a valor per afegir el seu propi registre
 ErrorCodeCantContainZero=El codi no pot contenir el valor 0
 DisableJavascript=Desactivar funcions JavaScript i Ajax (Recomanat per a persones cegues o navegadors de text)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Esperar que pressioni una tecla abans de carregar
 DelaiedFullListToSelectContact=Esperar que pressioni un tecla abans de carregar el contingut dels contactes en el combo (Això pot incrementar el rendiment si té un gran número de contactes)
 NumberOfKeyToSearch=Nombre de caràcters per a desencadenar la cerca: %s
 NotAvailableWhenAjaxDisabled=No disponible quan Ajax estigui desactivat
-AllowToSelectProjectFromOtherCompany=En un document d'un tercer, pots triar un projecte enllaçat a un altre tercer
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Javascript desactivat
 UsePreviewTabs=Veure fitxes "vista prèvia"
 ShowPreview=Veure previsualització
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Codificar els camps binaris en hexacesimal
 IgnoreDuplicateRecords=Ignorar els errors de duplicació (INSERT IGNORE)
 AutoDetectLang=Autodetecta (idioma del navegador)
 FeatureDisabledInDemo=Opció deshabilitada en demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permisos
 BoxesDesc=Els panells són components que mostren alguna informació que pots afegir per personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activa', o fent clic al cubell d'escombraries per desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
-ModulesDesc=Els mòduls Dolibarr defineixen les funcionalitats disponibles en l'aplicació. Alguns mòduls requereixen drets que hauran d'indicar als usuaris perquè puguin accedir a les seves funcionalitats.
+ModulesDesc=Els mòduls Dolibarr defineixen les funcionalitats disponibles en l'aplicació. Alguns mòduls requereixen permisos que hauràs d'indicar, i després habilitar el mòdul. Fes clic en el botó On/off per habilitar un mòdul/funcionalitat.
 ModulesMarketPlaceDesc=Pots trobar més mòduls per descarregar en pàgines web externes per internet...
 ModulesMarketPlaces=Més mòduls...
 DoliStoreDesc=DoliStore, el lloc oficial de mòduls complementaris per Dolibarr ERP / CRM
@@ -219,8 +225,8 @@ HelpCenterDesc1=Aquesta àrea et pot ajudar a obtenir un servei de suport de Dol
 HelpCenterDesc2=Alguns d'aquests serveis només estan disponibles en <b>anglès</b>.
 CurrentMenuHandler=Gestor de menú
 MeasuringUnit=Unitat de mesura
-Emails=E-Mails
-EMailsSetup=Configuració E-Mails
+Emails=Correus electrònics
+EMailsSetup=Configuració de correus electrònics
 EMailsDesc=Aquesta pàgina permet substituir els paràmetres PHP relacionats amb l'enviament de correus electrònics. En la majoria dels casos en SO com UNIX/Linux, els paràmetres PHP són ja correctes i aquesta pàgina és inútil.
 MAIN_MAIL_SMTP_PORT=Port del servidor SMTP (Per defecte a php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=Nom host o ip del servidor SMTP (Per defecte en php.ini: <b>%s</b>)
@@ -273,9 +279,10 @@ YouCanSubmitFile=Per aquest pas, pots enviar el paquet utilitzant aquesta utilit
 CurrentVersion=Versió actual de Dolibarr
 CallUpdatePage=Ves a la pàgina que actualitza l'estructura de base de dades i les dades: %s
 LastStableVersion=Última versió estable
+LastActivationDate=Last activation date
 UpdateServerOffline=Actualitzacións del servidor fora de línia
 GenericMaskCodes=Podeu introduir qualsevol màscara numèrica. En aquesta màscara, pot utilitzar les següents etiquetes:<br><b>{000000}</b> correspon a un número que s'incrementa en cadascun %s. Introduïu tants zeros com longuitud desitgi mostrar. El comptador es completarà a partir de zeros per l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b>Igual que l'anterior, amb una compensació corresponent al número a la dreta del signe + s'aplica a partir del primer %s.<br><b>{000000@x}</b>igual que l'anterior, però el comptador es restableix a zero quan s'arriba a x mesos (x entre 1 i 12). Si aquesta opció s'utilitza i x és de 2 o superior, llavors la seqüència {yy}{mm} ó {yyyy}{mm} també és necessària.<br><b>  {dd}  </b> dies (01 a 31).<br><b> {mm}</b> mes (01 a 12).<br><b> {yy} </ b>, <b> {yyyy</ b> ó <b>{y} </b> any en 2, 4 ó 1 xifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> el codi de client de n caràcters<br><b>{cccc000}</b> el codi de client en n caràcters és seguir per un comptador dedicat per al client. Aquest comptador dedicat del client es reinicia al mateix temps que el comptador global.<br><b>{tttt}</b> El codi de tipus tercer en n caràcters (veure tipus Diccionari tercers).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Qualsevol altre caràcter a la màscara es quedarà sense canvis. <br> No es permeten espais<br>
 GenericMaskCodes4a=<u>Exemple a la 99ª %s del tercer L'Empresa realitzada el 31/03/2007: </u> <br>
 GenericMaskCodes4b=<u>Exemple sobre un tercer creat el 31/03/2007: </u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Seguretat de les URL
 SecurityTokenIsUnique=Fer servir un paràmetre securekey únic per a cada URL?
 EnterRefToBuildUrl=Introduïu la referència de l'objecte %s
 GetSecuredUrl=Obté la URL calculada
-ButtonHideUnauthorized=Amaga els botons d'accions no autoritzades en compte de mostrar-los atenuats
+ButtonHideUnauthorized=Amaga els botons a usuaris no administradors per accions no autoritzades enlloc de mostrar-los en gris deshabilitats
 OldVATRates=Taxa d'IVA antiga
 NewVATRates=Taxa d'IVA nova
 PriceBaseTypeToChange=Canviar el preu on la referència de base és
@@ -349,6 +356,7 @@ ExtrafieldMail = Correu
 ExtrafieldSelect = Llista de selecció
 ExtrafieldSelectList = Llista de selecció de table
 ExtrafieldSeparator=Separador
+ExtrafieldPassword=Contrasenya
 ExtrafieldCheckBox=Casella de verificació
 ExtrafieldRadio=Botó de selecció excloent
 ExtrafieldCheckBoxFromList= Casella de verificació des de taula
@@ -383,11 +391,14 @@ EnableFileCache=Habilita la caché de fitxers
 ShowDetailsInPDFPageFoot=Afegeix més detalls en el peu dels fitxers PDF, com l'adreça de l'empresa, o altres camps (el NIF/CIF, codis professionals, ...).
 NoDetails=No hi ha més detalls en el peu
 DisplayCompanyInfo=Mostra l'adreça de l'empresa
-DisplayCompanyInfoAndManagers=Mostra l'empresa altres camps
+DisplayCompanyManagers=Mostra el gestor de noms
+DisplayCompanyInfoAndManagers=Mostra l'adreça de l'empresa i els noms del gerència
 EnableAndSetupModuleCron=Si vols tenir aquesta factura recurrent generada automàticament, el mòdul *%s* s'ha d'habilitar i configurar correctament. D'altra banda, la generació de factures s'ha de fer manualment des d'aquesta plantilla amb el bóto "Crea". Tingues en compte que si actives la generació automàtica, pots continuar generant factures manuals. No és possible la generació de duplicitats pel mateix període. 
 ModuleCompanyCodeAquarium=Retorna un codi comptable compost per:<br>%s seguit del codi de proveïdor per al codi comptable de proveïdor,<br>%s seguit del codi de client per al codi comptable de client.
 ModuleCompanyCodePanicum=Retorna un codi comptable buit.
 ModuleCompanyCodeDigitaria=El codi comptable depèn del codi del tercer. El codi està format pel caràcter 'C' en primera posició seguit dels 5 primers caràcters del codi del tercer.
+Use3StepsApproval=Per defecte, les comandes de compra han d'estar creades i aprovades per 2 usuaris diferents (un usuari per crear i un usuari per aprovar. Tingues en compte que si un usuari té ambdos permisos per crear i aprovar, un sol usuari serà suficient). Amb aquesta opció pots demanar un tercer usuari per aprovar, si l'import és major que un valor concret (així serien necessaris 3 passos: 1r validació, 2n primera aprovació i 3r segona aprovació si l'import és suficient).<br>Deixa-ho buit per fer només una aprovació (2 passos), o deixa-ho amb un valor molt baix (0.1) si sempre serà necessària una segona aprovació.
+UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
 
 # Modules
 Module0Name=Usuaris i grups
@@ -416,7 +427,7 @@ Module49Name=Editors
 Module49Desc=Gestió d'editors
 Module50Name=Productes
 Module50Desc=Gestió de productes
-Module51Name=Publipostage
+Module51Name=Correus massius
 Module51Desc=Administració i enviament de correu de paper en massa
 Module52Name=Stocks de productes
 Module52Desc=Gestió de stocks de productes
@@ -428,8 +439,8 @@ Module55Name=Codis de barra
 Module55Desc=Gestió dels codis de barra
 Module56Name=Telefonia
 Module56Desc=Gestió de la telefonia
-Module57Name=Domiciliacions
-Module57Desc=Gestió de domiciliacions. També inclou generació d'arxiu SEPA pels països europeus.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integració amb ClickToDial
 Module59Name=Bookmark4u
@@ -441,7 +452,7 @@ Module75Desc=Gestió de les notes de despeses i desplaçaments
 Module80Name=Expedicions
 Module80Desc=Gestió d'expedicions i recepcions
 Module85Name=Bancs i caixes
-Module85Desc=Gestió dels comptes financers de tipus comptes bancaris, postals o efectiu
+Module85Desc=Gestió de comptes bancaris o efectiu
 Module100Name=External site
 Module100Desc=Inclou qualsevol lloc web extern en els menús de Dolibarr, veient-lo en un frame
 Module105Name=Mailman i SPIP
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Interface amb el calendari webcalendar
 Module500Name=Pagaments especials
 Module500Desc=Gestió de despeses especials (impostos varis, dividends)
-Module510Name=Sous
-Module510Desc=Gestió dels salaris dels empleats i pagaments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Préstec
 Module520Desc=Gestió de préstecs
 Module600Name=Notificacions
-Module600Desc=Envia notificacions d'Email (disparades per algun esdeveniment de negoci) a usuaris (configuració definida en cada usuari), contactes de tercers (configuracio definida en cada tercer) o correus electrònics fixes.
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donacions
 Module700Desc=Gestió de donacions
 Module770Name=Informes de despeses
@@ -606,10 +617,10 @@ Permission142=Crea/modifica tots els projectes i tasques (també projectes priva
 Permission144=Elimina tots els projectes i tasques (també els projectes privats dels que no sóc contacte)
 Permission146=Consulta proveïdors
 Permission147=Consulta estadístiques
-Permission151=Consulta domiciliacions
-Permission152=Crear/modificar domiciliacions
-Permission153=Enviar domiciliacions
-Permission154=Abonar/tornar domiciliacions
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Consulta contractes/subscripcions
 Permission162=Crear/Modificar contractes/subscripcions
 Permission163=Activar un servei/subscripció d'un contracte
@@ -747,6 +758,7 @@ Permission1236=Exporta factures de proveïdors, atributs i pagaments
 Permission1237=Exporta comandes de proveïdors juntament amb els seus detalls
 Permission1251=Llançar les importacions en massa a la base de dades (càrrega de dades)
 Permission1321=Exporta factures de clients, atributs i cobraments
+Permission1322=Reopen a paid bill
 Permission1421=Exporta comandes de clients i atributs
 Permission20001=Consulta els dies de lliures disposició (propis i subordinats)
 Permission20002=Crea/modifica els teus dies lliures retribuïts
@@ -780,6 +792,10 @@ Permission55002=Crear/modificar enquestes
 Permission59001=Consulta marges comercials
 Permission59002=Definir marges comercials
 Permission59003=Consulta qualsevol marge de l'usuari
+Permission63001=Consulta recursos
+Permission63002=Crea/modifica recursos
+Permission63003=Elimina recursos
+Permission63004=Enllaça recursos en esdeveniments de l'agenda
 DictionaryCompanyType=Tipus de tercers
 DictionaryCompanyJuridicalType=Formes jurídiques de tercers
 DictionaryProspectLevel=Perspectiva nivell client potencial
@@ -823,13 +839,13 @@ LTRate=Tarifa
 LocalTax1IsNotUsed=No subjecte
 LocalTax1IsUsedDesc=Utilitza un 2n tipus d'impost (diferent de l'IVA)
 LocalTax1IsNotUsedDesc=No utilitzar un altre tipus d'impost (diferent de l'IVA)
-LocalTax1Management=Gestió 2on. tipus d'impost
+LocalTax1Management=2n tipus d'impost
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=No subjecte
 LocalTax2IsUsedDesc=Utilitza un 3r tipus d'impost (diferent de l'IVA)
 LocalTax2IsNotUsedDesc=No utilitzar un altre tipus d'impost (diferent de l'IVA)
-LocalTax2Management=Gestió 2on. tipus d'impost
+LocalTax2Management=3r tipus d'impost
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES= Gestió Recàrrec d'Equivalència
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etiqueta utilitzada per defecte si no es troba cap traducció
 LabelOnDocuments=Etiqueta sobre documents
 NbOfDays=Nº de dies
 AtEndOfMonth=A final de mes
+CurrentNext=Actual/Següent
 Offset=Decàleg
 AlwaysActive=Sempre actiu
 Upgrade=Actualització
@@ -888,7 +905,7 @@ Skin=Tema visual
 DefaultSkin=Tema visual por defecte
 MaxSizeList=Longuitud màxima de llistats
 DefaultMaxSizeList=Longitud màxima per defecte per a les llistes
-DefaultMaxSizeShortList=Longitud màxima per defecte llistes curtes (per example, a la fitxa de client)
+DefaultMaxSizeShortList=Longitud màxima per defecte en llistes curtes (per exemple, en la fitxa de client)
 MessageOfDay=Missatge del dia
 MessageLogin=Missatge del login
 PermanentLeftSearchForm=Zona de recerca permanent del menú de l'esquerra
@@ -950,7 +967,7 @@ LogEventDesc=Podeu habilitar el registre d'esdeveniments de seguretat Dolibarr a
 AreaForAdminOnly=Aquestes funcions només són accessibles a un usuari administrador.
 SystemInfoDesc=La informació del sistema és informació tècnica accessible només en només lectura als administradors.
 SystemAreaForAdminOnly=Aquesta àrea només és accessible als usuaris de tipus administradors. Cap permís Dolibarr permet estendre el cercle de usuaris autoritzats a aquesta áera.
-CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o entitat a administrar (Feu clic al botó "Modificar" a peu de pàgina)
+CompanyFundationDesc=Edita en aquesta pàgina tota la informació coneguda sobre l'empresa o entitat a administrar (Fes clic al botó "Modificar" o "Desar" a peu de pàgina)
 DisplayDesc=Selecciona els paràmetres relacionats amb l'aparença de Dolibarr
 AvailableModules=Mòduls disponibles
 ToActivateModule=Per activar els mòduls, aneu a l'àrea de Configuració (Inici->Configuració->Mòduls).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Atenció, en alguns sistemes Linux, amb aquest mètode
 PathToDocuments=Rutes d'accés a documents
 PathDirectory=Catàleg
 SendmailOptionMayHurtBuggedMTA=La funcionalitat d'enviar correus electrònics a través del "correu directe PHP" genera una sol·licitud que poden ser mal interpretats per alguns servidors de correu. Això és tradueix en missatges de correu electrònic illegibles per a les persones allotjades a aquestes plataformes. Aquest és el cas de clients en certs proveïdors de serveis d'internet (Ex: Orange). Això no és un problema ni de Dolibarr ni de PHP, però si del servidor de correu. Encara que, pot agregar la opció MAIN_FIX_FOR_BUGGED_MTA amb el valor 1 a la Configuració -> Varis per tractar que Dolibarr eviti l'error. Un altre solució (recomanada) és utilitzar el mètode d'enviament per SMTP que no té aquest inconvenient.
-TranslationSetup=Configuració traducció
-TranslationDesc=Com mostrar l'idioma de l'aplicació<br>* A nivell de sistema: menú <strong>Inici - Configuració - Entorn</strong><br>* Per usuari: <strong>Configuració usuari</strong> en pestanya de la fitxa d'usuari (clic al seu nom d'usuari a la part superior de la pantalla).
-TranslationOverwriteDesc=També pots sobreescriure algun valor omplint la següent taula. Selecciona el teu idioma del desplegable "%s", afegeix la clau que trobis en el fitxer lang (langs/xx_XX/nomfitxer.lang) en "%s" i la nova traducció en "%s".
+TranslationSetup=Configuració de traducció
+TranslationKeySearch=Cerca una clau o cadena de traducció
+TranslationOverwriteKey=Sobreescriu una cadena de traducció
+TranslationDesc=Com definir l'idioma de l'aplicació<br>* A nivell de sistema: menú <strong>Inici - Configuració - Entorn</strong><br>* Per usuari: Pestanya <strong>Configuració d'entorn d'usuari</strong> en la fitxa d'usuari (fes clic al nom d'usuari en la part superior de la pantalla).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Cadena de traducció
+CurrentTranslationString=Cadena de traducció actual
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=Nova cadena de traducció a mostrar
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Número total de mòduls activats: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
 ClassNotFoundIntoPathWarning=No s'ha trobat la classe %s en el seu path PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Usuari TLS
 LDAPServerUseTLSExample=El seu servidor utilitza TLS
 LDAPServerDn=DN del servidor
 LDAPAdminDn=DN del administrador
-LDAPAdminDnExample=DN complet (ej: cn=adminldap,dc=example,dc=com)
+LDAPAdminDnExample=DN complet (ex: cn=admin,dc=example,dc=com o cn=Administrator,cn=Users,dc=example,dc=com per active directory)
 LDAPPassword=Contrasenya de l'administrador
 LDAPUserDn=DN dels usuaris
 LDAPUserDnExample=DN complet (ej: ou=users,dc=example,dc=com)
@@ -1231,9 +1256,9 @@ LDAPFieldFirstName=Nom
 LDAPFieldFirstNameExample=Exemple : givenname
 LDAPFieldMail=E-Mail
 LDAPFieldMailExample=Exemple : mail
-LDAPFieldPhone=Telèfon treball
+LDAPFieldPhone=Número de telèfon de treball
 LDAPFieldPhoneExample=Exemple : telephonenumber
-LDAPFieldHomePhone=Telèfon personal
+LDAPFieldHomePhone=Número de telèfon personal
 LDAPFieldHomePhoneExample=Exemple : homephone
 LDAPFieldMobile=Telèfon mòbil
 LDAPFieldMobileExample=Exemple : mobile
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Exemple : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Exemple : objectsid
 LDAPFieldEndLastSubscription=Data final d'afiliació
-LDAPFieldTitle=Lloc/Funció
+LDAPFieldTitle=Càrrec
 LDAPFieldTitleExample=Exemple:títol
 LDAPSetupNotComplete=Configuració LDAP incompleta (a completar en les altres pestanyes)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contrasenya no indicats. Els accessos LDAP seran anònims i en només lectura.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Configuració dels mòduls Productes i Serveis
 NumberOfProductShowInSelect=Nº de productes màx a les llistes (0= sense límit)
 ViewProductDescInFormAbility=Visualització de les descripcions dels productes en els formularis
 MergePropalProductCard=Activa en la pestanya fitxers adjunts de productes/serveis una opció per convinar el document de producte en PDF a un pressupost en PDF (si el producte/servei es troba en el pressupost)
-ViewProductDescInThirdpartyLanguageAbility=Visualització de les descripcions de productes en l'idioma del tercer
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=També si vostè té un gran número de productes (> 100.000), pot augmentar la velocitat mitjançant l'estableciment. PRODUCT_DONOTSEARCH_ANYWHERE amb la constant a 1 a Configuració --> Altres. La cerca serà limitada a la creació de la cadena
 UseSearchToSelectProduct=Utilitzeu un formulari de cerca per triar un producte (en lloc d'una llista desplegable).
 SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Generador de codi de barres (utilitzat pel motor intern per a
 BarcodeInternalEngine=Motor intern
 BarCodeNumberManager=Configuració de la numeració automatica de codis de barres
 ##### Prelevements #####
-WithdrawalsSetup=Configuració del mòdul domiciliacions
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Configuració de les importacions del flux RSS
 NewRSS=Sindicació de un nou flux RSS
@@ -1467,7 +1492,7 @@ OnlyActiveElementsAreExposed=Només s'exposen els elements de mòduls habilitats
 ApiKey=Clau per l'API
 ##### Bank #####
 BankSetupModule=Configuració del mòdul Banc
-FreeLegalTextOnChequeReceipts=Menció complementària a les remeses de xecs
+FreeLegalTextOnChequeReceipts=Text complementari en remeses de xecs
 BankOrderShow=Ordre de visualització dels comptes bancaris segons països en usar la "compte de banc detallada"
 BankOrderGlobal=General
 BankOrderGlobalDesc=Ordre de visualització general
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Obrir any fiscal
 CloseFiscalYear=Tancar any fiscal
 DeleteFiscalYear=Eliminar any fiscal
 ConfirmDeleteFiscalYear=Esteu segur d'eliminar aquest any fiscal?
+ShowFiscalYear=Mostra l'any fiscal
 AlwaysEditable=Sempre es pot editar
 MAIN_APPLICATION_TITLE=Forçar visibilitat del nom de l'aplicació (advertència: indicar el seu propi nom aquí pot trencar la característica d'auto-omple natge de l'inici de sessió en utilitzar l'aplicació mòbil DoliDroid)
 NbMajMin=Nombre mínim de caràcters en majúscules
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=Llista de notificacions per usuari*
 ListOfNotificationsPerUserOrContact=Llista de notificacions per usuari* o per contacte**
 ListOfFixedNotifications=Llistat de notificacions fixes
 GoOntoUserCardToAddMore=Ves a la pestanya "Notificacions" d'un usuari per afegir o eliminar notificacions per usuaris.
-GoOntoContactCardToAddMore=Vagi a la pestanya "Notificacions" d'un contacte de tercers per afegir o eliminar notificacions per contactes/direccions
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Valor mínim/llindar
 BackupDumpWizard=Asistent per crear una copia de seguretat de la base de dades
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Remarca el color de la línia quan el ratolí hi passa per s
 TextTitleColor=Color de títol de pàgina
 LinkColor=Color dels enllaços
 PressF5AfterChangingThis=Prem F5 en el teclat després de canviar aquest valor per fer-ho efectiu
-NotSupportedByAllThemes=Funcionarà amb el tema eldy però no està suportat pels altres temes
+NotSupportedByAllThemes=Funcionarà amb els temes del nucli, però pot no estar suportat per temes externs
 BackgroundColor=Color de fons
 TopMenuBackgroundColor=Color de fons pel menú superior
+TopMenuDisableImages=Oculta les imatges en el menú superior
 LeftMenuBackgroundColor=Color de fons pel menú de l'esquerra
 BackgroundTableTitleColor=Color de fons per línies de títol en taules
 BackgroundTableLineOddColor=Color de fons per les línies senars de les taules
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Enviar intervenció
 MailToSendSupplierRequestForQuotation=Enviar pressupost de proveïdor
 MailToSendSupplierOrder=Enviar comanda de proveïdor
 MailToSendSupplierInvoice=Enviar factura de proveïdor
-MailToThirdparty=Enviar correu electrònic de la pàgina del tercer
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
 TitleExampleForMajorRelease=Exemple de missatge que es pot utilitzar per anunciar aquesta actualització de versió (ets lliure d'utilitzar-ho a les teves webs)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url per obtenir el token per utilitzar l'API (un cop s'ha r
 ListOfAvailableAPIs=Llistat de APIs disponibles
 activateModuleDependNotSatisfied=El mòdul "%s" depèn del mòdul "%s" que no s'ha trobat, així que el mòdul "%1$s" pot funcionar de forma incorrecte. Instal·la el mòdul "%2$s" o deshabilita el mòdul "%1$s" si vols estar segur de no tenir cap sorpresa
 CommandIsNotInsideAllowedCommands=La comanda que intentes executar no es troba en la llista de comandes permeses definides en paràmetres <strong>$dolibarr_main_restrict_os_commands</strong> en el fitxer <strong>conf.php</strong>.
+LandingPage=Pàgina de destinació principal
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=Aquest usuari no té permisos definits
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index ea7a8537d73..539961d5008 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -11,7 +11,7 @@ AccountLabel=Etiqueta compte financier
 CashAccount=Compte caixa/efectiu
 CashAccounts=Comptes caixa/efectiu
 CurrentAccounts=Comptes corrents
-SavingAccounts=comptes d'estalvis
+SavingAccounts=Comptes d'estalvis
 ErrorBankLabelAlreadyExists=Etiqueta de compte financier existent
 BankBalance=Saldo
 BankBalanceBefore=Saldo anterior
@@ -27,13 +27,9 @@ AllTime=Des del principi
 Reconciliation=Conciliació
 RIB=Compte bancari
 IBAN=Identificador IBAN
-IbanValid=Codi IBAN vàlid
-IbanNotValid=Codi IBAN no és vàlid
 BIC=Identificador BIC/SWIFT
-SwiftValid=BIC/SWIFT és vàlid
-SwiftNotValid=BIC/SWIFT no és vàlid
-StandingOrders=Domiciliacions
-StandingOrder=Domiciliació
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Extracte
 AccountStatementShort=Extracte
 AccountStatements=Extractes
@@ -51,7 +47,7 @@ MenuNewFinancialAccount=Nou compte
 EditFinancialAccount=Edició compte
 LabelBankCashAccount=Etiqueta compte o caixa
 AccountType=Tipus de compte
-BankType0=Compte bancari d'estalvis
+BankType0=Compte d'estalvis
 BankType1=Compte bancari corrent
 BankType2=Compte caixa/efectiu
 AccountsArea=Àrea comptes
@@ -78,6 +74,7 @@ AccountToCredit=Compte de crèdit
 AccountToDebit=Compte de dèbit
 DisableConciliation=Desactivar la funció de conciliació per a aquest compte
 ConciliationDisabled=Funció de conciliació desactivada
+LinkedToAConciliatedTransaction=Enllaça a una transacció conciliada
 StatusAccountOpened=Actiu
 StatusAccountClosed=Tancada
 AccountIdShort=Número
@@ -87,6 +84,8 @@ AddBankRecordLong=Realitzar un registre manual fora d'una factura
 ConciliatedBy=Conciliat per
 DateConciliating=Data conciliació
 BankLineConciliated=Registre conciliat
+Reconciled=Conciliat
+NotReconciled=No conciliat
 CustomerInvoicePayment=Cobrament a client
 SupplierInvoicePayment=Pagament a proveïdor
 SubscriptionPayment=Pagament de quota
@@ -94,18 +93,19 @@ WithdrawalPayment=Cobrament de domiciliació
 SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
-TransferDesc=En crear una transferència d'un dels seus comptes bancaris cap a una altre, Dolibarr crea dos registres comptables (un dèbit en un compte i un altre de crèdit, del mateix import, en l'altre compte. S'utilitza per als dos registres la mateixa etiqueta de transferència i la mateixa data)
+MenuBankInternalTransfer=Transferència interna
+TransferDesc=Traspassa d'un compte a un altre, Dolibarr generarà dos registres (dèbit en compte origen i crèdit en compte destí. Per aquesta transacció s'utilitzarà el mateix import (excepte el signe), l'etiqueta i la data).
 TransferFrom=De
 TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
 CheckTransmitter=Emissor
-ValidateCheckReceipt=Validar aquesta remesa?
-ConfirmValidateCheckReceipt=Esteu segur de voler validar aquesta remesa (cap modificació serà possible un cop la remesa estigui validada)?
-DeleteCheckReceipt=Voleu suprimir aquesta remesa?
-ConfirmDeleteCheckReceipt=Estàs segur de voler eliminar aquesta remesa?
-BankChecks=Xecs
+ValidateCheckReceipt=Vols validar aquesta remesa de xec?
+ConfirmValidateCheckReceipt=Vols validar aquesta remesa de xec (no serà possible canviar-ho un cop estigui fet)?
+DeleteCheckReceipt=Vols suprimir aquesta remesa de xec?
+ConfirmDeleteCheckReceipt=Vols eliminar aquesta remesa de xec?
+BankChecks=Xec bancari
 BankChecksToReceipt=Xecs en espera de l'ingrés
-ShowCheckReceipt=Mostrar remesa
+ShowCheckReceipt=Mostra la remesa d'ingrés de xec
 NumberOfCheques=N º de xecs
 DeleteTransaction=Eliminar la transacció
 ConfirmDeleteTransaction=Esteu segur de voler eliminar aquesta transacció?
@@ -126,10 +126,10 @@ AllAccounts=Tots els comptes bancaris/de caixa
 BackToAccount=Tornar al compte
 ShowAllAccounts=Mostra per a tots els comptes
 FutureTransaction=Transacció futura. No és possible conciliar.
-SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs a incloure a la remesa i feu clic a "Crear".
+SelectChequeTransactionAndGenerate=Selecciona/filtra els xecs a incloure en la remesa de xecs a ingressar i fes clic a "Crea".
 InputReceiptNumber=Selecciona l'estat del compte bancari relacionat amb la conciliació. Utilitza un valor numèric que es pugui ordenar: AAAAMM o AAAAMMDD
 EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
-ToConciliate=A conciliar?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=A continuació, comproveu les línies presents en l'extracte bancari i feu clic
 DefaultRIB=Codi BAN per defecte
 AllRIB=Tots els codis BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Esteu segur de voler marcar aquest xec com retornat?
 RejectCheckDate=Data de devolució del xec
 CheckRejected=Xec retornat
 CheckRejectedAndInvoicesReopened=Xec retornat i factures reobertes
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Plantilla per imprimir una pàgina amb informació BAN
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index b658064a977..fcf1b95863d 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -135,14 +135,14 @@ ErrorNoPaiementModeConfigured=No s'ha definit la forma de pagament per defecte.
 ErrorCreateBankAccount=Crea un compte bancari i després ves al panell de configuració del mòdul Factures per definir les formes de pagament
 ErrorBillNotFound=Factura %s inexistent
 ErrorInvoiceAlreadyReplaced=Error, vol validar una factura que rectifica la factura %s. Però aquesta última ja està rectificada per la factura %s.
-ErrorDiscountAlreadyUsed=Error, la remesa ja està assignada
+ErrorDiscountAlreadyUsed=Error, el descompte ja s'està utilitzant
 ErrorInvoiceAvoirMustBeNegative=Error, una factura rectificativa ha de tenir un import negatiu
 ErrorInvoiceOfThisTypeMustBePositive=Error, una factura d'aquest tipus ha de tenir un import positiu
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·lar una factura que ha estat substituïda per una altra que es troba en l'estat 'esborrany'.
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
-RecurringInvoiceTemplate=Factura recurrent
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No s'ha qualificat cap plantilla de factura recurrent per generar-se.
 FoundXQualifiedRecurringInvoiceTemplate=S'ha trobat la plantilla de factura/es recurrent %s qualificada per generar-se.
 NotARecurringInvoiceTemplate=No és una plantilla de factura recurrent
@@ -175,7 +175,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Aquesta elecció és possible
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Aquesta elecció és l'elecció que s'ha de prendre si les altres no són aplicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>client morós </b> és un client que no vol regularitzar el seu deute.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Aquesta elecció és possible si el cas de pagament incomplet és arran d'una devolució de part dels productes
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Aquesta elecció serà possible, per exemple, en els casos següents:<br>-pagament parcial ja que una partida de productes s'ha tornat. <br> - Reclamat per no lliurar productes de la factura <br>En tots els casos, la reclamació s'ha de regularitzar mitjançant un abonament
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilitza aquesta opció si totes les altres no et convenen, per exemple en la situació següent:<br>- pagament parcial ja que una partida de productes s'ha tornat<br>- la quantitat reclamada és massa important perquè s'ha oblidat un descompte<br>En tots els casos, la reclamació s'ha de regularitzar mitjançant un abonament.
 ConfirmClassifyAbandonReasonOther=Altres
 ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol altre cas. Per exemple arran de la intenció de crear una factura rectificativa.
 ConfirmCustomerPayment=¿Confirmeu el procés d'aquest pagament de <b>%s</b>%s?
@@ -193,7 +193,7 @@ ShowInvoice=Veure factura
 ShowInvoiceReplace=Veure factura rectificativa
 ShowInvoiceAvoir=Veure abonament
 ShowInvoiceDeposit=Mostrar factura d'acompte
-ShowInvoiceSituation=Mostra la situació de la factura
+ShowInvoiceSituation=Mostra la factura de situació
 ShowPayment=Veure pagament
 AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
@@ -209,8 +209,8 @@ EscompteOffered=Descompte (pagament aviat)
 EscompteOfferedShort=Descompte
 SendBillRef=Enviament de la factura %s
 SendReminderBillRef=Recordatori de la factura %s
-StandingOrders=Domiciliacions
-StandingOrder=Domiciliació
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Cap factura esborrany
 NoOtherDraftBills=Cap altra factura esborrany
 NoDraftInvoices=Sense factures esborrany
@@ -314,8 +314,8 @@ MergingPDFTool=Eina de fusió PDF
 AmountPaymentDistributedOnInvoice=Import de pagament distribuït en la factura
 PaymentOnDifferentThirdBills=Permet fer pagaments en factures de diferents tercers però de la mateixa empresa mare
 PaymentNote=Nota de pagament
-ListOfPreviousSituationInvoices=Llista de situació de factures anterior
-ListOfNextSituationInvoices=Llista de següents situacions de factures
+ListOfPreviousSituationInvoices=Llista de factures de situació anteriors
+ListOfNextSituationInvoices=Llista de factures de situació següents
 FrequencyPer_d=Cada %s dies
 FrequencyPer_m=Cada %s mesos
 FrequencyPer_y=Cada %s anys
@@ -351,8 +351,8 @@ VarAmount=Import variable (%% total)
 # PaymentType
 PaymentTypeVIR=Transferència bancària
 PaymentTypeShortVIR=Transferència bancària
-PaymentTypePRE=Domiciliació bancària
-PaymentTypeShortPRE=Domiciliació
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Efectiu
 PaymentTypeShortLIQ=Efectiu
 PaymentTypeCB=Targeta
@@ -369,7 +369,7 @@ PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Dades bancàries
 BankCode=Codi banc
-DeskCode=Cod. sucursal
+DeskCode=Codi oficina
 BankAccountNumber=Número compte
 BankAccountNumberKey=D. C.
 Residence=Domiciliació bancària
@@ -380,7 +380,8 @@ BICNumber=Codi BIC/SWIFT
 ExtraInfos=Informacions complementàries
 RegulatedOn=Pagar el
 ChequeNumber=Xec nº
-ChequeOrTransferNumber=Xec/Transerència nº
+ChequeOrTransferNumber=Nº Xec/Transferència
+ChequeBordereau=Comprova horari
 ChequeMaker=Autor xec/transferència
 ChequeBank=Banc del xec
 CheckBank=Xec
@@ -388,7 +389,7 @@ NetToBePaid=Net a pagar
 PhoneNumber=Tel.
 FullPhoneNumber=Telèfon
 TeleFax=Fax
-PrettyLittleSentence=Accepta el pagament mitjançant xecs al meu nom de les sumes degudes, en la meva qualitat de soci d'una empresa autoritzada per l'Administració Fiscal.
+PrettyLittleSentence=Accepta l'import del pagament mitjançant xecs al meu nom, en la meva qualitat de soci d'una empresa autoritzada per l'Administració Fiscal.
 IntracommunityVATNumber=NIF intracomunitari
 PaymentByChequeOrderedTo=Pagament mitjançant xec nominatiu a %s enviat a
 PaymentByChequeOrderedToShort=Pagament mitjançant xec nominatiu a
@@ -404,13 +405,13 @@ UseLine=Aplicar
 UseDiscount=Aplicar descompte
 UseCredit=Utilitzar crèdit
 UseCreditNoteInInvoicePayment=Reduir el pagament amb aquest crèdit
-MenuChequeDeposits=Remeses
-MenuCheques=Gestió xecs
-MenuChequesReceipts=Llista
+MenuChequeDeposits=Ingrés de xecs
+MenuCheques=Xecs
+MenuChequesReceipts=Remeses de xecs
 NewChequeDeposit=Nou dipòsit
-ChequesReceipts=Llistat remeses
-ChequesArea=Àrea remeses
-ChequeDeposits=Dipòsit de xecs
+ChequesReceipts=Remeses de xecs
+ChequesArea=Àrea de ingrés de xecs
+ChequeDeposits=Ingrés de xecs
 Cheques=Xecs
 DepositId=Id. dipòsit
 NbCheque=Número de xecs
@@ -427,15 +428,17 @@ CantRemovePaymentWithOneInvoicePaid=Eliminació impossible quan hi ha almenys un
 ExpectedToPay=Esperant el pagament
 CantRemoveConciliatedPayment=No es pot eliminar la conciliació de pagament
 PayedByThisPayment=Pagada per aquest pagament
-ClosePaidInvoicesAutomatically=Classificar com "Pagades" les factures rectificatives completament pagades.
+ClosePaidInvoicesAutomatically=Classificar com "Pagades" totes les factures estàndards, de situació o rectificatives completament pagades.
 ClosePaidCreditNotesAutomatically=Classifica com "Pagats" tots els abonaments completament reemborsats
+ClosePaidContributionsAutomatically=Classifica com "Pagades" tots els impostos varis pagats completament.
 AllCompletelyPayedInvoiceWillBeClosed=Totes les factures amb una resta a pagar 0 seran automàticament tancades a l'estat "Pagada".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reemborsar
 ListOfYourUnpaidInvoices=Llistat de factures impagades
 NoteListOfYourUnpaidInvoices=Nota: Aquest llistat només conté factures de tercers que tens enllaçats com a agent comercial.
 RevenueStamp=Timbre fiscal
-YouMustCreateInvoiceFromThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "client" des de tercers
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=Aquesta opció només està disponible quan es crea la factura des de la pestanya "proveïdor" del tercer
 YouMustCreateStandardInvoiceFirstDesc=Primer has de crear una factura estàndard i convertir-la en "plantilla" per crear una nova plantilla de factura
 PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
 PDFCrevetteDescription=Plantilla Crevette per factures PDF. Una plantilla de factura completa per factures de situació.
@@ -452,15 +455,15 @@ TypeContact_invoice_supplier_external_BILLING=Contacte proveïdor facturació
 TypeContact_invoice_supplier_external_SHIPPING=Contacte proveïdor entregues
 TypeContact_invoice_supplier_external_SERVICE=Contacte proveïdor serveis
 # Situation invoices
-InvoiceFirstSituationAsk=Situació primera factura
-InvoiceFirstSituationDesc=La <b>situació de factures</b> esta vinculades a situacions relacionades amb una progressió, per exemple, la progressió d'una construcció. Cada situació està lligada a una factura.
-InvoiceSituation=Situació factures
-InvoiceSituationAsk=Factura seguint una situació
-InvoiceSituationDesc=Crear una nova situació seguint una existent
-SituationAmount=Situació del import (sense IVA) de la factura
+InvoiceFirstSituationAsk=Primera factura de situació
+InvoiceFirstSituationDesc=Les <b>factures de situació</b> estan vinculades a situacions relacionades amb una progressió, per exemple, la progressió d'una construcció. Cada situació està lligada a una factura.
+InvoiceSituation=Factura de situació
+InvoiceSituationAsk=Factura que segueix una situació
+InvoiceSituationDesc=Crear una nova situació seguint una altra existent
+SituationAmount=Import (sense IVA) de la factura de situació
 SituationDeduction=Situació d'exportació
 ModifyAllLines=Modificar totes les línies
-CreateNextSituationInvoice=Crear següent situació
+CreateNextSituationInvoice=Crea la següent situació
 NotLastInCycle=Aquesta factura no és l'última en el cicle i no es pot modificar.
 DisabledBecauseNotLastInCycle=Ja existeix la següent situació.
 DisabledBecauseFinal=Aquesta situació és definitiva.
@@ -468,8 +471,8 @@ CantBeLessThanMinPercent=El progrés no pot ser menor que el seu valor en la sit
 NoSituations=No hi ha situacions obertes
 InvoiceSituationLast=Factura final i general
 PDFCrevetteSituationNumber=Situació N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situació de factura - COUNT
-PDFCrevetteSituationInvoiceTitle=Situació factures
+PDFCrevetteSituationInvoiceLineDecompte=Factura de situació - COUNT
+PDFCrevetteSituationInvoiceTitle=Factura de situació
 PDFCrevetteSituationInvoiceLine=Situació N°%s : Inv. N°%s en %s
 TotalSituationInvoice=Total situació
 invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o superior a la següent línia de factura
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia d
 ToCreateARecurringInvoice=Per crear una factura recurrent d'aquest contracte, primer crea aquesta factura esborrany, després converteix-la en una plantilla de factura i defineix la freqüència per a la generació de factures futures.
 ToCreateARecurringInvoiceGene=Per generar futures factures regulars i manualment, només ves al menú <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada automàticament, pregunta a l'administrador per habilitar i configurar el mòdul <strong>%s</strong>. Tingues en compte que ambdós mètodes (manual i automàtic) es poden utilitzar alhora sense risc de duplicats.
+DeleteRepeatableInvoice=Elimina la factura recurrent
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 0850e96908c..39c9ae88486 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Els meus últims %s marcadors
 BoxOldestExpiredServices=Serveis antics expirats
 BoxLastExpiredServices=Últims %s contactes amb serveis actius expirats
 BoxTitleLastActionsToDo=Últims %s events a realitzar
-BoxTitleLastContracts=Últims %s contractes
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Últimes %s donacions modificades
 BoxTitleLastModifiedExpenses=Últimes %s despeses modificades
 BoxGlobalActivity=Activitat global
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Pressupostos per mes
 NoTooLowStockProducts=Sense productes per sota de l'estoc mínim
 BoxProductDistribution=Distribució de productes/serveis
 BoxProductDistributionFor=Distribució de %s per %s
+BoxTitleLastModifiedSupplierBills=Últimes %s factures de proveïdor modificades
+BoxTitleLatestModifiedSupplierOrders=Últimes %s comandes de proveïdor modificades
+BoxTitleLastModifiedCustomerBills=Últimes %s factures de client modificades
+BoxTitleLastModifiedCustomerOrders=Últimes %s comandes de client modificades
+BoxTitleLastModifiedPropals=Últims %s pressupostos modificats
 ForCustomersInvoices=Factures a clientes
 ForCustomersOrders=Comandes de clients
 ForProposals=Pressupostos
 LastXMonthRolling=Els últims %s mesos consecutius
-ChooseBoxToAdd=Afegeix un panell a la teva taula de control
+ChooseBoxToAdd=Afegeix el panell a la teva taula de control
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 7410d11c9c8..f1ae472a71b 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=de
 CashDeskThirdParty=Tercer
 ShoppingCart=Cistella
 NewSell=Nova venda
-BackOffice=Back office
 AddThisArticle=Afegeix aquest article
 RestartSelling=Reprendre la venda
-SellFinished=Venda acabada
+SellFinished=Sale complete
 PrintTicket=Imprimir
 NoProductFound=Cap article trobat
 ProductFound=Producte trobat
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index aaa83c90298..eb97acfe67e 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Àrea d'etiquetes de clients
 MembersCategoriesArea=Àrea d'etiquetes de socis
 ContactsCategoriesArea=Àrea d'etiquetes de contactes
 AccountsCategoriesArea=Àrea d'etiquetes de comptes
+ProjectsCategoriesArea=Àrea d'etiquetes de projectes
 SubCats=Subcategories
 CatList=Llistat d'etiquetes
 NewCategory=Nova etiqueta
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Aquest tercer està enllaçat a les següents eti
 MemberIsInCategories=Aquest soci està enllçat a les següents etiquetes de socis
 ContactIsInCategories=Aquest contacte està enllaçat amb les següents etiquetes de contactes
 ProductHasNoCategory=Aquest producte/servei no es troba en cap etiqueta
-CompanyHasNoCategory=Aquest tercer no es troba en cap etiqueta
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Aquest soci no es troba en cap etiqueta
 ContactHasNoCategory=Aquest contacte no es troba en cap etiqueta
+ProjectHasNoCategory=Aquest projecte no es troba en cap etiqueta
 ClassifyInCategory=Afegeix a una etiqueta
 NotCategorized=Sense etiqueta
 CategoryExistsAtSameLevel=Aquesta categoria ja existeix per aquesta referència
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Etiquetes de productes
 MembersCategoriesShort=Etiquetes de socis
 ContactCategoriesShort=Etiquetes de contactes
 AccountsCategoriesShort=Etiquetes de comptes
+ProjectsCategoriesShort=Etiquetes de projectes
 ThisCategoryHasNoProduct=Aquesta categoria no conté cap producte.
 ThisCategoryHasNoSupplier=Aquesta categoria no conté cap proveïdor.
 ThisCategoryHasNoCustomer=Aquesta categoria no conté cap client.
 ThisCategoryHasNoMember=Aquesta categoria no té cap soci.
 ThisCategoryHasNoContact=Aquesta categoria no conté contactes
 ThisCategoryHasNoAccount=Aquesta categoria no conté cap compte.
+ThisCategoryHasNoProject=Aquesta categoria no conté cap projecte.
 CategId=ID d'etiqueta
 CatSupList=Llistat d'etiquetes de proveïdors
 CatCusList=Llistat d'etiquetes de clients/clients potencials
@@ -71,6 +75,7 @@ CatContactList=Llistat d'etiquetes de contactes
 CatSupLinks=Enllaços entre proveïdors i etiquetes
 CatCusLinks=Enllaços entre clients/clients potencials i etiquetes
 CatProdLinks=Enllaços entre productes/serveis i etiquetes
+CatProJectLinks=Enllaços entre projectes i etiquetes
 DeleteFromCat=Elimina de l'etiqueta
 ExtraFieldsCategories=Atributs complementaris
 CategoriesSetup=Configuració d'etiquetes
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 6644857d11b..e941dcca61a 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nou particular
 NewCompany=Nova empresa (client potencial, client, proveïdor)
 NewThirdParty=Nou tercer (client potencial, client, proveïdor)
 CreateDolibarrThirdPartySupplier=Crear un tercer (proveïdor)
+CreateThirdPartyOnly=Crea un tercer
+CreateThirdPartyAndContact=Crea un tercer + un contacte fill
 ProspectionArea=Àrea de pressupostos
 IdThirdParty=ID tercer
 IdCompany=Id empresa
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Proveïdors
 ThirdPartyType=Tipus de tercer
 Company/Fundation=Empresa/Entitat
 Individual=Particular
-ToCreateContactWithSameName=Crearà automàticament un contacte físic amb la mateixa informació
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Seu Central
 Subsidiaries=Filials
 ReportByCustomers=Informe per client
@@ -47,7 +49,7 @@ CivilityCode=Codi cortesia
 RegisteredOffice=Domicili social
 Lastname=Cognoms
 Firstname=Nom
-PostOrFunction=Lloc/funció
+PostOrFunction=Càrrec laboral
 UserTitle=Títol cortesia
 Address=Adreça
 State=Província
@@ -61,19 +63,19 @@ PhoneShort=Telèfon
 Skype=Skype
 Call=Trucar
 Chat=Xat
-PhonePro=Teléf. treball
-PhonePerso=Telèf. particular
+PhonePro=Telf. treball
+PhonePerso=Telf. particular
 PhoneMobile=Mòbil
-No_Email=No enviar e-mails massius
+No_Email=No enviar e-mailings massius
 Fax=Fax
 Zip=Codi postal
 Town=Població
 Web=Web
-Poste= Lloc
+Poste= Càrrec
 DefaultLang=Idioma per defecte
 VATIsUsed=Subjecte a IVA
 VATIsNotUsed=No subjecte a IVA
-CopyAddressFromSoc=Copiar l'adreça de l'empresa
+CopyAddressFromSoc=Omple l'adreça amb l'adreça del tercer
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tercer ni client ni proveïdor, no hi ha objectes vinculats disponibles
 ##### Local Taxes #####
 LocalTax1IsUsed=Utilitza segon impost
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=CIF/NIF Intracomunitari
 VATIntraShort=CIF/NIF Intra.
 VATIntraSyntaxIsValid=Sintaxi vàlida
-VATIntraValueIsValid=Valor vàlid
 ProspectCustomer=Client potencial/Client
 Prospect=Client potencial
 CustomerCard=Fitxa client
@@ -261,7 +262,9 @@ AddContactAddress=Crear contacte/adreça
 EditContact=Editar contacte
 EditContactAddress=Editar contacte/adreça
 Contact=Contacte
+ContactId=Id contacte
 ContactsAddresses=Contactes/Adreces
+FromContactName=Nom:
 NoContactDefinedForThirdParty=Cap contacte definit per a aquest tercer
 NoContactDefined=Cap contacte definit
 DefaultContact=Contacte per defecte
@@ -284,7 +287,7 @@ CompanyDeleted=L'empresa "%s" ha estat eliminada
 ListOfContacts=Llistat de contactes
 ListOfContactsAddresses=Llistat de contactes/adreces
 ListOfThirdParties=Llistat de tercers
-ShowCompany=Mostrar tercer
+ShowCompany=Mostra el tercer
 ShowContact=Mostrar contacte
 ContactsAllShort=Tots (sense filtre)
 ContactType=Tipus de contacte
@@ -294,6 +297,7 @@ ContactForProposals=Contacte de pressupostos
 ContactForContracts=Contacte de contracte
 ContactForInvoices=Contacte de factures
 NoContactForAnyOrder=Aquest contacte no és contacte de cap comanda
+NoContactForAnyOrderOrShipments=Aquest contacte no és un contacte per cap comanda o enviament
 NoContactForAnyProposal=Aquest contacte no és contacte de cap pressupost
 NoContactForAnyContract=Aquest contacte no és contacte de cap contracte
 NoContactForAnyInvoice=Aquest contacte no és contacte de cap factura
@@ -352,9 +356,9 @@ ExportCardToFormat=Exporta fitxa a format
 ContactNotLinkedToCompany=Contacte no vinculat a un tercer
 DolibarrLogin=Login usuari
 NoDolibarrAccess=Sense accés d'usuari
-ExportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contactes de tercers i atributs
-ImportDataset_company_1=Tercers (empreses/entitats/persones físiques) i propietats
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contactes/Adreces (de tercers o no) i atributs
 ImportDataset_company_3=Comptes bancaris
 ImportDataset_company_4=Tercers/Agents comercials (afecta als usuaris agents comercials en empreses)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Els tercers han sigut fusionats
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
 SaleRepresentativeLastname=Cognoms de l'agent comercial
+ErrorThirdpartiesMerge=Hi ha un error esborrant els tercers. Revisa el log. Els canvis no s'han desat.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index b724a32d261..77f36786f90 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Impost varis
 SocialContributions=Impostos varis
 SocialContributionsDeductibles=Impostos varis deduïbles
 SocialContributionsNondeductibles=Impostos varis no deduïbles
+LabelContrib=Etiqueta de aportació
+TypeContrib=Tipus d'aportació
 MenuSpecialExpenses=Pagaments especials
 MenuTaxAndDividends=Impostos i càrregues
 MenuSocialContributions=Impostos varis
@@ -95,15 +97,15 @@ SalesTurnoverMinimum=Volum de vendes mínim
 ByExpenseIncome=Per despeses & ingressos
 ByThirdParties=Per tercer
 ByUserAuthorOfInvoice=Per autor de la factura
-CheckReceipt=Llista de remeses
-CheckReceiptShort=Remeses
-LastCheckReceiptShort=Últimes %s remeses
-NewCheckReceipt=Nova remesa
+CheckReceipt=Ingrés de xec
+CheckReceiptShort=Ingrés de xec
+LastCheckReceiptShort=Últimes %s remeses de xec
+NewCheckReceipt=Nou descompte
 NewCheckDeposit=Nou ingrés
-NewCheckDepositOn=Crear nova remesa al compte: %s
+NewCheckDepositOn=Crea remesa per ingressar al compte: %s
 NoWaitingChecks=Sense xecs en espera de l'ingrés.
 DateChequeReceived=Data recepció del xec
-NbOfCheques=N º de xecs
+NbOfCheques=Nº de xecs
 PaySocialContribution=Pagar un impost varis
 ConfirmPaySocialContribution=Esteu segur de voler classificar aquest impost varis com a pagat?
 DeleteSocialContribution=Elimina un pagament d'impost varis
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 56ff41e9c3b..ea70b86a3d2 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Elimina la tasca programada
 Permission23104 = Executa les tasques programades
 # Admin
 CronSetup= Pàgina de configuració del mòdul - Gestió de tasques planificades
-URLToLaunchCronJobs=URL per llançar les tasques automàtiques
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=O per llançar una tasca específica
 KeyForCronAccess=Codi de seguretat per a la URL de llançament de tasques automàtiques
 FileToLaunchCronJobs=Ordre per llançar les tasques automàtiques
@@ -23,7 +23,7 @@ CronCommand=Comando
 CronList=Tasques programades
 CronDelete=Elimina les tasques programades
 CronConfirmDelete=Esteu segur de voler eliminar aquesta tasca programada?
-CronExecute=Llançar tasques programades
+CronExecute=Llança la tasca programada
 CronConfirmExecute=Esteu segur de voler executar ara aquesta tasca programada?
 CronInfo=Tasques programades li permet executar tasques que han sigut programades
 CronTask=Tasca
@@ -39,7 +39,7 @@ CronMethod=Mètod
 CronModule=Mòdul
 CronNoJobs=Sense treballs actualment
 CronPriority=Prioritat
-CronLabel=Descripció
+CronLabel=Etiqueta
 CronNbRun=Nº execucions
 CronMaxRun=Nº màx. d'exec.
 CronEach=Tota (s)
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Ves a menú "Inici - Utilitats de sistema - Tasq
 JobDisabled=Tasca desactivada
 MakeLocalDatabaseDumpShort=Còpia de seguretat de la base de dades local
 MakeLocalDatabaseDump=Crea un bolcat de base de dades local
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 9b5720605ed..4ced1718aaf 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -97,7 +97,7 @@ ErrorFailedToLoadRSSFile=Error en la recuperació del flux RSS. Afegiu la consta
 ErrorForbidden=Accés denegat. <br> Intentes accedir a una pàgina, àrea o funcionalitat d'un mòdul amb desactivat o sense estar en una sessió autenticada o que no se li permet al seu usuari.
 ErrorForbidden2=Els permisos per a aquest usuari poden ser assignats per l'administrador Dolibarr mitjançant el menú  %s-> %s.
 ErrorForbidden3=Dolibarr no sembla funcionar en una sessió autentificada. Consulteu la documentació d'instal lació de Dolibarr per saber com administrar les autenticacions (htacces, mod_auth o altre ...).
-ErrorNoImagickReadimage=La classe imagick_readimage no està present en aquesta instal lació de PHP. La ressenya no està doncs disponible. Els administradors poden desactivar aquesta pestanya en el menú Configuració->Visualització.
+ErrorNoImagickReadimage=No s'ha trobat la classe Imagick en aquesta instal lació PHP. La previsualització no està disponible. Els administradors poden deshabilitar aquesta pestanya en el menú Configuració - Entorn.
 ErrorRecordAlreadyExists=Registre ja existent
 ErrorCantReadFile=Error de lectura del fitxer '%s'
 ErrorCantReadDir=Error de lectura de la carpeta '%s'
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, el seu PHP ha de tenir instal·lat el mòdul <b>%s</b>
 ErrorOpenIDSetupNotComplete=Ha configurat Dolibarr per acceptar l'autentificació OpenID, però la URL del servei OpenID no es troba definida a la constant %s
 ErrorWarehouseMustDiffers=El magatzem d'origen i destí han de ser diferents
 ErrorBadFormat=El format és incorrecte!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, aquest soci encara no s'ha enllaçat a un tercer. Enllaci el soci a un tercer existent o creï un tercer nou abans de crear la quota amb la factura.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, hi ha entrades vinculades a aquest enviament. No es pot eliminar
 ErrorCantDeletePaymentReconciliated=No es pot eliminar un pagament que ha generat una transacció bancaria que es troba conciliada
 ErrorCantDeletePaymentSharedWithPayedInvoice=No es pot eliminar un pagament de vàries factures amb alguna factura amb l'estat Pagada
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=No hi ha suficient estoc del producte %
 ErrorStockIsNotEnoughToAddProductOnInvoice=No hi ha suficient estoc del producte %s per afegir-ho en una nova factura.
 ErrorStockIsNotEnoughToAddProductOnShipment=No hi ha suficient estoc del producte %s per afegir-ho en una nova entrega.
 ErrorStockIsNotEnoughToAddProductOnProposal=No hi ha suficient estoc del producte %s per afegir-ho en un nou pressupost
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=S'ha indicat una contrasenya per aquest soci. En canvi, no s'ha creat cap compte d'usuari, de manera que aquesta contrasenya s'ha desat però no pot ser utilitzada per entrar a Dolibarr. Es pot utilitzar per un mòdul/interfície extern, però si no cal definir cap usuari i contrasenya per un soci, pots deshabilitar la opció "Gestiona l'entrada per tots els socis" des de la configuració del mòdul Socis. Si necessites gestionar una entrada sense contrasenya, pots mantenir aquest camp buit i permetre aquest avís. Nota: El correu electrònic es pot utilitzar per entrar si el soci està enllaçat a un usuarí
@@ -189,7 +191,7 @@ WarningUntilDirRemoved=Aquesta alerta seguirà activa mentre la carpeta existeix
 WarningCloseAlways=Avís, el tancament és realitzat encara que la quantitat total difereixi entre els elements d'origen i destí. Activi aquesta funcionalitat amb precaució.
 WarningUsingThisBoxSlowDown=Atenció, l'ús d'aquest panell provoca serioses alentiments en les pàgines que mostren aquest panell.
 WarningClickToDialUserSetupNotComplete=La configuració de ClickToDial per al compte d'usuari no està completa (vegeu la pestanya ClickToDial en la seva fitxa d'usuari)
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat desactivada quant la configuració de visualització és optimitzada per a persones cegues o navegadors de text.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funcionalitat deshabilitada quan la configuració de l'entorn està optimitzada per a persones cegues o navegadors de text.
 WarningPaymentDateLowerThanInvoiceDate=La data de pagament (%s) és anterior a la data (%s) de la factura %s.
 WarningTooManyDataPleaseUseMoreFilters=Massa dades (més de %s línies). Utilitza més filtres o indica la constant %s amb un límit superior.
 WarningSomeLinesWithNullHourlyRate=Algunes vegades es van registrar per alguns usuaris quan no s'havia definit el seu preu per hora. Es va utilitzar un valor de 0 %s per hora, però això pot resultar una valoració incorrecta del temps dedicat.
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index b7939f4950e..cc1ba847ed6 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -33,7 +33,7 @@ TitreRequestCP=Fitxa de dies lliures
 NbUseDaysCP=Nombre de dies lliures consumits
 EditCP=Modificar
 DeleteCP=Eliminar
-ActionRefuseCP=Rebutjar
+ActionRefuseCP=Rebutja
 ActionCancelCP=Cancel·la
 StatutCP=Estat
 TitleDeleteCP=Eliminar la petició de dies lliures
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index f3a9a31a716..869e7a13205 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Aquest PHP suporta sessions
 PHPSupportPOSTGETOk=Aquest PHP suporta bé les variables POST i GET.
 PHPSupportPOSTGETKo=És possible que aquest PHP no suport les variables POST i/o GET. Comproveu el paràmetre <b>variables_order</b> del php.ini.
 PHPSupportGD=Aquest PHP suporta les funcions gràfiques GD.
+PHPSupportCurl=Aquest PHP suporta Curl.
 PHPSupportUTF8=Aquest PHP suporta les funcions UTFB.
 PHPMemoryOK=La seva memòria màxima de sessió PHP està definida a <b>%s</b>. Això hauria de ser suficient.
 PHPMemoryTooLow=La seva memòria màxima de sessió PHP està definida a <b>%s</b> bytes. Això és molt poc. Es recomana modificar el paràmetre <b>memory_limit</b> del seu arxiu <b> php.ini</b> a almenys <b>%s</b> octets.
 Recheck=Faci clic aquí per realitzar un test més exhaustiu
 ErrorPHPDoesNotSupportSessions=La seva instal·lació de PHP no suporta les sessions. Aquesta funcionalitat és necessària per fer funcionar a Dolibarr. Comprovi la seva configuració de PHP.
 ErrorPHPDoesNotSupportGD=Aquest PHP no suporta les funcions gràfiques GD. Cap gràfic estarà disponible.
+ErrorPHPDoesNotSupportCurl=La teva instal·lació PHP no soporta Curl.
 ErrorPHPDoesNotSupportUTF8=Aquest PHP no suporta les funcions UTF8. Resolgui el problema abans d'instal lar Dolibarr ja que no funcionarà correctamete.
 ErrorDirDoesNotExists=La carpeta <b>%s</b> no existeix o no és accessible.
 ErrorGoBackAndCorrectParameters=Torneu enrere i corregeix els paràmetres invàlids...
@@ -133,6 +135,10 @@ ActivateModule=Activació del mòdul %s
 ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
 WarningUpgrade=Atenció:\nHeu fet primer una còpia de la base de dades ?\nAixò és altament recomanat: per exemple, per alguns errors en sistemes de bases de dades (per exemple les versions mysql  5.5.40/41/42/43), on algunes dades o taules poden perdre's durant aquest procés, així que és recomanable tenir una còpia completa de la teva base de dades abans de començar la migració.\n\nFeu clic a OK per començar el procés de migració...
 ErrorDatabaseVersionForbiddenForMigration=La versió de la seva base de dades és %s. Aquesta te un error crític i es poden perdre dades si es fa un canvi a l'estructura de la base de dades i per fer l'actualització necessita fer aquests canvis. Per aquesta raó, la migració no es permetrà fins que s'actualitzi la seva base de dades a una versió estable i/o superior (llista de versions afectades: %s)
+KeepDefaultValuesWamp=Estàs utilitzant l'assistent d'instal·lació de DoliWamp amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent.
+KeepDefaultValuesDeb=Estàs utilitzant l'assistent d'instal·lació Dolibarr d'un paquet Linux (Ubuntu, Debian, Fedora...) amb els valors proposats més òptims. Només cal completar la contrasenya del propietari de la base de dades a crear. Canvia els altres paràmetres només si estàs segur del que estàs fent.
+KeepDefaultValuesMamp=Estàs utilitzant l'assistent d'instal·lació de DoliMamp amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent.
+KeepDefaultValuesProxmox=Estàs utilitzant l'assistent d'instal·lació de Dolibarr des d'una màquina virtual Proxmox amb els valors proposats més òptims. Canvia'ls només si estàs segur del que estàs fent.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Actualització de les dades de accions sobre elements
 MigrationPaymentMode=Actualització de les formes de pagament
 MigrationCategorieAssociation=Actualització de les categories
 MigrationEvents=Migració d'esdeveniments per afegir propietari a la taula d'asignació
+MigrationRemiseEntity=Actualitza el valor del camp entity de llx_societe_remise
+MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_remise_except
 MigrationReloadModule=Recarrega el mòdul %s
 ShowNotAvailableOptions=Mostra opcions no disponibles
 HideNotAvailableOptions=Amaga opcions no disponibles
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index 1fa2e513868..674a1055e3e 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Contacte client seguiment intervenció
 # Modele numérotation
 PrintProductsOnFichinter=Imprimeix també les línies de tipus "producte" (no només serveis) en les fitxes d'intervencions.
 PrintProductsOnFichinterDetails=Intervencions generades des de comandes
+UseServicesDurationOnFichinter=Utilitza la durada dels serveis en les intervencions generades des de comandes
 InterventionStatistics=Estadístiques de intervencions
 NbOfinterventions=Nº de fitxes de intervenció
 NumberOfInterventionsByMonth=Nº de fitxes de intervenció per mes (data de validació)
diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
index bb53c59cc75..0154b1d9e4e 100644
--- a/htdocs/langs/ca_ES/ldap.lang
+++ b/htdocs/langs/ca_ES/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Data primera adhesió
 LDAPFieldFirstSubscriptionAmount=Import primera adhesió
 LDAPFieldLastSubscriptionDate=Última data de subscripció
 LDAPFieldLastSubscriptionAmount=Últim import de subscripció
+LDAPFieldSkype=Id Skype
+LDAPFieldSkypeExample=Exemple : NomSkype
 UserSynchronized=Usuari sincronitzat
 GroupSynchronized=Grup sincronizado
 MemberSynchronized=Soci sincronitzat
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 9a281664623..cd0330ad3cf 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Llegit
 YourMailUnsubcribeOK=El correu electrònic <b>%s</b>  és correcta desuscribe.
 ActivateCheckReadKey=Clau utilitzada per encriptar la URL utilitzada per les característiques de "Lector" i "Desubscriu" 
 EMailSentToNRecipients=E-Mail enviat a %s destinataris.
+EMailSentForNElements=E-Mail enviat per %s elements.
 XTargetsAdded=<b>%s</b> destinataris agregats a la llista
-OnlyPDFattachmentSupported=Si el document PDF ja s'ha generat per la factura, s'adjuntarà al correu electrònic. Si no, no s'enviarà cap email (tingues en compte que en aquesta versió només es suporta com adjunts les factures PDF en enviaments massius).
+OnlyPDFattachmentSupported=Si el document PDF també s'ha generat per l'objecte a enviar, aquest afegirà adjunt a l'email. Si no, no s'enviarà cap email (tingues en compte també que només els documents PDF estan soportats com adjunt en enviaments massius en aquesta versió).
 AllRecipientSelected=Tots els tercers seleccionats si hi ha un e-mail definit
 ResultOfMailSending=Resultat de l'enviament massiu d'e-mails
 NbSelected=Nº seleccionats
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Valor màxim
 AdvTgtSearchDtHelp=Utilitza un interval per seleccionar el valor de la data
 AdvTgtStartDt=Dt. inici
 AdvTgtEndDt=Dt. final
-AdvTgtTypeOfIncudeHelp=Correu electrònic de destí del tercer i correu electrònic del contacte del tercer, o només el correu electrònic del tercer o només el correu electrònic del contacte
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Tipus de e-mail marcat
 AdvTgtContactHelp=Utilitza només si marques el contacte en "Tipus de e-mails marcats"
 AddAll=Afegeix tot
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 3c99aa3b7a3..fba6b68b283 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -67,6 +67,7 @@ SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
 SeeHere=Mira aquí
 BackgroundColorByDefault=Color de fons
+FileRenamed=The file was successfully renamed
 FileUploaded=L'arxiu s'ha carregat correctament
 FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no ha estat pujat. Feu clic a "Adjuntar aquest arxiu" per a això.
 NbOfEntries=Nº d'entrades
@@ -245,6 +246,10 @@ DateBuild=Data generació de l'informe
 DatePayment=Data pagament
 DateApprove=Data d'aprovació
 DateApprove2=Data d'aprovació (segona aprobació)
+UserCreation=Usuari de creació
+UserModification=Usuari de modificació
+UserCreationShort=Usuari crea.
+UserModificationShort=Usuari modif.
 DurationYear=any
 DurationMonth=mes
 DurationWeek=setmana
@@ -256,6 +261,7 @@ DurationDays=dies
 Year=Any
 Month=Mes
 Week=Setmana
+WeekShort=Setmana
 Day=Dia
 Hour=Hora
 Minute=Minut
@@ -278,6 +284,7 @@ MonthOfDay=Mes del dia
 HourShort=H
 MinuteShort=Minut
 Rate=Tipus
+CurrencyRate=Tarifa de conversió de moneda
 UseLocalTax=Incloure taxes
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -556,7 +563,7 @@ MailSentBy=Mail enviat per
 TextUsedInTheMessageBody=Text utilitzat en el cos del missatge
 SendAcknowledgementByMail=Envia el correu electrònic de confirmació
 EMail=Correu electrònic
-NoEMail=Sense e-mail
+NoEMail=Sense correu electrònic
 NoMobilePhone=Sense mòbil
 Owner=Propietari
 FollowingConstantsWillBeSubstituted=Les següents constants seran substituïdes pel seu valor corresponent.
@@ -565,8 +572,11 @@ BackToList=Tornar al llistat
 GoBack=Tornar enrera
 CanBeModifiedIfOk=Pot modificar-se si és vàlid
 CanBeModifiedIfKo=Pot modificar-se si no és vàlid
+ValueIsValid=Valor vàlid
+ValueIsNotValid=Valor invàlid
 RecordModifiedSuccessfully=Registre modificat amb èxit
 RecordsModified=%s registres modificats
+RecordsDeleted=%s registres eliminats
 AutomaticCode=Creació automàtica de codi
 FeatureDisabled=Funció desactivada
 MoveBox=Mou el panell
@@ -575,6 +585,7 @@ NotEnoughPermissions=No té autorització per aquesta acció
 SessionName=Nom sesió
 Method=Mètode
 Receive=Recepció
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Mai rebut
@@ -598,6 +609,7 @@ DisabledModules=Mòduls desactivats
 For=Per a
 ForCustomer=Per a client
 Signature=Signatura
+DateOfSignature=Data de signatura
 HidePassword=Mostra comanda amb contrasenya oculta
 UnHidePassword=Mostra comanda amb contrasenya a la vista
 Root=Arrel
@@ -641,6 +653,15 @@ NewAttribute=Nou atribut
 AttributeCode=Codi atribut
 URLPhoto=Url de la foto/logo
 SetLinkToAnotherThirdParty=Enllaça amb un altre tercer
+LinkTo=Enllaça a
+LinkToProposal=Enllaça a pressupost
+LinkToOrder=Enllaça a comanda
+LinkToInvoice=Enllaça a factura
+LinkToSupplierOrder=Enllaça a comanda de proveïdor
+LinkToSupplierProposal=Enllaça a pressupost de proveïdor
+LinkToSupplierInvoice=Enllaça a factura de proveïdor
+LinkToContract=Enllaça a contracte
+LinkToIntervention=Enllaça a intervenció
 CreateDraft=Crea esborrany
 SetToDraft=Tornar a redactar
 ClickToEdit=Clic per a editar
@@ -680,7 +701,7 @@ AddBox=Afegir quadre
 SelectElementAndClickRefresh=Seleccioneu un element i feu clic a Actualitza
 PrintFile=%s arxius a imprimir
 ShowTransaction=Mostra la transacció en el compte bancari
-GoIntoSetupToChangeLogo=Anar a Inici->Configuració->Empresa per canviar el logotip o anar a Inici->Configuració->Visualització per amagar.
+GoIntoSetupToChangeLogo=Ves a Inici - Configuració - Empresa per canviar el logo o ves a Inici - Configuració - Entorn per ocultar-lo.
 Deny=Denegar
 Denied=Denegad
 ListOfTemplates=Llistat de plantilles
@@ -701,6 +722,9 @@ RelatedObjects=Objectes relacionats
 ClassifyBilled=Classificar facturat
 Progress=Progrés
 ClickHere=Fes clic aquí
+FrontOffice=Front office
+BackOffice=Back office
+View=Veure
 # Week day
 Monday=Dilluns
 Tuesday=Dimarts
@@ -716,7 +740,7 @@ ThursdayMin=Dj
 FridayMin=Dv
 SaturdayMin=Ds
 SundayMin=Dg
-Day1=Dillus
+Day1=Dilluns
 Day2=Dimarts
 Day3=Dimecres
 Day4=Dijous
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index a84dcec2ede..f7e6e5e0771 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=El marge ha de ser un valor numèric
 markRateShouldBeLesserThan100=El marge té que ser menor que 100
 ShowMarginInfos=Mostrar info de marges
 CheckMargins=Detall de marges
+MarginPerSaleRepresentativeWarning=L'informe de marges per usuari utilitza l'enllaç entre tercers i agents comercials per calcular el marge de cada usuari. Degut a que alguns tercers no es poden enllaçar a cap agent comercial i que alguns tercers poden estar enllaçats amb varis agents comercials, alguns marges poden no aparèixer o aparèixer en vàries línies diferents.
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 8000f3fc3b5..f4e278b8e6a 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -54,7 +54,7 @@ MemberStatusResiliatedShort=De baixa
 MembersStatusToValid=Socis esborrany
 MembersStatusResiliated=Socis donats de baixa
 NewCotisation=Nova aportació
-PaymentSubscription=Pagament de quotes
+PaymentSubscription=Nou pagament de quota
 SubscriptionEndDate=Data final d'afiliació
 MembersTypeSetup=Configuració dels tipus de socis
 NewSubscription=Nova afiliació
@@ -68,7 +68,7 @@ SendCardByMail=Envia fitxa per e-mail
 AddMember=Crea soci
 NoTypeDefinedGoToSetup=No s'ha definit cap tipus de soci. Ves al menú "Tipus de socis"
 NewMemberType=Nou tipus de soci
-WelcomeEMail=E-mail
+WelcomeEMail=Correu electrònic de benvinguda
 SubscriptionRequired=Subjecte a cotització
 DeleteType=Eliminar
 VoteAllowed=Vot autoritzat
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index 1e2e5131bfc..f108c0f2a23 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -1,15 +1,26 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configuració Oauth
+OAuthServices=Serveis de OAuth
+ManualTokenGeneration=Generació manual de tokens
 NoAccessToken=No es pot accedir al token desat en la base de dades local
 HasAccessToken=S'ha generat un token i s'ha desat en la base de dades local
 NewTokenStored=Token rebut i desat
-ToCheckDeleteTokenOnProvider=Per comprobar/eliminar l'autorització desada pel proveïdor OAuth %s
+ToCheckDeleteTokenOnProvider=Comprova/elimina l'autorització desada pel proveïdor OAuth %s
 TokenDeleted=Token eliminat
 RequestAccess=Clica aquí per demanar/renovar l'accés i rebre un nou token per desar
 DeleteAccess=Faci clic aquí per eliminar token
 UseTheFollowingUrlAsRedirectURI=Utilitza la següent URL com a URI de redirecció quan es crea la teva credencial en el teu proveïdor OAuth:
 ListOfSupportedOauthProviders=Entra les credencials donades pel teu proveïdor OAuth2. Només es poden veure proveïdors que suporten OAuth2. Aquesta configuració es pot utilitzar per altres mòduls que necessiten autenticació OAuth2.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Ves a <a href="https://console.developers.google.com/" target="_blank">aquesta pàgina</a>, i després a Credentials per crear les credencials Oauth
+TOKEN_ACCESS=
+TOKEN_REFRESH=Refresc present de token
+TOKEN_EXPIRED=Token expirat
+TOKEN_EXPIRE_AT=El token expira el
+TOKEN_DELETE=Elimina el token desat
+OAUTH_GOOGLE_NAME=Servei OAuth de Google
+OAUTH_GOOGLE_ID=Id OAuth de Google
+OAUTH_GOOGLE_SECRET=Secret OAuth de Google
+OAUTH_GOOGLE_DESC=Ves a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">aquesta pàgina</a>, i després a "Credentials" per crear les credencials OAuth
+OAUTH_GITHUB_NAME=Servei OAuth de GitHub
+OAUTH_GITHUB_ID=Id OAuth de GitHub
+OAUTH_GITHUB_SECRET=Secret OAuth de GitHub
+OAUTH_GITHUB_DESC=Ves a<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">aquesta pàgina</a>, i després a "Registra una nova aplicació" per crear les credencials OAuth
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index f9b1d028550..9f5db1e40e8 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -58,7 +58,7 @@ MenuOrdersToBill=Comandes a facturar
 MenuOrdersToBill2=Comandes facturables
 ShipProduct=Enviar producte
 CreateOrder=Crear comanda
-RefuseOrder=Rebutjar la comanda
+RefuseOrder=Rebutja la comanda
 ApproveOrder=Aprobar comanda
 Approve2Order=Aprovar comanda (segon nivell)
 ValidateOrder=Validar la comanda
@@ -145,7 +145,7 @@ PDFProformaDescription=Una factura proforma completa (logo...)
 # Orders modes
 OrderByMail=Correu
 OrderByFax=Fax
-OrderByEMail=E-Mail
+OrderByEMail=Correu electrònic
 OrderByWWW=En línia
 OrderByPhone=Telèfon
 CreateInvoiceForThisCustomer=Facturar comandes
@@ -157,3 +157,4 @@ OrderCreated=Les seves comandes han estat creats
 OrderFail=S'ha produït un error durant la creació de les seves comandes
 CreateOrders=Crear comandes
 ToBillSeveralOrderSelectCustomer=Per crear una factura per nombroses comandes, faci primer clic sobre el client i després esculli "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index 45bcba3b469..94d8bc3a513 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -17,7 +17,7 @@ Notify_ORDER_SENTBYMAIL=Enviament comanda de client per e-mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Enviament comanda a proveïdor per e-mail
 Notify_ORDER_SUPPLIER_VALIDATE=Comanda a proveïdor registrada
 Notify_ORDER_SUPPLIER_APPROVE=Aprovació comanda a proveïdor
-Notify_ORDER_SUPPLIER_REFUSE=Rebuig comanda a proveïdor
+Notify_ORDER_SUPPLIER_REFUSE=Comanda a proveïdor rebutjada
 Notify_PROPAL_VALIDATE=Validació pressupost client
 Notify_PROPAL_CLOSE_SIGNED=Pressupost tancat com a firmat
 Notify_PROPAL_CLOSE_REFUSED=Pressupost tancat com a rebutjat
@@ -168,8 +168,8 @@ EMailTextOrderValidated=La comanda %s que el concerneix ha estat validada.
 EMailTextOrderApproved=Comanda %s aprovada
 EMailTextOrderValidatedBy=La comanda %s ha sigut registrada per %s.
 EMailTextOrderApprovedBy=Comanda %s aprovada per %s
-EMailTextOrderRefused=Comanda %s rebutjada
-EMailTextOrderRefusedBy=Comanda %s rebutjada per %s
+EMailTextOrderRefused=La comanda %s s'ha rebutjat
+EMailTextOrderRefusedBy=La comanda %s s'ha rebutjat per %s
 EMailTextExpeditionValidated=L'enviament %s ha estat validat.
 ImportedWithSet=Lot d'importació (import key)
 DolibarrNotification=Notificació automàtica
diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
index eae624cd552..c79efc65394 100644
--- a/htdocs/langs/ca_ES/printing.lang
+++ b/htdocs/langs/ca_ES/printing.lang
@@ -18,10 +18,6 @@ UserConf=Configuració per usuari
 PRINTGCP_INFO=Configuració de l'API Google OAuth
 PRINTGCP_AUTHLINK=Autenticació
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Refresc present de token
-PRINTGCP_TOKEN_EXPIRED=Token expirat
-PRINTGCP_TOKEN_EXPIRE_AT=El token expira el
-PRINTGCP_DELETE_TOKEN=Elimina el token desat
 PrintGCPDesc=Aquest driver li permet enviar documents directament a una impressora amb Google Cloud Print
 GCP_Name=Nom
 GCP_displayName=Nom a mostrar
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 7fc79533e20..e4ed2925b30 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serie
 atleast1batchfield=Data de caducitat o Data de venda o Lot/Numero de Serie
 batch_number=Número de Lot/Serie
 BatchNumberShort=Lot/Serie
-l_eatby=Data de caducitat
-l_sellby=Data límit de venda
+EatByDate=Data de caducitat
+SellByDate=Data límit de venda
 DetailBatchNumber=Detalls del lot/serie
 DetailBatchFormat=Lot/Serie: %s - Caducitat: %s - Límit de venda: %s (Estoc: %d)
 printBatch=Lot/Serie %s
@@ -19,3 +19,6 @@ printQty=Quant.: %d
 AddDispatchBatchLine=Afegir una línia per despatx per caducitat
 WhenProductBatchModuleOnOptionAreForced=Si el mòdul de Lot/Serie està activat, l'increment/disminució d'estoc està forçat a l'elecció anterior i no pot editar-se. Les altres opcions poden definir-se si cal.
 ProductDoesNotUseBatchSerial=Aquest producte no utilitza lot/número de sèrie
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Mostra l'estoc actual de la parella producte/lot
+ShowLogOfMovementIfLot=Mostra el registre de moviments de la parella producte/lot
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index 0130acf7baa..7f26aa75f0a 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Canvi d'IVA massiu
 ProductVatMassChangeDesc=Pot utilitzar aquesta pàgina per modificar la tassa d'IVA definida en els productes o serveis d'un valor a un altre. Atenció, ja aquest canvi es realitzara en tota la base de dades.
 MassBarcodeInit=Inicialització massiu de codis de barres
 MassBarcodeInitDesc=Pot utilitzar aquesta pàgina per inicialitzar el codi de barres en els objectes que no tenen un codi de barres definit. Comprovi abans que el mòdul de codis de barres estar ben configurat
-ProductAccountancyBuyCode=Codi comptable (compres)
-ProductAccountancySellCode=Codi comptable (vendes)
+ProductAccountancyBuyCode=Codi comptable (compra)
+ProductAccountancySellCode=Codi comptable (venda)
 ProductOrService=Producte o servei
 ProductsAndServices=Productes i serveis
 ProductsOrServices=Productes o serveis
@@ -59,6 +59,8 @@ SellingPriceHT=PVP sense IVA
 SellingPriceTTC=PVP amb IVA
 CostPriceDescription=Aquest preu (net d'impostos) es pot utilitzar per acumular l'import mitjà del cost del producte per l'empresa. Pot ser qualsevol preu calculat per tu mateix, per exemple amb el preu mitjà de compra més el cost mitjà de producció i distribució.
 CostPriceUsage=En una versió futura, aquest valor es podrà utilitzar pel càlcul de marges.
+SoldAmount=Import venut
+PurchasedAmount=Import comprat
 NewPrice=Nou preu
 MinPrice=Preu de venda mín.
 CantBeLessThanMinPrice=El preu de venda no ha de ser inferior al mínim per a aquest producte (%s sense IVA). Aquest missatge pot estar causat per un descompte molt gran.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Imprimir varies etiquetes per codi de barres
 BuildPageToPrint=Generar pàgines a imprimir
 FillBarCodeTypeAndValueManually=Emplenar tipus i valor del codi de barres manualment
 FillBarCodeTypeAndValueFromProduct=Emplenar tipus i valor del codi de barres d'un producte
-FillBarCodeTypeAndValueFromThirdParty=Emplenar tipus i valor del codi de barres d'un tercer
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definir el tipus o valor de codi de barres incomplet del producte %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definir el tipus o valor de codi de barres incomplet del tercer %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Informació del codi de barres del producte %s:
-BarCodeDataForThirdparty=informació del codi de barres del tercer %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definir codis de barres per tots els registres (pica els valors de codis de barres ja registrats)
 PriceByCustomer=Preus diferents per cada client
 PriceCatalogue=Un preu de venda simple per producte/servei
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index c9421286b4c..cb0b15ee446 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -41,13 +41,13 @@ TimeSpentByYou=Temps dedicat per vostè
 TimeSpentByUser=Temps dedicat per usuari
 TimesSpent=Temps dedicat
 RefTask=Ref. tasca
-LabelTask=Etiqueta tasca
+LabelTask=Etiqueta de la tasca
 TaskTimeSpent=Temps dedicat a les tasques
 TaskTimeUser=Usuari
 TaskTimeNote=Nota
 TaskTimeDate=Data
 TasksOnOpenedProject=Tasques en projectes oberts
-WorkloadNotDefined=Carga de treball no definida
+WorkloadNotDefined=Càrrega de treball no definida
 NewTimeSpent=Nou temps dedicat
 MyTimeSpent=El meu temps dedicat
 Tasks=Tasques
@@ -70,11 +70,11 @@ ListOfTasks=Llistat de tasques
 GoToListOfTimeConsumed=Ves al llistat de temps consumit
 GoToListOfTasks=Ves al llistat de tasques
 ListProposalsAssociatedProject=Llistat de pressupostos associats al projecte
-ListOrdersAssociatedProject=Llistat de comandes associades al projecte
-ListInvoicesAssociatedProject=Llistat de factures associades al projecte
-ListPredefinedInvoicesAssociatedProject=Llistat de plantilles de factures de client associades al projecte
-ListSupplierOrdersAssociatedProject=Llistat de comandes a proveïdors associades al projecte
-ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associades al projecte
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Llistatde contractes associats al projecte
 ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
 ListExpenseReportsAssociatedProject=Llistat d'informes de despeses associades al projecte
@@ -89,7 +89,7 @@ ActivityOnProjectThisYear=Activitat en el projecte aquest any
 ChildOfTask=Fil de la tasca
 NotOwnerOfProject=No és responsable d'aquest projecte privat
 AffectedTo=Assignat a
-CantRemoveProject=Aquest projecte no pot ser eliminat perquè està referenciat per molts objectes (factures, comandes o altres). veure la llista a la pestanya Referències.
+CantRemoveProject=No es pot eliminar aquest projecte perquè està enllaçat amb altres objectes (factures, comandes o altres). Consulta la pestanya Referències.
 ValidateProject=Validar projecte
 ConfirmValidateProject=Esteu segur de voler validar aquest projecte?
 CloseAProject=Tancar projecte
@@ -102,7 +102,7 @@ YouAreNotContactOfProject=Vostè no és contacte d'aquest projecte privat
 DeleteATimeSpent=Elimina el temps dedicat
 ConfirmDeleteATimeSpent=Esteu segur de voler eliminar aquest temps dedicat?
 DoNotShowMyTasksOnly=Veure també tasques no assignades a mi
-ShowMyTasksOnly=Veure nomes tasques assignades a mi
+ShowMyTasksOnly=Veure només les tasques que tinc assignades
 TaskRessourceLinks=Recursos
 ProjectsDedicatedToThisThirdParty=Projectes dedicats a aquest tercer
 NoTasks=Cap tasca per a aquest projecte
@@ -123,6 +123,7 @@ ProjectReportDate=Canviar les dates de les tasques en funció de la data d'inici
 ErrorShiftTaskDate=S'ha produït un error en el canvi de les dates de les tasques
 ProjectsAndTasksLines=Projectes i tasques
 ProjectCreatedInDolibarr=Projecte %s creat
+ProjectModifiedInDolibarr=Projecte %s modificat
 TaskCreatedInDolibarr=La tasca %s a sigut creada
 TaskModifiedInDolibarr=La tasca %s a sigut modificada
 TaskDeletedInDolibarr=La tasca %s a sigut eliminada
@@ -150,10 +151,10 @@ AddElement=Vincular a element
 DocumentModelBeluga=Plantilla de projecte per resum d'objectes vinculats
 DocumentModelBaleine=Plantilla d'informe de projectes per tasques
 PlannedWorkload=Càrrega de treball prevista
-PlannedWorkloadShort=Carrega de treball
+PlannedWorkloadShort=Càrrega de treball
 ProjectReferers=Registres relacionats
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
-FirstAddRessourceToAllocateTime=Associa un recurs per reservar temps
+FirstAddRessourceToAllocateTime=Associa un recurs d'usuari per reservar el temps de la tasca
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
 InputPerAction=Entrada per acció
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Projectes oberts per estats d'oportunitat
 ProjectsStatistics=Estadístiques en projectes/leads
 TaskAssignedToEnterTime=Tasca assignada. És possible entrar els temps en aquesta tasca.
 IdTaskTime=Id de temps de tasca
-YouCanCompleteRef=Si vols completar la referència amb més informació (per utilitzar-la als filtres de cerca), es recomanda afegir el caràcter - per separar-ho, així la numeració automàtica funcionarà correctament pels propers projectes. Per exemple %s-ABC. També pots preferir afegir claus de cerca en l'etiqueta.
+YouCanCompleteRef=Si vols completar la referència amb més informació (per utilitzar-la als filtres de cerca), es recomana afegir el caràcter - per separar-ho, així la numeració automàtica funcionarà correctament pels propers projectes. Per exemple %s-ABC. També pots preferir afegir claus de cerca en l'etiqueta. Però la millor pràctica pot ser afegir un camp dedicat, també anomenat Atributs complementaris.
 OpenedProjectsByThirdparties=Projectes oberts per tercers
 OnlyOpportunitiesShort=Només oportunitats
 OpenedOpportunitiesShort=Oportunitats obertes
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index a0c4eb15926..4602fe24e12 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nou pagament de sous
 SalaryPayment=Pagament de sous
 SalariesPayments=Pagaments de sous
 ShowSalaryPayment=Veure pagament de sous
-THM=Preu mig per hora
-TJM=Preu mig per dia
+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)
 TJMDescription=Aquest valor només és informatiu i no s'utilitza en cap càlcul
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 0b829a1c205..653de72d93b 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Elimina l'enviament
 Stock=Estoc
 Stocks=Estocs
 StocksByLotSerial=Estocs per lot/sèrie
+LotSerial=Lots/Sèries
+LotSerialList=Llista de lots/sèries
 Movements=Moviments
 ErrorWarehouseRefRequired=El nom de referència del magatzem és obligatori
 ListOfWarehouses=Llistat de magatzems
@@ -43,6 +45,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor d'estocs
 UserWarehouseAutoCreate=Crea automàticament existències/magatzem propi de l'usuari en la creació de l'usuari
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Estoc del producte i estoc del subproducte són independents
 QtyDispatched=Quantitat desglossada
 QtyDispatchedShort=Quant. rebuda
@@ -132,3 +135,9 @@ OpenAll=Actiu per a totes les accions
 OpenInternal=Actiu per accions internes
 OpenShipping=Actiu per enviaments
 OpenDispatch=Obert per l'enviament
+UseDispatchStatus=Utilitza l'estat d'enviament (aprovat/rebutjat)
+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
diff --git a/htdocs/langs/ca_ES/supplier_proposal.lang b/htdocs/langs/ca_ES/supplier_proposal.lang
index f0c3389013e..7ed239797bb 100644
--- a/htdocs/langs/ca_ES/supplier_proposal.lang
+++ b/htdocs/langs/ca_ES/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Model de creació per defecte
 DefaultModelSupplierProposalToBill=Model per defecte en tancar una petició de preu (acceptada)
 DefaultModelSupplierProposalClosed=Model per defecte en tancar una petició de preu (rebutjada)
 ListOfSupplierProposal=Llistat de peticions de preu a proveïdor
+ListSupplierProposalsAssociatedProject=Llista de pressupostos de proveïdor associats al projecte
 SupplierProposalsToClose=Pressupostos de proveïdor a tancar
 SupplierProposalsToProcess=Pressupostos de proveïdor a processar
 LastSupplierProposals=Última petició de preu
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index b4932805eca..fc42e8ab194 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -7,13 +7,13 @@ History=Històric
 ListOfSuppliers=Llistat de proveïdors
 ShowSupplier=Mostrar proveïdor
 OrderDate=Data comanda
-BuyingPriceMin=Preu de compra mínim
-BuyingPriceMinShort=Preu de compra mín.
-TotalBuyingPriceMinShort=Total dels preus de compra dels subproductes
-TotalSellingPriceMinShort=Total dels preus de venda dels subproductes
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Alguns subproductes no tenen preus definits
-AddSupplierPrice=Afegir preu de proveïdor
-ChangeSupplierPrice=Canviar preu de proveïdor
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Aquesta referència de proveïdor ja està associada a la referència: %s
 NoRecordedSuppliers=Sense proveïdors registrats
 SupplierPayment=Pagament a proveïdor
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Llista de comandes a proveïdors
 MenuOrdersSupplierToBill=Comandes a proveïdors a facturar
 NbDaysToDelivery=Temps d'entrega en dies
 DescNbDaysToDelivery=El retard més gran d'entrega dels productes d'aquesta comanda
-UseDoubleApproval=Utilitza la doble aprovació quan l'import (sense impostos) és més gran (la segona aprovació es pot fer per un usuari amb els permisos dedicats. Posa 0 per deshabilitar la doble aprovació).
 SupplierReputation=Reputació del proveïdor
 DoNotOrderThisProductToThisSupplier=No demanar
 NotTheGoodQualitySupplier=Qualitat incorrecte
 ReputationForThisProduct=Reputació
+BuyerName=Nom del comprador
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index 8e1dd0c7d09..99fa8185d9d 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -11,7 +11,7 @@ PasswordChangedTo=Contrasenya modificada en: %s
 SubjectNewPassword=La seva contrasenya Dolibarr
 GroupRights=Permisos de grup
 UserRights=Permisos usuari
-UserGUISetup=Interface usuari
+UserGUISetup=Configuració d'entorn d'usuari
 DisableUser=Desactiva
 DisableAUser=Desactiva un usuari
 DeleteUser=Eliminar
@@ -67,7 +67,7 @@ ExportDataset_user_1=Usuaris Dolibarr i propietats
 DomainUser=Usuari de domini
 Reactivate=Reactivar
 CreateInternalUserDesc=Aquest formulari li permet crear un usuari intern de la seva empresa/entitat. Per crear un usuari extern (clients, proveïdors, ...), utilitzeu el botó 'Crear usuari de Dolibarr' a la fitxa de contacte del tercer.
-InternalExternalDesc=Un usuari <b>intern</b> és un usuari que pertany a la seva empresa/entitat. <br>Un usuari<b>extern</b> és un usuari client, proveïdor o un altre.<br><br>En els 2 casos, els permisos d'usuari defineixen els drets d'accés, però l'usuari extern pot a més tenir un gestor de menús diferent a l'usuari intern (vegeu Inici - Configuració - Visualització)
+InternalExternalDesc=Un usuari <b>intern</b> és un usuari que pertany a la teva empresa/entitat. <br>Un usuari<b>extern</b> és un usuari client, proveïdor o un altre.<br><br>En els 2 casos, els permisos d'usuari defineixen els drets d'accés, però l'usuari extern pot a més tenir un gestor de menús diferent a l'usuari intern (vegeu Inici - Configuració - Entorn)
 PermissionInheritedFromAGroup=El permís es concedeix ja que ho hereta d'un grup al qual pertany l'usuari.
 Inherited=Heretat
 UserWillBeInternalUser=L'usuari creat serà un usuari intern (ja que no està lligat a un tercer en particular)
@@ -100,3 +100,6 @@ WeeklyHours=Hores setmanals
 ColorUser=Color d'usuari
 DisabledInMonoUserMode=Deshabilitat en mode manteniment
 UserAccountancyCode=Codi comptable d'usuari
+UserLogoff=Usuari desconnectat
+UserLogged=Usuari connectat
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index 1c5c39fe282..11237539e35 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edita menú
 EditPageMeta=Edita "meta"
 EditPageContent=Edita contingut
 Website=Lloc web
+Webpage=Pàgina web
 AddPage=Afegeix pàgina
 PreviewOfSiteNotYetAvailable=La previsualització del teu lloc web <strong>%s</strong> encara no està disponible. Primer has d'afegir una pàgina.
 RequestedPageHasNoContentYet=La pàgina solicitada amb id %s encara no té contingut o el fitxer cau .tpl.php s'ha eliminat. Edita el contingut de la pàgina per solucionar-ho.
@@ -22,4 +23,6 @@ ViewPageInNewTab=Mostra la pàgina en una nova pestanya
 SetAsHomePage=Indica com a Pàgina principal
 RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
-SetHereVirtualHost=Si en el teu servidor web pots definir un host virtual dedicat amb un directori root en <strong>%s</strong>, defineix aquí el nom del host virtual i així la previsualització es farà utilitzant aquest accés directe enlloc del contenidor d'URLs de Dolibarr.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 799bbe94b8e..aed2903a464 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Àrea domiciliacions de clients
-StandingOrders=Domiciliacions
-StandingOrder=Domiciliació
-NewStandingOrder=Nova domiciliació
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=A processar
-WithdrawalsReceipts=Ordres domiciliades
-WithdrawalReceipt=Ordre domiciliació
-LastWithdrawalReceipts=Últimes %s ordres de domiciliació
-WithdrawalsLines=Línies de domiciliació
-RequestStandingOrderToTreat=Peticions de domiciliacions a processar
-RequestStandingOrderTreated=Peticions de domiciliacions processades
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Encara no és possible. L'estat de la domiciliació ter que ser 'abonada' abans de poder realitzar devolucions a les seves línies
-NbOfInvoiceToWithdraw=Nº de factures pendents de domiciliació
-NbOfInvoiceToWithdrawWithInfo=Nombre de factures a l'espera de domiciliació per a clients que tenen número de compte definit
-InvoiceWaitingWithdraw=Factures en espera de domiciliació
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Import a domiciliar
-WithdrawsRefused=Domiciliacions retornades
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Cap factura a client amb mode de pagament 'Domiciliació' en espera. Anar a la pestanya 'Domiciliació' a la fitxa de la factura per fer una petició.
 ResponsibleUser=Usuari responsable de les domiciliacions
-WithdrawalsSetup=Configuració de les domiciliacions
-WithdrawStatistics=Estadístiques de domiciliacions
-WithdrawRejectStatistics=Estadístiques de domiciliacions retornades
-LastWithdrawalReceipt=Últimes %s ordres de domiciliació
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Fer una petició de domiciliació
 ThirdPartyBankCode=Codi banc del tercer
 NoInvoiceCouldBeWithdrawed=No s'ha domiciliat cap factura. Assegureu-vos que les factures són d'empreses amb les dades de comptes bancaris correctes.
@@ -46,7 +47,7 @@ StatusRefused=Tornada
 StatusMotif0=No especificat
 StatusMotif1=Provisió insuficient
 StatusMotif2=Ordre del client
-StatusMotif3=Sense ordre de domiciliació
+StatusMotif3=No direct debit payment order
 StatusMotif4=Compte bloquejat
 StatusMotif5=Compte inexistent
 StatusMotif6=Compte sense saldo
@@ -61,28 +62,43 @@ 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 receptor de les domiciliacions
+BankToReceiveWithdraw=Bank account to receive direct debit
 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ó.
-DoStandingOrdersBeforePayments=Aquesta pestanya li permet realitzar una petició de domiciliacions. Una vegada realitzades les peticions, vagi al menú Bancs -> Domiciliacions per gestionar-les. En tancar una domiciliació, els pagaments de les factures s'enregistraran automàticament, i les factures completament pagades seran tancades
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Arxiu de la domiciliació
 SetToStatusSent=Classificar com "Arxiu enviat"
 ThisWillAlsoAddPaymentOnInvoice=Es crearan els pagaments de les factures i les classificarà com pagades
 StatisticsByLineStatus=Estadístiques per estats de línies
-RUM=RUM
-RUMWillBeGenerated=El número RUM es generarà un cop la informació del compte bancari estigui desat
-WithdrawMode=Mode domiciliació (FRST o RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Total de la petició de domiciliació:
 WithdrawRequestErrorNilAmount=No es pot crear la sol·licitud de domiciliació per un import nul.
+SepaMandate=SEPA Direct Debit Mandate
+SepaMandateShort=Mandat SEPA
+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=El teu nom
+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
 
 ### Notifications
-InfoCreditSubject=Pagament de l'ordre de domiciliació %s pel banc
-InfoCreditMessage=L'ordre de domiciliació %s ha estat abonada pel banc <br> Data de pagament: %s
-InfoTransSubject=Enviament de domiciliació %s al banc
-InfoTransMessage=L'ordre de domiciliació %s ha estat enviada al banc per %s %s.<br><br>
+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>
 InfoTransData=Import: %s<br>Mètode: %s<br>Data: %s
-InfoRejectSubject=Domiciliació tornada
-InfoRejectMessage=Bon dia: <br><br>la domiciliació de la factura %s per compte de l'empresa %s, amb un import de %s ha sigut retornada pel banc.<br><br>--<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
 ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després d'aquesta simulació
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index 160cd3f9967..2ddd2ec9d18 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuració del mòdul workflow
 WorkflowDesc=Aquest mòdul li permet canviar el comportament de les accions automàticament en l'aplicació. De forma predeterminada, el workflow està obert (configuri segons les seves necessitats). Activi les accions automàtiques que li interessin.
 ThereIsNoWorkflowToModify=No hi ha modificacions disponibles del fluxe de treball amb els mòduls activats.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automàticament una factura a client
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar com facturat el pressupost quan la comanda de client relacionada es classifiqui com pagada
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificar com facturades les comanda(es) quan la factura relacionada es classifiqui com a pagada
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificar com a facturades les comanda(es) de clients relacionats quan la factura sigui validada
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classifica com a facturat el pressupost enllaçat quan la factura de client sigui validada
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index f5414d739c2..8e5a59d4c21 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Deníky
 JournalFinancial=Finanční deníky
 BackToChartofaccounts=Návrat účtové osnovy
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Vyberte účtové osnovy
 Addanaccount=Přidat účetní účet
 AccountAccounting=Účetní účet
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Přerušení
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Členění zákazníků
-SuppliersVentilation=Členění dodvatelů
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Zprávy
 NewAccount=Nový účetní účet
 Create=Vytvořit
-CreateMvts=Create movement
-UpdateMvts=Změna pohybu
-WriteBookKeeping=Účetní záznamy v hlavní účetní knize
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Hlavní účetní kniha
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Řádky faktury, které mají být prověřeny
-InvoiceLinesDone=Prověření řádků faktury
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Prověřit
+Ventilate=Bind
 
 Processing=Dřu jako kůň  .....
 EndProcessing=Konec zpracování
-AnyLineVentilate=Prověřit všechny řádky
+AnyLineVentilate=Any lines to bind
 SelectedLines=Vybrané řádky
 Lineofinvoice=Řádky faktury
-VentilatedinAccount=Úspěšně prověření v účetním účtu
-NotVentilatedinAccount=Neprověřeno v účetním účtu
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Počet prvků, které mají být zobrazeny rozdělením podle stránky (doporučené maximum: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začněte třídění rozkladných stránek "Má k rozdělení" nejnovějšími elementy
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začněte třídění rozpisu stránek "Breakdown", podle nejnovějších prvků
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Délka hlavních účtů
-ACCOUNTING_LENGTH_AACCOUNT=Délka účtů třetích stran
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Prodejní deník
 ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Deník
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Odstranit záznamy hlavní knihy
-
 DescSellsJournal=Prodejní deník
 DescPurchasesJournal=Nákupní deník
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Platba zákaznické faktury
-
 ThirdPartyAccount=Účet třetí strany
-
-NewAccountingMvt=Nový pohyb
-NumMvts=Číslo pohybu
-ListeMvts=Seznam pohybů
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debetní a kreditní nemůže mít hodnotu ve stejnou dobu
 
-ReportThirdParty=Seznam účtů třetí strany
-DescThirdPartyReport=Poraďte se zde seznam třetích stran, zákazníky a dodavateli a jejich účetní účty
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Seznam účetních účtů
 
@@ -114,22 +134,29 @@ Pcgtype=Třída účtu
 Pcgsubtype=Podle třídy účtu
 Accountparent=kořen účtu
 
-DescVentilCustomer=Seznamte se zde s ročním rozdělením účetnictví faktur zákazníků
 TotalVente=Total turnover before tax
 TotalMarge=Celkové tržby marže
-DescVentilDoneCustomer=Seznamte se zde se seznamem linek faktur zákazníků a jejich účetních účtů
-DescVentilTodoCustomer=Prověřte své řádky zákaznické faktury s účetním účtem.
-ChangeAccount=Změna účetních účtů pro řádky vybraných účtů:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Poraďte se zde s ročním rozdělením účetnictví faktur dodavatelů
-DescVentilDoneSupplier=Poraďte se zde se seznamem linek faktur dodavatele a jejich účetních účtů
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Ověřit automaticky
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Chyba, nelze odstranit tento účetní účet, protože ho zrovna používáte
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Karta členění
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index aec2797976b..98595abdc30 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimentální
 VersionDevelopment=Vývoj
 VersionUnknown=Neznámý
 VersionRecommanded=Doporučené
-FileCheck=Soubory Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Chybějící soubory
 FilesUpdated=Aktualizované soubory
-FileCheckDolibarr=Zkontrolujte Dolibarr soubory Integrity
-XmlNotFound=Soubor XML ze Dolibarr integrity nebyly načteny
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID relace
 SessionSaveHandler=Manipulátor uložených relací
 SessionSavePath=Místo uložení relace
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Chyba, přesnost vyšší než <b>%s</b> nen
 DictionarySetup=Nastavení slovníku
 Dictionary=Slovníky
 Chartofaccounts=Graf účtů
-Fiscalyear=Fiskální roky
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Hodnota &quot;system&quot; a &quot;systemauto&quot; je vyhrazena. Můžete použít &quot;user&quot; k pŕidání vlastního záznamu
 ErrorCodeCantContainZero=Kód nemůže obsahovat hodnotu 0
 DisableJavascript=Vypnout JavaScript a Ajax funkce (Doporučuje se pro nevidomého či textové prohlížeče)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Počet charakterů nutných k spuštění hledání: %s
 NotAvailableWhenAjaxDisabled=Není k dispozici při vypnutém Ajaxu
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript zablokován
 UsePreviewTabs=Použijte náhled
 ShowPreview=Zobrazit náhled
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Zakódovat binární data v hexadecimálním tvaru
 IgnoreDuplicateRecords=Ignorovat chyby duplicitních záznamů (INSERT IGNORE)
 AutoDetectLang=Autodetekce (jazyku prohlížeče)
 FeatureDisabledInDemo=Funkce zakázána v demu
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Oprávnění
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Pouze prvky z <a href="%s">povolených modulů</a> jsou uvedeny.
-ModulesDesc=Dolibarr moduly jsou rozšiřující funkcionality v systému. Některé moduly vyžadují po spuštění nastavit uživatelům určité oprávnění. Kliknutím na na tlačítko ON / OFF ve sloupci "Stav", modul zapnete či vypnete.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Více modulů ...
 DoliStoreDesc=DoliStore, oficiální trh pro download externích modulů Dolibarr ERP / CRM
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr aktuální verze
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Aktualizace serveru v režimu offline
 GenericMaskCodes=Můžete zadat jakoukoliv masku číselné řady. V masce můžete použít následující značky: <br><b>{000000}</b> číslo, automaticky inkrementované o 1 při každým %s. Počet nul odpovídá požadovanému počtu číslic. Číslo se zleva doplní nulami pro dosažení požadovaného počtu číslic. <br><b>{000000+000}</b> stejné jako předchozí, ale ofset odpovídající číslu napravo od znaku + bude použit pro první %s. <br><b>{000000@x}</b> stejné jako předchozí, ale počítadlo se resetuje na nulu, když je dosaženo měsíce x (x je v rozmezí 1 ~ 12, nebo 0 pro použití prvního měsíce fiskálního roku definované ve vaší konfiguraci, nebo 99 pro vynulování každý měsíc ). Pokud se tato volba používá, a x je 2 nebo vyšší, pak je rovněž požadovaná posloupnost {yy}{mm} či {yyyy}{mm}. <br><b>{dd}</b> den (01 až 31).<br><b>{mm}</b> měsíc (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> nebo <b>{y}</b> rok, 2, 4 nebo 1 číslo. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Všechny ostatní znaky v masce zůstanou nedotčeny. <br> Mezery nejsou povoleny. <br>
 GenericMaskCodes4a=<u>Příklad na 99. %s třetí strany TheCompany proveden 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Příklad třetí osoby vytvořené 03.01.2007:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametry k zajištění URL
 SecurityTokenIsUnique=Používáme unikátní securekey parametr pro každou adresu URL
 EnterRefToBuildUrl=Zadejte odkaz na objekt %s
 GetSecuredUrl=Získejte vypočtenou URL
-ButtonHideUnauthorized=Skrýt tlačítka pro neautorizovaným zásahům místo ukazuje zdravotním tlačítka
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Staré Sazba DPH
 NewVATRates=Nová sazba DPH
 PriceBaseTypeToChange=Změnit na cenách s hodnotou základního odkazu uvedeného na
@@ -349,6 +356,7 @@ ExtrafieldMail = E-mail
 ExtrafieldSelect = Vyberte seznam
 ExtrafieldSelectList = Vyberte z tabulky
 ExtrafieldSeparator=Oddělovač
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Zaškrtávací políčko
 ExtrafieldRadio=Přepínač
 ExtrafieldCheckBoxFromList= Kontrolní pole z tabulky
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Uživatelé a skupiny
@@ -428,8 +439,8 @@ Module55Name=Čárové kódy
 Module55Desc=Barcode řízení
 Module56Name=Telefonie
 Module56Desc=Telefonie integrace
-Module57Name=Trvalé příkazy
-Module57Desc=Trvalé příkazy a řízení výběrů. Také zahrnuje generování souboru SEPA pro evropské země.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrace ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=WebCalendar
 Module410Desc=WebCalendar integrace
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Platy
-Module510Desc=Řízení výplat zaměstnanců a plateb
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Půjčka
 Module520Desc=Správa úvěrů
 Module600Name=Upozornění
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Dary
 Module700Desc=Darování řízení
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Přečtěte si poskytovatelé
 Permission147=Přečtěte si statistiky
-Permission151=Přečtěte si trvalé příkazy
-Permission152=Vytvořit / upravit trvalých příkazů žádost
-Permission153=Převodovka trvalých příkazů příjmy
-Permission154=Kredit / odmítnout trvalých příkazů příjmy
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Přečtené smlouvy/předplatné
 Permission162=Create/modify contracts/subscriptions
 Permission163=Aktivace služby / předplatné smlouvy
@@ -747,6 +758,7 @@ Permission1236=Export dodavatelské faktury, atributy a platby
 Permission1237=Export dodavatelské objednávky a informace o nich
 Permission1251=Spustit Hmotné dovozy externích dat do databáze (načítání dat)
 Permission1321=Export zákazníků faktury, atributy a platby
+Permission1322=Reopen a paid bill
 Permission1421=Export objednávek zákazníků a atributy
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Vytvořit/upravit ankety
 Permission59001=Přečtěte si obchodní marže
 Permission59002=Definovat obchodní marže
 Permission59003=Přečtěte si všechny marže uživatele
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Potencionální úroveň cílů
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label používá ve výchozím nastavení, pokud není překl
 LabelOnDocuments=Štítek na dokumenty
 NbOfDays=Nb dní
 AtEndOfMonth=Na konci měsíce
+CurrentNext=Current/Next
 Offset=Ofset
 AlwaysActive=Vždy aktivní
 Upgrade=Vylepšit
@@ -950,7 +967,7 @@ LogEventDesc=Můžete povolit zde protokolování událostí Dolibarr zabezpeče
 AreaForAdminOnly=Tyto vlastnosti mohou být použity <b>správcem uživatele.</b>
 SystemInfoDesc=Systémové informace je různé technické informace získáte v režimu pouze pro čtení a viditelné pouze pro správce.
 SystemAreaForAdminOnly=Tato oblast je k dispozici pro správce uživatele. Žádný z Dolibarr oprávnění může snížit tento limit.
-CompanyFundationDesc=Úpravy na této stránce všechny známé informace o společnosti nebo nadace, které potřebujete k řízení (K tomu, klikněte na tlačítko &quot;Upravit&quot; v dolní části stránky)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Můžete si vybrat každý parametr týkající se vzhledu Dolibarr a cítit se zde
 AvailableModules=Dostupné moduly
 ToActivateModule=Pro aktivaci modulů, přejděte na nastavení prostoru (Domů-&gt; Nastavení-&gt; Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Upozornění na některých operačních systémech Li
 PathToDocuments=Cesta k dokumentům
 PathDirectory=Adresář
 SendmailOptionMayHurtBuggedMTA=Funkce se odesílat e-maily pomocí metody "PHP mail direct" bude generovat e-mailové zprávy, které by mohly být není správně analyzovat některými dostávají poštovní servery. Výsledkem je, že některé maily nelze číst lidé hostovaných těmito platformami odposloucháván. To je případ některých poskytovatelů služeb Internetu (Ex: Orange ve Francii). To není problém do Dolibarr ani do PHP, ale na přijímání e-mailový server. Můžete však přidat možnost MAIN_FIX_FOR_BUGGED_MTA do 1 do nastavení - jiné upravovat Dolibarr k tomu nedošlo. Nicméně, může dojít k problému s jinými servery, které respektují přísně standard SMTP. Jiné řešení (doporučeno), je použít metodu "SMTP socket knihovnu", které nemá žádné nevýhody.
-TranslationSetup=Konfigurace de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povolit alespoň jeden modul
 ClassNotFoundIntoPathWarning=Třída %s nenašli cestu do PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Použít TLS
 LDAPServerUseTLSExample=Váš server LDAP použití TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Kompletní DN (ex: cn = admin, dc = priklad, dc = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Heslo správce
 LDAPUserDn=DN uživatelů
 LDAPUserDnExample=Kompletní DN (ex: ou = uživatelé, dc = priklad, dc = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Příklad: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Příklad: objectSID
 LDAPFieldEndLastSubscription=Datum ukončení předplatného
-LDAPFieldTitle=Post / Funkce
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Příklad: title
 LDAPSetupNotComplete=Nastavení LDAP není úplná (přejděte na záložku Ostatní)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Žádný správce nebo heslo k dispozici. LDAP přístup budou anonymní a pouze pro čtení.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produkty a služby moduly nastavení
 NumberOfProductShowInSelect=Maximální počet výrobků ve komba vyberte seznamy (0 = bez omezení)
 ViewProductDescInFormAbility=Vizualizace popisy produktů ve formách (jinak jako vyskakovací bublině)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Vizualizace Popisy výrobků v thirdparty jazyce
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Použijte vyhledávací formulář pro výběr produku (spíše než rozevíracího seznamu).
 SetDefaultBarcodeTypeProducts=Výchozí typ čárového kódu použít pro produkty
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Čárový kód generování nástroj pro příkazovou řádku
 BarcodeInternalEngine=Vnitřní motor
 BarCodeNumberManager=Manažer automatického definování čísel čárových kódů
 ##### Prelevements #####
-WithdrawalsSetup=Odstoupení modul nastavení
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Externí RSS dovoz Nastavení
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Otevřeno fiskální rok
 CloseFiscalYear=Zavřít fiskální rok
 DeleteFiscalYear=Smazat fiskální rok
 ConfirmDeleteFiscalYear=Jste si jisti, že chcete tento fiskální rok smazat?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Může být vždy upraveno
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimální počet velkých písmen
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Seznam pevných oznámení
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Práh
 BackupDumpWizard=Průvodce vybudovat záložní databázi soubor s výpisem
 SomethingMakeInstallFromWebNotPossible=Instalace externího modulu není možné z webového rozhraní z tohoto důvodu:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index f0d0ffb66a6..e8f89a4aab8 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -27,13 +27,9 @@ AllTime=Od začátku
 Reconciliation=Vyrovnání
 RIB=Číslo bankovního účtu
 IBAN=IBAN
-IbanValid=IBAN je platný
-IbanNotValid=IBAN není platný
 BIC=BIC/SWIFT kód
-SwiftValid=BIC/SWIFT je platný
-SwiftNotValid=BIC/SWIFT není platný
-StandingOrders=Trvalé příkazy
-StandingOrder=Trvalý příkaz
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Výpis z účtu
 AccountStatementShort=Prohlášení
 AccountStatements=Výpisy z účtů
@@ -78,6 +74,7 @@ AccountToCredit=Úvěrový účet
 AccountToDebit=Účet na vrub
 DisableConciliation=Zakázat funkci porovnání pro tento účet
 ConciliationDisabled=Funkce porovnání vypnuta
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Otevřeno
 StatusAccountClosed=Zavřeno
 AccountIdShort=Číslo
@@ -87,6 +84,8 @@ AddBankRecordLong=Přidat transakci ručně
 ConciliatedBy=Porovnáno
 DateConciliating=Datum porovnání
 BankLineConciliated=Transakce porovnána
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Zákaznická platba
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Výběr platby
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankovní převod
 BankTransfers=Bankovní převody
-TransferDesc=Přenos z jednoho účtu na jiný bude Dolibarr účtovat dvěma záznamy (debetní ve zdrojovém účtu a kreditní v cílovém účtu, ve stejné výši. Stejné označení a datum bude použito pro tuto transakci)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Převod z <b>%s</b> na <b>%s</b> %s <b>%s</b> byl zaznamenán.
@@ -129,7 +129,7 @@ FutureTransaction=Transakce v budoucnosti.  Žádný způsob, jak porovnat.
 SelectChequeTransactionAndGenerate=Výběr/filtr kontrol zahrnujících příjem šekových vkladů, a klikněte na "Vytvořit".
 InputReceiptNumber=Vyberte si výpis z účtu v souvislosti s porovnáváním. Použijte tříditelnou číselnou hodnotu: YYYYMM nebo YYYYMMDD
 EventualyAddCategory=Eventuelně upřesněte kategorii, ve které chcete klasifikovat záznamy
-ToConciliate=Porovnat?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Poté zkontrolujte řádky, které jsou ve výpisu z účtu a klikněte na tlačítko
 DefaultRIB=Výchozí BAN
 AllRIB=Všechny BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 47793214001..8b616a17546 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nelze zrušit, pokud fakt
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akce na faktuře
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Nabídnutá  sleva (platba před termínem)
 EscompteOfferedShort=Discount
 SendBillRef=Předložení faktury %s
 SendReminderBillRef=Předložení faktury %s (upomínka)
-StandingOrders=Trvalé příkazy
-StandingOrder=Trvalý příkaz
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Žádné návrhy faktury
 NoOtherDraftBills=Žádné jiné návrhy faktury
 NoDraftInvoices=Žádné návrhy faktury
@@ -351,8 +351,8 @@ VarAmount=Variabilní částka (%% celk.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bankovní objednávka
-PaymentTypeShortPRE=Bankovní objednávky
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Hotovost
 PaymentTypeShortLIQ=Hotovost
 PaymentTypeCB=Kreditní karta
@@ -381,6 +381,7 @@ ExtraInfos=Extra informace
 RegulatedOn=Regulovány
 ChequeNumber=Zkontrolujte N °
 ChequeOrTransferNumber=Kontrola/převod č.
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Šek z banky
 CheckBank=Kontrola (šek)
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Uhrazeno touto platbou
 ClosePaidInvoicesAutomatically=Označit jako "Placeno" všechny standardní situace nebo náhradní faktury v plné výši.
 ClosePaidCreditNotesAutomatically=Označit jako "Placeno" všechny dobropisy zcela splaceny.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Všechny faktury s žádnými dalšími platbami bude automaticky uzavřeny ve stavu "Placené".
 ToMakePayment=Zaplatit
 ToMakePaymentBack=Vrátit
 ListOfYourUnpaidInvoices=Seznam nezaplacených faktur
 NoteListOfYourUnpaidInvoices=Poznámka: Tento seznam obsahuje pouze faktury pro třetí strany které jsou propojeny na obchodního zástupce.
 RevenueStamp=Kolek
-YouMustCreateInvoiceFromThird=Tato možnost je dostupná pouze při vytváření faktury ze záložky "zákazníka" z třetí strany
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription= PDF šablona faktur Crabe. Kompletní šablona faktury (doporučená šablona)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/cs_CZ/boxes.lang b/htdocs/langs/cs_CZ/boxes.lang
index e7937fc8608..32b2cd25de4 100644
--- a/htdocs/langs/cs_CZ/boxes.lang
+++ b/htdocs/langs/cs_CZ/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Nejstarší aktivní expirované služby
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Globální aktivita (faktury, návrhy, objednávky)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Nabídky za měsíc
 NoTooLowStockProducts=Žádný výrobek pod nízkým limitem skladem
 BoxProductDistribution=Produkty/služby distribuce
 BoxProductDistributionFor=Distribuce %s pro %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Zákaznické faktury
 ForCustomersOrders=Zákaznické objednávky
 ForProposals=Nabídky
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/cs_CZ/cashdesk.lang b/htdocs/langs/cs_CZ/cashdesk.lang
index ab2b8e11eca..1ce5fe2a967 100644
--- a/htdocs/langs/cs_CZ/cashdesk.lang
+++ b/htdocs/langs/cs_CZ/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=na
 CashDeskThirdParty=Třetí strana
 ShoppingCart=Nákupní vozík
 NewSell=Nový prodej
-BackOffice=Back office
 AddThisArticle=Přidat tento článek
 RestartSelling=Vraťte se na prodej
-SellFinished=Prodej skončen
+SellFinished=Sale complete
 PrintTicket=Tisk dokladu
 NoProductFound=Žádný článek nalezen
 ProductFound=vyhledané výrobky
diff --git a/htdocs/langs/cs_CZ/categories.lang b/htdocs/langs/cs_CZ/categories.lang
index 8fac301ca7a..85bb68d858e 100644
--- a/htdocs/langs/cs_CZ/categories.lang
+++ b/htdocs/langs/cs_CZ/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Oblast zákaznické tagy/kategorie
 MembersCategoriesArea=Oblast uživatelské tagy/kategorie
 ContactsCategoriesArea=Oblast tagy/kategorie kontakty
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Podkategorie
 CatList=Výpis tagů/kategorií
 NewCategory=Nový tag/kategorie
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Tato třetí strana je propojena na následujíc
 MemberIsInCategories=Tento uživatel je propojen na následující uživatelské tagy/kategorie
 ContactIsInCategories=Tento kontakt je propojen na následujícíí kontakty tagy/kategorie
 ProductHasNoCategory=Tento produkt/služba není v žádném tagu/kategoriích
-CompanyHasNoCategory=Tato třetí strana není v žádném tagu/kategoriích
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Tento uživatel není v žádném tagu/kategoriích
 ContactHasNoCategory=Tento kontakt není v žádném tagu/kategorii
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Přidat do tagu/kategorie
 NotCategorized=Bez tagu/kategorie
 CategoryExistsAtSameLevel=Tato kategorie již existuje s tímto čj
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Produkty tagy/kategorie
 MembersCategoriesShort=Uživatelé tagy/kategorie
 ContactCategoriesShort=Tagy/kategorie kontakty
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Tato kategorie neobsahuje žádný produkt.
 ThisCategoryHasNoSupplier=Tato kategorie neobsahuje žádné dodavatele.
 ThisCategoryHasNoCustomer=Tato kategorie neobsahuje žádné zákazníky.
 ThisCategoryHasNoMember=Tato kategorie neobsahuje žádné uživatele.
 ThisCategoryHasNoContact=Tato kategorie neobsahuje žádný kontakt.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=ID tagu/kategorie
 CatSupList=Seznam tagů/kategorií dodavatelů
 CatCusList=Seznam tagů/kategorií zákazníků/cílů
@@ -71,6 +75,7 @@ CatContactList=Seznam kontaktů tagů/kategorií
 CatSupLinks=Spojení mezi dodavateli a tagy/kategoriemi
 CatCusLinks=Spojení mezi zákazníky/cíly a tagy/kategoriemi
 CatProdLinks=Spojení mezi produkty/službami a tagy/kategoriemi
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Odebrat z tagů/kategorií
 ExtraFieldsCategories=Doplňkové atributy
 CategoriesSetup=Nastavení tagů/kategorií
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index 669e587126e..e3f12589593 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nová soukromá osoba
 NewCompany=Nová společnost (cíl. zákazník, dodavatel)
 NewThirdParty=Nová třetí strana (cíl, zákazník, dodavatel)
 CreateDolibarrThirdPartySupplier=Vytvořit třetí stranu (dodavatele)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Oblast cílových kontaktů
 IdThirdParty=ID třetí strany
 IdCompany=ID společnosti
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Dodavatelé
 ThirdPartyType=Typ třetí strany
 Company/Fundation=Společnosti/Nadace
 Individual=Soukromá osoba
-ToCreateContactWithSameName=Automaticky vytvoří fyzický kontakt se stejnými informacemi
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Mateřská společnost
 Subsidiaries=Dceřiné společnosti
 ReportByCustomers=Reporty dle zákazníků
@@ -47,7 +49,7 @@ CivilityCode=Etický kodex
 RegisteredOffice=Sídlo společnosti
 Lastname=Příjmení
 Firstname=Křestní jméno
-PostOrFunction=Post/Funkce
+PostOrFunction=Job position
 UserTitle=Titul
 Address=Adresa
 State=Stát/Okres
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Telefon [práce]
 PhonePerso=Telefon osobní
 PhoneMobile=Mobil
-No_Email=Nezasílat hromadné e-maily
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=PSČ
 Town=Město
@@ -73,7 +75,7 @@ Poste= Pozice
 DefaultLang=Výchozí jazyk
 VATIsUsed=Plátce DPH
 VATIsNotUsed=Neplátce DPH
-CopyAddressFromSoc=Vyplnit adresu z adresy třetí strany
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Daňové identifikační číslo
 VATIntraShort=Daňové identifikační číslo
 VATIntraSyntaxIsValid=Syntaxe je správná
-VATIntraValueIsValid=Hodnota je platná
 ProspectCustomer=Cíl / Zákazník
 Prospect=Cíl
 CustomerCard=Karta zákazníka
@@ -261,7 +262,9 @@ AddContactAddress=Vytvořit kontakt/adresu
 EditContact=Upravit kontakt
 EditContactAddress=Upravit kontakt/adresu
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakty/adresy
+FromContactName=Name:
 NoContactDefinedForThirdParty=Žádný kontakt není definován této třetí straně
 NoContactDefined=Žádný kontakt není definován
 DefaultContact=Výchozí kontakty / adresy
@@ -284,7 +287,7 @@ CompanyDeleted=Společnost %s odstraněna z databáze.
 ListOfContacts=Seznam kontaktů/adres
 ListOfContactsAddresses=Seznam kontaktů / adres
 ListOfThirdParties=Seznam třetích stran
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Zobrazit kontakt
 ContactsAllShort=Vše (Bez filtru)
 ContactType=Typ kontaktu
@@ -294,6 +297,7 @@ ContactForProposals=Kontakt nabídky
 ContactForContracts=Kontakt smlouvy
 ContactForInvoices=Kontakt fakturace
 NoContactForAnyOrder=Tento kontakt není přiřazen k žádné objednávce
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Tento kontakt není přiřazen k žádné obchodní nabídce
 NoContactForAnyContract=Tento kontakt není přiřazen k žádné smlouvě
 NoContactForAnyInvoice=Tento kontakt není přiřazen k žádné faktuře
@@ -352,9 +356,9 @@ ExportCardToFormat=Exportovat kartu do formátu
 ContactNotLinkedToCompany=Kontakt není spojen s žádnou třetí stranou
 DolibarrLogin=Přihlášení do Dolibarru
 NoDolibarrAccess=Žádný přístup k Dolibarr
-ExportDataset_company_1=Třetí strany (Společnosti/nadace/osoby) a vlastnosti
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakty a vlastnosti
-ImportDataset_company_1=Třetí strany (Společnosti/nadace/osoby) a vlastnosti
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakty/Adresy (třetích stran a dalších) a atributy
 ImportDataset_company_3=Bankovní detaily
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Třetí strany  byly sloučeny
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/cs_CZ/compta.lang b/htdocs/langs/cs_CZ/compta.lang
index b1ba7e56ca4..6a4ff69b239 100644
--- a/htdocs/langs/cs_CZ/compta.lang
+++ b/htdocs/langs/cs_CZ/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Zvláštní výdaje
 MenuTaxAndDividends=Daně a dividendy
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 6b82bb81cdb..9760355d74d 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Nastavení naplánovaných úloh
-URLToLaunchCronJobs=URL ke kontrole a spuštění úlohy v případě potřeby
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Nebo zkontrolovat a zahájit konkrétní práci
 KeyForCronAccess=Bezpečnostní klíč URL spuštění úlohy
 FileToLaunchCronJobs=Příkazový řádek pro spuštění úlohy
@@ -23,7 +23,7 @@ CronCommand=Příkaz
 CronList=Naplánované úlohy
 CronDelete=Smazat naplánované úlohy
 CronConfirmDelete=Jste si jisti, že chcete odstranit tyto naplánované úlohy?
-CronExecute=Spuštění naplánovaných úloh
+CronExecute=Launch scheduled job
 CronConfirmExecute=Jste si jisti, že chcete provést tyto naplánované úlohy nyní?
 CronInfo=Plánovací modul úloh umožňují provádět úlohy, které byly plánované
 CronTask=Práce
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Žádné registrované úkoly
 CronPriority=Priorita
-CronLabel=Popis
+CronLabel=Label
 CronNbRun=Nb. zahájit
 CronMaxRun=Max nb. launch
 CronEach=Každý
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 4ceda95b525..e1fe5c6f00e 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Chyba, musí mít PHP modul <b>%s</b> nainstalovat tuto funkc
 ErrorOpenIDSetupNotComplete=Můžete nastavení Dolibarr konfigurační soubor, aby OpenID ověřování, ale URL OpenID služby není definován do stálých %s
 ErrorWarehouseMustDiffers=Zdrojové a cílové sklady musí se liší
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 754abdc5d01..382bfcb1a16 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Tato PHP instalace podporuje relace.
 PHPSupportPOSTGETOk=Tato PHP instalace podporuje proměnné POST a GET.
 PHPSupportPOSTGETKo=Je možné, že vaše instalace PHP nepodporuje proměnné POST a/nebo GET. Zkontrolujte parametr <b>variables_order</b> ve Vašem php.ini.
 PHPSupportGD=Tato PHP instalace podporuje GD grafické funkce.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Tato PHP instalace podporuje UTF8 funkce.
 PHPMemoryOK=Maximální velikost relace je nastavena na <b>%s.</b> To by mělo stačit.
 PHPMemoryTooLow=Maximální velikost relace je nastavena na <b>%s</b> bajtů. To bohužel nestačí. Zvyšte svůj parametr <b>memory_limit</b> ve Vašem <b>php.ini</b> na minimální velikost <b>%s</b> bajtů.
 Recheck=Klikněte zde pro více vypovídající test
 ErrorPHPDoesNotSupportSessions=Vaše PHP instalace nepodporuje relace. Tato funkce je nutná, pro správnou funkčnost Dolibarr. Zkontrolujte Vaše PHP nastavení.
 ErrorPHPDoesNotSupportGD=Tato PHP instalace nepodporuje GD grafické funkce. Žádný graf nebude k dispozici.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Tato PHP instalace nepodporuje UTF8 funkce. Tato funkce je nutná, pro správnou funkčnost Dolibarr. Zkontrolujte Vaše PHP nastavení.
 ErrorDirDoesNotExists=Adresář %s neexistuje.
 ErrorGoBackAndCorrectParameters=Jděte zpět a opravte špatné parametry.
@@ -133,6 +135,10 @@ ActivateModule=Aktivace modulu %s
 ShowEditTechnicalParameters=Klikněte zde pro zobrazení / editaci pokročilých parametrů (pro experty)
 WarningUpgrade=Varování:\nProvedli jste zálohu databáze jako první? \nPokud ji neprovede, můžete kvůli některým chybám v databázových systémech (například mysql verze 5.5.40/41/42/43) přijít o data, proto vám doporučujeme mít zálohu před spuštěním migrace.\n\nStiskněte OK pro spuštění migrace...
 ErrorDatabaseVersionForbiddenForMigration=Vaše verze databáze  je %s. Ta bohužel obsahuje kritickou chybu mající zásadní vliv na ztrátu dat, pokud provedete změnu struktury ve vaší databázi, stejně jako je to vyžadováno v procesu migrace. Z tohoto důvodu nebude migrace povolena, dokud neprovedete upgrade databáze na vyšší fixní verzi (seznam známých chybných verzí: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Aktualizovat údaje na činnostech
 MigrationPaymentMode=Migrace dat platebního režimu
 MigrationCategorieAssociation=Migrace kategorií
 MigrationEvents=Migrace událostí přidá vlastníka události do přiřazené tabulky
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Načíst modul %s
 ShowNotAvailableOptions=Ukázat nedostupné možnosti
 HideNotAvailableOptions=Skrýt nedostupné možnosti
diff --git a/htdocs/langs/cs_CZ/interventions.lang b/htdocs/langs/cs_CZ/interventions.lang
index cedbef7d7fc..d316896b10c 100644
--- a/htdocs/langs/cs_CZ/interventions.lang
+++ b/htdocs/langs/cs_CZ/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=V návaznosti kontakt se zákazníkem
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=intervence generované z objednávek
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/cs_CZ/ldap.lang b/htdocs/langs/cs_CZ/ldap.lang
index c3450428222..a56f8104cd7 100644
--- a/htdocs/langs/cs_CZ/ldap.lang
+++ b/htdocs/langs/cs_CZ/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Datum prvního odběru
 LDAPFieldFirstSubscriptionAmount=Množství prvního odběru
 LDAPFieldLastSubscriptionDate=Poslední datum odběru
 LDAPFieldLastSubscriptionAmount=Množství posledního odběru
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Uživatel synchronizován
 GroupSynchronized=Skupina synchronizována
 MemberSynchronized=Člen synchronizován
diff --git a/htdocs/langs/cs_CZ/mails.lang b/htdocs/langs/cs_CZ/mails.lang
index f51ab9e855b..5fce291b5a4 100644
--- a/htdocs/langs/cs_CZ/mails.lang
+++ b/htdocs/langs/cs_CZ/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Číst
 YourMailUnsubcribeOK=Mailová zpráva <b>%s</b> byla správně odstraněna z mailing listu
 ActivateCheckReadKey=Tlačítko slouží k šifrování URL používané pro "Potvrzení o přečtení" a funkce "Odhlášení"
 EMailSentToNRecipients=Email byl odeslán na %s příjemcům.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> příjemců přidáno do seznamu cílů
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 831ee013839..356493e7b00 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -67,6 +67,7 @@ SelectDate=Výběr datumu
 SeeAlso=Viz také %s
 SeeHere=Nahlédněte zde
 BackgroundColorByDefault=Výchozí barva pozadí
+FileRenamed=The file was successfully renamed
 FileUploaded=Soubor byl úspěšně nahrán
 FileWasNotUploaded=Soubor vybrán pro připojení, ale ještě nebyl nahrán. Klikněte na "Přiložit soubor".
 NbOfEntries=Počet záznamů
@@ -245,6 +246,10 @@ DateBuild=Zpráva data vzniku
 DatePayment=Datum platby
 DateApprove=Schválené datum
 DateApprove2=Schválené datum (druhé schválení)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=rok
 DurationMonth=měsíc
 DurationWeek=týden
@@ -256,6 +261,7 @@ DurationDays=dny
 Year=Rok
 Month=Měsíc
 Week=Týden
+WeekShort=Week
 Day=Den
 Hour=Hodina
 Minute=Minuta
@@ -278,6 +284,7 @@ MonthOfDay=Měsíce ode dne
 HourShort=H
 MinuteShort=mn
 Rate=Sazba
+CurrencyRate=Currency conversion rate
 UseLocalTax=Včetně DPH
 Bytes=Bytů
 KiloBytes=Kilobajty
@@ -565,8 +572,11 @@ BackToList=Zpět na seznam
 GoBack=Návrat
 CanBeModifiedIfOk=Může být změněn, pokud platí
 CanBeModifiedIfKo=Může být změněn, pokud není platný
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Nahrávání bylo úspěšně upraveno
 RecordsModified=%s záznamy změněny
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatický kód
 FeatureDisabled=Funkce vypnuta
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Nemáte oprávnění pro tuto akci
 SessionName=Název relace
 Method=Metoda
 Receive=Přijmout
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Částečný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -598,6 +609,7 @@ DisabledModules=Zakázané moduly
 For=Pro
 ForCustomer=Pro zákazníky
 Signature=Podpis
+DateOfSignature=Date of signature
 HidePassword=Zobrazit příkaz s heslem skryté
 UnHidePassword=Zobrazit skutečný příkaz s odstraněným heslem
 Root=Kořen
@@ -641,6 +653,15 @@ NewAttribute=Nový atribut
 AttributeCode=Kód atributu
 URLPhoto=URL obrázku/loga
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Vytvořte návrh
 SetToDraft=Zrušit návrh
 ClickToEdit=Klepnutím lze upravit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Pondělí
 Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index 1b4135195ea..eb410f737c1 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Hodnocení musí být číselná hodnota
 markRateShouldBeLesserThan100=Označení sazby by měla být nižší než 100
 ShowMarginInfos=Ukázat informace o marži
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/cs_CZ/oauth.lang b/htdocs/langs/cs_CZ/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/cs_CZ/oauth.lang
+++ b/htdocs/langs/cs_CZ/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 07b35cd8104..25948a2808a 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Vaše objednávky byly vytvořeny
 OrderFail=Došlo k chybě během vytváření objednávky
 CreateOrders=Vytvoření objednávky
 ToBillSeveralOrderSelectCustomer=Chcete-li vytvořit fakturu z několika řádů, klikněte nejprve na zákazníka, pak zvolte "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/cs_CZ/printing.lang b/htdocs/langs/cs_CZ/printing.lang
index d9195ba436a..bae3e486a02 100644
--- a/htdocs/langs/cs_CZ/printing.lang
+++ b/htdocs/langs/cs_CZ/printing.lang
@@ -18,10 +18,6 @@ UserConf=Nastavení pro uživatele
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Tento ovladač umožňuje odesílat dokumenty přímo k tiskárně s Google Cloud Print.
 GCP_Name=Název
 GCP_displayName=Zobrazovaný název
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index 14de12c8706..6cbc373f7f2 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Množství/sériové
 atleast1batchfield=Spotřeba podle data nebo datum prodeje nebo množství/sériové číslo
 batch_number=Množství/Sériové číslo
 BatchNumberShort=Množství/Série
-l_eatby=Spotřeba podle data
-l_sellby=Prodej podle data
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Detail množství/série 
 DetailBatchFormat=Množství/Sériel: %s - Spotřeba: %s - Prodej: %s (Qty : %d)
 printBatch=Množství/Série: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Přidat řádek pro dispečink  skladovatelnosti
 WhenProductBatchModuleOnOptionAreForced=Když modul množství/série je zapnut, zvýšení/snížení ve skladovém režimu je vyhrazeno poslední volbě a nelze jej upravovat. Další možnosti lze definovat, jak požadujete
 ProductDoesNotUseBatchSerial=Tento produkt nepoužívá šarže/sériové číslo
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 9e291288522..beaee57919a 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Hromadná změna DPH
 ProductVatMassChangeDesc=Tuto stránku lze použít k úpravě sazby DPH definované u produktů nebo služeb  z jedné do druhé hodnoty. Varování:  Tato změna se provádí ve všech databázích!!.
 MassBarcodeInit=Hromadný čárový kód inicializace
 MassBarcodeInitDesc=Tato stránka může být použita k inicializaci čárového kódu na objekty, které nemají definovaný čárový kód. Zkontrolujte před touto akcí, zda je nastavení modulu čárového kódu kompletní.
-ProductAccountancyBuyCode=Účetní kód (nákup)
-ProductAccountancySellCode=Účetní kód (prodej)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produkt nebo služba
 ProductsAndServices=Produkty a služby
 ProductsOrServices=Výrobky nebo služby
@@ -59,6 +59,8 @@ SellingPriceHT=Prodejní cena (bez DPH)
 SellingPriceTTC=Prodejní cena (vč. DPH)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nová cena
 MinPrice=Min. prodejní cena
 CantBeLessThanMinPrice=Prodejní cena nesmí být nižší než minimální povolená pro tento produkt (%s bez daně). Toto hlášení se může také zobrazí, pokud zadáte příliš důležitou slevu.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Vytiskněte několik štítků pro jeden čárový kód
 BuildPageToPrint=Generování stránky pro tisk
 FillBarCodeTypeAndValueManually=Zadat typ čárového kódu a hodnotu ručně.
 FillBarCodeTypeAndValueFromProduct=Zadat typ čárového kódu a hodnoty z čárového kódu produktu.
-FillBarCodeTypeAndValueFromThirdParty=Zadat typ čárového kódu a hodnoty z čárového kódu třetí strany.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definice typu nebo hodnoty čárového kódu není kompletní pro produkt %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definice typu nebo hodnoty čárového kódu není kompletní pro třetí stranu %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Čárový kód informace o výrobku %s :
-BarCodeDataForThirdparty=Čárový kód informace o třetí straně %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definovat hodnotu čárového kódu pro všechny záznamy (tato akce také obnoví hodnotu čárového kódu již definovanou s novými hodnotami)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 3bb25c0af55..36dce17f75a 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Seznam obchodních návrhů spojených s projektem
-ListOrdersAssociatedProject=Seznam zákaznických objednávek související s projektem
-ListInvoicesAssociatedProject=Seznam zákaznických faktur souvisejících s projektem
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Seznam dodavatelských objednávek souvisejících s projektem
-ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur související s projektem
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Seznam zakázek souvisejících s projektem
 ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
 ListExpenseReportsAssociatedProject=Seznam vyúčtování výdajů souvisejících s projektem
@@ -123,6 +123,7 @@ ProjectReportDate=Změnit datum úkolu dle data zahájení projektu
 ErrorShiftTaskDate=Nelze přesunout datum úkolu dle nového data zahájení projektu
 ProjectsAndTasksLines=Projekty a úkoly
 ProjectCreatedInDolibarr=Projekt %s vytvořen
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Úkol %s vytvořen
 TaskModifiedInDolibarr=Úkol %s upraven
 TaskDeletedInDolibarr=Úkol %s smazán
@@ -153,7 +154,7 @@ PlannedWorkload=Plánované vytížení
 PlannedWorkloadShort=Pracovní zátěž
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekt musí být nejdříve ověřen
-FirstAddRessourceToAllocateTime=Přiřadit zdroj k vyčlenění času
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Vstup za den
 InputPerWeek=Vstup za týden
 InputPerAction=Vstup za akci
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index 83a7f3349e9..d9b53d9346c 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nová platba mzdy
 SalaryPayment=Platba mzdy
 SalariesPayments=Platby mezd
 ShowSalaryPayment=Ukázat platbu mzdy
-THM=Průměrná hodinová mzda
-TJM=Průměrná denní cena
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=Současná mzda
 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
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 61a092c586d..5f2878afc48 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Smazat odeslání
 Stock=Sklad
 Stocks=Sklady
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Pohyby
 ErrorWarehouseRefRequired=Referenční jméno skladiště je povinné
 ListOfWarehouses=Seznam skladišť
@@ -43,6 +45,7 @@ PMPValue=Vážená průměrná cena
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Hodnota skladišť
 UserWarehouseAutoCreate=Vytvořte skladiště automaticky při vytváření uživatele
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Sklady produktů a subproduktů jsou nezávislé
 QtyDispatched=Množství odesláno
 QtyDispatchedShort=Odeslané množství
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/cs_CZ/supplier_proposal.lang b/htdocs/langs/cs_CZ/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/cs_CZ/supplier_proposal.lang
+++ b/htdocs/langs/cs_CZ/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 4b11e46c3bb..e1d9bee947f 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -7,13 +7,13 @@ History=Historie
 ListOfSuppliers=Seznam dodavatelů
 ShowSupplier=Zobrazit dodavatele
 OrderDate=Datum objednávky
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Některé vedlejší produkty nemají stanovené žádné ceny
-AddSupplierPrice=Přidat dodavatelskou cenu
-ChangeSupplierPrice=Změnit dodavatelskou cenu
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tato referenční dodavatel je již spojeno s odkazem: %s
 NoRecordedSuppliers=Žádní zaznamenaní dodavatelé
 SupplierPayment=Platba dodavatele
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Seznam dodavatelských objednávek
 MenuOrdersSupplierToBill=Fakturované zakázky dodavatele
 NbDaysToDelivery=Zpoždění dodávky  ve dnech
 DescNbDaysToDelivery=Největší zpoždění dodávek z produktů z této objednávky
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index fa687ab3331..0c89f280a10 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Týdenní hodiny
 ColorUser=Barva uživatele
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/cs_CZ/website.lang b/htdocs/langs/cs_CZ/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/cs_CZ/website.lang
+++ b/htdocs/langs/cs_CZ/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/cs_CZ/withdrawals.lang b/htdocs/langs/cs_CZ/withdrawals.lang
index eb2886a13e1..2334fef2b3e 100644
--- a/htdocs/langs/cs_CZ/withdrawals.lang
+++ b/htdocs/langs/cs_CZ/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Plocha trvalých příkazů zákazníků
-StandingOrders=Trvalé příkazy
-StandingOrder=Trvalé příkazy
-NewStandingOrder=Nový trvalý příkaz
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Ve zpracování
-WithdrawalsReceipts=Výběrové příjmy
-WithdrawalReceipt=Výběrový příjem
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Řádky výběrů
-RequestStandingOrderToTreat=Žádost o trvalé příkazy pro zpracování
-RequestStandingOrderTreated=Žádost o zpracované  trvalé příkazy
+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
 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=Faktury s požadavkem výběru
-NbOfInvoiceToWithdrawWithInfo=Faktury s požadavkem výběru pro zákazníky, kterř mají nastavené informace o bankovním účtu
-InvoiceWaitingWithdraw=Faktura čekající na výběr
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Částka výběru
-WithdrawsRefused=Odmítnutí výběru
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Žádné zákaznické faktury v režimu platby "výběr"nečekají. Přejděte na "výběrovou" tabulku na kartě faktury a vytvořte požadavek
 ResponsibleUser=Odpovědný uživatel
-WithdrawalsSetup=Nastavení výběrů
-WithdrawStatistics=Statistiky výběrů
-WithdrawRejectStatistics=Statistiky odmítnutých výběrů
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Vytvořit požadavek výběru
 ThirdPartyBankCode=Bankovní kód třetí strany
 NoInvoiceCouldBeWithdrawed=Neúspěšný výběr z faktur. Zkontrolujte, že faktury jsou na firmy s platným BAN.
@@ -46,7 +47,7 @@ StatusRefused=Odmítnutí
 StatusMotif0=Nespecifikovaný
 StatusMotif1=Nedostatek finančních prostředků
 StatusMotif2=Žádost o napadení
-StatusMotif3=Bez příkazu k výběru
+StatusMotif3=No direct debit payment order
 StatusMotif4=Objednávka zákazníka
 StatusMotif5=RIB nepoužitelný
 StatusMotif6=Účet bez rovnováhy
@@ -61,28 +62,43 @@ 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 výběru
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-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.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Soubor výběru
 SetToStatusSent=Nastavte na stav "Odeslaný soubor"
 ThisWillAlsoAddPaymentOnInvoice=To se bude vztahovat i platby faktur a bude klasifikováno jako "Placeno"
 StatisticsByLineStatus=Statistika podle stavu řádků
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Platba trvalého příkazu %s bankou
-InfoCreditMessage=Trvalý příkaz %s byl vyplacen bankou <br> Údaje o platbě: %s
-InfoTransSubject=Přenos trvalého příkazu %s do banky
-InfoTransMessage=Trvalý příkaz %s byl odeslán do banky prostřednictvím %s %s.<br><br>
+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>
 InfoTransData=Částka: %s<br>Metoda: %s<br>Datum: %s
-InfoRejectSubject=Trvalý příkaz odmítl
-InfoRejectMessage=Dobrý den, <br><br> trvalý příkaz na faktuře %s týkající se společnosti, %s, s množstvím %s byl odmítnut bankou. <br><br> - <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
 ModeWarning=Volba pro reálný režim nebyl nastaven, můžeme zastavit tuto simulaci
diff --git a/htdocs/langs/cs_CZ/workflow.lang b/htdocs/langs/cs_CZ/workflow.lang
index 4e065f5c62b..85b8c3475ac 100644
--- a/htdocs/langs/cs_CZ/workflow.lang
+++ b/htdocs/langs/cs_CZ/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Nastavení workflow modulu
 WorkflowDesc=Tento modul je určen k úpravě chování automatických akcí, v aplikaci. Ve výchozím nastavení workflow je otevřen (uděláte něco, co chcete). Můžete aktivovat automatické akce, které jsou zajímavé.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označit propojený zdrojový návrh jako zaúčtovaný, když je objednávka zákazníka nastavena jako placená
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označit propojenou zdrojovou objednávku zákazníka(ů) jako zaúčtované, když jsou zákaznické faktury nastaveny jako placené
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označit propojenou zdrojovou objednávku zákazníka(ů) jako zaúčtovanou, když je ověřená zákaznická faktura
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 8abc18cc837..59a9ccf4ffd 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journaler
 JournalFinancial=Finans journal
 BackToChartofaccounts=Returner kontoplan
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Vælg en kontoplan
 Addanaccount=Tilføj en regnskabsmæssig konto
 AccountAccounting=Regnskabsmæssig konto
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Sammenbrud
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Udspecificer kunder
-SuppliersVentilation=Udspecificer leverandører
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reporter
 NewAccount=By regnskabskonto
 Create=Opret
-CreateMvts=Create movement
-UpdateMvts=Ændring af en bevægelse
-WriteBookKeeping=Optage konti i kontoplanen
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Kontoplan
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Linjer af faktura, der skal fornyes
-InvoiceLinesDone=Fornyede linjer af faktura
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Forny
+Ventilate=Bind
 
 Processing=Forarbejde
 EndProcessing=Forarbejdet
-AnyLineVentilate=Linjer, der skal fornyes
+AnyLineVentilate=Any lines to bind
 SelectedLines=Valgte linjer
 Lineofinvoice=Fakturalinjer
-VentilatedinAccount=Fornyet med succes i den regnskabsmæssige konto
-NotVentilatedinAccount=Ikke fornyede i den regnskabsmæssige konto
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Længde af det almindelige regnskab
-ACCOUNTING_LENGTH_AACCOUNT=Længde af de tredjeparts-konti
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Salgskladde
 ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Slet posterne i kontoplanen
-
 DescSellsJournal=Salgskladde
 DescPurchasesJournal=Købskladde
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Betaling af kundefaktura
-
 ThirdPartyAccount=Tredjepart konto
-
-NewAccountingMvt=Ny bevægelse
-NumMvts=Antal bevægelser
-ListeMvts=Liste af bevægelser / kontokort
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debet og kredit kan ikke have en værdi på samme tid
 
-ReportThirdParty=Tredjeparts konto liste
-DescThirdPartyReport=Gå til en liste over de tredjeparts kunder og leverandører og deres regnskabssystemer konti
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Liste over de regnskabsmæssige konti
 
@@ -114,22 +134,29 @@ Pcgtype=Kontoens klasse
 Pcgsubtype=Kontoens underklasse
 Accountparent=Roden af kontoen
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Samlet salgsforskel
-DescVentilDoneCustomer=Gå til en liste over de linjer af fakturaer kunder og deres regnskabskonto
-DescVentilTodoCustomer=Forny dine linjer ag kundefaktura med en regnskabskonto
-ChangeAccount=Skift den regnskabsmæssige konto for strækninger, der er udvalgt af hensyn til:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilDoneSupplier=Gå til en liste over de linjer af fakturaer leverandør og deres regnskabskonto
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Forny automatisk
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Fejl, kan du ikke slette denne regnskabsmæssige konto, fordi den bruges
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 5d66d64c891..3d767e03521 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Eksperimentel
 VersionDevelopment=Udvikling
 VersionUnknown=Ukendt
 VersionRecommanded=Anbefalet
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler for at gemme sessioner
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Fejl, en præcision højere <b>end %s</b> er
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Kode kan ikke indeholde værdien 0
 DisableJavascript=Deaktiver JavaScript og Ajax-funktioner (Anbefales til blinde personer eller tekstbrowsere)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=NBR af tegn til at udløse søgning: %s
 NotAvailableWhenAjaxDisabled=Ikke tilgængelige, når Ajax handicappede
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript slået
 UsePreviewTabs=Brug forhåndsvisning faner
 ShowPreview=Vis forhåndsvisning
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binære data i hexadecimal
 IgnoreDuplicateRecords=Ignorer fejl dubletter (INSERT IGNORE)
 AutoDetectLang=Autodetect (browsersprog)
 FeatureDisabledInDemo=Funktionen slået fra i demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Tilladelser
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr moduler definere, hvilke funktioner er aktiveret i softwaren. Nogle moduler kræver tilladelser skal du give brugere, efter at have aktiveret modul.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr aktuelle version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Alle andre tegn i maske vil forblive intakt. <br> Mellemrum er ikke tilladt. <br>
 GenericMaskCodes4a=<u>Eksempel på 99. %s af den tredje part TheCompany gøres 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Eksempel på tredjemand oprettet den 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametre for at sikre URL'er
 SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadresse
 EnterRefToBuildUrl=Indtast reference for objekter %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Gammel moms sats
 NewVATRates=Ny moms sats
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = EMail
 ExtrafieldSelect = Vælg liste
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Brugere og grupper
@@ -428,8 +439,8 @@ Module55Name=Stregkoder
 Module55Desc=Stregkoder 'ledelse
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
-Module57Name=Stående ordrer
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integration
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Adviséringer
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donationer
 Module700Desc=Gaver 'ledelse
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Læs udbydere
 Permission147=Læs statistikinterval
-Permission151=Læs stående ordrer
-Permission152=Setup stående ordrer
-Permission153=Læs stående ordrer kvitteringer
-Permission154=Credit / afvise stående ordrer kvitteringer
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Eksporter leverandør fakturaer, attributter og betalinger
 Permission1237=Export supplier orders and their details
 Permission1251=Kør massen import af eksterne data i databasen (data belastning)
 Permission1321=Eksporter kunde fakturaer, attributter og betalinger
+Permission1322=Reopen a paid bill
 Permission1421=Eksporter kundens ordrer og attributter
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan
 LabelOnDocuments=Etiketten på dokumenter
 NbOfDays=Nb dage
 AtEndOfMonth=Ved udgangen af måneden
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Altid aktiv
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=Du kan gøre det muligt at logge for Dolibarr sikkerhed begivenhede
 AreaForAdminOnly=Disse funktioner kan anvendes af <b>administrator brugere.</b> Administrator funktioner og hjælpe er identificeret i Dolibarr af følgende picto:
 SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
 SystemAreaForAdminOnly=Dette område er til rådighed for administratoren brugere. Ingen af de Dolibarr permissions kan reducere denne grænse.
-CompanyFundationDesc=Redigere på denne side alle kendte oplysninger om virksomheden eller fundation du har brug for at styre
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Du kan vælge hver parameter i forbindelse med Dolibarr udseende og stemning her
 AvailableModules=Tilgængelige moduler
 ToActivateModule=Du kan aktivere moduler, gå på setup Samarbejdsområde.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Advarsel, på nogle Linux-systemer, for at sende e-mai
 PathToDocuments=Sti til dokumenter
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Brug TLS
 LDAPServerUseTLSExample=Din LDAP server brug TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=Komplet DN (ex: cn= adminldap, dc= samfundet, dc= dk)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator adgangskode
 LDAPUserDn=Brugernes DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Komplet DN (ex: ou= brugere, DC= samfund, dc= dk)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Eksempel: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Eksempel: objectsid
 LDAPFieldEndLastSubscription=Dato for tilmelding udgangen
-LDAPFieldTitle=Post / Funktion
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP-opsætning ikke komplet (gå på andre faner)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr. administrator eller adgangskode forudsat. LDAP adgang vil være anonym og i skrivebeskyttet tilstand.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produkter og Services moduler opsætning
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=Max antal produkter i combos vælge lister (0= ingen grænse)
 ViewProductDescInFormAbility=Visualisering af Varebeskrivelserne i de former (ellers som popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualisering af produkter beskrivelser i thirdparty sprog
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default stregkode type bruge til produkter
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Tilbagetrækning modul opsætning
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Eksterne RSS import setup
 NewRSS=Ny RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 45be0dab0d5..17689388af2 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Forsoning
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT-nummer
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Stående ordrer
-StandingOrder=Stående ordre
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Kontoudtog
 AccountStatementShort=Erklæring
 AccountStatements=Kontoudtog
@@ -78,6 +74,7 @@ AccountToCredit=Hensyn til kredit
 AccountToDebit=Hensyn til at debitere
 DisableConciliation=Deaktiver forlig kendetegn for denne konto
 ConciliationDisabled=Forligsudvalget funktionen slået
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Lukket
 AccountIdShort=Antal
@@ -87,6 +84,8 @@ AddBankRecordLong=Tilføj transaktion manuelt
 ConciliatedBy=Forligsteksten ved
 DateConciliating=Forlige dato
 BankLineConciliated=Transaktion forligsteksten
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Kundens betaling
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Tilbagetrækning betaling
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankoverførsel
 BankTransfers=Bankoverførsler
-TransferDesc=Overførsel fra en konto til en anden, Dolibarr vil skrive to bøger (en overførselsautorisation i kilde-konto og en kredit i målet konto, af samme beløb. Samme etiket og dato vil blive brugt til denne transaktion)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overførsel <b>fra %s til %s %s%</b> s er blevet registreret.
@@ -129,7 +129,7 @@ FutureTransaction=Transaktion i futur. Ingen måde at forene.
 SelectChequeTransactionAndGenerate=Vælg / filter, at kontrollen skal omfatte ind checken depositum modtaget og klikke på &quot;Opret&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 88bb5f45c81..7d792044355 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fejl, kan ikke annullere en fakt
 BillFrom=Fra
 BillTo=Bill til
 ActionsOnBill=Aktioner på faktura
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Rabat (betaling før sigt)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Stående ordrer
-StandingOrder=Stående ordre
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nr. udkast til fakturaer
 NoOtherDraftBills=Ingen andre forslag til fakturaer
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bankens orden
-PaymentTypeShortPRE=Bankens orden
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Kreditkort
@@ -381,6 +381,7 @@ ExtraInfos=Ekstra infos
 RegulatedOn=Reguleres på
 ChequeNumber=Check N
 ChequeOrTransferNumber=Check / Transfer N
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Betales af denne betaling
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status &quot;betales&quot;.
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Faktura model Crabe. En fuldstændig faktura model (Support moms option, rabatter, betalinger betingelser, logo, etc. ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index d64a143b831..fc99dc35305 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Ældste aktive udløbne tjenester
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Kundernes fakturaer
 ForCustomersOrders=Customers orders
 ForProposals=Forslag
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index 946a1cfa8d3..17b8641292d 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=om
 CashDeskThirdParty=Tredjemands
 ShoppingCart=Indkøbskurv
 NewSell=Ny sælge
-BackOffice=Back office
 AddThisArticle=Tilføj denne artikel
 RestartSelling=Gå tilbage til sælger
-SellFinished=Sælg færdig
+SellFinished=Sale complete
 PrintTicket=Print billet
 NoProductFound=Ingen artiklen fundet
 ProductFound=Produktet findes
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index bd4ceafd141..7bb290243fa 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Underkategorier
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denne kategori allerede findes på samme sted
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Denne kategori indeholder ingen produkt.
 ThisCategoryHasNoSupplier=Denne kategori indeholder ingen leverandør.
 ThisCategoryHasNoCustomer=Denne kategori indeholder ingen kunde.
 ThisCategoryHasNoMember=Denne kategori indeholder ikke et medlem.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index a13c777570d..c72833f9d14 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Ny privatperson
 NewCompany=Nye firma (emne, kunde, leverandør)
 NewThirdParty=Ny tredjepart (emne, kunde, leverandør)
 CreateDolibarrThirdPartySupplier=Opret en trediepart (leverandør)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospektering område
 IdThirdParty=Id tredjepart
 IdCompany=CVR
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Leverandører
 ThirdPartyType=Tredjepart type
 Company/Fundation=Company / Foundation
 Individual=Privatperson
-ToCreateContactWithSameName=Vil skabe automatisk en fysisk kontakt med samme informationer
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Moderselskab
 Subsidiaries=Datterselskaber
 ReportByCustomers=Rapport fra kunder
@@ -47,7 +49,7 @@ CivilityCode=Høfligt kode
 RegisteredOffice=Hjemsted
 Lastname=Efternavn
 Firstname=Fornavn
-PostOrFunction=Post / Funktion
+PostOrFunction=Job position
 UserTitle=Titel
 Address=Adresse
 State=Stat / Canton
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. telefonen
 PhonePerso=Pers. telefon
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=By
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Sprog som standard
 VATIsUsed=Moms anvendes
 VATIsNotUsed=Moms, der ikke anvendes
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Momsregistreringsnummer
 VATIntraShort=Momsregistreringsnummer
 VATIntraSyntaxIsValid=Syntaks er gyldigt
-VATIntraValueIsValid=Værdi er gyldigt
 ProspectCustomer=Prospect / Kunden
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Rediger kontakt / adresse
 EditContactAddress=Edit contact/address
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakt / Adresser
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=Ingen kontakt er defineret for denne tredjepart
 DefaultContact=Default kontakt
@@ -284,7 +287,7 @@ CompanyDeleted=Company " %s" slettet fra databasen.
 ListOfContacts=Listen over kontakter
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=Liste over tredjemand
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Vis kontakt
 ContactsAllShort=Alle (nr. filter)
 ContactType=Kontakt type
@@ -294,6 +297,7 @@ ContactForProposals=Forslag 'kontakt
 ContactForContracts=Kontrakter »kontakt
 ContactForInvoices=Faktura 'kontakt
 NoContactForAnyOrder=Denne kontakt er ikke kontakt til vilkårlig rækkefølge
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Denne kontakt er ikke en kontakt til noget kommercielt forslag
 NoContactForAnyContract=Denne kontakt er ikke en kontakt til en kontrakt
 NoContactForAnyInvoice=Denne kontakt er ikke en kontakt til en faktura
@@ -352,9 +356,9 @@ ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontakt ikke knyttet til nogen tredjepart
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Ingen Dolibarr adgang
-ExportDataset_company_1=Tredieparter (Firmaer/foreninger/privatpersoner) og egenskaber
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakter og egenskaber
-ImportDataset_company_1=Tredieparter (Firmaer/foreninger/privatpersoner) og egenskaber
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakter/Adresser (af trediepart eller ikke) og egenskaber
 ImportDataset_company_3=Bankoplysninger
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index a7a503d80c0..44c6bf89f5a 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Skatter og udbytter
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index fedcbf3bc02..bac550f23e3 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Metode
 CronModule=Modul
 CronNoJobs=No jobs registered
 CronPriority=Prioritet
-CronLabel=Beskrivelse
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 9b85439416c..f1e8ec3a2bc 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index e815dec46d7..3d9a33c9f76 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Denne PHP understøtter sessioner.
 PHPSupportPOSTGETOk=Denne PHP understøtter variabler POST og GET.
 PHPSupportPOSTGETKo=Det er muligt din PHP setup ikke understøtter variabler POST og / eller GET. Tjek din parameter <b>variables_order</b> i php.ini.
 PHPSupportGD=Denne PHP støtte GD grafiske funktioner.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Denne PHP støtte UTF8 funktioner.
 PHPMemoryOK=Din PHP max session hukommelse er sat <b>til %s.</b> Dette skulle være nok.
 PHPMemoryTooLow=Din PHP max session hukommelse er sat <b>til %s</b> bytes. Dette skulle være for lav. Skift din <b>php.ini</b> at indstille <b>memory_limit</b> parameter til <b>mindst %s</b> bytes.
 Recheck=Klik her for en mere significative test
 ErrorPHPDoesNotSupportSessions=Din PHP installation ikke støtte sessioner. Denne funktion er forpligtet til at gøre Dolibarr fungerer. Tjek din PHP setup.
 ErrorPHPDoesNotSupportGD=Din PHP installation ikke understøtter grafiske funktion GD. Nr. grafen vil være til rådighed.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Din PHP installation ikke støtte UTF8 funktioner. Dolibarr kan ikke fungere korrekt. Løse dette, før du installerer Dolibarr.
 ErrorDirDoesNotExists=Directory %s ikke eksisterer.
 ErrorGoBackAndCorrectParameters=Gå tilbage og rette forkerte parametre.
@@ -133,6 +135,10 @@ ActivateModule=Aktiver modul %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Opdatere data om tiltag
 MigrationPaymentMode=Data migration for betaling mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index a7ca1a8e07c..6708ddef108 100644
--- a/htdocs/langs/da_DK/interventions.lang
+++ b/htdocs/langs/da_DK/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Opfølgning kunde kontakt
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/da_DK/ldap.lang b/htdocs/langs/da_DK/ldap.lang
index 41d1162d4db..2732616c854 100644
--- a/htdocs/langs/da_DK/ldap.lang
+++ b/htdocs/langs/da_DK/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Første abonnement dato
 LDAPFieldFirstSubscriptionAmount=Fist abonnement beløb
 LDAPFieldLastSubscriptionDate=Seneste abonnement dato
 LDAPFieldLastSubscriptionAmount=Seneste abonnement beløb
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Bruger synkroniseres
 GroupSynchronized=Gruppen synkroniseres
 MemberSynchronized=Medlem synkroniseres
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index a560b1f6ab0..dd8a30df2d1 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Læs
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index eba2e9d9f14..ad80720f563 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=Se også %s
 SeeHere=See here
 BackgroundColorByDefault=Standard baggrundsfarve
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=En fil er valgt for udlæg, men endnu ikke var uploadet. Klik på "Vedhæft fil" for dette.
 NbOfEntries=Nb af tilmeldinger
@@ -245,6 +246,10 @@ DateBuild=Rapport bygge dato
 DatePayment=Dato for betaling
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uge
@@ -256,6 +261,7 @@ DurationDays=dage
 Year=År
 Month=Måned
 Week=Uge
+WeekShort=Week
 Day=Dag
 Hour=Time
 Minute=Minut
@@ -278,6 +284,7 @@ MonthOfDay=Måned fra den dato
 HourShort=H
 MinuteShort=mn
 Rate=Hyppighed
+CurrencyRate=Currency conversion rate
 UseLocalTax=Incl. afgift
 Bytes=Bytes
 KiloBytes=Kilobyte
@@ -565,8 +572,11 @@ BackToList=Tilbage til listen
 GoBack=Gå tilbage
 CanBeModifiedIfOk=Kan ændres, hvis det er gyldigt
 CanBeModifiedIfKo=Kan ændres, hvis ikke gyldigt
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Optag modificerede held
 RecordsModified=%s poster rettet
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatisk kode
 FeatureDisabled=Feature handicappede
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Du har ikke tilladelse til denne handling
 SessionName=Session navn
 Method=Metode
 Receive=Modtag
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldrig modtaget
@@ -598,6 +609,7 @@ DisabledModules=Handikappede moduler
 For=For
 ForCustomer=For kunden
 Signature=Underskrift
+DateOfSignature=Date of signature
 HidePassword=Vis kommandoen med adgangskode skjulte
 UnHidePassword=Vis reelle kommandoen med klare adgangskode
 Root=Rot
@@ -641,6 +653,15 @@ NewAttribute=Ny attribut
 AttributeCode=Attribut koden
 URLPhoto=Url af foto / logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Opret udkast
 SetToDraft=Back to draft
 ClickToEdit=Klik for at redigere
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index c026918cf7c..2de5e702148 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/da_DK/oauth.lang b/htdocs/langs/da_DK/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/da_DK/oauth.lang
+++ b/htdocs/langs/da_DK/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index 01f3b31e38b..63a78213b27 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/da_DK/printing.lang b/htdocs/langs/da_DK/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/da_DK/printing.lang
+++ b/htdocs/langs/da_DK/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index 3b556441cd7..1b117c70c33 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Regnskab kode (købe)
-ProductAccountancySellCode=Regnskab kode (sælge)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produkt eller tjeneste
 ProductsAndServices=Produkter og services
 ProductsOrServices=Produkter eller tjenesteydelser
@@ -59,6 +59,8 @@ SellingPriceHT=Salgspris (efter skat)
 SellingPriceTTC=Salgspris (inkl. skat)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Ny pris
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere end minimum tilladt for dette produkt ( %s uden skat)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 6e8894e71a9..decf122d906 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lister over de kommercielle forslag er forbundet med projektet
-ListOrdersAssociatedProject=Lister over de ordrer, er forbundet med projektet
-ListInvoicesAssociatedProject=Lister over de fakturaer forbundet med projektet
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Liste over leverandører ordrer forbundet med projektet
-ListSupplierInvoicesAssociatedProject=Liste over leverandører fakturaer forbundet med projektet
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet
 ListFichinterAssociatedProject=Liste over interventioner i forbindelse med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index e580214d068..ecec4a8f27c 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Slet afsendelse
 Stock=Stock
 Stocks=Lagre
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Bevægelser
 ErrorWarehouseRefRequired=Warehouse reference navn er påkrævet
 ListOfWarehouses=Liste over pakhuse
@@ -43,6 +45,7 @@ PMPValue=Værdi
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lager værdi
 UserWarehouseAutoCreate=Opret en bestand automatisk, når du opretter en bruger
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Afsendte mængde
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/da_DK/supplier_proposal.lang b/htdocs/langs/da_DK/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/da_DK/supplier_proposal.lang
+++ b/htdocs/langs/da_DK/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index d339536cb35..350ccb255d0 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -7,13 +7,13 @@ History=Historie
 ListOfSuppliers=Liste over leverandører
 ShowSupplier=Vis leverandør
 OrderDate=Bestil dato
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Nogle underprodukter har ingen pris defineret
-AddSupplierPrice=Tilføj leverandør pris
-ChangeSupplierPrice=Skifte leverandør pris
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne henvisning leverandøren er allerede forbundet med en reference: %s
 NoRecordedSuppliers=Nr. leverandører registreres
 SupplierPayment=Leverandør betaling
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Liste over leverandør ordrer
 MenuOrdersSupplierToBill=Leverandør ordrer der kan faktureres
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 428d20f03f5..2ecd865ec75 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index a6a08781066..0242fcd13d9 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Kunder stående ordrer område
-StandingOrders=Stående ordrer
-StandingOrder=Stående ordrer
-NewStandingOrder=Nye stående ordre
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=For at kunne behandle
-WithdrawalsReceipts=Tilbagekøb kvitteringer
-WithdrawalReceipt=Tilbagetrækning modtagelse
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Tilbagekøb linjer
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Faktura afvente trække
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Beløb til at trække
-WithdrawsRefused=Tilbagekalder nægtet
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nr. kundens faktura i betalingssystemer mode "trække" venter. Gå på 'Træk' fane på faktura-kort til at fremsætte en anmodning.
 ResponsibleUser=Ansvarlig bruger
-WithdrawalsSetup=Tilbagetrækning setup
-WithdrawStatistics=Tilbagekalder »statistik
-WithdrawRejectStatistics=Trække afviser 'statistikker
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Foretag en trække anmodning
 ThirdPartyBankCode=Tredjepart bankkode
 NoInvoiceCouldBeWithdrawed=Nr. faktura withdrawed med succes. Kontroller, at fakturaen er for selskaber med en gyldig forbud.
@@ -46,7 +47,7 @@ StatusRefused=Afviste
 StatusMotif0=Uspecificeret
 StatusMotif1=Levering insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=Ingen Tilbagetrækning for
+StatusMotif3=No direct debit payment order
 StatusMotif4=Kunde Bestil
 StatusMotif5=RIB inexploitable
 StatusMotif6=Konto uden balance
@@ -61,28 +62,43 @@ 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 til at modtage trækker sig
+BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=Kredit på
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Betaling af stående ordre %s af banken
-InfoCreditMessage=Den stående ordre %s er betalt af banken <br> Data for betaling: %s
-InfoTransSubject=Transmission af stående ordre %s til bank
-InfoTransMessage=Den stående ordre %s er transmited til bank ved %s %s. <br><br>
+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>
 InfoTransData=Beløb: %s <br> Methodology: %s <br> Dato: %s
-InfoRejectSubject=Stående For nægtede
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Mulighed for real mode ikke var indstillet, vi stopper efter denne simulation
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index d13d31f92da..6e6b0b41596 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow-modul opsætning
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 548ae036d99..e6837704eef 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -15,11 +15,9 @@ NextValue=Nächste Wert
 AntiVirusCommandExample=Beispiel für ClamWin: c:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe <br>Beispiel für ClamAV: /usr/bin/clamscan
 AntiVirusParamExample=Beispiel für ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ImportMySqlDesc=Zum Wiederherstellen einer Sicherungsdatei müssen Sie folgenden Befehl über die Kommandozeile ausführen:
-GenericMaskCodes2=<b>(cccc)</b> den Client-Code <br> <b>() cccc000</b> den Client-Code auf n Zeichen ist, gefolgt von einer Client-ref Zähler ohne Offset-und zeroized mit der globalen Zähler. <br>
 GenericMaskCodes5=<b>ABC (yy) (mm) - (000000)</b> wird <b>ABC0701-000099</b> <br> <b>(0000 +100)-ZZZ / tt () / XXX</b> wird <b>0199-ZZZ/31/XXX</b>
 NumberOfModelFilesFound=Anzahl der in diesen Verzeichnissen gefundenen .odt-Dokumentvorlagen
 Module53Desc=Services-Verwaltung
-Module57Name=ausstehende Bestellungen
 Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
 Module310Desc=Mitgliederverwaltun
@@ -34,7 +32,6 @@ Permission61=Eingriffe ansehen
 Permission62=Eingriffe erstellen/bearbeiten
 Permission64=Eingriffe löschen
 Permission67=Eingriffe exportieren
-Permission153=Dauerauftragsbelege einsehen
 Permission172=Reisen löschen
 Permission192=Leitungen anlegen
 Permission193=Leitungen verwerfen
@@ -92,7 +89,6 @@ CompanyCurrency=Firmenwährung
 DelaysOfToleranceBeforeWarning=Verspätungstoleranz vor Benachrichtigungen
 Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Verzögerungstoleranz (in Tagen) vor  Benachrichtigung über zu aktivierende Services
 Delays_MAIN_DELAY_RUNNING_SERVICES=Verzögerungstoleranz (in Tagen) vor Benachrichtigung zu überfälligen Services
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
 DocumentModelOdt=Erstellen von Dokumentvorlagen im OpenDocuments-Format (.odt-Dateien für OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwürfen (alle, falls leer)
 WatermarkOnDraftProposal=Wasserzeichen für Angebotsentwürfe (alle, falls leer)
@@ -103,4 +99,3 @@ FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
 WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
 UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden
 PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index fabf70832a6..e8f5078c1c3 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -1,17 +1,19 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomersUnpaid=Kunden wegen eines nicht bezahlten Rechnungen
-BillsCustomersUnpaidForCompany=Kunden wegen eines nicht bezahlten Rechnungen für %s
-BillsSuppliersUnpaid=Lieferanten nicht bezahlten Rechnungen
-InvoiceDeposit=Anzahlung Rechnung
-InvoiceDepositAsk=Anzahlung Rechnung
-InvoiceDepositDesc=Diese Art der Rechnung erfolgt, wenn eine Anzahlung eingegangen ist.
-InvoiceProForma=Proforma Rechnung
-InvoiceProFormaAsk=Proforma Rechnung
-InvoiceProFormaDesc=<b>Proforma Rechnung</b> ist ein Bild eines echten Rechnung, hat aber keine Buchhaltung Wert.
+BillsCustomersUnpaid=Unbezahlte Kundenrechnungen
+BillsCustomersUnpaidForCompany=Unbezahlte Kundenrechnungen für %s
+BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
+BillsSuppliersUnpaidForCompany=Unbezahlte Liferantenrechnung für %s
+DisabledBecauseNotErasable=Deaktiviert, weil es nicht gelöscht werden kann
+InvoiceStandardDesc=Dies ist die übliche Rechnungsart.
+InvoiceDeposit=Anzahlung
+InvoiceDepositAsk=Anzahlung
+InvoiceDepositDesc=Diese Art der Rechnung wird ausgestellt, wenn eine Anzahlung eingegangen ist.
+InvoiceProForma=Proformarechnung
+InvoiceProFormaAsk=Proformarechnung
+InvoiceProFormaDesc=<b>Proformarechnung</b> entspricht dem Wert der echten Rechnung, wird aber nicht verbucht.
+InvoiceReplacementDesc=<b>Ersatzrechnung</b> wird verwendet um eine Rechnung, die niemals bezahlt wurde, zu stornieren.<br><br>Beachte: Nur Rechnungen ohne Bezahlung können storniert werden. Wenn die stornierte Rechnung noch nicht geschlossen is, wird sie automatisch geschlossen und als 'storniert' markiert.
 ConsumedBy=Consumed von
 CardBill=Rechnungskarte
-StandingOrders=ausstehende Bestellungen
-StandingOrder=ausstehende Bestellung
 NewRelativeDiscount=Neue relative Rabatt
 DescTaxAndDividendsArea=Dieser Bereich stellt eine Übersicht über alle Zahlungen, die für die Steuer-oder Sozialabgaben. Nur Datensätze mit der Bezahlung während der festgesetzten Jahr hier.
 RelatedBill=Verwandte Rechnung
diff --git a/htdocs/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang
index 5d03cea798a..dee60c635ee 100644
--- a/htdocs/langs/de_AT/companies.lang
+++ b/htdocs/langs/de_AT/companies.lang
@@ -12,4 +12,3 @@ CustomerCode=Kunden-Code
 CapitalOf=Hauptstadt von %s
 NorProspectNorCustomer=Weder Lead noch Kunde
 OthersNotLinkedToThirdParty=Andere, nicht mit einem Partner verknüpfte
-ExportDataset_company_1=Partner und Eigenschaften
diff --git a/htdocs/langs/de_AT/compta.lang b/htdocs/langs/de_AT/compta.lang
index d05c0a92293..4f52c4300a0 100644
--- a/htdocs/langs/de_AT/compta.lang
+++ b/htdocs/langs/de_AT/compta.lang
@@ -3,7 +3,6 @@ TaxModuleSetupToModifyRules=Die Einstellungen zur Berechnung finden Sie in den e
 OptionModeTrueDesc=In diesem Modus erfolgt die Umsatzberechnung über Zahlungseingänge (Zahlungsdatum).<br>Die Gültigkeit der Daten ist nur bei der Überprüfung der Zu- und Abgänge auf den Konten durch Rechnungen gewährleistet.
 VATReportBuildWithOptionDefinedInModule=Ausgewiesenen Beträge sind hier anhand von Regeln Tax Modul Setup definiert.
 RemainingAmountPayment=Leistende Zahlung übrig:
-Balance=Saldo
 VATReceived=Eingehobene MwSt.
 VATToCollect=Einzuhebende MwSt.
 VATSummary=MwSt. Zahllast
diff --git a/htdocs/langs/de_AT/orders.lang b/htdocs/langs/de_AT/orders.lang
index 813ef90c7b2..69006143803 100644
--- a/htdocs/langs/de_AT/orders.lang
+++ b/htdocs/langs/de_AT/orders.lang
@@ -5,9 +5,7 @@ OrdersInProcess=Bestellunen in Bearbeitung
 StatusOrderReceivedAllShort=Zur Gänze erhalten
 StatusOrderOnProcess=In Arbeit
 StatusOrderReceivedAll=Zur Gänze erhalten
-LastOrders=Neueste %s Bestellungen
 RefOrder=Bestellung Nr.
-RefCustomerOrder=Kundenbestellung Nr.
 AuthorRequest=Authorenrechte beantragen
 PaymentOrderRef=Zahlung zu Bestellung %s
 CloneOrder=Duplizieren
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index fb42f297cdc..ddac2ce7772 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -1,7 +1,5 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Artikel Nr.
-ProductAccountancyBuyCode=Kontierungsschlüssel (Einkauf)
-ProductAccountancySellCode=Kontierungsschlüssel (verkaufen)
 OnSell=Verfügbar
 OnBuy=Gekaufte
 NotOnSell=Aufgelassen
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
index 93ca575035d..9f6b518c6e9 100644
--- a/htdocs/langs/de_AT/withdrawals.lang
+++ b/htdocs/langs/de_AT/withdrawals.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-LastWithdrawalReceipt=%s neuste Abbuchungsbelege
 WithdrawalRefused=Abbuchungen abgelehnt
 InvoiceRefused=Ablehnung in Rechnung stellen
 StatusWaiting=Wartestellung
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index 315a2939e25..faa7f6c70db 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -33,6 +33,8 @@ DoliPartnersDesc=Unternehmensliste, die Zusatzmodule oder Funktionen entwicklen
 WebSiteDesc=Webseite für die Suche nach weiteren Modulen
 BoxesActivated=Aktivierte Boxen
 ReferencedPreferredPartners=Bevorzugte Geschäftspartner
+ForAnswersSeeForum=Für alle anderen Fragen / Hilfe, können Sie die Dolibarr Forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
+HelpCenterDesc1=In diesem Bereich können Sie sich ein Hilfe-Support-Service auf Dolibarr.
 MeasuringUnit=Masseinheit
 MAIN_MAIL_SMTP_PORT=SMTP-Port (standardmässig in der php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_SERVER=SMTP-Host (standardmässig in php.ini: <b>%s</b>)
@@ -44,7 +46,6 @@ ModuleFamilySrm=Lieferantenverwaltung (SRM)
 InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Legen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "eigenes").<br>
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehen Sie zur Seite %s.
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erfoderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
-GenericMaskCodes2=<b>{cccc}</b>  den Kunden-Code mit n Zeichen<br><b>{cccc000}</b> den Kunden-Code mit n Zeichen, gefolgt von einer Client-Zähler zugeordnet zu dem Kunden. <br><b>{tttt}</b> Die Geschäftspartner ID mit n Zeichen (siehe Wörterbuch Partner Typen).<br>
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Dritten thecompany Geschehen 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Dritte erstellt am 2007-03-01:</u> <br>
 UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
@@ -57,7 +58,6 @@ NewVATRates=Neuer MwSt. Satz
 ExtrafieldCheckBoxFromList=Checkbox von Tabelle
 LibraryToBuildPDF=Verwendete Bibliothek zur PDF-Erzeugung
 SetAsDefault=Als Standard definieren
-DisplayCompanyInfoAndManagers=Firmen- und Managernamen anzeigen
 ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Lieferantenummer für einen Lieferanten-Kontierungscode und %s, gefolgt vom Kundencontierungscode für einen Kundenkontierungscode.
 ModuleCompanyCodePanicum=Generiert einen leeren Kontierungscode.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Geschäftspartner Code ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Geschäftspartner Codes zusammen.
@@ -65,7 +65,6 @@ Module1Name=Geschäftspartner
 Module1Desc=Geschäftspartner- und Kontakteverwaltung (Kunden, Leads, ...)
 Module20Desc=Angeboteverwaltung
 Module49Desc=Bearbeiterverwaltung
-Module57Desc=Abbuchungsaufträge und Entzugsmanagement. Hierzu gehört auch Generation von SEPA-Datei für europäische Länder.
 Module70Name=Arbeitseinsätze
 Module80Name=Auslieferungen
 Module240Desc=Werkzeug zum Datenexport (mit Assistent)
@@ -91,6 +90,7 @@ Permission122=Mit Benutzer verbundene Geschäftspartner erstellen/bearbeiten
 Permission125=Mit Benutzer verbundene Geschäftspartner löschen
 Permission126=Geschäftspartner exportieren
 Permission144=Löschen Sie alle Projekte und Aufgaben (einschliesslich privater Projekte in denen ich kein Kontakt bin)
+Permission172=Reise- und Spesenabrechnung erstellen/ändern
 Permission187=Lieferantenbestellungen schliessen
 Permission188=Lieferantenbestellungen verwerfen
 Permission193=Leitungen abbrechen
@@ -155,6 +155,8 @@ PasswordGenerationNone=Keine automatische Passwortvorschläge, das Passwort muss
 CompanyCodeChecker=Modul für Geschäftspartner-Code-Erstellung (Kunden oder Lieferanten)
 CompanyIdProfChecker=Berufs-Identifikation einzigartige
 MustBeMandatory=Erforderlich um Geschäftspartner anzulegen?
+SuggestPaymentByRIBOnAccount=Zahlung per Lastschrift vorschlagen
+SuggestPaymentByChequeToAddress=Zahlung per Scheck vorschlagen
 SupplierPaymentSetup=Lieferantenzahlungen einrichten
 ProposalsPDFModules=PDF-Anbebotsmodule
 FreeLegalTextOnProposal=Freier Rechtstext für Angebote
@@ -177,7 +179,6 @@ ApplicativeCache=Applicative Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Anwendungs Cache Modul\n<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
 MemcachedModuleAvailableButNotSetup=Module memcached für applicative Cache gefunden, aber Setup-Modul ist nicht vollständig.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled..
-ViewProductDescInThirdpartyLanguageAbility=Anzeige der Produktbeschreibungen in der Sprache des Geschäftspartners
 UseSearchToSelectProductTooltip=Wenn Sie eine grosse Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
 UseUnits=Definieren Sie eine Masseinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
@@ -204,7 +205,6 @@ TasksNumberingModules=Aufgaben-Nummerierungs-Modul
 CloseFiscalYear=Fiskalisches Jahr schliessen
 NbMajMin=Mindestanzahl Grossbuchstaben
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
-GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" von einem  Geschäftspartner Kontakt , um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
 ConfFileMuseContainCustom=Zur Installation eines externen Modul speichern Sie die Modul-Dateien in Verzeichnis <strong>%s</strong>. Damit Dolibarr dieses Verzeichniss verwendet, müssen Sie in der Setupdatei <strong>conf/conf.php</strong> die Option<br><strong>$dolibarr_main_url_root_alt</strong> auf<br><strong>$dolibarr_main_url_root_alt="/custom"</strong> oder <br><strong>'%s/custom';</strong> ändern
 HighlightLinesColor=Farbe des Highlight Effekt bei Mausbewegung (wählen sie keine für keinen Highlight Effekt)
 TextTitleColor=Farbe des Seitentitels
@@ -212,7 +212,6 @@ LinkColor=Linkfarbe
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat automatisch dazuaddiert werden
 RecuperableOnly=Ja für MwSt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
 MailToSendIntervention=Um Interventions zu schicken
-MailToThirdparty=Um Email von Geschäftspartner zu schicken
 ModelModulesProduct=Vorlage für Produktdokumente
 ToGenerateCodeDefineAutomaticRuleFirst=Um automatisch Barcodenummern zu generieren, muss zuerst ein Nummerierungmodul im Barcodemodul definiert werden.
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 8833b4aa82c..63922070e16 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -1,6 +1,11 @@
 # Dolibarr language file - Source file is en_US - banks
+AllTime=Vom start
+AccountType=Kontoart
+AccountCard=Konto-Karte
 Conciliable=Ausgleichsfähig
 SupplierInvoicePayment=Lieferantenzahlung
+WithdrawalPayment=Entnahme Zahlung
+BankTransfers=Kontentransfer
 ConfirmValidateCheckReceipt=Scheck wirklich annehmen? Eine Änderung ist anschliessend nicht mehr möglich.
 BankChecksToReceipt=Checks die auf Einlösung warten
 PaymentDateUpdateSucceeded=Zahlungsdatum erfolgreich aktualisiert
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 0da19676706..36a71f8d685 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -48,7 +48,6 @@ PaymentStatusToValidShort=Freizugeben
 ErrorVATIntraNotConfigured=Intrakommunale MwSt.-Nr. noch nicht definiert
 ErrorNoPaiementModeConfigured=Keine standardmässige Zahlungsart definiert. Beheben Sie diesen Fehler in den Einstellungen des Rechnungsmoduls.
 ErrorCreateBankAccount=Legen Sie ein Bankkonto an und definieren Sie anschliessend die Zahlungsarten in den Einstellungen des Rechnungsmoduls.
-RecurringInvoiceTemplate=Wiederkehrende Rechnung
 NoQualifiedRecurringInvoiceTemplateFound=Keine passende wiederkehrende Rechnungsvorlage gefunden
 FoundXQualifiedRecurringInvoiceTemplate=%s passende Vorlagen zum generieren von wiederkehrenden Rechnungen gefunden.
 NotARecurringInvoiceTemplate=Keine Rechnungsvorlage für wiederkehrende Rechnungen
@@ -58,11 +57,13 @@ ConfirmClassifyPaidPartiallyReasonAvoir=Der offene Zahlbetrag <b>( %s %s)</b> re
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Der offene Zahlbetrag <b>( %s %s)</b> resultiert aus einem gewährten Skonto. Ich akzeptiere den Verlust der MwSt. aus diesem Rabatt.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Kundenverschulden
 RelatedRecurringCustomerInvoices=Verknüpfte wiederkehrende Kundenrechnung
+DateMaxPayment=Zahlung fällig bis
 SupplierBillsToPay=Offene Lieferantenrechnungen
 Reduction=Ermässigung
 Reductions=Ermässigungen
 CreditNoteDepositUse=Rechnung muss validiert werden, um diese Gutschriftsart zu verwenden
 AmountPaymentDistributedOnInvoice=Zahlungsbetrag auf Rechnungen verteilen
+PaymentOnDifferentThirdBills=Erlaube Zahlungen an andere Partner, aber mit gleicher übergeordnetem Unternehmung
 FrequencyPer_d=Alle %s Tage
 FrequencyPer_m=Alle %s Monate
 FrequencyPer_y=Alle %s Jahre
@@ -71,6 +72,7 @@ NextDateToExecution=Datum der nächsten Rechnungsstellung
 DateLastGeneration=Datum der letzten Rechnungsstellung
 MaxPeriodNumber=Maximal Anzahl der generierten Rechnungen
 NbOfGenerationDone=Anzahl der schon erstellten Rechnungen
+MaxGenerationReached=Maximal Anzahl der Generierungen erreicht
 GeneratedFromRecurringInvoice=Aus wiederkehrender Rechnungsvorlage %s erstellt
 InvoiceGeneratedFromTemplate=Rechnung %s aus wiederkehrender Rechnungsvorlage %s erstellt
 PaymentCondition30DENDMONTH=30 Tage ab Monatsende
@@ -81,9 +83,9 @@ ExtraInfos=Zusatzinformationen
 IntracommunityVATNumber=Innergemeinschaftliche MwSt-Nummer
 VATIsNotUsedForInvoice=* Nicht für MwSt-art-CGI-293B
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
-YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Geschäftspartners aus erstellt wird
 YouMustCreateStandardInvoiceFirstDesc=Sie müssen zuerst eine Standardrechnung Erstellen und diese dann in eine Rechnungsvorlage umwandeln
 SituationAmount=Situation Rechnungsbetrag (ohne MwSt.)
+invoiceLineProgressError=Rechnungszeile Fortschritt kann nicht grösser oder gleich der nächsten Rechnungszeile sein
 updatePriceNextInvoiceErrorUpdateline=Fehler: Aktualisiere Preis auf Rechnungszeile: %s
 ToCreateARecurringInvoice=Um eine wiederkehrende Rechnung für diesen Vertrag zu erstellen, zuerst einen Rechnungsentwurf erstellen und diesen dann in eine Vorlage umwandeln und zuletzt den Rechnungsintervall erfassen.
 ToCreateARecurringInvoiceGene=Um zukünftige wiederkehrende Rechnungen manuell zu erstellen, gehen Sie zum Menü <strong>%s - %s - %s</strong>.
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index 4d8d004c42a..14a44819c8d 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -22,4 +22,3 @@ BoxGoodCustomers=Guter Kunde
 LastRefreshDate=Datum der letzten Aktualisierung
 NoRecordedInterventions=Keine verzeichneten Einsätze
 LastXMonthRolling=%s letzte Monate gleitend
-ChooseBoxToAdd=Box zum Startbildschirm hinzufügen
diff --git a/htdocs/langs/de_CH/categories.lang b/htdocs/langs/de_CH/categories.lang
index cd50a46cfcd..44f0c7186c7 100644
--- a/htdocs/langs/de_CH/categories.lang
+++ b/htdocs/langs/de_CH/categories.lang
@@ -2,22 +2,28 @@
 Rubrique=Tag/Kategorie
 Rubriques=Tags/Kategorien
 NoCategoryYet=Keine Kategorie/Tags von dieser Art erstellt
+AddIn=Einfügen in
 CategoriesArea=Tags/Kategorien - Übersicht
+ProductsCategoriesArea=Produkte/Leistungen Kategorien-Übersicht
 MembersCategoriesArea=Mitglieder- Kategorien/Tags
+AccountsCategoriesArea=Kontenkategorien Übersicht
 CatList=Liste der Kategorien/Tags
 NewCategory=Neue Kategorie/Tag
 CreateCat=Kategorie/Tag erstellen
 CreateThisCat=Kategorie/Tag erstellen
+ImpossibleAddCat=Kategorie %s kann nicht zugewiesen werden
 ProductIsInCategories=Produkt/Leistung ist zu folgenden Kategorien/Tags verknüpft
 CompanyIsInCustomersCategories=Dieser Geschäftspartner ist folgenden Kunden- Kategorien/Tags zugewiesen
 CompanyIsInSuppliersCategories=Dieser Parnter ist folgenden Lieferanten- Kategorien/Tags zugewiesen
 MemberIsInCategories=Dieses Mitglied ist folgenden Mitglieder- Kategorien/Tags zugewiesen
 ContactIsInCategories=Dieser Kontakt ist mit folgenden Kontakte- Kategorien/Tags verknüpft
-CompanyHasNoCategory=Dieser Geschäftspartner ist in keiner Kategorie
 ClassifyInCategory=Zu Kategorie/Tag hinzufügen
 ContentsVisibleByAllShort=Öffentl. Inhalt
 CustomersCategoryShort=Kunden- Kategorie/Tag
 ProductsCategoryShort=Produkt- Kategorie/Tag
 MembersCategoryShort=Mitglieds- Kategorie/Tag
+ProspectsCategoriesShort=Leaskategorien
 CustomersProspectsCategoriesShort=Kunden- / Leadkategorien
+AccountsCategoriesShort=Kontenkategorien
+ThisCategoryHasNoAccount=Dieser Kategorie sind keine Konten zugewiesen.
 CatContactList=Liste der Kontakt- Kategorien/Tags
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index da38bb15ca9..dd71caf694a 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -15,11 +15,10 @@ ThirdParty=Geschäftspartner
 ThirdParties=Geschäftspartner
 ThirdPartyType=Typ des Geschäftspartners
 Company/Fundation=Firma/Verein
-ToCreateContactWithSameName=Legt aus diesen Daten autom. eine Person/Kontakt an
-No_Email=keine E-Mail-Kampagne senden
+PostOrFunction=Position
+No_Email=Keine E-Mail-Kampagnen
 VATIsUsed=MwSt.-pflichtig
 VATIsNotUsed=Nicht MwSt-pflichtig
-CopyAddressFromSoc=Übernehme die Adresse vom Geschäftspartner
 ThirdpartyNotCustomerNotSupplierSoNoRef=Adresse ist weder Kunde noch Lieferant, keine Objekte zum Verknüpfen verfügbar
 LocalTax1IsUsed=Zweite Steuer verwenden
 LocalTax2IsUsed=Dritte Steuer nutzen
@@ -29,13 +28,16 @@ CustomerCodeModel=Kunden-Code-Modell
 SupplierCodeModel=Lieferanten-Code Modell
 ProfId1AR=Prof Id 1 (CUIT)
 ProfId2AR=Prof Id 2 (Revenu Bestien)
+ProfId1AT=Prof Id 1
 ProfId4AT=Prof Id 4
 ProfId1BE=Prof Id 1 (Anzahl Professionnel)
 ProfId1BR=CNPJ
 ProfId2BR=IE (Staatliche Behörde)
 ProfId3BR=IM (kommunale Behörde)
+ProfId1CH=--
 ProfId3CH=Prof Id 1 (Bundes-Nummer)
 ProfId4CH=Prof Id 2 (Commercial Record-Nummer)
+ProfId1DE=Umsatzsteuer-Identifikationsnummer
 ProfId4DE=Steuernummer
 ProfId1ES=Prof Id 1 (CIF / NIF)
 ProfId2ES=Prof Id 2 (Social Security Number)
@@ -61,11 +63,13 @@ ProfId4PT=Prof Id 4 (Konservatorium)
 ProfId2TN=Prof Id 2 (Geschäftsjahr matricule)
 ProfId3TN=Prof Id 3 (Douane-Code)
 ProfId1RU=Prof ID 1 (OGRN)
+VATIntra=Umsatzsteuer-Identifikationsnummer
 VATIntraShort=MwSt.-Nr.
 CustomerCard=Kundenkarte
 CustomerRelativeDiscountShort=Rabatt rel.
 CustomerAbsoluteDiscountShort=Rabatt abs.
 CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmässig keinen relativen Rabatt
+ContactId=Kontakt ID
 NoContactDefinedForThirdParty=Für diesen Geschäftspartner ist kein Kontakt eingetragen
 NoContactDefined=Kein Kontakt vorhanden
 AddThirdParty=Geschäftspartner erstellen
@@ -75,9 +79,11 @@ SupplierCodeShort=Lieferanten-Nr.
 RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent ist
 RequiredIfSupplier=Erforderlich falls Geschäftspartner Lieferant ist
 ListOfThirdParties=Liste der Geschäftspartner
+ShowContact=Zeige Kontaktangaben
 ContactForOrdersOrShipments=Bestellungs- oder Lieferkontakt
 ContactForProposals=Offertskontakt
 NoContactForAnyOrder=Kein Kontakt für Bestellungen
+NoContactForAnyOrderOrShipments=Dieser Kontakt ist kein Kontakt für eine Bestellung oder Lieferung
 NoContactForAnyProposal=Kein Kontakt für Offerte
 NoContactForAnyContract=Kein Kontakt für Verträge
 NoContactForAnyInvoice=Dieser Kontakt ist kein Kontakt für jegliche Rechnung
@@ -87,12 +93,12 @@ OthersNotLinkedToThirdParty=Andere, nicht mit einem Geschäftspartner verknüpft
 TE_GROUP=Grossunternehmen
 ContactNotLinkedToCompany=Kontakt keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr Benutzername
-ExportDataset_company_1=Geschäftspartner (Unternehmen/Stiftungen/Personen) und Eigenschaften
-ImportDataset_company_1=Geschäftspartner (Unternehmen/Stiftungen/Personen) und Eigenschaften
 ImportDataset_company_4=Geschäftspartner / Aussendienstmitarbeiter (Auswirkung Aussendienstmitarbeiter  an Unternehmen)
 AllocateCommercial=Vertriebsmitarbeiter zuweisen
 Organization=Organisation
 FiscalMonthStart=Ab Monat des Geschäftsjahres
+YouMustAssignUserMailFirst=Um E-Mail Benachrichtigungen für diesen Benutzer hinzuzufügen müssen Sie zuerst eine Emailadresse beim Benutzer definieren.
+YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte beim Geschäftspartner anlegen, um E-Mail-Benachrichtigungen hinzufügen zu können.
 ThirdPartiesArea=Geschäftspartner- und Kontaktbereich
 LastModifiedThirdParties=Letzte %s bearbeitete Geschäftspartner
 OutstandingBillReached=Kreditlimit erreicht
diff --git a/htdocs/langs/de_CH/compta.lang b/htdocs/langs/de_CH/compta.lang
index 0cd5bacccac..95941ed71a0 100644
--- a/htdocs/langs/de_CH/compta.lang
+++ b/htdocs/langs/de_CH/compta.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - compta
 FeatureIsSupportedInInOutModeOnly=Dieses Feautre ist nur in der Soll-Haben-Option verfügbar (siehe Konfiguration des Rechnungswesen-Moduls)
 PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem Geschäftspartner verbunden
+Balance=Bilanz
 VATReceived=Erhobene MwSt.
 VATSummary=MwSt. Saldo
+LT2SummaryES=EKSt. Übersicht
 VATPaid=Bezahlte MwSt.
 VATCollected=Erhobene MwSt.
 SocialContributionsDeductibles=Abzugsberechtigte Sozialabgaben/Steuern
 SocialContributionsNondeductibles=Nicht abzugsberechtigte Sozialabgaben/Steuern
 PaymentVat=MwSt.-Zahlung
 VATPayment=MwSt.-Zahlung
+VATPayments=MwSt-Zahlungen
 ShowVatPayment=Zeige MwSt. Zahlung
 ByThirdParties=Durch Geschäftspartner
 LastCheckReceiptShort=Letzte %s Scheckeinnahmen
@@ -27,6 +30,10 @@ VATReportByQuartersInDueDebtMode=Quartalsbericht zur vereinnahmten und bezahlten
 SeeVATReportInInputOutputMode=Siehe <b>%sMwSt.-Einnahmen%s</b>-Bericht für eine standardmässige Berechnung
 SeeVATReportInDueDebtMode=Siehe <b>%sdynamischen MwSt.%s</b>-Bericht für eine Berechnung mit dynamischer Option
 ThirdPartyMustBeEditAsCustomer=Geschäftspartner muss als Kunde definiert werden
+Pcg_version=Pcg-Version
+Pcg_type=PCG Typ
+Pcg_subtype=PCG Subtyp
+InvoiceLinesToDispatch=versandbereite Rechnungszeilen
 ToCreateAPredefinedInvoice=Um eine Rechnungsvorlage zu erstellen, erstellen Sie eine Standard-Rechnung und klicken dann (ohne Freigabe) auf den Knopf "%s".
 CalculationRuleDesc=Zur Berechnung der Gesamt-MwSt. gibt es zwei Methoden: <br>Methode 1 rundet die Steuer in jeder Zeile und addiert zum Schluss. <br>Methode 2 summiert alle Steuer-Zeilen und rundet am Ende. <br>Das endgültige Ergebnis kann sich in wenigen Cent unterscheiden. Standardmodus ist <b>Modus %s.</b>
 CalculationRuleDescSupplier=Gemäss Ihrem Lieferanten, wählen Sie die  geeignete Methode, um die gleiche Berechnungsregel anzuwenden um das selbe Ergebnis wie Ihr Lieferant zu bekommen.
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index 1516ede3104..a5a59536eca 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -14,7 +14,6 @@ ErrorMaxNumberReachForThisMask=Maximum Grösse für diese Maske erreicht
 ErrorProdIdAlreadyExist=%s wurde bereits einem Geschäftspartner zugewiesen
 ErrorForbidden3=Es scheint keine ordnungsgemässe Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
 ErrorDateMustBeBeforeToday=Datum darf nicht in der Zukunft sein
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Geschäftspartner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Geschäftspartner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen.
 ErrorWarehouseRequiredIntoShipmentLine=Warenlager ist auf der Lieferzeile erforderlich.
 ErrorFileMustHaveFormat=Datei muss das Format %s haben
 ErrorSupplierCountryIsNotDefined=Zu diesem Lieferant ist kein Land definiert. Bitte korrigieren Sie dies zuerst.
diff --git a/htdocs/langs/de_CH/install.lang b/htdocs/langs/de_CH/install.lang
index d7167fd1730..2be735a8057 100644
--- a/htdocs/langs/de_CH/install.lang
+++ b/htdocs/langs/de_CH/install.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - install
+InstallEasy=Wir haben uns bemüht, die Installation von Dolibarr so einfach wie möglich zu gestalten. \nBefolgen Sie einfach die Schritte auf dem Bildschirm.
 ConfFileIsNotWritable=Die Konfigurationsdatei <b>%s</b> ist nicht beschreibbar. Bitte überprüfen Sie die Dateizugriffsrechte. Für die Erstinstallation muss Ihr Webserver in die Konfigurationsdatei schreiben können, sezzten Sie die Dateiberechtigungen entsprechend (z.B. mittels "chmod 666" auf Unix-Betriebssystemen).
 ErrorDatabaseAlreadyExists=Eine Datenbank mit dem Namen '%s' exisitiert bereits.
 IfDatabaseExistsGoBackAndCheckCreate=Sollte die Datebank bereits existieren, gehen Sie bitte zurück und deaktivieren Sie das Kontrollkästchen "Datenbank erstellen".
diff --git a/htdocs/langs/de_CH/ldap.lang b/htdocs/langs/de_CH/ldap.lang
new file mode 100644
index 00000000000..6b559655802
--- /dev/null
+++ b/htdocs/langs/de_CH/ldap.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - ldap
+LDAPCard=LDAP-Karte
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index 4a5c0aee792..dc5f69fccf3 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -24,8 +24,13 @@ AvailableVariables=Verfügbare Ersatzvariablen
 NotEnoughDataYet=Nicht genügend Daten
 ErrorCanNotCreateDir=Kann Verzeichnis %s nicht erstellen
 ErrorFileNotUploaded=Die Datei konnte nicht hochgeladen werden. Stellen Sie sicher dass die Dateigrösse nicht den gesetzten Maximalwert übersteigt, das Zielverzeichnis über genügend freien Speicherplatz verfügt und noch keine Datei mit gleichem Namen existiert.
+ErrorRecordIsUsedByChild=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untegeordneten Datensatz verwendet.
+ErrorDuplicateField=Dieser Wert ist nicht einzigartig (schon vorhanden)
+ErrorSomeErrorWereFoundRollbackIsDone=Einige Fehler wurden gefunden. Änderungen rückgängig gemacht.
+ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer <b>%s</b> nicht aus der Systemdatenbank laden.
 ErrorNoSocialContributionForSellerCountry=Fehler, keine Definition für Sozialabgaben/Steuerwerte definiert für Land '%s'.
 GoToWikiHelpPage=Onlinehilfe (Internetzugang notwendig)
+DolibarrInHttpAuthenticationSoPasswordUseless=Authentifizierungsmodus mit dem Wert <b>%s</b> in der Konfigurationsdatei <b>conf.php.</b> definiert.<br> Die Passwort-Datenbank ist dadurch eine externe und Änderungen in diesem Bereich haben unter Umständen keine Auswirkungen.
 RequestLastAccessInError=Letzter Datenbankfehler
 ReturnCodeLastAccessInError=Rückgabewert des letzten Datenbankfehlers
 InformationLastAccessInError=Informationen zum letzten Datenbankfehler
@@ -35,7 +40,6 @@ AddToDraft=Zu Entwurf hinzufügen
 Close=Schliessen
 CloseBox=Box vom Startbildschirm entfernen
 ValidateAndApprove=Freigeben und bestätigen
-NoUserGroupDefined=Keine Benutzergruppe definiert
 DateToday=Aktuelles Datum
 DateStart=Startdatum
 DateEnd=Enddatum
@@ -43,6 +47,8 @@ DateModificationShort=Änd.Datum
 DateClosing=Schliessungsdatum
 DateOperationShort=Ausf.Datum
 MinuteShort=min
+PriceUHT=VP (netto)
+PriceUTTC=E.P. (inkl. Steuern)
 AmountHT=Betrag (exkl. MwSt.)
 AmountVAT=MwSt.-Betrag
 MulticurrencyAmountHT=Nettobetrag, in Währung
@@ -50,19 +56,27 @@ MulticurrencyAmountTTC=Bruttobetrag, in Währung
 MulticurrencyAmountVAT=Steuerbetrag, in Währung
 AmountLT1=MwSt.-Betrag 2
 AmountLT2=MwSt.-Betrag 3
+Percentage=Prozentangabe
 TotalHTShortCurrency=Totalbetrag (In Währung)
 TotalTTCShort=Totalbetrag (inkl. MwSt.)
 TotalHT=Totalbetrag
 TotalHTforthispage=Totalbetrag für diese Seite
 Totalforthispage=Total für diese Seite
+TotalTTCToYourCredit=Bruttosumme
 TotalVAT=MwSt.
 TotalLT1=Gesamte MwSt. 2
 TotalLT2=Gesamte MwSt. 3
 VAT=MwSt.
+Ref=Nummer
+RefPayment=Zahlungs-Nr.
+ActionsToDo=unvollständige Ereignisse
+ActionsToDoShort=Zu erledigen
+ActionRunningNotStarted=Nicht begonnen
 ContactsForCompany=Ansprechpartner/Adressen dieses Geschäftspartners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Geschäftspartner
 AddressesForCompany=Adressen für den Geschäftspartner
 ActionsOnCompany=Ereignisse zu diesem Geschäftspartner
+Generate=Erstelle
 Refused=zurückgewiesen
 Validated=Freigegeben
 Size=Grösse
@@ -72,13 +86,16 @@ Keyword=Stichwort
 NbOfThirdParties=Anzahl der Geschäftspartner
 NbOfObjectReferers=Anzahl verknüpfter Objekte
 Referers=Verknüpfte Objekte
+Uncheck=nicht gewählt
 CloseWindow=Fenster schliessen
 SendAcknowledgementByMail=Bestätigungsemail senden
 NoMobilePhone=Kein Mobiltelefon
 YouCanChangeValuesForThisListFromDictionarySetup=Sie können die Listenoptionen in den Wörterbuch-Einstellungen anpassen
 YouCanSetDefaultValueInModuleSetup=Standardwerte für neue Datensätzen können im Modulsetup eingestellt werden
+CurrentTheme=Aktuelle Oberfläche
 FreeLineOfType=Freitext vom Typ
 CoreErrorMessage=Entschulding, ein Fehler ist aufgetreten. Prüfen die die Logdateien oder benachrichtigen Sie den Administrator.
+CreditCard=Kreditkarte
 FieldsWithIsForPublic=Felder mit <b>%s</b> sind für Mitglieder öffentlich sichtbar. Über die "Öffentlich"-Checkbox können Sie dies ändern.
 ByMonthYear=Von Monat / Jahr
 AdminTools=Adminwerkzeuge
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 626846f9bae..c6836594e5f 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -42,4 +42,3 @@ MembersStatisticsByState=Mitgliederstatistik nach Kanton
 MembersStatisticsByTown=Mitgliederstatistik nach Ort
 NoValidatedMemberYet=Keine verifizierten Mitglieder gefunden
 Public=Informationen sind öffentlich
-Exports=Exporte
diff --git a/htdocs/langs/de_CH/oauth.lang b/htdocs/langs/de_CH/oauth.lang
index 37f05d252b0..e7af6ccf4f4 100644
--- a/htdocs/langs/de_CH/oauth.lang
+++ b/htdocs/langs/de_CH/oauth.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - oauth
 ListOfSupportedOauthProviders=Geben sie hier die OAuth2 Zugangsdaten ein. Nur unterstützte OAuth2 Anbieter sind hier sichtbar. Diese Einstellungen könne von anderen Modulen verwendet werden.
-OAUTH_GOOGLE_DESC=Gehen sie zu <a href="https://console.developers.google.com/" target="_blank">dieser Seite</a>, und erstellen sie dann OAuth Zugangsdaten
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index 90a7a2dcd4d..6d911725e0a 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -2,22 +2,32 @@
 ProductVatMassChange=MwSt-Massenänderung
 LastRecordedProducts=%s zuletzt erfasste Produkte
 CardProduct0=Produkt-Karte
+CardProduct1=Leistungs-Karte
 SellingPriceTTC=Verkaufspreis (inkl. MwSt.)
 CostPriceUsage=In einer zukünftigen Version kann dieser Wert für die Margenberechnung verwendet werden.
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
+ServicesArea=Leistungs-Übersicht
 SupplierCard=Lieferantenkarte
 SetDefaultBarcodeType=Wählen Sie den standardmässigen Barcode-Typ
 ParentProducts=Übergeordnetes Produkt
 VATRateForSupplierProduct=MwSt. Satz (für diesen Lieferanten/Produkt)
+DiscountQtyMin=Standard-Rabatt für die Menge
+PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte
+PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
+CloneCompositionProduct=Dupliziere Produkt-/Leistungs- Zusammenstellung
+NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
 SellingPrices=Verkaufspreise
 BuyingPrices=Einkaufspreise
-FillBarCodeTypeAndValueFromThirdParty=Barcode-Typ und -Wert von einem Geschäftspartner wählen.
-DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Geschäftspartner %s unvollständig.
-BarCodeDataForThirdparty=Barcode-Information von Geschäftspartner %s:
+CustomerPrices=Kunden Preise
+SuppliersPrices=Lieferanten Preise
+ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
+FillBarCodeTypeAndValueFromProduct=Barcode-Typ und -Wert von einem Produkt wählen.
 PriceByCustomer=Unterschiedliche Preise je nach Kunde
 PriceCatalogue=Ein einziger Verkaufspreis pro Produkt/Leistung
 PricingRule=Preisregel für Verkaufspreise
 PriceExpressionEditorHelp2=Sie können auf die ExtraFields mit Variablen wie <b>#extrafield_myextrafieldkey# </b> und globale Variablen mit <b>#global_mycode#</b> zugreifen
+PriceMode=Preisfindungs-Methode
+ComposedProductIncDecStock=Erhöhen/verringern Lagerbestand  bei verknüpften Produkten
 MinCustomerPrice=Mindespreis für Kunden
 AddUpdater=Aktualisierung hinzufügen
 VariableToUpdate=Zu aktualisierende Variablen
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index 1797678eba4..fc41771a9f9 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -10,7 +10,6 @@ TimeSpentByYou=Dein Zeitaufwand
 MyProjectsArea=Mein Projektbereich
 GoToListOfTimeConsumed=Zur Stundenaufwandsliste wechseln
 GoToListOfTasks=Zur Aufgabenliste gehen
-ListPredefinedInvoicesAssociatedProject=Liste der Rechnungsvorlagen, die mit diesem Projekt verknüpft sind
 ListFichinterAssociatedProject=Liste Eingriffe, die mit diesem Projekt verknüpft sind
 ChildOfTask=Kindelement von Projekt/Aufgabe
 CloseAProject=Projekt schliessen
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index 570dd441130..7b868fcd25c 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -1,7 +1,9 @@
 # Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Warenlagerkarte
 CancelSending=Lieferung abbrechen
 StockTransfer=Lagerumbuchung
 MassStockTransferShort=Massen Lagerumbuchungen
+StockLowerThanLimit=Bestand unterhalb des Sicherungsbestandes
 DeStockOnShipmentOnClosing=Verringere echten Bestände bei Lieferbestätigung
 ReStockOnDispatchOrder=Reale Bestände auf manuelle Dispatching in Hallen, nach Erhalt Lieferanten bestellen
 StockLimit=Sicherungsbestand für autom. Benachrichtigung
diff --git a/htdocs/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
index 7200efb2192..d1034fa92fb 100644
--- a/htdocs/langs/de_CH/suppliers.lang
+++ b/htdocs/langs/de_CH/suppliers.lang
@@ -1,8 +1,4 @@
 # Dolibarr language file - Source file is en_US - suppliers
-BuyingPriceMin=Mindest Einkaufspreis
-BuyingPriceMinShort=Min.Einkaufspreis
-TotalBuyingPriceMinShort=Summe der Einkaufspreise der Unterprodukte
-TotalSellingPriceMinShort=Summe der Verkaufspreise der Unterprodukte
 ConfirmCancelThisOrder=Möchten Sie diese Bestellung wirklich verwerfen <b>%s</b> ?
 SupplierReputation=Lieferantenbewertung
 DoNotOrderThisProductToThisSupplier=Nicht bestellen
diff --git a/htdocs/langs/de_CH/website.lang b/htdocs/langs/de_CH/website.lang
index a372b4d33e5..44135bb92c7 100644
--- a/htdocs/langs/de_CH/website.lang
+++ b/htdocs/langs/de_CH/website.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 WebsiteSetupDesc=Erstellen sie hier soviele Webauftritte wie sie wollen. Dann gehen sie ins Menü Webauftritt um sie zu bearbeiten.
-DeleteWebsite=Webauftritt löschen
+DeleteWebsite=Webseite löschen
 ConfirmDeleteWebsite=Möchten sie wirklich diesen Webauftritt löschen? Alle Seiten und Inhalte werden dadurch auch gelöscht.
 WEBSITE_CSS_URL=URL zu externer CSS Datei
 EditPageMeta=Metadaten bearbeiten
diff --git a/htdocs/langs/de_CH/withdrawals.lang b/htdocs/langs/de_CH/withdrawals.lang
index 1d473ceaef9..7035a9787fc 100644
--- a/htdocs/langs/de_CH/withdrawals.lang
+++ b/htdocs/langs/de_CH/withdrawals.lang
@@ -1,7 +1,4 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-LastWithdrawalReceipts=%s neueste Abbuchungsbelege
-RequestStandingOrderToTreat=Anfrage für Dauerauftrage zu bearbeiten
-LastWithdrawalReceipt=%s neueste Abbuchungsbelege
 ThirdPartyBankCode=BLZ Geschäftspartner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich abgebucht. Überprüfen Sie die Kontonummern der den Rechnungen zugewiesenen Geschäftspartnern.
 WithdrawalRefusedConfirm=Möchten Sie wirklich eine Abbuchungsablehnung zu diesem Geschäftspartner erstellen?
diff --git a/htdocs/langs/de_CH/workflow.lang b/htdocs/langs/de_CH/workflow.lang
index 58bc3f11d07..5e0e8ac9e7c 100644
--- a/htdocs/langs/de_CH/workflow.lang
+++ b/htdocs/langs/de_CH/workflow.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowDesc=Dieses Modul wurde gestaltet um das Verhalten von automatischen Aktionen in den Anwendung zu verändern. Standardmässig wird der Prozess offen sein. (Sie können die Dinge in der gewünschten Reihenfolge tun). Sie können die automatische Aktionen, die Sie interessieren aktivieren.
+ThereIsNoWorkflowToModify=Es sind keine Workflow Änderungen möglich mit den aktivierten Modulen.
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 9f8d3c5c7c8..debc6a6f6d2 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journale
 JournalFinancial=Finanzjournale
 BackToChartofaccounts=Zurück zum  Kontenplan
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Kontenplan wählen
 Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
 AccountAccounting=Buchhaltungskonto
 AccountAccountingShort=Konto
 AccountAccountingSuggest=Buchhaltungskontovorschlag
-Ventilation=Aufteilung
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Buchhaltung
-CustomersVentilation=Aufteilung Kunden
-SuppliersVentilation=Aufteilung Lieferanten
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Berichte
 NewAccount=Neues Buchhaltungskonto
 Create=Erstelle
-CreateMvts=Lagerbewegung erstellen
-UpdateMvts=Lagerbewegung ändern
-WriteBookKeeping=Konten ins Hauptbuch übernehmen
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Hauptbuch
 AccountBalance=Saldo Sachkonto
 
 CAHTF=Einkaufssume pro Lieferant ohne Steuer
-InvoiceLines=Rechnungszeile bereinigen
-InvoiceLinesDone=Bereinigte Rechnungszeilen
-IntoAccount=Erörtern im Sachkonto
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=erörtern
+Ventilate=Bind
 
 Processing=Bearbeitung
 EndProcessing=Das Ende der Verarbeitung
-AnyLineVentilate=Beliebige Zeile zu bereinigen
+AnyLineVentilate=Any lines to bind
 SelectedLines=Gewählte Zeilen
 Lineofinvoice=Rechnungszeile
-VentilatedinAccount=Erfolgreich im Rechnungskonto bereinigt
-NotVentilatedinAccount=Nicht im Rechnungskonto bereinigt
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Anzahl der Elemente, die Aufgliederung nach Seite angezeigt werden (empfohlenes Maximum: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Beginnen Sie die Sortierung der Abbau Seiten "Muss sortiert werden" durch die aktuellen Elemente
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie die Sortierung der Abbau Seiten "Abbau" durch die aktuellen Elemente
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Listenlänge für die Anzeige von Produkt- und Dienstleistungsbeschreibung (Empfehlung = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Länge für die Anzeige der Beschreibung von Produkte und Leistungen in den Listen (Ideal = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Länge der Finanzbuchführung
-ACCOUNTING_LENGTH_AACCOUNT=Länge der Partner
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Einstellung für die Null am Ende eines Kontenrahmenkonto. In einigen Länder erforderlich. Deaktiviert in die Standard-Einstellungen. Beachten Sie dabei die Einstellung der "Länge des Kontos".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Ausgangsrechnungen
 ACCOUNTING_PURCHASE_JOURNAL=Eingangsrechnungen
@@ -81,32 +102,31 @@ Sens=Zweck
 Codejournal=Journal
 NumPiece=Teilenummer
 AccountingCategory=Buchhaltungskategorie
-
 NotMatch=undefiniert
-
 DeleteMvt=Lösche Hauptbuch Datensätze
 DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
-ConfirmDeleteMvt=Dadurch werden alle Datensätze des Hauptbuchs  für das Jahr und/oder von einem bestimmten Journal gelöscht
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Löschen Sie die Einträge des Hauptbuchs
-
 DescSellsJournal=Verkaufsjournal
 DescPurchasesJournal=Einkaufsjournal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Rechnungszahlung (Kunde)
-
 ThirdPartyAccount=Partner Konto
-
-NewAccountingMvt=Neue Änderung
-NumMvts=Anzahl der Änderungen
-ListeMvts=Liste der Bewegungen
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
 
-ReportThirdParty=Liste der Partner Konten
-DescThirdPartyReport=Konsultieren Sie hier die Liste der Drittkunden und die Anbieter und ihre Buchhaltungskonten
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Liste der Abrechnungskonten
 
@@ -114,22 +134,29 @@ Pcgtype=Kontenklasse
 Pcgsubtype=Unterkontenklasse
 Accountparent=Wurzeln des Kontos
 
-DescVentilCustomer=Konsultieren Sie hier die jährliche Aufteilung der Buchhaltung Ihrer Rechnungs-Kunden
 TotalVente=Verkaufssumme ohne Steuer
 TotalMarge=Gesamt-Spanne
-DescVentilDoneCustomer=Konsultieren Sie hier die Liste der Zeilen der Rechnungs-Kunden und deren Abrechnungskonto
-DescVentilTodoCustomer=Bereinigen Sie die Zeilen der Kundenrechnung mit einem Rechnungskonto
-ChangeAccount=Ändern sie das Abrechnungskonto für markierte Zeilen durch das Konto:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Konsultieren Sie hier die jährliche Aufteilung der Buchhaltung, Ihrer Rechnungen der Lieferanten
-DescVentilDoneSupplier=Konsultieren Sie hier die Liste der Zeilen der Rechnungs-Kunden und deren Abrechnungskonto
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Automatisch geltend machen
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchhaltungskonto nicht löschen, da es benutzt wird.
 MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s
-FicheVentilation=Zusammensetzung - Karte
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Vorgänge werden in das Hauptbuch übertragen.
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Massenaktualisierung der Kategorien
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export zu Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Rechnungswesen initialisieren
-InitAccountancyDesc=Hier kann für Artikel und Dienstleistungen ein Sachkonto vorgegeben werden, wenn noch kein Rechnungswesen-Konto für Ein- und Verkäufe definiert ist. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Moduls Rechnungswesen vollständig ist.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Optionen
 OptionModeProductSell=Modus Verkauf
 OptionModeProductBuy=Modus Einkäufe
 OptionModeProductSellDesc=Zeige alle Artikel ohne Sachkonto Verkauf
 OptionModeProductBuyDesc=Alle Artikel ohne Sachkonto Einkauf anzeigen
+CleanFixHistory=Bereinige Buchhaltungs-Konten von Positionen, die nicht in Kontenplänen existieren.
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Bereich von Sachkonten
@@ -167,3 +196,9 @@ Formula=Formel
 ErrorNoAccountingCategoryForThisCountry=Für dieses Land sind keine Kontenkategorien verfügbar
 ExportNotSupported=Das eingestellte Exportformat wird von deiser Seite nicht unterstützt
 BookeppingLineAlreayExists=Datensätze existieren bereits in der Buchhaltung
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 4697482aa28..9038ad5bfd0 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimentell
 VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlen
-FileCheck=Datei Integrität
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Fehlende Dateien
 FilesUpdated=Dateien ersetzt
-FileCheckDolibarr=Überprüfe Integrität von Dolibarr Dateien
-XmlNotFound=XML-Datei  Integrität von Dolibarr nicht gefunden
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Session
 SessionSaveHandler=Handler für Sitzungsspeicherung
 SessionSavePath=Pfad für Sitzungsdatenspeicherung
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Fehler: Eine höhere Genauigkeit als <b>%s</b
 DictionarySetup=Stammdaten
 Dictionary=Stammdaten
 Chartofaccounts=Kontenplan
-Fiscalyear=Fiskalische Jahre
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Die Werte 'system' und 'systemauto' für Typ sind reserviert. Sie können 'user' als Wert verwenden, um Ihren eigenen Datensatz hinzuzufügen
 ErrorCodeCantContainZero=Code darf keinen Wert 0 enthalten
 DisableJavascript=JavaScript- und Ajax-Funktionen deaktivieren (empfohlen für Blinde und Text-Browser)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Warte bis Taste gedrückt wurde bevor Inhalte in
 DelaiedFullListToSelectContact=Warten bis Taste gedrückt bevor der Inhalt der Kontakt Combo Liste geladen wird (Dies kann die Leistung erhöhen, wenn Sie eine große Anzahl von Kontakten haben)
 NumberOfKeyToSearch=Anzahl der Buchstaben um eine Suche auszulösen: %s
 NotAvailableWhenAjaxDisabled=Nicht verfügbar, wenn Ajax deaktiviert
-AllowToSelectProjectFromOtherCompany=Bei Partner können Projekte von anderen Partnern ausgewählt werden
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript deaktiviert
 UsePreviewTabs=Vorschautabs verwenden
 ShowPreview=Vorschau anzeigen
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Hexadezimal-Verschlüsselung für Binärdateien
 IgnoreDuplicateRecords=Datensatzduplikate ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Berechtigungen
 BoxesDesc=Boxen sind auf einigen Seiten angezeigte Informationsbereiche. Sie können die Anzeige einer Box einstellen, indem Sie auf die Zielseite klicken und 'Aktivieren' wählen. Zum Ausblenden einer Box klicken Sie einfach auf den Papierkorb.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
-ModulesDesc=Hier können Sie die verfügbaren Module und Funktionen auswählen. Einige Module benötigen nach ihrer Aktivierung das Setzen spezifischer Benutzerberechtigungen.
+ModulesDesc=Die Module bestimmen, welche Funktionalität in Dolibarr verfügbar ist. Manche Module erfordern zusätzlich Berechtigungen die Benutzern die das Modul nutzen sollen gewährt werden muss, nachdem das Modul aktiviert wurde. \nKlicken Sie auf die Schaltfläche on/off, um ein Modul zu aktivieren. 
 ModulesMarketPlaceDesc=Sie finden weitere Module auf externen Web-Sites...
 ModulesMarketPlaces=Sie können zusätzliche Module im Web finden...
 DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiterungen
@@ -214,8 +220,8 @@ OfficialWebHostingService=Offizielle Web-Hosting-Services (Cloud Hosting)
 ReferencedPreferredPartners=Bevorzugte Partner
 OtherResources=Andere Ressourcen
 ForDocumentationSeeWiki=Für Benutzer-und Entwickler-Dokumentation (DOC, ...), FAQs <br> Werfen Sie einen Blick auf die Dolibarr Wiki: <br> <a href="%s" target="_blank"><b> %s</b></a>
-ForAnswersSeeForum=Für alle anderen Fragen / Hilfe, können Sie die Dolibarr Forum: <br> <a href="%s" target="_blank"><b> %s</b></a>
-HelpCenterDesc1=In diesem Bereich können Sie sich ein Hilfe-Support-Service auf Dolibarr.
+ForAnswersSeeForum=Für alle anderen Fragen, können Sie das Dolibarr Forum: <br> <a href="%s" target="_blank"><b> %s</b></a> benutzen.
+HelpCenterDesc1=In diesem Bereich erwartet Sie eine Übersicht von Hilfe und Support-Services für Dolibarr.
 HelpCenterDesc2=Ein Teil dieses Dienstes sind <b>nur</b> in <b>Englisch</b> verfügbar.
 CurrentMenuHandler=Aktuelle Menü-Handler
 MeasuringUnit=Maßeinheit
@@ -273,9 +279,10 @@ YouCanSubmitFile=Durch diesen Schritt, können Sie das Paket mit diesem Tool sen
 CurrentVersion=Aktuelle dolibarr-Version
 CallUpdatePage=Zur Aktualisierung der Daten und Datenbankstrukturen zur Seite %s gehen.
 LastStableVersion=Letzte stabile Version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update-Server offline
 GenericMaskCodes=Sie können ein beliebiges Numerierungsschema wählen. Dieses Schema könnte z.B. so aussehen:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück. Ist diese Option gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
-GenericMaskCodes2=<b>{cccc}</b>  den Kunden-Code mit n Zeichen<br><b>{cccc000}</b> den Kunden-Code mit n Zeichen, gefolgt von einer Client-Zähler zugeordnet zu dem Kunden. <br><b>{tttt}</b> Die Partner ID mit n Zeichen (siehe unter Einstellungen-Stammdaten->Arten von Partnern).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben. <br> Leerzeichen sind nicht zulässig. <br>
 GenericMaskCodes4a=<u>Beispiel auf der 99. %s des Partners DieFirma erstellt am 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Beispiel für Partner erstellt am 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameter zum Sichern von URLs
 SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
 EnterRefToBuildUrl=Geben Sie eine Referenz für das Objekt %s ein
 GetSecuredUrl=Holen der berechneten URL
-ButtonHideUnauthorized=Unterdrücke Schaltflächen bei unerlaubtem Zugriff statt sie zu deaktivieren
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Alter USt.-Satz
 NewVATRates=Neuer USt.-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -349,6 +356,7 @@ ExtrafieldMail = E-Mail
 ExtrafieldSelect = Wähle Liste
 ExtrafieldSelectList = Wähle von Tabelle
 ExtrafieldSeparator=Trennzeichen
+ExtrafieldPassword=Passwort
 ExtrafieldCheckBox=Kontrollkästchen
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Kontrollkästchen von Tabelle
@@ -383,11 +391,14 @@ EnableFileCache=Dateicache aktivieren
 ShowDetailsInPDFPageFoot=Mehr Detailinfos im PDF Fussbereich anzeigen, wie z.B. Ihre Firmenadresse, oder CEO Name (Zusätzlich zur Firmennummer, Firmenart und MWSt Nummer).
 NoDetails=Keine weiteren Details in der Fusszeile
 DisplayCompanyInfo=Firmenadresse anzeigen
-DisplayCompanyInfoAndManagers=Namen von Firma und Geschäftsführung anzeigen
+DisplayCompanyManagers=Anzeige Namen der Geschäftsführung
+DisplayCompanyInfoAndManagers=Firmenanschrift und Managernamen anzeigen
 EnableAndSetupModuleCron=Um wiederkehrende Rechnungen automatisch zu generieren, muss Modul *%s* aktiviert und korrekt eingerichtet sein. Ansonsten müssen die Rechnungen via *Erstellen* Knopf auf dieser Vorlage erstellt werden. Auch wenn die Rechnungen automatisch generiert werden, können trotzdem noch manuelle Rechnungen erstellt werden. Die Perioden werden nicht doppelt in Rechnung gestellt.
 ModuleCompanyCodeAquarium=Generiert einen Kontierungscode %s, gefolgt von der Lieferantenummer für einen Lieferanten-Kontierungscode und %s, gefolgt vom Kundenkontierungscode für einen Kundenkontierungscode.
 ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben.
 ModuleCompanyCodeDigitaria=Kontierungscode hängt vom Partnercode ab. Der Code setzt sich aus dem Buchstaben 'C' und den ersten 5 Stellen des Partnercodes zusammen.
+Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/User zum erstellen und ein Schritt/User für die Freigabe).<br> Hinweis: wenn ein User zum erstellen und freigeben berechtigt ist, dann reicht ein User für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
+UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
 
 # Modules
 Module0Name=Benutzer und Gruppen
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode-Verwaltung
 Module56Name=Telefonie
 Module56Desc=Telefonie-Integration
-Module57Name=Abbuchungsaufträge
-Module57Desc=Abbuchungsaufträge und Abhebungsmanagement. Hierzu gehört auch Generierung einer SEPA-Datei für europäische Länder.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial-Integration
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Sonderausgaben
 Module500Desc=Verwalten von speziellen Ausgaben (Steuern, Sozialabgaben, Dividenden)
-Module510Name=Löhne
-Module510Desc=Verwaltung der Angestellten-Gehälter und -Zahlungen
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Darlehen
 Module520Desc=Verwaltung von Darlehen
 Module600Name=Benachrichtigungen
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Spenden
 Module700Desc=Spendenverwaltung
 Module770Name=Spesenabrechnungen
@@ -606,10 +617,10 @@ Permission142=Projekte und Aufgaben erstellen und ändern (Auch private Projekte
 Permission144=Löschen Sie alle Projekte und Aufgaben (einschließlich privater Projekte in denen ich kein Kontakt bin)
 Permission146=Lieferanten einsehen
 Permission147=Statistiken einsehen
-Permission151=Lastschriftaufträge einsehen
-Permission152=Lastschriftaufträge erstellen/bearbeiten
-Permission153=Lastschriftaufträge übermitteln
-Permission154=Lastschriftaufträge genehmigen/ablehnen
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Verträge/Abonnements einsehen
 Permission162=Verträge/Abonnements erstellen/bearbeiten
 Permission163=Service/Abonnement in einem Vertrag aktivieren
@@ -617,7 +628,7 @@ Permission164=Service/Abonnement in einem Vertrag deaktivieren
 Permission165=Verträge/Abonnement löschen
 Permission167=Verträge exportieren
 Permission171=Reise- und Spesenabrechnung einsehen (Eigene und von Untergebenen)
-Permission172=Reise- und Spesenabrechnung erstellen/ändern
+Permission172=Reise- und Spesenabrechnung erstellen/bearbeiten
 Permission173=Reise- und Spesenabrechnung verwerfen
 Permission174=Alle Reise- und Spesenabrechnung einsehen
 Permission178=Reise- und Spesenabrechnung exportieren
@@ -747,6 +758,7 @@ Permission1236=Lieferantenrechnungen, -attribute und zahlungen exportieren
 Permission1237=Lieferantenbestellungen mit Details exportieren
 Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
+Permission1322=Reopen a paid bill
 Permission1421=Exportieren von Kundenaufträge und Attribute
 Permission20001=Urlaubsanträge einsehen (eigene und die der Untergebenen)
 Permission20002=Ihre eigenen Urlaubsanträge erstellen/bearbeiten
@@ -764,7 +776,7 @@ Permission2403=Ereignisse  (Termine/Aufgaben) in Verbindung mit eigenem Konto l
 Permission2411=Ereignisse (Termine/Aufgaben) Anderer einsehen
 Permission2412=Ereignisse (Termine/Aufgaben) Anderer erstellen/bearbeiten
 Permission2413=Ereignisse (Termine/Aufgaben) Anderer löschen
-Permission2414=Ereignisse/Aufgaben anderer Benutzer exportieren
+Permission2414=Ereignisse (Termine/Aufgaben) Anderer exportieren
 Permission2501=Dokumente herunterladen oder einsehen
 Permission2502=Dokumente herunterladen
 Permission2503=Dokumente bestätigen oder löschen
@@ -780,6 +792,10 @@ Permission55002=Abstimmung erstellen/ändern
 Permission59001=Gewinnspanne einsehen
 Permission59002=Gewinnspanne definieren
 Permission59003=Lesen aller Benutzer Margen
+Permission63001=Ressourcen anzeigen
+Permission63002=Ressource erstellen/bearbeiten
+Permission63003=Ressource löschen
+Permission63004=Verbinden von  Ressourcen zu Ereignissen
 DictionaryCompanyType=Arten von Partnern
 DictionaryCompanyJuridicalType=Rechtsformen von Partnern
 DictionaryProspectLevel=Potenzialstufen von Geschäftsaussicht
@@ -853,6 +869,7 @@ LabelUsedByDefault=Bezeichnung wird verwendet falls keine Übersetzung für den
 LabelOnDocuments=Bezeichnung auf Dokumenten
 NbOfDays=Anzahl der Tage
 AtEndOfMonth=Am Ende des Monats
+CurrentNext=Current/Next
 Offset=Wertsprung
 AlwaysActive=Immer aktiv
 Upgrade=Aktualisierung
@@ -950,7 +967,7 @@ LogEventDesc=Hier können Sie die Protokollierungseinstellungen für sicherheits
 AreaForAdminOnly=Diese Funktionen stehen ausschließlich <b>Administratoren</b> zur Verfügung. Administrationsfunktionen und -hilfe werden in dolibarr durch die folgenden Symbole dargestellt:
 SystemInfoDesc=Verschiedene systemrelevante, technische Informationen - Lesemodus und nur für Administratoren sichtbar.
 SystemAreaForAdminOnly=Dieser Bereich steht ausschließlich Administratoren zur Verfügung. Keine der Benutzerberechtigungen kann dies ändern.
-CompanyFundationDesc=Tragen Sie hier alle Informationen zum Unternehmen ein, das Sie verwalten möchten
+CompanyFundationDesc=Tragen Sie hier alle Informationen zum Unternehmen ein, das Sie verwalten möchten (Zum Bearbeiten auf den Button "Bearbeiten" oder "Speichern" am Schluss der Seite klicken)
 DisplayDesc=Hier können Sie die Oberfläche, sowie das allgemeine 'Look and Feel' des Systems anpassen
 AvailableModules=Verfügbare Module
 ToActivateModule=Zum Aktivieren von Modulen gehen Sie zu Start->Einstellungen->Module
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Achtung: Auf einigen Linux-Systemen muss die Einrichtu
 PathToDocuments=Dokumentenpfad
 PathDirectory=Verzeichnispfad
 SendmailOptionMayHurtBuggedMTA=Feature-Mails mit der Methode "PHP mail direkt" senden generiert eine Mail-Nachricht, die nicht korrekt möglicherweise von einigen Mail-Servern empfangen analysiert werden. Ergebnis ist, dass manche Mails nicht von Menschen, die von thoose abgehört Plattformen gehostet gelesen werden. Es ist bei einigen Internet-Providern (Ex: Orange in Frankreich). Dies ist nicht ein Problem in Dolibarr noch in PHP aber auf empfangende Mail-Server. Sie können jedoch hinzuzufügen MAIN_FIX_FOR_BUGGED_MTA Option auf 1 in die Setup - andere zu Dolibarr ändern, um dies zu vermeiden. Sie können jedoch Probleme mit anderen Servern, dass die Achtung streng dem SMTP-Standard zu erleben. Die andere Lösung (empfohlen) ist es, die Methode "SMTP-Socket-Bibliothek", die keine Nachteile hat benutzen.
-TranslationSetup=Übersetzungseinstellungen
-TranslationDesc=Wie die angezeigte Sprache gewählt wird <br>*Systemweit: Menu <strong>Start - Einstellungen - Anzeige</strong><br>* Pro Benutzer: <strong>Benutzeroberfläche</strong>-Registerkarte der Benutzerkarte (Klicken Sie auf den Benutzernamen am oberen Bildschirmrand).
-TranslationOverwriteDesc=Sie können Standardwerte zum füllen der folgenden Tabelle überschreiben.Wählen Sie dazu Ihre Sprache aus dem Dropdown "%s", fügen den Schlüssel aus der Übersetzungsdatei (langs/xx_XX/modul.lang) in "%s" ein und die neue Übersetzung in "%s".
+TranslationSetup=Konfiguration der Übersetzung
+TranslationKeySearch=Übersetzungsschlüssel oder -Zeichenkette suchen
+TranslationOverwriteKey=Überschreiben der Übersetzung
+TranslationDesc=Angezeichten Systemsprachen einstellen:<br>* Systemweit: Menü <strong>Start - Konfiguration - Anzeigen</strong><br>* Nach Benutzer: <strong>Benutzer konfigurieren</strong>Benutzer Karteireiter (Benutzername anklicken ganz oben auf dem Bildschirm).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Übersetzung Zeichenkette
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=Neue Übersetzungen anzeigen
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Anzahl aktivierterter Module: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
 ClassNotFoundIntoPathWarning=Klasse %s nicht innerhalb PHP-Pfad gefunden
@@ -1070,7 +1095,7 @@ HRMSetup=PV Modul Einstellungen
 CompanySetup=Unternehmenseinstellungen
 CompanyCodeChecker=Modul für Partner-Code-Erstellung (Kunden oder Lieferanten)
 AccountCodeManager=Modul für Kontierungs-Code-Erstellung (Kunden oder Lieferanten)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+NotificationsDesc=Die Funktion der Email-Benachrichtigung erlaubt Ihnen den stillen und automatischen Versand von Emails zu einigen Dolibarr-Ereignissen. Folgende Ziele können definiert werden:
 NotificationsDescUser=* pro Benutzer, ein Benutzer pro mal
 NotificationsDescContact=* pro Partnerkontakte (Kunden oder Lieferanten), ein Kontakt pro mal
 NotificationsDescGlobal=* oder duch setzten der globalen E-Mailziele im Modulsetup
@@ -1093,8 +1118,8 @@ CreditNote=Gutschrift
 CreditNotes=Gutschriften
 ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Empfohlene Zahlungsart für Rechnung falls nicht in gesondert definiert
-SuggestPaymentByRIBOnAccount=Zahlung per Lastschrift vorschlagen
-SuggestPaymentByChequeToAddress=Zahlung per Scheck vorschlagen
+SuggestPaymentByRIBOnAccount=Bankvorschlag bei Zahlung per Überweisung
+SuggestPaymentByChequeToAddress=Bankvorschlag bei Zahlung per Scheck
 FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungs-Entwurf (keines, falls leer)
 PaymentsNumberingModule=Zahlungen Nummerierungs Module
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=TLS
 LDAPServerUseTLSExample=Ihr LDAP-Server TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Vollständige DN (zB: cn=adminldap,dc=society,dc=com)
+LDAPAdminDnExample=Vollständige DN (z.B. cn=admin,dc=example,dc=com oder cn=Administrator,cn=Users,dc=example,dc=com für Active Directory)
 LDAPPassword=Administrator-Passwort
 LDAPUserDn=Benutzer DN
 LDAPUserDnExample=Vollständige DN (zB: ou=users,dc=society,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Beispiel: firma
 LDAPFieldSid=SID
 LDAPFieldSidExample=Beispiel : objectsid
 LDAPFieldEndLastSubscription=Auslaufdatum des Abonnements
-LDAPFieldTitle=Posten / Funktion
+LDAPFieldTitle=Position
 LDAPFieldTitleExample=Beispiel: Titel
 LDAPSetupNotComplete=LDAP-Setup nicht vollständig (siehe andere Tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Kein Administrator oder Passwort gefunden. LDAP-Zugang wird anonym und im Lese-Modus ausgeführt.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produkte und Leistungen Module Einstellungen
 NumberOfProductShowInSelect=Max. Anzahl der Produkte in Mehrfachauswahllisten (0=kein Limit)
 ViewProductDescInFormAbility=Anzeige der Produktbeschreibungen in Formularen (sonst als ToolTip-  Popup)
 MergePropalProductCard=Aktivieren einer Option unter Produkte/Leistungen  Registerkarte verknüpfte Dateien, um Produkt-PDF-Dokumente um Angebots PDF azur zusammenzuführen, wenn Produkte/Leistungen in dem Angebot sind.
-ViewProductDescInThirdpartyLanguageAbility=Anzeige der Produktbeschreibungen in der Sprache des Partners
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Wenn Sie eine große Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn des Strings.
 UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden.
 SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar Code Kommandozeilen-Tool (verwendet interne Engine für
 BarcodeInternalEngine=interne Engine
 BarCodeNumberManager=Manager für die automatische Generierung von Barcode-Nummer
 ##### Prelevements #####
-WithdrawalsSetup=Abbuchungseinstellungen
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Externe RSS-Einbindungseinstellungen
 NewRSS=Neuer RSS-Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Fiskalisches Jahr öffnen
 CloseFiscalYear=Fiskalisches Jahr schließen
 DeleteFiscalYear=Fiskalisches Jahr löschen
 ConfirmDeleteFiscalYear=Möchten Sie dieses fiskalische Jahr wirklich löschen?
+ShowFiscalYear=Geschäftsjahr anzeigen
 AlwaysEditable=kann immer bearbeitet werden
 MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Großbuchstaben
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=Liste der Benachrichtigungen nach Benutzer*
 ListOfNotificationsPerUserOrContact=Liste der Benachrichtigungen nach Benutzer oder Kontakt**
 ListOfFixedNotifications=Liste von ausbesserten Benachrichtigungen
 GoOntoUserCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" eines Benutzers, um Benachrichtigungen für Benutzer zu erstellen/entfernen
-GoOntoContactCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" von einem  Partner Kontakt , um Hinweise für Kontakte/Adressen zu erstellen oder zu entfernen
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Schwellenwert
 BackupDumpWizard=Assistenten zum erstellen der Datenbank-Backup Dump-Datei 
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Farbe der Zeile hervorheben, wenn die Maus darüberfährt (l
 TextTitleColor=Farbe des Seitenkopfs
 LinkColor=Farbe für Hyperlinks
 PressF5AfterChangingThis=Drücken Sie F5 auf der Tastatur, nachdem dem Sie diesen Wert geändert haben, damit die Änderungen wirksam ist
-NotSupportedByAllThemes=Funktioniert mit dem eldy Theme, ist aber nicht in allen Themen unterstützt
+NotSupportedByAllThemes=Funktioniert mit dem Standard-Designvorlagen: wird möglicherweise nicht von externen Designvorlagen unterstützt
 BackgroundColor=Hintergrundfarbe
 TopMenuBackgroundColor=Hintergrundfarbe für Hauptmenü
+TopMenuDisableImages=Symbole im oberen Menü ausblenden. 
 LeftMenuBackgroundColor=Hintergrundfarbe für Menü Links
 BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
 BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Um Serviceauftrag zu schicken
 MailToSendSupplierRequestForQuotation=Um Anfrage an den Lieferanten schicken
 MailToSendSupplierOrder=Um Lieferantenbestellung zu schicken
 MailToSendSupplierInvoice=Um Lieferantenrechnung zu schicken
-MailToThirdparty=Um E-Mail von Partner zu schicken
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Standardanzeige als Listenansicht
 YouUseLastStableVersion=Sie verwenden die letzte stabile Version
 TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine Hauptversion anzukündigen. Sie können diese auf Ihrer Website verwenden.
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=URL um ein Token für die API Nutzung zu erhalten (Erhalten
 ListOfAvailableAPIs=Liste von verfügbaren APIs
 activateModuleDependNotSatisfied=Modul "%s" benötigt Modul "%s" welches fehlt, dadurch funktioniert Modul "%1$s" möglicherweise nicht korrekt. Installieren Sie Modul "%2$s" oder deaktivieren Sie Modul "%1$s" um auf der sicheren Seite zu sein
 CommandIsNotInsideAllowedCommands=Das Kommando ist nicht in der Liste der erlaubten Kommandos, definiert in <strong>$dolibarr_main_restrict_os_commands</strong> in der <strong>conf.php</strong> Datei.
+LandingPage=Einstiegsseite
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 3cec78884cc..21ef2110483 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -23,17 +23,13 @@ EndBankBalance=Endbestand
 CurrentBalance=Aktueller Kontostand
 FutureBalance=Zukünftiger Kontostand
 ShowAllTimeBalance=Zeige Kontostand seit Eröffnung
-AllTime=Vom start
+AllTime=Vom Start
 Reconciliation=Zahlungsabgleich
 RIB=Kontonummer
 IBAN=IBAN Nummer
-IbanValid=IBAN ist gültig
-IbanNotValid=IBAN ist nicht gültig
 BIC=BIC/Swift Code
-SwiftValid=BIC ist gültig
-SwiftNotValid=BIC ist nicht gültig
-StandingOrders=Abbuchungsaufträge
-StandingOrder=Abbuchungsauftrag
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Kontoauszug
 AccountStatementShort=Auszug
 AccountStatements=Kontoauszüge
@@ -50,12 +46,12 @@ NewFinancialAccount=Neues Finanzkonto
 MenuNewFinancialAccount=Neues Finanzkonto
 EditFinancialAccount=Konto bearbeiten
 LabelBankCashAccount=Bank- oder Kassebezeichnung
-AccountType=Kontoart
+AccountType=Art des Kontos
 BankType0=Sparkonto
 BankType1=Girokonto
 BankType2=Kasse
 AccountsArea=Finanzkonten
-AccountCard=Konto-Karte
+AccountCard=Konto - Karte
 DeleteAccount=Konto löschen
 ConfirmDeleteAccount=Möchten Sie dieses Konto wirklich löschen?
 Account=Konto
@@ -78,6 +74,7 @@ AccountToCredit=Konto für Gutschrift
 AccountToDebit=Zu belastendes Konto
 DisableConciliation=Zahlungsausgleich für dieses Konto deaktivieren
 ConciliationDisabled=Zahlungsausgleich deaktiviert
+LinkedToAConciliatedTransaction=Verknüpft mit einer beschwichtigen Transaktion
 StatusAccountOpened=Geöffnet
 StatusAccountClosed=Geschlossen
 AccountIdShort=Nummer
@@ -87,14 +84,17 @@ AddBankRecordLong=Transaktion manuell hinzufügen
 ConciliatedBy=Ausgeglichen durch
 DateConciliating=Ausgleichsdatum
 BankLineConciliated=Transaktion ausgeglichen
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Kundenzahlung
 SupplierInvoicePayment=Lieferanten-Zahlung
 SubscriptionPayment=Beitragszahlung 
-WithdrawalPayment=Entnahme Zahlung
+WithdrawalPayment=Lastschriftzahlung
 SocialContributionPayment=Zahlung von Sozialabgaben/Steuern
 BankTransfer=Kontentransfer
-BankTransfers=Kontentransfer
-TransferDesc=Transfer zwischen Konten. Gebucht werden beide Sätze (eine Belastung im Haben-Konto und eine Gutschrift im Soll-Konto mit gleichem Betrag, Bezeichner und Datum)
+BankTransfers=Kontentransfers
+MenuBankInternalTransfer=interner Transfer
+TransferDesc=Transfer aus einem Konto ins andere; Dolibarr wird zwei Datensätze schreiben (eine Belastung im Quellkonto und eine Gutschrift im Zielkonto. Die gleichen Betrag (jedoch nicht dessen Zeichenmarkierung), Benennung und Datum werden für diesen Transfer verwendet)
 TransferFrom=Von
 TransferTo=An
 TransferFromToDone=Eine Überweisung <b>von %s nach %s iHv %s %s</b> wurde verbucht.
@@ -129,7 +129,7 @@ FutureTransaction=Zukünftige Transaktionen.
 SelectChequeTransactionAndGenerate=Schecks auswählen/filtern um Sie in den Einzahlungsbeleg zu integrieren und auf "Erstellen" klicken.
 InputReceiptNumber=Wählen Sie den Kontoauszug  der mit der Zahlungs übereinstimmt. Verwenden Sie einen sortierbaren numerischen Wert: YYYYMM oder YYYYMMDD
 EventualyAddCategory=Wenn möglich Kategorie angeben, worin die Daten eingeordnet werden
-ToConciliate=Konsolidieren?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken
 DefaultRIB=Standard Bankkonto-Nummer
 AllRIB=Alle Bankkonto-Nummern
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Wollen sie diesen Scheck wirklich als zurückgewiesen kennzei
 RejectCheckDate=Datum an dem der Scheck zurückgewiesen wurde
 CheckRejected=Scheck zurückgewiesen
 CheckRejectedAndInvoicesReopened=Scheck zurückgewiesen und Rechnungen wieder geöffnet
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 5d92943e9bb..c8bfc1bb464 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -42,7 +42,7 @@ NotConsumed=Nicht verbrauchte
 NoReplacableInvoice=Keine ersatzfähige Rechnungsnummer
 NoInvoiceToCorrect=Keine zu korrigierende Rechnung
 InvoiceHasAvoir=Korrigiert durch eine oder mehrere Rechnungen
-CardBill=Übersicht
+CardBill=Rechnung - Karte
 PredefinedInvoices=Vordefinierte Rechnungen
 Invoice=Rechnung
 Invoices=Rechnungen
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fehler: Sie können keine Rechnu
 BillFrom=Von
 BillTo=An
 ActionsOnBill=Ereignisse zu dieser Rechnung
-RecurringInvoiceTemplate=wiederkehrende Rechnung
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=Keine Vorlagen zur Erstellung von wiederkehrende Rechnungen gefunden.
 FoundXQualifiedRecurringInvoiceTemplate=Es wurden %s Vorlagen zur Erstellung von wiederkehrende Rechnung(en) gefunden.
 NotARecurringInvoiceTemplate=keine Vorlage für wiederkehrende Rechnung
@@ -209,8 +209,8 @@ EscompteOffered=Rabatt angeboten (Skonto)
 EscompteOfferedShort=Rabatt
 SendBillRef=Einreichung der Rechnung %s
 SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
-StandingOrders=Lastschriftverfahren
-StandingOrder=Dauerauftrag
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Keine Rechnungsentwürfe
 NoOtherDraftBills=Keine Rechnungsentwürfe Anderer
 NoDraftInvoices=Keine Rechnungsentwürfe
@@ -222,7 +222,7 @@ SendReminderBillByMail=Erinnerung per E-Mail versenden
 RelatedCommercialProposals=Verknüpfte Angebote
 RelatedRecurringCustomerInvoices=verbundene wiederkehrende Kundenrechnungen
 MenuToValid=Zur Freigabe
-DateMaxPayment=Zahlung fällig bis
+DateMaxPayment=Fälligkeitsdatum
 DateInvoice=Rechnungsdatum
 DatePointOfTax=Steuerort
 NoInvoice=Keine Rechnung
@@ -269,7 +269,7 @@ Deposits=Einlagen
 DiscountFromCreditNote=Rabatt aus Gutschrift %s
 DiscountFromDeposit=Die Zahlungen aus Anzahlung Rechnung %s
 AbsoluteDiscountUse=Diese Art von Krediten verwendet werden kann auf der Rechnung vor der Validierung
-CreditNoteDepositUse=Rechnung muss validiert werden, um mit diesem König von Krediten
+CreditNoteDepositUse=Das Rechnungsmodul muss aktiviert sein, um diese Art von Kredit zu verwenden
 NewGlobalDiscount=Neue Rabattregel
 NewRelativeDiscount=Neuer relativer Rabatt
 NoteReason=Anmerkung/Begründung
@@ -312,7 +312,7 @@ LatestRelatedBill=Letzte ähnliche Rechnung
 WarningBillExist=Achtung, es existiert bereits mindestens eine Rechnung
 MergingPDFTool=PDF zusammenführen
 AmountPaymentDistributedOnInvoice=Zahlungsbetrag verteilt auf Rechnung
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Erlaube Zahlungen für Rechnungen an verschiedene Partner der selben Firma.
 PaymentNote=Zahlungshinweis
 ListOfPreviousSituationInvoices=Liste der vorherigen Fortschrittsrechnungen
 ListOfNextSituationInvoices=Liste der nächsten Fortschrittsrechnungen
@@ -351,8 +351,8 @@ VarAmount=Variabler Betrag (%% tot.)
 # PaymentType
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
-PaymentTypePRE=Bankeinzug/Lastschrift
-PaymentTypeShortPRE=Lastschrift
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Bar
 PaymentTypeShortLIQ=Bar
 PaymentTypeCB=Kreditkarte
@@ -381,6 +381,7 @@ ExtraInfos=Weitere Informationen
 RegulatedOn=Gebucht am
 ChequeNumber=Schecknummer
 ChequeOrTransferNumber=Scheck-/Überweisungsnummer
+ChequeBordereau=Zeitplan überprüfen
 ChequeMaker=Scheck / Transfer Übermittler
 ChequeBank=Scheckbank
 CheckBank=Scheck
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Zugeordnete Zahlung kann nicht gelöscht werden.
 PayedByThisPayment=mit dieser Zahlung beglichen
 ClosePaidInvoicesAutomatically=Markiert alle Standard- oder Ersatzrechnungen als "bezahlt", wenn diese vollständig beglichen sind.
 ClosePaidCreditNotesAutomatically=Markiert alle Gutschriften als "bezahlt", wenn diese vollständig beglichen sind.
+ClosePaidContributionsAutomatically=Vollständig beglichenen Sozialabgaben oder Steuerbeträge als "bezahlt" kennzeichnen.
 AllCompletelyPayedInvoiceWillBeClosed=Alle Rechnungen ohne ausstehende Zahlungen werden automatisch geschlossen und als "bezahlt" markiert.
 ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
 ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
 NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
 RevenueStamp=Steuermarke
-YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Zuerst muss eine Standardrechnung erstellt werden, dies kann dann in eine neue Rechnungsvorlage konvertiert werden
 PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage)
 PDFCrevetteDescription=PDF Rechnungsvorlage Crevette. Vollständige Rechnungsvolage für normale Rechnungen
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Fehler: Preis der Rechnungsposition %s akt
 ToCreateARecurringInvoice=Um eine wiederkehrende Rechnung für diesen Vertrag zu erstellen, legen Sie zuerst einen Rechnungsentwurf an, wandeln diesen dann in eine Rechnungsvorlage um und definieren die Häufigkeit der Erstellung der zukünftigen Rechnungen.
 ToCreateARecurringInvoiceGene=Um zukünftige Rechnungen regelmäßig und manuell zu erstellen, rufen Sie das Menü <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Wollen Sie diese Rechnungen automatisch generieren lassen, fragen Sie Ihren Administrator das Modul <strong>%s</strong> zu aktivieren und einzurichten. Sie können beide Methoden (manuell und automatisch) ohne Risiko von doppelten Rechnungen zusammen verwenden.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 6036a4c2aa0..71333802cd5 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Meine %s neuesten Lesezeichen
 BoxOldestExpiredServices=Die ältesten abgelaufenen aktiven Dienste
 BoxLastExpiredServices=Letzte %s älteste Kontake mit aktiven abgelaufenen Diensten.
 BoxTitleLastActionsToDo=%s neueste Aufgaben zu erledigen
-BoxTitleLastContracts=%s neueste Verträge
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Letzte %s geänderte Spenden.
 BoxTitleLastModifiedExpenses=Letzte %s geänderte Spesenabrechnungen.
 BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
@@ -72,6 +72,11 @@ BoxProposalsPerMonth=Angebote pro Monat
 NoTooLowStockProducts=Keine Produkte unter der min. Warenlimite
 BoxProductDistribution=Verteilung von Produkten/Leistungen
 BoxProductDistributionFor=Verteilung von %s für %s
+BoxTitleLastModifiedSupplierBills=%s zuletzt bearbeitete Lieferantenrechnungen
+BoxTitleLatestModifiedSupplierOrders=%s zuletzt bearbeitete Lieferantenbestellungen
+BoxTitleLastModifiedCustomerBills=%s zuletzt bearbeitete Kundenrechnungen
+BoxTitleLastModifiedCustomerOrders=%s zuletzt bearbeitete Kundenaufträge
+BoxTitleLastModifiedPropals=%s zuletzt bearbeiteten Angebote
 ForCustomersInvoices=Kundenrechnungen
 ForCustomersOrders=Kundenaufträge
 ForProposals=Angebote
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index eed0df2c908..c05e58c818b 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=An
 CashDeskThirdParty=Kunde
 ShoppingCart=Warenkorb
 NewSell=Neuer Verkauf
-BackOffice=Dolibarr
 AddThisArticle=In Warenkorb legen
 RestartSelling=zurück zum Verkauf
-SellFinished=Verkauf abgeschlossen
+SellFinished=Sale complete
 PrintTicket=Kassenbon drucken
 NoProductFound=Kein Artikel gefunden
 ProductFound=Produkt gefunden
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index c2c7fe61612..a78c6a22c66 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -2,18 +2,19 @@
 Rubrique=#tag/Kategorie
 Rubriques=#tags/Kategorien
 categories=Tags/Kategorien
-NoCategoryYet=Keine Kategorie/#tags von dieser Art erstellt
+NoCategoryYet=Keine Kategorie/#tags dieser Art erstellt
 In=In
-AddIn=Einfügen in
+AddIn=Hinzufügen
 modify=Ändern
 Classify=Einordnen
 CategoriesArea=#tags/Kategorien - Übersicht
-ProductsCategoriesArea=Produkte/Leistungen Kategorien-Übersicht
+ProductsCategoriesArea=Produkte/Leistungen Tags/Kategorien-Übersicht
 SuppliersCategoriesArea=Lieferantenkategorien bzw. Suchwörter Übersicht
 CustomersCategoriesArea=Kundenkategorien bzw. Suchwörter Übersicht
 MembersCategoriesArea=Mitglieder-Kategorien/#tags
 ContactsCategoriesArea=Kontaktkategorien bzw. Suchwörter Übersicht
-AccountsCategoriesArea=Kontenkategorien Übersicht
+AccountsCategoriesArea=Kontenkategorie-Übersicht
+ProjectsCategoriesArea=Projektkategorien/Suchwörter-Übersicht
 SubCats=Unterkategorien
 CatList=Liste der Kategorien/#tags
 NewCategory=Neue Kategorie/#tag
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Dieser Parnter ist folgenden Lieferanten- Kategor
 MemberIsInCategories=Dieses Mitglied ist folgenden Mitglieder- Kategorien/#tags zugewiesen
 ContactIsInCategories=Dieser Kontakt ist folgenden Kontakte- Kategorien/#tags verknüpft
 ProductHasNoCategory=Dieses Produkt/Leistung ist keiner Kategorie zugewiesen.
-CompanyHasNoCategory=Dieser Partner ist in keiner Kategorie
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory= Dieses Mitglied ist keiner Kategorie zugewiesen.
 ContactHasNoCategory= Dieser Kontakt ist keiner Kategorie zugewiesen.
+ProjectHasNoCategory=Dieses Projekt ist keiner Kategorie oder Suchwörtern zugewiesen.
 ClassifyInCategory=Kategorie/#tag hinzufügen
 NotCategorized=ohne Zuordnung
 CategoryExistsAtSameLevel=Diese Kategorie existiert bereits auf diesem Level
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Produktkategorien
 MembersCategoriesShort=Mitgliederkategorien
 ContactCategoriesShort=Kontaktkategorien
 AccountsCategoriesShort=Kontokategorien
+ProjectsCategoriesShort=Projektkategorie bzw. Suchwörter
 ThisCategoryHasNoProduct=Diese Kategorie enthält keine Produkte.
 ThisCategoryHasNoSupplier=Diese Kategorie enthält keine Lieferanten.
 ThisCategoryHasNoCustomer=Diese Kategorie enthält keine Kunden.
 ThisCategoryHasNoMember=Diese Kategorie enthält keine Mitglieder.
 ThisCategoryHasNoContact=Diese Kategorie enthält keine Kontakte.
 ThisCategoryHasNoAccount=Diese Kategorie enthält keine Konten.
+ThisCategoryHasNoProject=Diese Kategorie enthält keine Projekte.
 CategId=Kategorie-ID
 CatSupList=Liste der Lieferantenkategorien
 CatCusList=Liste der Kunden-/ Leadkategorien
@@ -71,6 +75,7 @@ CatContactList=Liste der Kontakt Kategorien/#tags
 CatSupLinks=Verbindung zwischen Lieferanten und Kategorien
 CatCusLinks=Verbindung zwischen Kunden-/Leads und Kategorien
 CatProdLinks=Verbindung zwischen Produkten/Leistungen und Kategorien
+CatProJectLinks=Links zwischen Projekten und Kategorien bzw. Suchwörtern
 DeleteFromCat=Aus Kategorie entfernen
 ExtraFieldsCategories=Ergänzende Attribute
 CategoriesSetup=Suchwörter/Kategorien Einstellungen
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 48a2c238fa8..3b7badcb60f 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -11,7 +11,7 @@ AddAction=Termin/Aufgabe erstellen
 AddAnAction=Erstelle Termin/Aufgabe
 AddActionRendezVous=erstelle Termin
 ConfirmDeleteAction=Möchten Sie dieses Ereignis wirklich löschen?
-CardAction=Ereignisse Übersicht
+CardAction=Ereignis - Karte
 ActionOnCompany=Verknüpfte Unternehmen
 ActionOnContact=Verknüpfter Kontakt
 TaskRDVWith=Termin mit %s
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 7ef5314c890..09530dba465 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Neue Privatperson
 NewCompany=Neues Unternehmen (Leads, Kunden, Lieferanten)
 NewThirdParty=Neuer Partner (Leads, Kunden, Lieferanten)
 CreateDolibarrThirdPartySupplier=Neuen Partner erstellen (Lieferant)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Übersicht Geschäftsanbahnung
 IdThirdParty=Partner-ID
 IdCompany=Unternehmen-ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Lieferanten
 ThirdPartyType=Typ des Partners
 Company/Fundation=Firma/Institution
 Individual=Privatperson
-ToCreateContactWithSameName=Legt aus diesen Daten automatisch einen Kontakt an
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Muttergesellschaft
 Subsidiaries=Tochtergesellschaften
 ReportByCustomers=Bericht von den Kunden
@@ -47,7 +49,7 @@ CivilityCode=Anrede
 RegisteredOffice=Firmensitz
 Lastname=Nachname
 Firstname=Vorname
-PostOrFunction=Posten / Funktion
+PostOrFunction=Position / Funktion
 UserTitle=Anrede
 Address=Adresse
 State=Bundesland
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Telefon berufl.
 PhonePerso=Telefon privat
 PhoneMobile=Mobiltelefon
-No_Email=Keine E-Mail-Kampagne senden
+No_Email=Verweigere E-Mail-Kampagnen
 Fax=Fax
 Zip=PLZ
 Town=Stadt
@@ -73,8 +75,8 @@ Poste= Posten
 DefaultLang=Standard-Sprache
 VATIsUsed=USt-pflichtig
 VATIsNotUsed=Nicht USt-pflichtig
-CopyAddressFromSoc=Übernehme die Adresse vom Partner
-ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ist weder Kunden noch Lieferanten, keine verfügbare verweisende Objekte
+CopyAddressFromSoc=Fill address with third party address
+ThirdpartyNotCustomerNotSupplierSoNoRef=Partner ist weder Kunde noch Lieferant, keine verbundenen Objekte
 ##### Local Taxes #####
 LocalTax1IsUsed=Nutze zweiten Steuersatz
 LocalTax1IsUsedES= RE wird verwendet
@@ -110,7 +112,7 @@ ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1
+ProfId1AT=Steuernummer (Identifikationsnummer des Finanzamt)
 ProfId2AT=Gerichtsstand
 ProfId3AT=Firmenbuchnummer
 ProfId4AT=Prof ID 4
@@ -134,7 +136,7 @@ ProfId3BR=Kommunalbehörde
 ProfId4BR=Bildungsgutschein
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=--
+ProfId1CH=UID-Nummer (Nummer des Finanzamt für juristische Personen)
 ProfId2CH=--
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Commercial Record number)
@@ -152,7 +154,7 @@ ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Umsatzsteuer-Identifikationsnummer
+ProfId1DE=Steuernummer
 ProfId2DE=Amtsgericht
 ProfId3DE=Handelsregister-Nummer
 ProfId4DE=-
@@ -236,10 +238,9 @@ ProfId3RU=KPP
 ProfId4RU=OKPO
 ProfId5RU=-
 ProfId6RU=-
-VATIntra=Umsatzsteuer-Identifikationsnummer
-VATIntraShort=Steuernummer
+VATIntra=Umsatzsteuer-ID
+VATIntraShort=USt-IdNr.
 VATIntraSyntaxIsValid=Die Syntax ist gültig
-VATIntraValueIsValid=Der Wert ist gültig
 ProspectCustomer=Lead / Kunde
 Prospect=Lead
 CustomerCard=Kunden - Karte
@@ -261,7 +262,9 @@ AddContactAddress=Kontakt/Adresse erstellen
 EditContact=Kontakt bearbeiten
 EditContactAddress=Kontakt/Adresse bearbeiten
 Contact=Kontakt
+ContactId=Kontakt-ID
 ContactsAddresses=Kontakte/Adressen
+FromContactName=Name:
 NoContactDefinedForThirdParty=Für diesen Partner ist kein Kontakt eingetragen
 NoContactDefined=Kein Kontakt für diesen Partner
 DefaultContact=Standardkontakt
@@ -284,8 +287,8 @@ CompanyDeleted=Firma "%s" aus der Datenbank gelöscht.
 ListOfContacts=Liste der Kontakte
 ListOfContactsAddresses=Liste der Ansprechpartner/Adressen
 ListOfThirdParties=Liste der Partner
-ShowCompany=Partner anzeigen
-ShowContact=Zeige Kontaktangaben
+ShowCompany=Show third party
+ShowContact=Kontakt  anzeigen
 ContactsAllShort=Alle (Kein Filter)
 ContactType=Kontaktart
 ContactForOrders=Bestellungskontakt
@@ -294,6 +297,7 @@ ContactForProposals=Angebotskontakt
 ContactForContracts=Vertragskontakt
 ContactForInvoices=Rechnungskontakt
 NoContactForAnyOrder=Kein Kontakt für Bestellungen definiert
+NoContactForAnyOrderOrShipments=Dieser Kontakt kann nicht für Bestellungen oder Lieferungen verwendet werden
 NoContactForAnyProposal=Kein Kontakt für Angebote definiert
 NoContactForAnyContract=Kein Kontakt für Verträge definiert
 NoContactForAnyInvoice=Kein Kontakt für Rechnungen definiert
@@ -308,7 +312,7 @@ VATIntraCheck=Prüfen
 VATIntraCheckDesc=Der Link <b>%s</b> erlaubt eine Anfrage am Europäischen Mehrwertsteuer-Check-Service. Ein externer Zugang zum Internet-Server ist für diesen Dienst erforderlich.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Überprüfen Sie Intrakommunale USt-Website der Europäischen Kommission
-VATIntraManualCheck=Sie können die Überprüfung auch manuell durchführen <a href="%s" target=Sie können auch manuell die europäische Website <a href="%s" target="_blank">%s</a> befragen
+VATIntraManualCheck=Sie können die Überprüfung auch manuell auf der Internetseite der Europäische Kommission durchführen: <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Anfrage nicht möglich. Überprüfungsdienst wird vom Mitgliedsland nicht angeboten (%s).
 NorProspectNorCustomer=kein Kunde, kein Lead
 JuridicalStatus=Rechtsform
@@ -352,9 +356,9 @@ ExportCardToFormat=Karte in Format exportieren
 ContactNotLinkedToCompany=Kontakt keinem Partner zugeordnet
 DolibarrLogin=Dolibarr-Benutzername
 NoDolibarrAccess=Kein Zugang
-ExportDataset_company_1=Partner (Unternehmen/Stiftungen/Personen) und Eigenschaften
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakte und Eigenschaften
-ImportDataset_company_1=Partner (Unternehmen/Stiftungen/Personen) und Eigenschaften
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakte/Adressen (von Dritten oder auch nicht) und Attribute
 ImportDataset_company_3=Bankverbindung
 ImportDataset_company_4=Partner/Außendienstmitarbeiter (Auswirkung Außendienstmitarbeiter an Unternehmen)
@@ -369,8 +373,8 @@ AllocateCommercial=Dem Vertriebsmitarbeiter zugewiesen
 Organization=Partner
 FiscalYearInformation=Informationen über das Geschäftsjahr
 FiscalMonthStart=Erster Monat des Geschäftsjahres
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Sie müssen zunächst eine E-Mail-Adresse für diesen Benutzer anlegen, um E-Mail-Benachrichtigungen zu ermöglichen.
+YouMustCreateContactFirst=Um Email-Benachrichtigungen anlegen zu können, müssen Sie zunächst einen Kontakt mit gültiger Email-Adresse zum Partner hinzufügen.
 ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Leads
 ListCustomersShort=Liste der Kunden
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
 SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertriebsmitarbeiters
 SaleRepresentativeLastname=Nachname des Vertriebsmitarbeiters
+ErrorThirdpartiesMerge=Es gab einen Fehler beim Löschen des Partners. Bitte überprüfen Sie im Protokoll. Änderungen wurden rückgängig gemacht.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 743d8e5dea7..2bc916c59ad 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -23,7 +23,7 @@ PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem P
 PaymentsNotLinkedToUser=Zahlungen mit keinem Benutzer verbunden
 Profit=Gewinn
 AccountingResult=Buchhaltungsergebnis
-Balance=Bilanz
+Balance=Saldo
 Debit=Soll
 Credit=Haben
 Piece=Beleg
@@ -33,7 +33,7 @@ VATToPay=MwSt. Verkäufe - USt.
 VATReceived=Erhobene USt.
 VATToCollect=MwSt. Einkäufe - VSt.
 VATSummary=USt. Saldo
-LT2SummaryES=EKSt. Übersicht
+LT2SummaryES=EKSt. Saldo
 LT1SummaryES=Saldo RE
 VATPaid=Bezahlte USt.
 LT2PaidES=EKSt. gezahlt
@@ -49,6 +49,8 @@ SocialContribution=Sozialabgabe oder Steuersatz
 SocialContributions= Steuern- oder Sozialabgaben
 SocialContributionsDeductibles=Abzugsberechtigte Sozialabgaben oder Steuern
 SocialContributionsNondeductibles=Nicht abzugsberechtigte Sozialabgaben oder Steuern
+LabelContrib=Beitrag Bezeichnung
+TypeContrib=Beitrag Typ
 MenuSpecialExpenses=Sonstige Ausgaben
 MenuTaxAndDividends=Steuern und Dividenden
 MenuSocialContributions=Sozialabgaben/Steuern
@@ -77,8 +79,8 @@ LT1PaymentES=RE Zahlung
 LT1PaymentsES=RE Zahlungen
 LT2PaymentES=EKSt. Zahlung
 LT2PaymentsES=EKSt. Zahlungen
-VATPayment=Steuer-/Soz.Beitragzahlung
-VATPayments=MwSt-Zahlungen
+VATPayment=USt. Zahlung
+VATPayments=USt Zahlungen
 VATRefund=Umsatzsteuer Rückerstattung
 Refund=Rückerstattung
 SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
@@ -167,10 +169,10 @@ InvoiceRef=Rechnungs-Nr.
 CodeNotDef=Nicht definiert
 WarningDepositsNotIncluded=Abschlagsrechnungen werden in dieser Version des Rechnungswesens nicht berücksichtigt.
 DatePaymentTermCantBeLowerThanObjectDate=Die Zahlungsfrist darf nicht kleiner als das Objektdatum sein
-Pcg_version=Pcg-Version
-Pcg_type=PCG Typ
-Pcg_subtype=PCG Subtyp
-InvoiceLinesToDispatch=versandbereite Rechnungszeilen 
+Pcg_version=Version des Kontenplans
+Pcg_type=Klasse des Kontos
+Pcg_subtype=Klasse des Kontos 
+InvoiceLinesToDispatch=versandbereite Rechnungspositionen
 ByProductsAndServices=Nach Produkten und Leistungen
 RefExt=Externe Referenz
 ToCreateAPredefinedInvoice=Um eine Rechnungsvorlage zu erstellen, erstellen Sie eine normale Rechnung. Anschließend klicken Sie auf den Button "%s", ohne die Rechnung freizugeben.
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index d51542c1479..d5e233f9287 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -54,9 +54,9 @@ LastContracts=%s neueste Verträge
 LastModifiedServices=%s zuletzt veränderte Leistungen
 ContractStartDate=Vertragsbeginn
 ContractEndDate=Vertragsende
-DateStartPlanned=Geplanter Beginn
+DateStartPlanned=In Betrieb gesetzt am
 DateStartPlannedShort=Beginn
-DateEndPlanned=voraussichtliches Enddatum
+DateEndPlanned=aktuell verrechnet bis
 DateEndPlannedShort=Ende
 DateStartReal=Effektiver Beginn
 DateStartRealShort=effektives Startdatum
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index e288c3d1955..a1771301711 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Lösche geplanten Job
 Permission23104 = Führe geplanten Job aus
 # Admin
 CronSetup= Jobverwaltungs-Konfiguration
-URLToLaunchCronJobs=URL zum Prüfen und Starten von Cronjobs wenn nötig
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Oder zum Prüfen und Starten von speziellen Jobs
 KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
 FileToLaunchCronJobs=Kommandozeile zum Starten von Cronjobs
@@ -23,7 +23,7 @@ CronCommand=Befehl
 CronList=Geplante Aufträge
 CronDelete=cronjobs löschen
 CronConfirmDelete=Sind Sie sicher, dass Sie diese geplanten Aufträge löschen wollen?
-CronExecute=Starte geplante cronjobs
+CronExecute=Geplanter Auftrag jetzt ausführen 
 CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge  jetzt ausführen möchten?
 CronInfo=Das Modul "Zeitgesteuerte Cron-Jobs" erlaubt die geplanten Cron-Jobs die programmiert wurden durchzuführen.
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Methode
 CronModule=Modul
 CronNoJobs=Keine Jobs eingetragen
 CronPriority=Rang
-CronLabel=Beschreibung
+CronLabel=Bezeichnung
 CronNbRun=Anzahl Starts
 CronMaxRun=max. Anzahl Starts
 CronEach=Jede
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Gehen Sie in Menü "Start - Module Hilfsprogramm
 JobDisabled=Aufgabe deaktiviert
 MakeLocalDatabaseDumpShort=lokales Datenbankbackup
 MakeLocalDatabaseDump=erstelle einen lokalen Datenbankdump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index 9960d95b3f5..d3ae766b5f5 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Lieferung
 DeliveryRef=Fer. Lieferung
-DeliveryCard=Lieferkarte
+DeliveryCard=Lieferung - Karte
 DeliveryOrder=Lieferschein
 DeliveryDate=Liefertermin
 CreateDeliveryOrder=Erstelle Lieferschein
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index a51d6820929..e8aa274b5ce 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Fehler, Ihr PHP muss das Modul <b>%s</b> installiert haben um
 ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt, dass die Anmeldung mit OpenID möglich ist, aber die URL zum OpenID Service ist noch nicht in %s definiert.
 ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein
 ErrorBadFormat=Falsches Format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Fehler: Es sind noch Auslieferungen zu diesen Versand vorhanden. Löschen deshalb nicht möglich.
 ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
 ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Lagerbestand für Produkt / Leistung %s
 ErrorStockIsNotEnoughToAddProductOnInvoice=Lagerbestand für Produkt / Leistung %s ist zu klein um es zur neuen Rechnung hinzu zu fügen.
 ErrorStockIsNotEnoughToAddProductOnShipment=Lagerbestand für Produkt / Leistung %s ist zu klein um es zur neuen Lieferung hinzu zu fügen.
 ErrorStockIsNotEnoughToAddProductOnProposal=Lagerbestand für Produkt / Leistung %s ist zu klein um es zum neuen Angebot hinzu zu fügen.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
diff --git a/htdocs/langs/de_DE/help.lang b/htdocs/langs/de_DE/help.lang
index a5b308f76cc..7d93a8c6bfe 100644
--- a/htdocs/langs/de_DE/help.lang
+++ b/htdocs/langs/de_DE/help.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki-Unterstützung
+CommunitySupport=Forum/Wiki Unterstützung
 EMailSupport=E-Mail-Unterstützung
 RemoteControlSupport=Fernwartungs-Support
 OtherSupport=Weitere Unterstützung
 ToSeeListOfAvailableRessources=Hier sehen Sie die verfügbaren Ressourcen:
 HelpCenter=Hilfe-Center
-DolibarrHelpCenter=Hilfe-und Supportcenter
-ToGoBackToDolibarr=Klicken Sie hier um zum System <a href="%s">zurückzukehren</a>
+DolibarrHelpCenter=Hilfe- und Supportcenter
+ToGoBackToDolibarr=Andernfalls klicken Sie <a href="%s">hier um zum System</a> zurückzukehren
 TypeOfSupport=Support-Typ
 TypeSupportCommunauty=Community (kostenlos)
 TypeSupportCommercial=Kommerzieller Support
@@ -15,7 +15,7 @@ NeedHelpCenter=Benötigen Sie Hilfe oder Unterstützung?
 Efficiency=Effizienz
 TypeHelpOnly=Ausschließlich Hilfe
 TypeHelpDev=Hilfe & Entwicklung
-TypeHelpDevForm=Hilfe, Entwicklung & Bildung
+TypeHelpDevForm=Hilfe&Entwicklung&Ausbildung
 ToGetHelpGoOnSparkAngels1=Einige Unternehmen bieten eine schnelle (manchmal prompte) und effiziente Online-Unterstützung durch Fernwartung. Solche Helfer finden Sie auf dieser Website <b>%s</b>
 ToGetHelpGoOnSparkAngels3=Über einen Klick auf diese Schaltfläche erhalten Sie eine Liste aller verfügbaren Trainer für das System
 ToGetHelpGoOnSparkAngels2=Gelegentlich ist zum Zeitpunkt Ihrer Suche vielleicht kein Partner verfügbar. Denken Sie daran, den Filter auf "Alle verfügbaren" zu setzen. So können Sie mehr Anfragen stellen.
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index e6d738bd51a..f0a69d39d97 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Wir haben uns bemüht, die Installation von Dolibarr so einfach wie möglich zu gestalten. \nBefolgen Sie einfach die Schritte auf dem Bildschirm.
+InstallEasy=Beachten Sie einfach die folgenden Schritte.
 MiscellaneousChecks=Systemvoraussetzungen prüfen
 ConfFileExists=Die Konfigurationsdatei <b>%s</b> ist vorhanden.
 ConfFileDoesNotExistsAndCouldNotBeCreated=Die Konfigurationsdatei <b>%s</b> ist nicht vorhanden und konnte auch nicht erstellt werden!
@@ -11,12 +11,14 @@ PHPSupportSessions=Ihre PHP-Konfiguration unterstützt Sessions.
 PHPSupportPOSTGETOk=Ihre PHP unterstützt GET und POST Variablen.
 PHPSupportPOSTGETKo=Ihre PHP-Konfiguration scheint GET- und/oder POST-Variablen nicht zu unterstützen. Überprüfen Sie in der php.ini den Parameter <b>variables_order</b>.
 PHPSupportGD=Ihre PHP-Konfiguration unterstützt grafische Funktionen mittels GD.
+PHPSupportCurl=PHP unterstützt die Erweiterung Curl
 PHPSupportUTF8=Ihre PHP-Konfiguration unterstützt UTF8-Funktionen.
 PHPMemoryOK=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b>. Dies sollte ausreichend sein.
 PHPMemoryTooLow=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>%s</b> Bytes. Dies ist nicht ausreichend. Ändern Sie in Ihrer <b>php.ini</b> den Parameter <b>memory_limit</b> auf mindestens <b>%s</b> Bytes.
 Recheck=Voraussetzungen erneut prüfen
 ErrorPHPDoesNotSupportSessions=Ihre PHP-Installation unterstützt keine Sitzungen. Diese Funktion ist für das Arbeiten mit dolibarr erforderlich. Bitte überprüfen Sie Ihre PHP-Konfiguration.
 ErrorPHPDoesNotSupportGD=Ihre PHP-Installation unterstützt keine grafischen Funktion mittels GD. Ihnen stehen dadurch keine Diagramme zur Verfügung.
+ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl nicht
 ErrorPHPDoesNotSupportUTF8=Ihre PHP-Installation unterstützt keine UTF8-Funktionen. Dies könnte die korrekte Funktionsweise von dolibarr behindern und Sie sollten dieses Problem vor der Installation beheben.
 ErrorDirDoesNotExists=Das Verzeichnis %s existiert nicht.
 ErrorGoBackAndCorrectParameters=Gehen Sie zurück und korrigieren Sie die ungültigen Parameter.
@@ -133,6 +135,10 @@ ActivateModule=Aktivieren von Modul %s
 ShowEditTechnicalParameters=Hier klicken um erweiterte Funktionen zu zeigen/bearbeiten (Expertenmodus)
 WarningUpgrade=Warnung:\nHaben Sie ein Backup der Datenbank erstellt ?\nDies ist empfohlen, da durch Fehler in der Datenbank (z.B. MySQL Version 5.5.40/41/42/43) einige Tabellen oder Daten während der Migration verloren gehen könnten.\nAlso ist es sehr wichtig, dass Sie einen vollständigen Dump der Datenbank erstellt haben, bevor Sie die Migration durchführen.\nKlicken Sie auf OK, um den Migrationsprozess zu starten.
 ErrorDatabaseVersionForbiddenForMigration=Die Version Ihres Datenbankmanager ist %s.\nDies ist einen kritischer Bug welcher zu Datenverlust führen kann, wenn Sie die Struktur der Datenbank wie vom Migrationsprozess erforderlich  ändern. Aus diesem Grund, ist die Migration nicht erlaubt bevor der Datenbankmanager auf eine später Version aktualisiert wurde (Liste betroffener Versionen %s )
+KeepDefaultValuesWamp=Wenn Sie den DoliWamp-Installationsassistent verwenden, werden hier bereits Werte vorgeschlagen. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
+KeepDefaultValuesDeb=Sie verwenden den Dolibarr-Installationsassistenten in einer Linux Umgebung (Ubuntu, Debian, Fedor...), entsprechend sind hier bereits Werte vorgeschlagenen. Sie müssen lediglich das Passwort des anzulegenden Datenbankbenutzers angeben. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
+KeepDefaultValuesMamp=Sie verwenden den DoliMamp-Installationsassistent, entsprechend werden hier bereits Werte vorgeschlagen. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
+KeepDefaultValuesProxmox=Sie verwenden den Dolibarr Installationsassistenten einer Proxmox "virtual appliance". Die hier vorgeschlagenen Werte sind bereits optimiert. Bitte nehmen Sie nur Änderungen vor wenn Sie wissen was Sie tun.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Aktualisiere die Termine/Aufgaben
 MigrationPaymentMode=Migration der Daten für die Zahlungsart
 MigrationCategorieAssociation=Migration von Kategorien
 MigrationEvents=Ereignisse migrierern, um den Besitzer des Ereignisses der Zuordnungstabelle hinzuzufügen
+MigrationRemiseEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise"
+MigrationRemiseExceptEntity=Aktualisieren Sie den Wert des Feld "entity" der Tabelle "llx_societe_remise_except"
 MigrationReloadModule=Neu Laden von Modul %s
 ShowNotAvailableOptions=Nicht verfügbare Optionen anzeigen
 HideNotAvailableOptions=Nicht verfügbare Optionen ausblenden
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index be6c0c11fda..4218e0ad70a 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - interventions
 Intervention=Serviceauftrag
 Interventions=Serviceaufträge
-InterventionCard=Serviceauftragskarte
+InterventionCard=Serviceauftrag - Karte
 NewIntervention=Neuer Serviceauftrag
 AddIntervention=Serviceauftrag erstellen
 ListOfInterventions=Liste der Serviceaufträge
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Kundenkontakt-Nachbetreuung
 # Modele numérotation
 PrintProductsOnFichinter=Auch Produktzeilen (Nicht nur Leistungen) auf der Serviceauftragskarte drucken
 PrintProductsOnFichinterDetails=Serviceaufträge durch Bestellungen generiert
+UseServicesDurationOnFichinter=Standard-Wert der Dauer für diesen Service aus dem Auftrag übernehmen
 InterventionStatistics=Statistik Serviceaufträge
 NbOfinterventions=Anzahl Karten für Serviceaufträge
 NumberOfInterventionsByMonth=Anzahl Karten für Serviceaufträge pro Monat (Freigabedatum)
diff --git a/htdocs/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang
index 9e47358ce84..404a297dfd5 100644
--- a/htdocs/langs/de_DE/ldap.lang
+++ b/htdocs/langs/de_DE/ldap.lang
@@ -7,7 +7,7 @@ LDAPInformationsForThisUser=Informationen in der LDAP-Datenbank für diesen Benu
 LDAPInformationsForThisGroup=Informationen in der LDAP-Datenbank für diese Gruppe
 LDAPInformationsForThisMember=Informationen in der LDAP-Datenbank für dieses Mitglied
 LDAPAttributes=LDAP-Attribute
-LDAPCard=LDAP-Karte
+LDAPCard=LDAP - Karte
 LDAPRecordNotFound=LDAP-Datenbankeintrag nicht gefunden
 LDAPUsers=Benutzer in LDAP-Datenbank
 LDAPFieldStatus=Status
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Datum der Erstmitgliedschaft
 LDAPFieldFirstSubscriptionAmount=Höhe des ersten Mitgliedsbeitrags
 LDAPFieldLastSubscriptionDate=Datum der letzten Mitgliedschaft
 LDAPFieldLastSubscriptionAmount=Höhe des letzten Mitgliedsbeitrags
+LDAPFieldSkype=Skype ID
+LDAPFieldSkypeExample=Beispiel: Skype-Name
 UserSynchronized=Benutzer synchronisiert
 GroupSynchronized=Gruppe synchronisiert
 MemberSynchronized=Mitglied synchronisiert
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 85f540024e6..27d587b88cd 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Lesen
 YourMailUnsubcribeOK=Die E-Mail-Adresse <b>%s</b> ist korrekt aus der Mailing-Liste ausgetragen.
 ActivateCheckReadKey=Schlüssel um die URL für "Lesebestätigung" und "Abmelden" zu verschlüsseln
 EMailSentToNRecipients=E-Mail versandt an %s Empfänger.
+EMailSentForNElements=%s e-Mails verschickt
 XTargetsAdded=<b>%s</b> Empfänger der Liste zugefügt
-OnlyPDFattachmentSupported=Wenn die PDF-Datei für die Rechnung schon erstellt wurde, wird sie der E-Mail angehängt. Ohne PDF-Datei wird keine E-Mail verschickt (es sind nur PDF-Dateien als Anhang für Seriendrucke zulässig).
+OnlyPDFattachmentSupported=Wenn das PDF-Dokument bereits erstellt wurde, wird es an den E- Mail-Anhang hinzugefügt werden. Andernfalls wird keine E- Mail verschickt(Beachten Sie, dass in dieser Version nur PDF-Dokumente  als Anhang an eine E- Mail-Kampagnen hinzugefügt werden können).
 AllRecipientSelected=Alle ausgewählten Partner wenn eine E-Mail erfasst wurde.
 ResultOfMailSending=Sende-Ergebnis der E-Mail-Kampagne
 NbSelected=Anz. gewählte
@@ -111,7 +112,7 @@ NoNotificationsWillBeSent=Für dieses Ereignis und diesen Partner sind keine Ben
 ANotificationsWillBeSent=Eine Benachrichtigung wird per E-Mail versandt
 SomeNotificationsWillBeSent=%s Benachrichtigungen werden per E-Mail versandt
 AddNewNotification=Neues E-Mail-Benachrichtigungsziel aktivieren
-ListOfActiveNotifications=List all active targets for email notification
+ListOfActiveNotifications=Liste aller aktive Empänger für E-Mail Benachrichtigungen
 ListOfNotificationsDone=Liste aller versandten E-Mail Benachrichtigungen
 MailSendSetupIs=Der E-Mail-Versand wurde auf '%s' konfiguriert. Dieser Modus kann nicht für E-Mail-Kampagnen verwendet werden.
 MailSendSetupIs2=Sie müssen zuerst mit einem Admin-Konto im Menü %sStart - Einstellungen - E-Mails%s den Parameter <strong>'%s'</strong> auf den Modus '%s' ändern. Dann können Sie die Daten des SMTP-Servers von Ihrem Internetdienstanbieter eingeben und die E-Mail-Kampagnen-Funktion nutzen.
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximalwert
 AdvTgtSearchDtHelp=Intervall verwenden um ein Datum auszuwählen
 AdvTgtStartDt=Startdatum
 AdvTgtEndDt=Enddatum
-AdvTgtTypeOfIncudeHelp=Empfänger EMail des Partners und EMail des Kontakt des Partners, oder einfach nur Partner-EMail oder einfach nur Kontakt EMail
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Empfänger 
 AdvTgtContactHelp=Verwenden Sie nur, wenn Ihr Zielkontakt unter den  "Typ des E-Mail-Empfänger"
 AddAll=Alle hinzufügen
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 8921beea1af..ac1185f96f5 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -49,17 +49,17 @@ ErrorFileNotUploaded=Die Datei konnte nicht hochgeladen werden. Stellen Sie sich
 ErrorInternalErrorDetected=Interner Fehler entdeckt
 ErrorWrongHostParameter=Ungültige Host-Parameter
 ErrorYourCountryIsNotDefined=Ihr Land ist nicht definiert. Bitte vervollständigen Sie das Profil unter Start - Einstellungen - Firma/Stiftung
-ErrorRecordIsUsedByChild=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untegeordneten Datensatz verwendet.
+ErrorRecordIsUsedByChild=Kann diesen Eintrag nicht löschen. Dieser Eintrag wird von mindestens einem untergeordneten Datensatz verwendet.
 ErrorWrongValue=Ungültiger Wert
 ErrorWrongValueForParameterX=Ungültiger Wert für den Parameter %s
 ErrorNoRequestInError=Keine Anfrage im Fehler
 ErrorServiceUnavailableTryLater=Dieser Service steht derzeit nicht zur Verfügung. Bitte versuchen Sie es später erneut.
-ErrorDuplicateField=Dieser Wert ist nicht einzigartig (schon vorhanden)
-ErrorSomeErrorWereFoundRollbackIsDone=Einige Fehler wurden gefunden. Änderungen rückgängig gemacht.
+ErrorDuplicateField=Dieser Wert ist schon vorhanden (Das Feld erfordert einen einzigartigen Wert)
+ErrorSomeErrorWereFoundRollbackIsDone=Einige Fehler wurden gefunden. Änderungen werden rückgängig gemacht.
 ErrorConfigParameterNotDefined=Parameter <b>%s</b> innerhalb der Konfigurationsdatei <b>conf.php.</b> nicht definiert.
-ErrorCantLoadUserFromDolibarrDatabase=Kann Benutzer <b>%s</b> nicht aus der Systemdatenbank laden.
+ErrorCantLoadUserFromDolibarrDatabase=Benutzer <b>%s</b> in der Dolibarr-Datenbank nicht gefunden
 ErrorNoVATRateDefinedForSellerCountry=Fehler, keine MwSt.-Sätze für Land  '%s' definiert.
-ErrorNoSocialContributionForSellerCountry=Fehler, keine Definition für Sozialabgaben/Steuerwerte definiert in Firma '%s'.
+ErrorNoSocialContributionForSellerCountry=Fehler, Sozialabgaben/Steuerwerte für Land '%s' nicht definiert.
 ErrorFailedToSaveFile=Fehler, konnte Datei nicht speichern.
 NotAuthorized=Sie haben keine Berechtigung dazu.
 SetDate=Datum
@@ -67,6 +67,7 @@ SelectDate=Wählen Sie ein Datum
 SeeAlso=Siehe auch %s
 SeeHere=Sehen Sie hier
 BackgroundColorByDefault=Standard-Hintergrundfarbe
+FileRenamed=The file was successfully renamed
 FileUploaded=Datei wurde erfolgreich hochgeladen
 FileWasNotUploaded=Ein Dateianhang wurde gewählt aber noch nicht hochgeladen. Klicken Sie auf "Datei anhängen" um den Vorgang zu starten.
 NbOfEntries=Anzahl der Einträge
@@ -76,7 +77,7 @@ RecordSaved=Eintrag gespeichert
 RecordDeleted=Eintrag gelöscht
 LevelOfFeature=Funktionslevel
 NotDefined=Nicht definiert
-DolibarrInHttpAuthenticationSoPasswordUseless=Authentifizierungsmodus mit dem Wert <b>%s</b> in der Konfigurationsdatei <b>conf.php.</b> definiert.<br> Die Passwort-Datenbank ist dadurch eine externe und Änderungen in diesem Bereich haben unter Umständen keine Auswirkungen.
+DolibarrInHttpAuthenticationSoPasswordUseless=Das Authentifizierungsmodus wurde mit dem Wert <b>%s</b> in der Konfigurationsdatei <b>conf.php.</b> definiert<br>. Das bedeutet, dass die Passwort-Datenbank extern ist.  Änderungen in diesem Bereich haben unter Umständen keine Auswirkungen.
 Administrator=Administrator
 Undefined=Nicht definiert
 PasswordForgotten=Passwort vergessen?
@@ -144,7 +145,7 @@ Cancel=Abbrechen
 Modify=Ändern
 Edit=Bearbeiten
 Validate=Bestätigen
-ValidateAndApprove=Freigegeben und Bestätigt
+ValidateAndApprove=Freigaben bestätigen
 ToValidate=Freizugeben
 Save=Speichern
 SaveAs=Speichern unter
@@ -175,7 +176,7 @@ User=Benutzer
 Users=Benutzer
 Group=Gruppe
 Groups=Gruppen
-NoUserGroupDefined=Kein Benutzergruppe definiert
+NoUserGroupDefined=Keine Benutzergruppe definiert
 Password=Passwort
 PasswordRetype=Geben Sie das Passwort noch einmal ein
 NoteSomeFeaturesAreDisabled=Bitte beachten Sie, dass viele Funktionen/Module in dieser Demo deaktiviert sind
@@ -245,6 +246,10 @@ DateBuild=Datum der Berichterstellung
 DatePayment=Zahlungsziel
 DateApprove=Genehmigungsdatum
 DateApprove2=Genehmigungsdatum (zweite Genehmigung)
+UserCreation=Erzeugungs-Benutzer
+UserModification=Aktualisierungs-Benutzer
+UserCreationShort=Erzeuger
+UserModificationShort=Aktualisierer
 DurationYear=Jahr
 DurationMonth=Monat
 DurationWeek=Woche
@@ -256,6 +261,7 @@ DurationDays=Tage
 Year=Jahr
 Month=Monat
 Week=Woche
+WeekShort=Woche
 Day=Tag
 Hour=Stunden
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Tag des Monats
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Währung Wechselkurs
 UseLocalTax=inkl. MwSt.
 Bytes=Bytes
 KiloBytes=Kilobyte
@@ -299,9 +306,9 @@ UnitPrice=Stückpreis
 UnitPriceHT=Stückpreis (netto)
 UnitPriceTTC=Stückpreis (brutto)
 PriceU=VP
-PriceUHT=VP (netto)
+PriceUHT=St.-Pr. (Netto)
 PriceUHTCurrency=Nettopreis (Währung)
-PriceUTTC=E.P. (inkl. Steuern)
+PriceUTTC=St.-Pr. (inkl. Steuern)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
 AmountPayment=Zahlungsbetrag
@@ -320,20 +327,20 @@ AmountLT2ES=Betrag IRPF
 AmountTotal=Gesamtbetrag
 AmountAverage=Durchschnittsbetrag
 PriceQtyMinHT=Mindestmengenpreis (netto)
-Percentage=Prozentangabe
+Percentage=Prozentsatz
 Total=Gesamt
 SubTotal=Zwischensumme
 TotalHTShort=Nettosumme
 TotalHTShortCurrency=Summe (Netto in Währung)
 TotalTTCShort=Gesamtbetrag (inkl. USt.)
-TotalHT=Gesamtpreis
-TotalHTforthispage=Gesamtpreis für diese Seite
+TotalHT=Summe (exkl. Ust)
+TotalHTforthispage=Gesamtpreis (Netto) für diese Seite
 Totalforthispage=Gesamtbetrag dieser Seite
 TotalTTC=Bruttosumme
-TotalTTCToYourCredit=Bruttosumme
-TotalVAT=USt.
-TotalLT1=Gesamte USt. 2
-TotalLT2=Gesamte USt. 3
+TotalTTCToYourCredit=\nGesamtbetrag (inkl. USt.) zu ihren Gunsten
+TotalVAT=USt. gesamt
+TotalLT1=USt. gesamt 2
+TotalLT2=USt. gesamt 3
 TotalLT1ES=Summe RE
 TotalLT2ES=Summe IRPF
 HT=Netto
@@ -355,25 +362,25 @@ OtherStatistics=Weitere Statistiken
 Status=Status
 Favorite=Favorit
 ShortInfo=Info.
-Ref=Nummer
+Ref=Referenz-Nr.
 ExternalRef=Externe-ID
 RefSupplier=Lieferanten-Nr.
-RefPayment=Zahlungs-Nr.
+RefPayment=Zahlungsref.-Nr.
 CommercialProposalsShort=Angebote
 Comment=Kommentar
 Comments=Kommentare
-ActionsToDo=unvollständige Ereignisse
-ActionsToDoShort=Zu erledigen
+ActionsToDo=Aufgaben
+ActionsToDoShort=zu erledigen
 ActionsDoneShort=Erledigt
 ActionNotApplicable=Nicht anwendbar
-ActionRunningNotStarted=Nicht begonnen
+ActionRunningNotStarted=zu beginnen
 ActionRunningShort=Begonnen
 ActionDoneShort=Abgeschlossen
 ActionUncomplete=unvollständig
 CompanyFoundation=Firma oder Institution
 ContactsForCompany=Ansprechpartner/Adressen dieses Partners
 ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
-AddressesForCompany=Adressen für den Partner
+AddressesForCompany=Anschriften zu diesem Partner
 ActionsOnCompany=Ereignisse zu diesem Partner
 ActionsOnMember=Aktionen zu diesem Mitglied
 NActionsLate=%s verspätet
@@ -384,7 +391,7 @@ RemoveFilter=Filter entfernen
 ChartGenerated=Diagramm erstellt
 ChartNotGenerated=Diagramm nicht erstellt
 GeneratedOn=Erstellt am %s
-Generate=Erstelle
+Generate=Erzeugen
 Duration=Dauer
 TotalDuration=Gesamtdauer
 Summary=Zusammenfassung
@@ -525,7 +532,7 @@ DateFromTo=Von %s bis %s
 DateFrom=Von %s
 DateUntil=Bis %s
 Check=Prüfen
-Uncheck=nicht gewählt
+Uncheck=Deaktivieren
 Internal=Intern
 External=Extern
 Internals=Interne
@@ -565,8 +572,11 @@ BackToList=Zurück zur Liste
 GoBack=Zurück
 CanBeModifiedIfOk=Änderung möglich falls gültig
 CanBeModifiedIfKo=Änderung möglich falls ungültig
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Wert erfolgreich geändert
 RecordsModified=%s Datensätze geändert
+RecordsDeleted=%s Datensätze gelöscht
 AutomaticCode=Automatischer Code
 FeatureDisabled=Funktion deaktiviert
 MoveBox=Box verschieben
@@ -575,6 +585,7 @@ NotEnoughPermissions=Ihre Berechtigungen reichen hierfür nicht aus
 SessionName=Sitzungsname
 Method=Methode
 Receive=Erhalten
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Teilweise
 TotalWoman=Vollständig
 NeverReceived=Nie erhalten
@@ -592,12 +603,13 @@ MenuAgendaGoogle=Google-Agenda
 ThisLimitIsDefinedInSetup=Gesetzte Dolibarr-Limits (Menü Start-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
 NoFileFound=Keine Dokumente in diesem Verzeichnis
 CurrentUserLanguage=Aktuelle Benutzersprache
-CurrentTheme=Aktuelle Oberfläche
+CurrentTheme=Aktuelles Design
 CurrentMenuManager=Aktuelle Menüverwaltung
 DisabledModules=Deaktivierte Module
 For=Für
 ForCustomer=Für Kunden
 Signature=E-Mail-Signatur
+DateOfSignature=Date of signature
 HidePassword=Sichere Passworteingabe (Zeichen nicht angezeigt)
 UnHidePassword=Passwort in Klartext anzeigen
 Root=Stammordner
@@ -616,9 +628,9 @@ MenuManager=Menüverwaltung
 WarningYouAreInMaintenanceMode=Achtung: Die Anwendung befindet sich im Wartungsmodus und kann derzeit nur von Benutzer <b>%s</b> verwendet werden.
 CoreErrorTitle=Systemfehler
 CoreErrorMessage=Entschuldigung, ein Fehler ist aufgetreten. Prüfen die die Logdateien oder benachrichtigen Sie den Administrator.
-CreditCard=Kreditkarte
+CreditCard=Kredit - Karte
 FieldsWithAreMandatory=Felder mit <b>%s</b> sind Pflichtfelder
-FieldsWithIsForPublic=Felder mit <b>%s</b> sind für Mitglieder öffentlich sichtbar. Über das "Öffentlich"-Kontrollkästchen können Sie dies ändern.
+FieldsWithIsForPublic=Felder mit <b>%s</b> werden auf die öffentlich sichtbare Mitgliederliste angezeigt. Deaktivieren Sie bitte den "Öffentlich"-Kontrollkästchen wenn das nicht möchten.\n
 AccordingToGeoIPDatabase=(nach GeoIP-Auflösung)
 Line=Zeile
 NotSupported=Nicht unterstützt
@@ -641,6 +653,15 @@ NewAttribute=Neues Attribut
 AttributeCode=Attribut Code
 URLPhoto=URL für Foto/Bild
 SetLinkToAnotherThirdParty=Link zu einem anderen Partner
+LinkTo=Link zu
+LinkToProposal=Link zu Angebot
+LinkToOrder=Link zur Bestellung
+LinkToInvoice=Link zur Rechnung
+LinkToSupplierOrder=Link zur Lieferentenbestellung
+LinkToSupplierProposal=Link zum Lieferantenangebot
+LinkToSupplierInvoice=Link zur Lieferantenrechnung
+LinkToContract=Link zum Vertrag
+LinkToIntervention=Link zu Arbeitseinsatz
 CreateDraft=Entwurf erstellen
 SetToDraft=Auf Entwurf zurücksetzen
 ClickToEdit=Klicken zum Bearbeiten
@@ -701,6 +722,9 @@ RelatedObjects=Verknüpfte Objekte
 ClassifyBilled=Als verrechnet markieren
 Progress=Entwicklung
 ClickHere=Hier klicken
+FrontOffice=Frontoffice
+BackOffice=Backoffice
+View=Ansicht
 # Week day
 Monday=Montag
 Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 3a445f85dd3..85a66f5914e 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Die Rate muss ein numerischer Wert sein
 markRateShouldBeLesserThan100=Die markierte Rate sollte kleiner sein als 100
 ShowMarginInfos=Zeige Rand-Informationen
 CheckMargins=Detail zu Gewinnspanne
+MarginPerSaleRepresentativeWarning=Manche Partner sind mit keinem Handelsvertreter verknüpft, andere können mit mehreren Benutzer verknüpft sein, weswegen manche Gewinnspannen nicht in diesem Bericht erscheinen können oder aber mehrmals vorkommen.
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index fbc550f4e79..86909a31158 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Mitglieder-Übersicht
 MemberCard=Mitglied - Karte
-SubscriptionCard=Abonnementkarte
+SubscriptionCard=Abonnement - Karte
 Member=Mitglied
 Members=Mitglieder
 ShowMember=Zeige Mitgliedskarte
@@ -152,7 +152,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Letztes Mitgliedsdatum
 Nature=Art
 Public=Informationen sind öffentlich (Nein = Privat)
-Exports=Exports
+Exports=Exporte
 NewMemberbyWeb=Neues Mitgliede hinzugefügt, warte auf Genehmigung.
 NewMemberForm=Neues Mitgliederformular
 SubscriptionsStatistics=Statistik über Abonnements
diff --git a/htdocs/langs/de_DE/oauth.lang b/htdocs/langs/de_DE/oauth.lang
index 963b14aa49f..736ed849b6a 100644
--- a/htdocs/langs/de_DE/oauth.lang
+++ b/htdocs/langs/de_DE/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Konfiguration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=Kein Zugriffstoken in der lokalen Datenbank gespeichert
 HasAccessToken=Ein Token wurde erstellt und in der lokalen Datenbank gespeichert
 NewTokenStored=Empfangene und gespeicherte Token
@@ -9,7 +11,16 @@ RequestAccess=Hier klcien, um Zugriff anzufordern/zu verlängern und einen neuen
 DeleteAccess=Hier klicken, um das Token zu löschen
 UseTheFollowingUrlAsRedirectURI=Benutzen Sie diese URL zur Weiterleitung, wenn Sie die Anmeldedaten Ihres OAuth Anbieters erstellen.
 ListOfSupportedOauthProviders=Hier Anmeldedaten Ihres OAuth2 Anbieters eintragen. Nur OAuth2 Anbieter werden hier angezeigt. Diese Einstellungen können von anderen Module genutzt werden, die OAuth2 Authentifizierung benötigen.
-OAUTH_GOOGLE_NAME=Google API
-OAUTH_GOOGLE_ID=Google APi ID
-OAUTH_GOOGLE_SECRET=API Google Secret
-OAUTH_GOOGLE_DESC=Gehen Sie auf  <a href="https://console.developers.google.com/" target="_blank">diese Seite</a> dort auf Credentials um Oauth-Anmeldedaten anzulegen
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
index aa6ba5d757a..ac3ea835a05 100644
--- a/htdocs/langs/de_DE/opensurvey.lang
+++ b/htdocs/langs/de_DE/opensurvey.lang
@@ -40,7 +40,7 @@ SurveyResults=Resultate
 PollAdminDesc=Sie sind berechtigt, sämtliche Abstimmungszeilen mit dem Button "Edit" zu verändern. Sie können zusätzlich auch eine Spalte oder Zeile mit %s entfernen. Sie können auch eine neue Spalte hinzufügen mit %s.
 5MoreChoices=5 weitere Möglichkeiten
 Against=Dagegen
-YouAreInivitedToVote=Du bist eingeladen, Deine Stimme abzugeben
+YouAreInivitedToVote=Sie sind eingeladen, Ihre Stimme abzugeben
 VoteNameAlreadyExists=Dieser Name wurde für diese Abstimmung schon benutzt
 AddADate=Datum hinzufügen
 AddStartHour=Startzeit hinzufügen
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index ddd5779b6cf..0aadaa8f802 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Ihre Bestellungen wurden erstellt
 OrderFail=Ein Fehler trat beim erstellen der Bestellungen auf
 CreateOrders=Erzeuge Bestellungen
 ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und wählen Sie dann "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/de_DE/printing.lang b/htdocs/langs/de_DE/printing.lang
index 5db88d97b05..67cf0ae68ed 100644
--- a/htdocs/langs/de_DE/printing.lang
+++ b/htdocs/langs/de_DE/printing.lang
@@ -18,10 +18,6 @@ UserConf=Pro Benutzer einrichten
 PRINTGCP_INFO=Google OAuth API Einrichtung
 PRINTGCP_AUTHLINK=Authentifizierung
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Aktualisierung des Tokens vorhanden
-PRINTGCP_TOKEN_EXPIRED=Token abgelaufen
-PRINTGCP_TOKEN_EXPIRE_AT=Token läuft ab am
-PRINTGCP_DELETE_TOKEN=Lösche gespeicherten Token
 PrintGCPDesc=Dieser Treiber erlaubt das direkte senden zu ein Drucker via Google Cloud Print
 GCP_Name=Name
 GCP_displayName=Angezeigter Name
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index b4b05bc614d..8415d515ddb 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Charge / Serie
 atleast1batchfield=Verzehr-bis oder Verkaufen-bis Datum oder Lot / Seriennummer
 batch_number=Lot / Seriennummer
 BatchNumberShort=Charge / Serie
-l_eatby=Verzehren-bis-Datum
-l_sellby=Verkaufen-bis-Datum
+EatByDate=Haltbarkeitsdatum 
+SellByDate=Verkaufslimitdatum
 DetailBatchNumber=Charge / Serie Details
 DetailBatchFormat=Lot/Serien-Nr.: %s - Verbrauchen-bis: %s -Verkaufen bis: %s (Menge: %d)
 printBatch=Charge / Serie: %s
@@ -19,3 +19,6 @@ printQty=Menge: %d
 AddDispatchBatchLine=Fügen Sie eine Zeile für Haltbarkeit Versendung
 WhenProductBatchModuleOnOptionAreForced=Wenn das Modul Lot/Serien-Nr. eingeschaltet ist, wird der Modus für Lagerbestands-Erhöhungen / -Senkungen auf die letzte Auswahl festgelegt und kann nicht geändert werden. Andere Optionen können nach Wunsch eingestellt werden.
 ProductDoesNotUseBatchSerial=Dieses Produkt verwendet keine Lose oder Seriennummern
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 7fb407acb1d..6a09b38049f 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=USt-Massenänderung
 ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
 MassBarcodeInit=Initialisierung Barcodes
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
-ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto
-ProductAccountancySellCode=Buchhaltung - Erlöskonto
+ProductAccountancyBuyCode=Buchhaltung - Konto (Anschaffung)
+ProductAccountancySellCode=Buchhaltung - Konto (Verkauf)
 ProductOrService=Produkt oder Leistung
 ProductsAndServices=Produkte und Leistungen
 ProductsOrServices=Produkte oder Leistungen
@@ -33,7 +33,7 @@ LastModifiedProductsAndServices=Letzte %s bearbeitete Produkte/Leistungen
 LastRecordedProducts=Letzte %s erfasste Produkte/Leistungen
 LastRecordedServices=%s zuletzt erfasste Leistungen
 CardProduct0=Produkt - Karte
-CardProduct1=Leistungs-Karte
+CardProduct1=Leistung - Karte
 Stock=Warenbestand
 Stocks=Warenbestände
 Movements=Lagerbewegungen
@@ -57,8 +57,10 @@ AppliedPricesFrom=Preise angewandt von
 SellingPrice=Verkaufspreis
 SellingPriceHT=Verkaufspreis (ohne Steuern)
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
-CostPriceDescription=Der Preis (Netto ohne Steuer) kann dafür verwendet werden, die durchschnittlichen Kosten dieses Artikel zu speichern. Es kann jeder Preis verwendet werden, der kalkuliert wurde, z.B. der durchschnittliche EK-Preis plus durchschnittliche Produktion und Vertriebskosten.
+CostPriceDescription=Der Preis (netto, ohne Steuern) kann dafür verwendet werden, die durchschnittlichen Kosten dieses Artikel zu speichern. Es kann jeder Preis verwendet werden, der kalkuliert wurde, z. B. der durchschnittliche Einkaufspreis plus durchschnittliche Produktions- und Vertriebskosten.
 CostPriceUsage=In einer zukünftigen Version könnte dieses Feld für die Margenberechnung benutzt werden.
+SoldAmount=Verkaufte Menge
+PurchasedAmount=angeschaffte Menge
 NewPrice=Neuer Preis
 MinPrice=Mindestverkaufspreis
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne USt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
@@ -73,7 +75,7 @@ ShowProduct=Produkt anzeigen
 ShowService=Leistung anzeigen
 ProductsAndServicesArea=Produkt- und Leistungsübersicht
 ProductsArea=Produkt-Übersicht
-ServicesArea=Leistungs-Übersicht
+ServicesArea=Leistungsübersicht
 ListOfStockMovements=Liste der Lagerbewegungen
 BuyingPrice=Einkaufspreis
 PriceForEachProduct=Produkte mit spezifischen Preisen
@@ -114,14 +116,14 @@ ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen?
 ProductSpecial=Spezial
 QtyMin=Mindestmenge
 PriceQtyMin=Preis für diese Mindestmenge (mit/ohne Rabatt)
-VATRateForSupplierProduct=USt. Satz (für diesen Lieferanten/Produkt)
-DiscountQtyMin=Standard-Rabatt für die Menge
+VATRateForSupplierProduct=Umsatzsteuersatz (für diesen Lieferanten/diesesProdukt)
+DiscountQtyMin=Standardrabatt für die Menge
 NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert
 NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert
-PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte
+PredefinedProductsToSell=Vordefinierte Verkaufsprodukte
 PredefinedServicesToSell=Vordefinierte Leistungen für Verkauf
 PredefinedProductsAndServicesToSell=Vordefinierte Produkte/Leistungen für Verkauf
-PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
+PredefinedProductsToPurchase=Vordefinierte Einkaufsprodukte
 PredefinedServicesToPurchase=Vordefinierte Leistungen für Einkauf
 PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte/Leistungen für Einkauf
 NotPredefinedProducts=Keine vordefinierten Produkte/Leistungen
@@ -136,13 +138,13 @@ CloneProduct=Produkt/Leistung duplizieren
 ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
 CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
 ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
-CloneCompositionProduct=Dupliziere Produkt-/Leistungs- Zusammenstellung
+CloneCompositionProduct=Dupliziere Produkt-/Leistungszusammenstellung
 ProductIsUsed=Produkt in Verwendung
-NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
+NewRefForClone=Artikelnummer neues Produkt/Leistung
 SellingPrices=Verkaufspreis
 BuyingPrices=Einkaufspreis
-CustomerPrices=Kunden Preise
-SuppliersPrices=Lieferanten Preise
+CustomerPrices=Kundenpreise
+SuppliersPrices=Lieferantenpreise
 SuppliersPricesOfProductsOrServices=Lieferantenpreise (von Produkten oder Leistungen)
 CustomCode=Interner Code
 CountryOrigin=Urspungsland
@@ -170,7 +172,7 @@ m3=m³
 liter=Liter
 l=L
 ProductCodeModel=Vorlage für Produktreferenz
-ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
+ServiceCodeModel=Vorlage für Dienstleistungsreferenz
 CurrentProductPrice=Aktueller Preis
 AlwaysUseNewPrice=Immer aktuellen Preis von Produkt/Leistung nutzen
 AlwaysUseFixedPrice=Festen Preis nutzen
@@ -196,12 +198,12 @@ NumberOfStickers=Anzahl Etiketten pro Seite
 PrintsheetForOneBarCode=Mehrere Aufkleber pro Barcode drucken
 BuildPageToPrint=Druckseite erzeugen
 FillBarCodeTypeAndValueManually=Barcode-Typ und -Wert manuell ausfüllen.
-FillBarCodeTypeAndValueFromProduct=Barcode-Typ und -Wert von einem Produkt wählen.
-FillBarCodeTypeAndValueFromThirdParty=Barcode-Typ und -Wert von einem Partner wählen.
+FillBarCodeTypeAndValueFromProduct=Barcode-Typ und -Wert eines Produkts wählen.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Barcode-Typ oder -Wert bei Produkt %s unvollständig.
-DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner  %s unvollständig.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode-Information von Produkt %s:
-BarCodeDataForThirdparty=Barcode-Information von Partner %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definieren Sie den Barcode-Wert für alle Datensätze (das auch die Barcode-Werte bereits von neuen definiert Reset)
 PriceByCustomer=unterschiedliche Preise für jeden Kunden
 PriceCatalogue=Ein einziger Preis pro Produkt/Leistung
@@ -218,10 +220,10 @@ PriceExpressionEditorHelp2=Sie können auf die zusätzlichen Felder mit Variable
 PriceExpressionEditorHelp3=In  Produkt/Leistung und Lieferantenpreise stehen diese Variablen zur Verfügung: <br> <b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In Produkt/Leistung Preis nur: <b>#supplier_min_price#</b><br>In  Lieferantenpreise nur: <b>#supplier_quantity# et #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=verfügbare globale Werte:
-PriceMode=Preisfindungs-Methode
+PriceMode=Preisfindungsmethode
 PriceNumeric=Nummer
 DefaultPrice=Standardpreis
-ComposedProductIncDecStock=Erhöhen/verringern Lagerbestand  bei verknüpften Produkten
+ComposedProductIncDecStock=Erhöhen/Verringern des Lagerbestands bei verknüpften Produkten
 ComposedProduct=Teilprodukt
 MinSupplierPrice=Minimaler Einkaufspreis
 MinCustomerPrice=Minimum Kundenpreis
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 0a07d46f0ca..1db75e48df7 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GoToListOfTasks=Liste der Aufgaben aufrufen
 ListProposalsAssociatedProject=Liste Angebote, die mit diesem Projekt verknüpft sind
-ListOrdersAssociatedProject=Liste Aufträge, die mit diesem Projekt verknüpft sind
-ListInvoicesAssociatedProject=Liste Rechnungen,  die mit diesem Projekt verknüpft sind
-ListPredefinedInvoicesAssociatedProject=Liste von Rechnungsvorlagen, die mit diesem Projekt verknüpft sind.
-ListSupplierOrdersAssociatedProject=Liste Lieferantenbestellungen, die mit diesem Projekt verknüpft sind
-ListSupplierInvoicesAssociatedProject=Liste Lieferantenrechnungen, die mit diesem Projekt verknüpft sind
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Liste Verträge, die mit diesem Projekt verknüpft sind
 ListFichinterAssociatedProject=Liste der Serviceaufträge, die mit diesem Projekt verknüpft sind
 ListExpenseReportsAssociatedProject=Liste Spesenabrechnungen, die mit diesem Projekt verknüpft sind
@@ -123,6 +123,7 @@ ProjectReportDate=Passe Aufgaben-Datum dem Projekt-Startdatum an
 ErrorShiftTaskDate=Es ist nicht möglich, das Aufgabendatum dem neuen Projektdatum anzupassen
 ProjectsAndTasksLines=Projekte und Aufgaben
 ProjectCreatedInDolibarr=Projekt %s erstellt
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Aufgabe %s erstellt
 TaskModifiedInDolibarr=Aufgabe %s geändert
 TaskDeletedInDolibarr=Aufgabe %s gelöscht
@@ -153,7 +154,7 @@ PlannedWorkload=Geplante Auslastung
 PlannedWorkloadShort=Arbeitsaufwand
 ProjectReferers=Verknüpfte Einträge
 ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
-FirstAddRessourceToAllocateTime=Eine Resource zuweisen um Zeit zu reservieren
+FirstAddRessourceToAllocateTime=Benutzer eine Ressource pro Aufgabe zuordnen, um eine Zeitspanne einzuräumen
 InputPerDay=Eingang pro Tag
 InputPerWeek=Eingang pro Woche
 InputPerAction=Eingang pro Aktion
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Offene Projekte/Verkaufschancen nach Status
 ProjectsStatistics=Statistik über Projekte und Leads
 TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe sollte möglich sein.
 IdTaskTime=ID Zeit Aufgabe
-YouCanCompleteRef=Wenn Sie das Projektkürzel mit Informationen versehen wollen (um es als Suchfilter zu benutzen), wird empfohlen, ein Minuszeichen zur Trennung einzufügen. Die automatische Numerierung funktioniert für die zukünftigen Projekte normal, z.B. %s-ABC. Sie können auch Suchschlüssel im Label benutzen.
+YouCanCompleteRef=Wenn Sie die Referenz mit Infromationen vervollständigen möchten (um diese als Suchfilter zu verwenden), wird empfohlen ein Trennzeichen einzusetzen, damit den Nummernkreis der zukünftigen Projekten weiterhin korrekt funktioniert. Zum Beispiel  %s-ABC. Sie können aber auch in den Label Suchbegriffe hinzufügen. Ein bewährtes Verfahren besteht darin, ein dedizierter Feld einzufügen, bekannt unter dem Begriff ergänzenden Attributen.
 OpenedProjectsByThirdparties=Offene Projekte nach Partner
 OnlyOpportunitiesShort=nur Verkaufschancen
 OpenedOpportunitiesShort=Offene Verkaufschancen
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
index 18fd6a518b7..64d9045cb9b 100644
--- a/htdocs/langs/de_DE/resource.lang
+++ b/htdocs/langs/de_DE/resource.lang
@@ -8,7 +8,7 @@ NoResourceLinked=Keine Ressource verknüpft
 
 ResourcePageIndex=Liste der Ressourcen
 ResourceSingular=Ressource
-ResourceCard=Ressourcen-Karte
+ResourceCard=Ressource - Karte
 AddResource=Ressource erstellen
 ResourceFormLabel_ref=Ressourcen-Name
 ResourceType=Ressourcen-Typ
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 5110869b284..f8fbeb6ac23 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warenlagerkarte
+WarehouseCard=Warenlager - Karte
 Warehouse=Warenlager
 Warehouses=Warenlager
 NewWarehouse=Neues Warenlager
@@ -15,6 +15,8 @@ DeleteSending=Lieferung löschen
 Stock=Warenbestand
 Stocks=Warenbestände
 StocksByLotSerial=Lagerbestand pro Charge/Seriennummer
+LotSerial=Chargen/Serien-Nummern
+LotSerialList=Liste der Chargen/Serien-Nummern
 Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
@@ -37,12 +39,13 @@ LabelMovement=Lagerbewegungs-Etikett
 NumberOfUnit=Anzahl der Einheiten
 UnitPurchaseValue=Einkaufspreis pro Stück
 StockTooLow=Mindestbestand unterschritten
-StockLowerThanLimit=Bestand unterhalb des Sicherungsbestandes
+StockLowerThanLimit=Bestand unterhalb der Mindestbestandsmenge
 EnhancedValue=Warenwert
 PMPValue=Gewichteter Warenwert
 PMPValueShort=DSWP
 EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Beim Anlegen eines Benutzers automatisch neues Warenlager erstellen
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Produkt Lager und Unterprodukt Lager sind unabhängig
 QtyDispatched=Versandmenge
 QtyDispatchedShort=Menge versandt
@@ -53,7 +56,7 @@ RuleForStockManagementIncrease=Regel für automatische Erhöhung der Bestände (
 DeStockOnBill=Verringere reale Bestände bei Bestätigung von Rechnungen/Gutschriften
 DeStockOnValidateOrder=Verringere reale Bestände bei Bestätigung von Kundenbestellungen
 DeStockOnShipment=Verringere reale Bestände bei Bestädigung von Lieferungen
-DeStockOnShipmentOnClosing=Lagerbestände beim schliessen der Versanddokumente
+DeStockOnShipmentOnClosing=Verringere Lagerbestände beim Schließen der Versanddokumente
 ReStockOnBill=Erhöhung der tatsächlichen Bestände in den Rechnungen / Gutschriften
 ReStockOnValidateOrder=Erhöhung der realen Bestände auf Bestellungen stellt fest
 ReStockOnDispatchOrder=Erhöhe Warenbestände bei manueller Lieferung in das Lager, nachdem die Bestellung eingegangen ist.
@@ -62,7 +65,7 @@ StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und L
 NoPredefinedProductToDispatch=Keine vordefinierten Produkte für dieses Objekt. Also kein Versand im Lager erforderlich ist.
 DispatchVerb=Versand
 StockLimitShort=Alarmschwelle
-StockLimit=Sicherungsbestand für automatische Benachrichtigung
+StockLimit=Mindestbestand vor Warnung
 PhysicalStock=Istbestand
 RealStock=Realer Lagerbestand
 VirtualStock=Theoretisches Warenlager
@@ -114,14 +117,14 @@ RecordMovement=Eintrag verschoben
 ReceivingForSameOrder=Empfänger zu dieser Bestellung
 StockMovementRecorded=aufgezeichnete Lagerbewegungen
 RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit
-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=Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zur Rechnung hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
+StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Auftrag hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
+StockMustBeEnoughForShipment= Der Lagerbestand muss ausreichend sein um ein Produkt/Dienstleistung zum Versand hinzuzufügen. (Die Prüfung erfolgt auf Basis des aktuellen realen Lagerbestandes, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Veränderung des Lagerbestands.)
 MovementLabel=Titel der Lagerbewegung
 InventoryCode=Bewegungs- oder Bestandscode
 IsInPackage=In Paket enthalten
 WarehouseAllowNegativeTransfer=Bestand kann negativ sein
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
+qtyToTranferIsNotEnough=Sie verfügen über nicht genügend Lagerbestand im Ursprungslager.
 ShowWarehouse=Zeige Lager
 MovementCorrectStock=Lagerkorrektur für Produkt %s
 MovementTransferStock=Umlagerung des Produkt %s in ein anderes Lager
@@ -132,3 +135,9 @@ OpenAll=Verfügbar für alle Aktionen
 OpenInternal=Verfügbar für interne Aktionen
 OpenShipping=Für die Lieferung verfügbar
 OpenDispatch=Für den Versand verfügbar
+UseDispatchStatus=Versandstatus setzen (bestätigen/ablehnen)
+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
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index 319d7a11629..16031cc49b5 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -12,7 +12,7 @@ RequestsOpened=offene Preisanfragen
 SupplierProposalArea=Bereich Lieferantenangebote
 SupplierProposalShort=Lieferanten Angebot
 SupplierProposals=Lieferanten Angebote
-SupplierProposalsShort=Supplier proposals
+SupplierProposalsShort=Lieferanten Angebote
 NewAskPrice=neue Preisanfrage
 ShowSupplierProposal=Presianfrage anzeigen
 AddSupplierProposal=Preisanfrage erstellen
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Erstellung eines Standard-Modells
 DefaultModelSupplierProposalToBill=Standardvorlage wenn eine Preisanfrage geschlossen wird (angenommen)
 DefaultModelSupplierProposalClosed=Standardvorlage wenn eine Preisanfrage geschlossen wird (abgelehnt)
 ListOfSupplierProposal=Liste von Angebotsanfragen für Lieferanten
+ListSupplierProposalsAssociatedProject=Liste der Zuliefererangebote, die mit diesem Projekt verknüpft sind
 SupplierProposalsToClose=zu schließende Lieferantenangebote 
 SupplierProposalsToProcess=Lieferantenangebote in Bearbeitung
 LastSupplierProposals=Letzte Preisanfragen
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index b8588f1785c..a34139b3e9a 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -7,13 +7,13 @@ History=Verlauf
 ListOfSuppliers=Lieferantenliste
 ShowSupplier=Zeige Lieferanten
 OrderDate=Bestelldatum
-BuyingPriceMin=Minimaler Angebotspreis
-BuyingPriceMinShort=Min. Angebotspreis
-TotalBuyingPriceMinShort=Summe der Angebotspreise der Unterprodukte
-TotalSellingPriceMinShort=Summe Verkaufspreise der Unterprodukte
+BuyingPriceMin=Bester Einkaufspreis
+BuyingPriceMinShort=min. EK
+TotalBuyingPriceMinShort=Summe Unterprodukte Einkaufspreis
+TotalSellingPriceMinShort=Summe  Unterprodukte Verkaufspreis
 SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis 
-AddSupplierPrice=Lieferantenpreis erfassen
-ChangeSupplierPrice=Lieferantenpreis ändern
+AddSupplierPrice=Einkaufspreis anlegen
+ChangeSupplierPrice=Ändere Einkaufspreis
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Für dieses Produkt existiert bereits ein Lieferantenpreis vom gewählten Anbieter: %s
 NoRecordedSuppliers=Keine Lieferanten erfasst
 SupplierPayment=Lieferantenzahlung
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Liste der Lieferantenbestellungen
 MenuOrdersSupplierToBill=Zu berechnende Lieferantenbestellungen
 NbDaysToDelivery=Lieferverzug in Tagen
 DescNbDaysToDelivery=Max. Verspätungstoleranz bei Lieferverzögerungen bei Produkten aus dieser Bestellung
-UseDoubleApproval=Verwende doppelte Genehmigung, wenn der Betrag (ohne Steuer) höher ist als (die zweite Genehmigung kann von jedem Benutzer mit einem speziellen Benutzerrecht durchgeführt werden. Setzen Sie es auf 0 für keine doppelte Genehmigung)
 SupplierReputation=Lieferanten Reputation
 DoNotOrderThisProductToThisSupplier=Nicht sortieren
 NotTheGoodQualitySupplier=Ungültige Qualität
 ReputationForThisProduct=Reputation
+BuyerName=Käufer
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index d7eaa1b9e8f..afbdc69976e 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -30,7 +30,7 @@ CreateUser=Benutzer erstellen
 LoginNotDefined=Benutzername ist nicht gesetzt.
 NameNotDefined=Name ist nicht gesetzt.
 ListOfUsers=Liste der Benutzer
-SuperAdministrator=Super Administrator
+SuperAdministrator=Super-Administrator
 SuperAdministratorDesc=Administrator mit allen Rechten
 AdministratorDesc=Administrator
 DefaultRights=Standardberechtigungen
@@ -100,3 +100,6 @@ WeeklyHours=Wochenstunden
 ColorUser=Benutzerfarbe
 DisabledInMonoUserMode=Deaktiviert im Wartungsmodus
 UserAccountancyCode=Buchhaltungscode Benutzer
+UserLogoff=Benutzer abmelden
+UserLogged=Benutzer angemeldet
+DateEmployment=Datum der Einstellung
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index 9e3285ee547..a30750f9ab5 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
-WebsiteSetupDesc=Erstellen Sie hier für jede benötigte Website einen Eintrag. Gehen Sie anschließend in das Menü Websites zu Bearbeitung.
+WebsiteSetupDesc=Erstellen Sie hier für jede benötigte Website einen Eintrag. Gehen Sie anschließend in das Menü Websites zur Bearbeitung.
 DeleteWebsite=Website löschen
 ConfirmDeleteWebsite=Möchten Sie diese Website wirklich löschen? Alle Seiten inkl. Inhalt werden auch gelöscht.
 WEBSITE_PAGENAME=Seitenname/Alias
@@ -12,6 +12,7 @@ EditMenu=Menü bearbeiten
 EditPageMeta=Meta bearbeiten
 EditPageContent=Inhalt bearbeiten
 Website=Webseite
+Webpage=Webseite
 AddPage=Seite hinzufügen
 PreviewOfSiteNotYetAvailable=Vorschau ihrer Webseite <strong>%s</strong> noch nicht Verfügbar. Zuerst muss eine Seite hinzugefügt werden.
 RequestedPageHasNoContentYet=Die Seite mit id %s hat keinen Inhalt oder die Cachedatei .tpl.php wurde gelöscht. Editieren Sie den Inhalt der Seite um das Problem zu lösen.
@@ -21,5 +22,7 @@ ViewSiteInNewTab=Webseite in neuen Tab anzeigen
 ViewPageInNewTab=Seite in neuem Tab anzeigen
 SetAsHomePage=Als Startseite festlegen
 RealURL=Echte URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+ViewWebsiteInProduction=Anzeige der Webseite über die Startseite\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nüber die URL der Homepage
+SetHereVirtualHost=Wenn Sie auf Ihrem Webserver einen dedizierten virtuellen Host mit dem Hauptverzeichnis <strong>%s</strong> einrichten können, geben Sie hier den virtuellen Host-Namen ein, so dass die Vorschau dann über den direkten Web-Server Zugriff funktioniert und nicht nur der Dolibarr Server benutzt werden kann.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index 454876ec160..a42be3df2ef 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=SEPA-Lastschriftverfahren-Übersicht
-StandingOrders=Lastschriftverfahren
-StandingOrder=Lastschriftverfahren
-NewStandingOrder=Neuer Abbucher
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Zu bearbeiten
-WithdrawalsReceipts=Abbuchungsbelege
-WithdrawalReceipt=Abbuchungsbeleg
-LastWithdrawalReceipts=Letzte %s Abbuchungsbelege
-WithdrawalsLines=Abbuchungszeilen
-RequestStandingOrderToTreat=Anfrage für Daueraufträge zu bearbeiten
-RequestStandingOrderTreated=Anfrage für Lastschriftauftrag bearbeitet
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Funktion nicht verfügbar. Der Status des Abbucher muss auf "durchgeführt"  gesetzt sein bevor eine Erklärung für die Ablehnung eingetragen werden können.
-NbOfInvoiceToWithdraw=Anzahl der abzubuchenden Rechnungen
-NbOfInvoiceToWithdrawWithInfo=Anzahl der Rechnungen mit Abbuchungsanfragen für Kunden mit einem hinterlegten Bankkonto
-InvoiceWaitingWithdraw=Rechnung warten auf Abbuchung
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Rechnung wartet auf Lastschrifteinzug
 AmountToWithdraw=Abbuchungsbetrag
-WithdrawsRefused=Abbuchungen abgelehnt
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Keine Kundenrechnung mit Zahlungsart ""Abbuchung" im Wartezustand. Stellen Sie neue Anträge im 'Abbuchungs'-Tab der Rechnungskarte.
 ResponsibleUser=Verantwortlicher Benutzer
-WithdrawalsSetup=Abbuchungseinstellungen
-WithdrawStatistics=Abbuchungsstatistik
-WithdrawRejectStatistics=Statistik abgelehnter Abbuchungen
-LastWithdrawalReceipt=Letzte %s Abbuchungsbelege
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Beantragen Sie einen Abbuchungsantrag
 ThirdPartyBankCode=IBAN Partner
 NoInvoiceCouldBeWithdrawed=Keine Rechnung erfolgreich abgebucht. Überprüfen Sie die Kontonummern der den Rechnungen zugewiesenen Partnern.
@@ -46,7 +47,7 @@ StatusRefused=Abgelehnt
 StatusMotif0=Nicht spezifiziert
 StatusMotif1=Unzureichende Deckung
 StatusMotif2=Anfrage bestritten
-StatusMotif3=Kein Abbuchungsauftrag
+StatusMotif3=No direct debit payment order
 StatusMotif4=Kundenanfrage
 StatusMotif5=nicht nutzbare Kontodaten
 StatusMotif6=Leeres Konto
@@ -61,28 +62,43 @@ NotifyCredit=Abbuchungsgutschrift
 NumeroNationalEmetter=Nat. Überweisernummer
 WithBankUsingRIB=Bankkonten mit RIB
 WithBankUsingBANBIC=Bankkonten mit IBAN/BIC
-BankToReceiveWithdraw=Bankkonto für Abbuchungen
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=In diesem Register können Sie ein  Lastschriftverfahren anfordern. Ist das erledigt, gehen Sie im Menü Finanzen auf das Menü neuer Abbucher um die Lastschriften zu verwalten. Wenn das Lastschriftverfahren abgeschlossen ist, wird die Zahlung bei Rechnung automatisch aufgezeichnet werden, und die Rechnung wird abgeschlossen, wenn kein Rechnungsbetrag mehr offen ist.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Datei abbuchen
 SetToStatusSent=Setze in Status "Datei versandt"
 ThisWillAlsoAddPaymentOnInvoice=Dies wird auch Zahlungen auf Rechnungen erstellen und diese als bezahlt markieren
 StatisticsByLineStatus=Statistiken nach Statuszeilen
-RUM=RUM
-RUMWillBeGenerated=RUM Zahl wird beim speichern der Bankinformationen generiert
-WithdrawMode=Abbuchungsmodus (FRST oder RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Abbuchungsauftrag Betrag:
 WithdrawRequestErrorNilAmount=Es kann keine Abbuchung für einen Nullbetrag erstellt werden.
+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=Name Kreditor
+SEPAFillForm=(B) Bitte füllen Sie alle mit * markierten Felder aus
+SEPAFormYourName=Ihr Name
+SEPAFormYourBAN=Your Bank Account Name (IBAN)
+SEPAFormYourBIC=Your Bank Identifier Code (BIC)
+SEPAFrstOrRecur=Type of payment
+ModeRECUR=Reccurent payment
+ModeFRST=Einmalzahlung
+PleaseCheckOne=Please check one only
 
 ### Notifications
-InfoCreditSubject=Zahlung Abbucher %s an die Bank
-InfoCreditMessage=Der Abbucher %s wurde von der Bank gebucht<br>Zahlungsdatum: %s
-InfoTransSubject=Übertragung des Abbucher %s zu Bank
-InfoTransMessage=Der Abbucher %s wurde von %s %s an die Bank übertragen.<br><br>
+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>
 InfoTransData=Betrag: %s<br>Verwendungszweck: %s<br>Datum: %s
-InfoRejectSubject=Lastschriftverfahren abgelehnt
-InfoRejectMessage=Hallo,<br><br>das Lastschriftverfahren für die Rechnung %s von der Firma %s, mit einem Betrag von %s wurde von der Bank abgelehnt.<br><br>--<br>%s
+InfoRejectSubject=Direct debit payment order refused
+InfoRejectMessage=Hallo,<br><br> der Lastschrift-Zahlungsauftrag der Rechnung %s im Zusammenhang mit dem Unternehmen %s, mit einem Betrag von %s wurde von der Bank abgelehnt <br> -- <br> %s
 ModeWarning=Echtzeit-Modus wurde nicht aktiviert, wir stoppen nach der Simulation.
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 2d331510f38..8a0cb0737b3 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung,
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Kennzeichne verknüpftes Angebot als in Rechnung gestellt, wenn der Kundenauftrag als bezahlt markiert wird
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als verrechnet, wenn die Kundenrechnung als bezahlt markiert wird
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kennzeichne verknüpfte Kundenaufträge als verrechnet, wenn die Kundenrechnung bestätigt wird
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Kennzeichne das verknüpfte Angebot als abgerechnet, wenn die Kundenrechnung erstellt wurde.
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 2cb086f467b..1b7c18c21a5 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -14,58 +14,79 @@ Journaux=Ημερολόγια
 JournalFinancial=Οικονιμικά ημερολόγια
 BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογαριασμών
 Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
 AccountAccounting=Λογιστική λογαριασμού
 AccountAccountingShort=Λογαριασμός
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Ανάλυση
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Λογιστική
-CustomersVentilation=Ανάλυση πελατών
-SuppliersVentilation=Ανάλυση προμηθευτών
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Αναφορές
 NewAccount=Νέος λογιστικός λογαριασμός
 Create=Δημιουργία
-CreateMvts=Create movement
-UpdateMvts=Τροποποίηση μιας κίνησης
-WriteBookKeeping=Εγγραφή λογαριασμών στο γενικό καθολικό
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Γενικό Καθολικό
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Εγγραφές τιμολογίου για ανανέωση
-InvoiceLinesDone=Ανανεωμένες εγγραφές τιμολογίου
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ανανέωση
+Ventilate=Bind
 
 Processing=Επεξεργασία
 EndProcessing=Τέλος της επεξεργασίας
-AnyLineVentilate=Εγγραφές προς ανανέωση
+AnyLineVentilate=Any lines to bind
 SelectedLines=Επιλεγμένες γραμμές
 Lineofinvoice=Γραμμή τιμολογίου
-VentilatedinAccount=Ανανεώθηκε επιτυχώς στον λογιστικό λογαριασμό
-NotVentilatedinAccount=Δεν ανανεώθηκε στον λογιστικό λογαριασμό
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Αριθμός αντικειμένων για ανάλυση ανά σελίδα (προτείνεται μέγιστο : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της κατανομής των σελίδων "Έχει για κατανομή» από τα πιο πρόσφατα στοιχεία
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της κατανομής των σελίδων "Ανάλυση" με τα πιο πρόσφατα στοιχεία
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Μήκος γενικών λογαριασμών
-ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτων
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Διάφορα ημερολόγια
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Ημερολόγιο εξόδων
 ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς
 ACCOUNTING_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή
-DONATION_ACCOUNTINGACCOUNT=Account to register donations
+DONATION_ACCOUNTINGACCOUNT=Λογαριασμός για την κατοχύρωση δωρεών
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για αγορά προϊόντων (εάν δεν είναι ορισμένος στην καρτέλα προϊόντος)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Προεπιλεγμένος λογιστικός λογαριασμός για πώληση προϊόντων (εάν δεν είναι ορισμένος στην καρτέλα προϊόντος)
@@ -81,32 +102,31 @@ Sens=Σημασία
 Codejournal=Ημερολόγιο
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Διαγράψτε τα αρχεία της γενικής λογιστικής
-
 DescSellsJournal=Ημερολόγιο πωλήσεων
 DescPurchasesJournal=Ημερολόγιο αγορών
-FinanceJournal=Finance journal
+FinanceJournal=Ημερολόγιο οικονομικών
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Πληρωμή τιμολογίου προμηθευτή
-
 ThirdPartyAccount=Λογαριασμός Πελ./Προμ.
-
-NewAccountingMvt=Νέα κίνηση
-NumMvts=Αριθμός κίνησης
-ListeMvts=Λίστα των κινήσεων
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Χρεωστικές και Πιστωτικές δεν μπορούν να χουν την ίδια αξία ταυτόχρονα
 
-ReportThirdParty=Λίστα λογαριασμού Πελ./Προμ.
-DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα των πελατών και των προμηθευτών και των λογιστικών τους λογαριασμούς τους
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 
@@ -114,22 +134,29 @@ Pcgtype=Τύπος λογαριασμού
 Pcgsubtype=Δευτερεύουσα κατηγορία λογαριασμού
 Accountparent=Ρίζα του λογαριασμού
 
-DescVentilCustomer=Συμβουλευτείτε εδώ την ετήσια κατανομή των λογαριασμών των τιμολογίων των πελατών σας
 TotalVente=Total turnover before tax
 TotalMarge=Συνολικό περιθώριο πωλήσεων
-DescVentilDoneCustomer=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων των πελατών και τη λογιστική των λογαριασμών τους
-DescVentilTodoCustomer=Ανανεώστε τις εγγραφές ενός τιμολογίου πελάτη με έναν λογιστικό λογαριασμό
-ChangeAccount=Αλλαγή λογιστικού λογαριασμού για εγγραφές επιλεγμένες από τον λογαριασμό:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Συμβουλευτείτε εδώ την ετήσια κατανομή των λογαριασμών των τιμολογίων των προμηθευτών σας
-DescVentilDoneSupplier=Συμβουλευτείτε εδώ τη λίστα των γραμμών των τιμολογίων του προμηθευτή και τη λογιστική του λογαριασμού τους
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Αυτόματη επικύρωση
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Φόρμα ανάλυσης
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Επιλογές
 OptionModeProductSell=Κατάσταση πωλήσεων
 OptionModeProductBuy=Κατάσταση αγορών
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 5413158e27c..6ecad8d4cd1 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -2,17 +2,22 @@
 Foundation=Οργανισμός
 Version=Έκδοση
 VersionProgram=Έκδοση Προγράμματος
-VersionLastInstall=Initial install version
+VersionLastInstall=Αρχική έκδοση εγκατάστασης
 VersionLastUpgrade=Έκδοση Τελευταίας Ενημέρωσης
 VersionExperimental=Πειραματική
 VersionDevelopment=Υπό ανάπτυξη
 VersionUnknown=Άγνωστη
 VersionRecommanded=Προτεινόμενη
-FileCheck=Ακεραιότητα αρχείων
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Αρχεία που λείπουν
 FilesUpdated=Ενημερωμένα αρχεία
-FileCheckDolibarr=Έλεγχος ακεραιότητας αρχείων του Dolibarr
-XmlNotFound=Δεν βρέθηκε xml αρχείο ακεραιότητας του Dolibarr
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Συνόδου
 SessionSaveHandler=Φορέας χειρισμού αποθήκευσης συνεδριών
 SessionSavePath=Αποθήκευση τοπικής προσαρμογής συνεδρίας
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Λάθος, μια διευκρίνιση μ
 DictionarySetup=Ρύθμισης λεξικού
 Dictionary=Λεξικά
 Chartofaccounts=Διάγραμμα λογαριασμών
-Fiscalyear=Οικονομικά έτη
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο
 ErrorCodeCantContainZero=Ο κώδικας δεν μπορεί να περιέχει την τιμή 0
 DisableJavascript=Απενεργοποίηση της Java ακολουθίας και των Ajax  λειτουργιών (Προτείνεται για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Πλήθος χαρακτήρων για να ξεκινήσει η αναζήτηση: %s
 NotAvailableWhenAjaxDisabled=Δεν είναι διαθέσιμο όταν η Ajax είναι απενεργοποιημένη
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Η JavaScript είναι απενεργοποιημένη
 UsePreviewTabs=Χρήση καρτελών προ επισκόπησης
 ShowPreview=Εμφάνιση προ επισκόπησης
@@ -117,7 +122,7 @@ CurrentSessionTimeOut=Χρονικό όριο περιόδου λειτουργ
 YouCanEditPHPTZ=Για να ορίσετε μια διαφορετική ζώνη ώρας της PHP (δεν απαιτείται), μπορείτε να δοκιμάσετε να προσθέσετε ένα αρχείο .htacces με μια γραμμή σαν αυτό "TZ setenv Europe / Paris"
 Box=Widget
 Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+MaxNbOfLinesForBoxes=Μέγιστο πλήθος γραμμών για τα widgets
 PositionByDefault=Προκαθορισμένη σειρά
 Position=Θέση
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
@@ -131,7 +136,7 @@ SystemToolsAreaDesc=Αυτή η περιοχή παρέχει δυνατότητ
 Purge=Εκκαθάριση
 PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
 PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeDeleteTemporaryFiles=Διαγραφή ολών των προσωρινών αρχείων (δεν υπάρχει κίνδυνος απώλειας δεδομένων)
 PurgeDeleteTemporaryFilesShort=Διαγραφή προσωρινών αρχείων
 PurgeDeleteAllFilesInDocumentsDir=Διαγραφή όλων των αρχείων στον κατάλογο <b>%s</b>.  Προσωρινά αρχεία αλλά και βάση δεδομένων αντιγράφων ασφαλείας κάδου απορριμάτων, αρχεία που συνδέονται με τα στοιχεία (ΠΕΛ./ΠΡΟΜ., τιμολόγια, ...) και μεταφορτώνονται στη μονάδα ECM θα διαγραφούν.
 PurgeRunNow=Διαγραφή τώρα
@@ -176,18 +181,19 @@ EncodeBinariesInHexa=Κωδικοποίηση δυαδικών δεδομένω
 IgnoreDuplicateRecords=Αγνοήστε τα λάθη των διπλών εγγραφών (Insert IGNORE)
 AutoDetectLang=Αυτόματη Ανίχνευση (γλώσσα φυλλομετρητή)
 FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Δικαιώματα
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
-ModulesDesc=Τα modules του Dolibarr ελέγχουν ποιες λειτουργίες είναι ενεργοποιημένες στο λογισμικό. Κάποια modules απαιτούν δικαιώματα που πρέπει να παρέχετε στους χρήστες, μετά την ενεργοποίηση του module. Κάντε κλικ στο κουμπί on/off στην στήλη "Κατάσταση" για να ενεργοποίησετε ένα module ή μια λειτουργία.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Περισσότερα Αρθρώματα...
 DoliStoreDesc=Το DoliStore, είναι η επίσημη περιοχή για να βρείτε εξωτερικά modules για το Dolibarr ERP/CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
 WebSiteDesc=Reference websites to find more modules...
 URL=Σύνδεσμος
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesAvailable=Διαθέσιμα Widgets
+BoxesActivated=Ενεργοποιημένα Widgets
 ActivateOn=Ενεργοποιήστε στις
 ActiveOn=Ενεργοποιήθηκε στις
 SourceFile=Πηγαίο αρχείο
@@ -273,9 +279,10 @@ YouCanSubmitFile=Για αυτό το βήμα μπορείτε να στείλ
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Μετάβαση στη σελίδα ενημέρωσης της δομής της βάσης δεδομένων και των δεδομένων: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
+LastActivationDate=Last activation date
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
 GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα  μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:<br>Το <b>{000000}</b> αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδέν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα. <br>Η μάσκα <b>{000000+000}</b> είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s. <br>Η μάσκα <b>{000000@x}</b> είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x  (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη. <br>Η μάσκα <b>{dd}</b> ημέρα (01 έως 31).<br><b>{mm}</b> μήνας (01 έως 12).<br><b>{yy}</b>, <b>{yyyy}</b> ή <b>{y}</b> έτος με χρήση 2, 4 ή 1 αριθμού. <br>
-GenericMaskCodes2=<b>{cccc}</b> ο κωδικός πελάτη σε n χαρακτήρες <br> <b>{cccc000}</b> ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από ένα μετρητή αφιερωμένο για τον πελάτη. Αυτός ο μετρητής ειναι αφιερωμένος στον πελάτη μηδενίζεται ταυτόχρονα από την γενικό μετρητή. <br> <b>{tttt}</b> Ο κωδικός των Πελ./Προμ. σε n χαρακτήρες (βλέπε λεξικό-thirdparty types). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.<br>Κενά διαστήματα δεν επιτρέπονται.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:</u><br>
@@ -331,13 +338,13 @@ UrlGenerationParameters=Παράμετροι για δημιουργία ασφ
 SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
 EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο
 GetSecuredUrl=Πάρτε υπολογιζόμενο URL
-ButtonHideUnauthorized=Απόκρυψη κουμπιών για μη επιτρεπτές ενέργειες αντί να φαίνονται απενεργοποιημένα κουμπιά
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Παλιός συντελεστής ΦΠΑ
 NewVATRates=Νέος συντελεστής ΦΠΑ
 PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
 MassConvert=Έναρξη μαζικής μεταβολής
 String=String
-TextLong=Long text
+TextLong=Μεγάλο κείμενο
 Int=Integer
 Float=Float
 DateAndTime=Ημερομηνία και ώρα
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Επιλογή από λίστα
 ExtrafieldSelectList = Επιλογή από πίνακα
 ExtrafieldSeparator=Διαχωριστικό
+ExtrafieldPassword=Συνθηματικό
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα
@@ -359,7 +367,7 @@ ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει ν
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
+LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
 WarningUsingFPDF=Προειδοποίηση: Το αρχείο <b>conf.php</b> περιλαμβάνει την επιλογή <b>dolibarr_pdf_force_fpdf=1</b>. Αυτό σημαίνει πως χρησιμοποιείτε η βιβλιοθήκη FPDF για να δημιουργούνται τα αρχεία PDF. Αυτή η βιβλιοθήκη είναι παλιά και δεν υποστηρίζει πολλές λειτουργίες (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), οπότε μπορεί να παρουσιαστούν λάθη κατά την δημιουργία των PDF.<br>Για να λυθεί αυτό και να μπορέσετε να έχετε πλήρη υποστήριξη δημιουργίας αρχείων PDF, παρακαλώ κατεβάστε την <a href="http://www.tcpdf.org/" target="_blank">βιβλιοθήκη TCPDF</a>,  και μετά απενεργοποιήστε ή διαγράψτε την γραμμή <b>$dolibarr_pdf_force_fpdf=1</b>, και εισάγετε αντί αυτής την <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
@@ -368,7 +376,7 @@ RefreshPhoneLink=Ανανέωση συνδέσμου
 LinkToTest=Δημιουργήθηκε σύνδεσμος για τον χρήστη <strong>%s</strong> (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
 KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή
 DefaultLink=Προεπιλεγμένος σύνδεσμος
-SetAsDefault=Set as default
+SetAsDefault=Ορισμός ως προεπιλογή
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
 ExternalModule=Εξωτερικό module - Εγκατεστημένο στον φάκελο %s
 BarcodeInitForThirdparties=Όγκος barcode init για Πέλ./Πρόμ.
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Χρήστες & Ομάδες
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Διαχείριση barcode
 Module56Name=Τηλεφωνία
 Module56Desc=Telephony integration
-Module57Name=Πάγιες εντολές
-Module57Desc=Πάγιες εντολές και διαχείριση απόσυρσης. Επίσης, περιλαμβάνει την παραγωγή του αρχείου SEPA για τις ευρωπαϊκές χώρες.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Ενοποίηση ενός συστήματος ClickToDial (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Ημερολόγιο ιστού
 Module410Desc=Διεπαφή ημερολογίου ιστού
 Module500Name=Ειδικά έξοδα
 Module500Desc=Διαχείριση ειδικών εξόδων (φόροι, δόσεις)
-Module510Name=Μισθοί
-Module510Desc=Διαχείριση υπαλλήλων, μισθών και πληρωμών
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Δάνειο
 Module520Desc=Διαχείριση δανείων
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Δωρεές
 Module700Desc=Donation management
 Module770Name=Αναφορές εξόδων
@@ -537,7 +548,7 @@ Module59000Name=Margins
 Module59000Desc=Module to manage margins
 Module60000Name=Commissions
 Module60000Desc=Module to manage commissions
-Module63000Name=Resources
+Module63000Name=Πόροι
 Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
 Permission11=Read customer invoices
 Permission12=Create/modify customer invoices
@@ -606,16 +617,16 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Πιστωτικές / αρνηθεί στέκεται εισπράξεις παραγγελιών
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Διαβάστε συμβάσεις/συνδρομές
 Permission162=Δημιουργία/τροποποίηση συμβολαίων/συνδρομών
 Permission163=Ενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
 Permission164=Απενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
 Permission165=Διαγραφή συμβολαίων/συνδρομών
-Permission167=Export contracts
+Permission167=Εξαγωγή συμβολαίων
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=Δημιουργία/τροποποίηση ταξίδια και έξοδα
 Permission173=Διαγραφή ταξιδιών και εξόδων
@@ -666,10 +677,10 @@ Permission262=Extend access to all third parties (not only those linked to user)
 Permission271=Read CA
 Permission272=Read invoices
 Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
+Permission281=Ανάγνωση επαφών
+Permission282=Δημιουργία/Επεξεργασία επαφών
+Permission283=Διαγραφή επαφών
+Permission286=Εξαγωγή επαφών
 Permission291=Read tariffs
 Permission292=Set permissions on the tariffs
 Permission293=Modify costumers tariffs
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Δημιουργία/τροποποίηση ερευνών
 Permission59001=Δείτε τα εμπορικά περιθώρια
 Permission59002=Ορίστε τα εμπορικά περιθώρια
 Permission59003=Διαβάστε το κάθε περιθώριο του χρήστη
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Προοπτική δυνητικό επίπεδο
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Ετικέτα στα έγγραφα
 NbOfDays=Πλήθος Ημερών
 AtEndOfMonth=Στο τέλος του μήνα
+CurrentNext=Current/Next
 Offset=Απόκλιση
 AlwaysActive=Πάντα εν ενεργεία
 Upgrade=Αναβάθμιση
@@ -935,13 +952,13 @@ SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are requi
 SetupDescription5=Other menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Ιστορικό εισόδου χρηστών
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
+InfoDolibarr=Πληροφορίες Dolibarr
+InfoBrowser=Πληροφορίες Φυλλομετρητή
+InfoOS=Πληροφορίες ΛΣ
+InfoWebServer=Πληροφορίες Web Server
+InfoDatabase=Πληροφορίες Συστήματος ΒΔ
+InfoPHP=Πληροφορίες PHP
+InfoPerf=Πληροφορίες επιδόσεων
 BrowserName=Όνομα φυλλομετρητή
 BrowserOS=Λειτουργικό σύστημα φυλλομετρητή
 ListOfSecurityEvents=List of Dolibarr security events
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Προσοχή, σε μερικά συστήματα L
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1095,16 +1120,16 @@ ForceInvoiceDate=Force invoice date to validation date
 SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
 SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
 SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
+FreeLegalTextOnInvoices=Ελεύθερο κείμενο στα τιμολόγια
 WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
+SuppliersPayment=Πληρωμές προμηθευτών
+SupplierPaymentSetup=Ρυθμίσεις Πληρωμών προμηθευτών
 ##### Proposals #####
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
 ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
+FreeLegalTextOnProposal=Ελεύθερο κείμενο στις προσφορές
 WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
 ##### SupplierProposal #####
@@ -1119,7 +1144,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 OrdersSetup=Order management setup
 OrdersNumberingModules=Orders numbering models
 OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
+FreeLegalTextOnOrders=Ελεύθερο κείμενο στις παραγγελίες
 WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
 ShippableOrderIconInList=Προσθήκη εικονιδίου στις Παραγγελίες που δείχνει ότι η παραγγελία μπορεί να αποσταλεί
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ρωτήστε τον τραπεζικό λογαριασμό για προορισμό της παραγγελίας
@@ -1129,7 +1154,7 @@ ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you
 ##### Bookmark4u #####
 ##### Interventions #####
 InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
+FreeLegalTextOnInterventions=Ελεύθερο κείμενο στα έντυπα παρέμβασης
 FicheinterNumberingModules=Intervention numbering models
 TemplatePDFInterventions=Intervention card documents models
 WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
@@ -1150,7 +1175,7 @@ LDAPSetup=LDAP Setup
 LDAPGlobalParameters=Global parameters
 LDAPUsersSynchro=Users
 LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
+LDAPContactsSynchro=Επαφές
 LDAPMembersSynchro=Members
 LDAPSynchronization=LDAP synchronisation
 LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Προϊόντα και Υπηρεσίες εγκατάστ
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Οπτικοποίηση των προϊόντων περιγραφών στη γλώσσα άλλους κατασκευαστές
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό προϊόντων (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά PRODUCT_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other.  αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
 UseSearchToSelectProduct=Χρησιμοποιήστε μια φόρμα αναζήτησης για να επιλέξετε ένα προϊόν (αντί για μια αναπτυσσόμενη λίστα).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Διαχειριστής για την αυτόματη αρίθμηση του barcode
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1359,7 +1384,7 @@ FreeLegalTextOnShippings=Ελεύθερο κείμενο για τις μετα
 DeliveryOrderNumberingModules=Products deliveries receipt numbering module
 DeliveryOrderModel=Products deliveries receipt model
 DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+FreeLegalTextOnDeliveryReceipts=Ελεύθερο κείμενο στις αποδείξεις παραλαβής
 ##### FCKeditor #####
 AdvancedEditor=Εξελιγμένο πρόγραμμα επεξεργασίας
 ActivateFCKeditor=Activate advanced editor for:
@@ -1467,7 +1492,7 @@ OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
 ApiKey=Key for API
 ##### Bank #####
 BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
+FreeLegalTextOnChequeReceipts=Ελεύθερο κείμενο στις λήψεις επιταγών
 BankOrderShow=Σειρά Εμφάνιση των τραπεζικών λογαριασμών για τις χώρες που χρησιμοποιούν &quot;λεπτομερή αριθμός τράπεζα&quot;
 BankOrderGlobal=Γενικός
 BankOrderGlobalDesc=Γενική σειρά εμφάνισης
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Άνοιγμα οικονομικού έτους
 CloseFiscalYear=Κλείσιμο οικονομικού έτους
 DeleteFiscalYear=Διαγραφή οικονομικού έτους
 ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το οικονομικό έτος;
+ShowFiscalYear=Εμφάνιση οικονομικού έτους
 AlwaysEditable=Μπορεί πάντα να επεξεργαστή
 MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
 NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
@@ -1522,11 +1548,11 @@ ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
+ListOfNotificationsPerUser=Λίστα ειδοποιήσεων ανά χρήστη*
+ListOfNotificationsPerUserOrContact=Λίστα ειδοποιήσεων ανά χρήστη* ή ανά επαφή**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Χρώμα τίτλου σελίδας
 LinkColor=Χρώμα σε συνδέσμους
 PressF5AfterChangingThis=Πατήστε το F5 στο πληκτρολόγιο μετά την αλλαγή αυτής της τιμής για να την ενεργοποιήσετε
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Χρώμα φόντου
 TopMenuBackgroundColor=Χρώμα φόντου για το επάνω μενού
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Χρώμα φόντου για το αριστερό μενού
 BackgroundTableTitleColor=Χρώμα φόντου για τη γραμμή επικεφαλίδας του πίνακα
 BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττές (μονές) γραμμές του πίνακα
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Χρησιμοποιείτε την τελευταία σταθερή έκδοση
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1583,7 +1610,7 @@ SeeSubstitutionVars=See * note for list of possible substitution variables
 AllPublishers=All publishers
 UnknownPublishers=Unknown publishers
 AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
+AddDictionaries=Προσθήκη λεξικών
 AddBoxes=Add widgets
 AddSheduledJobs=Add scheduled jobs
 AddHooks=Add hooks
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Σελίδα στόχος
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index e6eed9f21c4..c1800380ef5 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -27,13 +27,9 @@ AllTime=Από την αρχή
 Reconciliation=Πραγματοποίηση Συναλλαγών
 RIB=Αριθμός Τραπ. Λογαριασμού
 IBAN=IBAN
-IbanValid=Το ΙΒΑΝ είναι έγκυρο
-IbanNotValid=Το ΙΒΑΝ δεν είναι έγκυρο
 BIC=Αριθμός BIC/SWIFT
-SwiftValid=Το BIC/SWIFT είναι έγκυρο
-SwiftNotValid=Το BIC/SWIFT δεν είναι έγκυρο
-StandingOrders=Πάγιες εντολές
-StandingOrder=Πάγια εντολή
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Κίνηση Λογαριασμού
 AccountStatementShort=Κίνηση
 AccountStatements=Κινήσεις Λογαριασμού
@@ -78,6 +74,7 @@ AccountToCredit=Πίστωση στον Λογαριασμό
 AccountToDebit=Χρέωση στον Λογαριασμό
 DisableConciliation=Απενεργοποίηση της ιδιότητας συμφωνία από αυτό τον λογαριασμό
 ConciliationDisabled=Η ιδιότητα συμφωνία απενεργοποιήθηκε.
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Ανοιχτός
 StatusAccountClosed=Κλειστός
 AccountIdShort=Αριθμός
@@ -87,14 +84,17 @@ AddBankRecordLong=Χειροκίνητη Προσθήκη Συναλλαγής
 ConciliatedBy=Πραγματοποίηση Συναλλαγής από
 DateConciliating=Ημερομ. Πραγματοποίησης Συναλλαγής
 BankLineConciliated=Η Συναλλαγή Πραγματοποιήθηκε
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Πληρωμή Πελάτη
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
+SupplierInvoicePayment=Πληρωμή προμηθευτή
+SubscriptionPayment=Πληρωμή συνδρομής
 WithdrawalPayment=Ανάκληση πληρωμής
 SocialContributionPayment=Σίγουρα θέλετε να μαρκάρετε αυτό το αξιόγραφο σαν απορριφθέν;
 BankTransfer=Τραπεζική Μεταφορά
 BankTransfers=Τραπεζικές Μεταφορές
-TransferDesc=Μεταφορά από έναν λογαριασμό σε άλλον. Το  Dolibarr θα γράψει δύο βιβλία (χρεωστικό στον λογαριασμό πηγή και πιστωτικό στο λογαριασμό στόχο,με το ίδιο ποσό. Η ίδια ετικέτα και ημερομηνία θα χρησιμοποιηθούν για αυτή τη συναλλαγή)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Από
 TransferTo=Προς
 TransferFromToDone=Η μεταφορά από <b>%s</b> στον <b>%s</b> του <b>%s</b> %s έχει καταγραφεί.
@@ -104,7 +104,7 @@ ConfirmValidateCheckReceipt=Είστε σίγουροι ότι θέλετε να
 DeleteCheckReceipt=Διαγραφή της παραλαβής επιταγής;
 ConfirmDeleteCheckReceipt=Είστε σίγουροι ότι θέλετε να διαγράψετε την παραλαβή επιταγής;
 BankChecks=Τραπεζικές Επιταγές
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Επιταγές που αναμένουν κατάθεση
 ShowCheckReceipt=Ελέγξτε την απόδειξη κατάθεσης
 NumberOfCheques=Πλήθος Επιταγών
 DeleteTransaction=Διαγραφή Συναλλαγής
@@ -129,7 +129,7 @@ FutureTransaction=Συναλλαγή στο μέλλον. Δεν υπάρχει
 SelectChequeTransactionAndGenerate=Επιλέξτε/φίλτρο ελέγχου για να συμπεριληφθεί στην απόδειξη κατάθεσης και κάντε κλικ στο "Δημιουργία".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
-ToConciliate=Να συμβιβάσει;
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
 DefaultRIB=Προεπιλογή BAN
 AllRIB=Όλα τα BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Είστε σίγουροι ότι θέλετε να επισ
 RejectCheckDate=Ημερομηνία ελέγχου επιστροφής
 CheckRejected=Ελέγξτε την επιστροφή
 CheckRejectedAndInvoicesReopened=Ελέγξτε την επιστροφή και ξανά ανοίξτε τα τιμολόγια
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 29dc86795ae..295964ee259 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -11,10 +11,10 @@ BillsSuppliersUnpaidForCompany=Απλήρωτα τιμολόγια προμηθ
 BillsLate=Καθυστερημένες Πληρωμές
 BillsStatistics=Στατιστικά για τα τιμολόγια των πελατών 
 BillsStatisticsSuppliers=Στατιστικά για τα τιμολόγια των προμηθευτών
-DisabledBecauseNotErasable=Disabled because cannot be erased
+DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορή να διαγραφή
 InvoiceStandard=Τυπικό Τιμολόγιο
 InvoiceStandardAsk=Τυπικό Τιμολόγιο
-InvoiceStandardDesc=This kind of invoice is the common invoice.
+InvoiceStandardDesc=Αυτό το είδος τιμολογίου είναι το τυπικό τιμολόγιο.
 InvoiceDeposit=Τιμολόγιο Κατάθεσης
 InvoiceDepositAsk=Τιμολόγιο Κατάθεσης
 InvoiceDepositDesc=Αυτός ο τύπος τιμολογίου χρησιμοποιείτε όταν λαμβάνετε μια κατάθεση
@@ -99,7 +99,7 @@ DeleteBill=Διαγραφή Τιμολογίου
 SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη
 SearchASupplierInvoice=Εύρεση τιμολογίου προμηθευτή
 CancelBill=Ακύρωση Τιμολογίου
-SendRemindByMail=Αποστολή υπενθύμισης με EMail
+SendRemindByMail=Αποστολή υπενθύμισης με email
 DoPayment=Εισαγωγή Πληρωμής
 DoPaymentBack=Do payment back
 ConvertToReduc=Μετατροπή σε μελλοντική έκπτωση
@@ -129,7 +129,7 @@ BillShortStatusStarted=Ξεκίνησε
 BillShortStatusNotPaid=Απλήρωτο
 BillShortStatusClosedUnpaid=Κλειστό
 BillShortStatusClosedPaidPartially=Πληρωμένο (μερικώς)
-PaymentStatusToValidShort=Προς επικύρσωςη
+PaymentStatusToValidShort=Προς επικύρωση
 ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
 ErrorNoPaiementModeConfigured=No default payment mode defined. Go to Invoice module setup to fix this.
 ErrorCreateBankAccount=Create a bank account, then go to Setup panel of Invoice module to define payment modes
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=Από
 BillTo=Στοιχεία Πελάτη
 ActionsOnBill=Ενέργειες στο τιμολόγιο
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -184,7 +184,7 @@ ConfirmValidatePayment=Είστε σίγουροι ότι θέλετε να επ
 ValidateBill=Επικύρωση τιμολογίου
 UnvalidateBill=Μη επαληθευμένο τιμολόγιο
 NumberOfBills=Πλήθος τιμολογίων
-NumberOfBillsByMonth=Nb των τιμολογίων ανά μήνα
+NumberOfBillsByMonth=Πλήθος τιμολογίων ανά μήνα
 AmountOfBills=Ποσό τιμολογίων
 AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
 ShowSocialContribution=Εμφάνιση κοινωνικών εισφορών / Φορολογικά
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Έκπτωση
 SendBillRef=Υποβολή των τιμολογίων %s
 SendReminderBillRef=Υποβολή των τιμολογίων %s (υπενθύμιση)
-StandingOrders=Πάγιες Εντολές
-StandingOrder=Πάγια εντολή
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Δεν υπάρχουν προσχέδια
 NoOtherDraftBills=Δεν υπάρχουν άλλα προσχέδια
 NoDraftInvoices=Δεν υπάρχουν προσχέδια τιμολογίων
@@ -219,7 +219,7 @@ ToBill=Προς τιμολόγηση
 RemainderToBill=Υπόλοιπο προς χρέωση
 SendBillByMail=Αποστολή τιμολογίου με email
 SendReminderBillByMail=Αποστολή υπενθύμισης με email
-RelatedCommercialProposals=Related commercial proposals
+RelatedCommercialProposals=Σχετικές προσφορές
 RelatedRecurringCustomerInvoices=Related recurring customer invoices
 MenuToValid=Προς επικύρωση
 DateMaxPayment=Πληρωμή πριν από
@@ -234,7 +234,7 @@ SetConditions=Set payment conditions
 SetMode=Set payment mode
 SetRevenuStamp=Set revenue stamp
 Billed=Τιμολογημένο
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Επαναλαμβανόμενα τιμολόγια
 RepeatableInvoice=Πρότυπο τιμολογίου
 RepeatableInvoices=Πρότυπο τιμολόγιο
 Repeatable=Πρώτυπο
@@ -242,9 +242,9 @@ Repeatables=Πρώτυπα
 ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
 CreateRepeatableInvoice=Δημιουργία πρότυπο τιμολόγιο
 CreateFromRepeatableInvoice=Δημιουργία από πρότυπο τιμολόγιο
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Τιμολόγια πελάτη και γραμμές τιμολογίου
 CustomersInvoicesAndPayments=Πληρωμές και τιμολόγια πελατών
-ExportDataset_invoice_1=Customer invoices list and invoice's lines
+ExportDataset_invoice_1=Λίστα Τιμολλογίων πελάτη και γραμμών τιμολογίου
 ExportDataset_invoice_2=Πληρωμές και τιμολόγια πελατών
 ProformaBill=Proforma Bill:
 Reduction=Μείωση
@@ -285,7 +285,7 @@ IdSocialContribution=Κοινωνική εισφορά / Φορολογικά id
 PaymentId=Κωδ. Πληρωμής
 PaymentRef=Αναφ. πληρωμής
 InvoiceId=Κωδ. Τιμολογίου
-InvoiceRef=Κωδ. Τιμολογίου
+InvoiceRef=Αρ. Τιμολογίου
 InvoiceDateCreation=Ημερ. δημιουργίας τιμολογίου
 InvoiceStatus=Κατάσταση τιμολογίου
 InvoiceNote=Σημείωση τιμολογίου
@@ -311,7 +311,7 @@ RelatedSupplierInvoices=Σχετικά τιμολόγια προμηθευτών
 LatestRelatedBill=Τελευταίο σχετικό τιμολόγιο
 WarningBillExist=Προσοχή, ένα ή περισσότερα τιμολόγια υπάρχουν ήδη
 MergingPDFTool=Συγχώνευση εργαλείο PDF
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
+AmountPaymentDistributedOnInvoice=Ποσό πληρωμής κατανεμημένο στο τιμολόγιο
 PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
 PaymentNote=Σημείωση πληρωμής
 ListOfPreviousSituationInvoices=List of previous situation invoices
@@ -321,11 +321,11 @@ FrequencyPer_m=Κάθε %s μήνες
 FrequencyPer_y=Κάθε %s χρόνια
 toolTipFrequency=Πααδείγματα:<br /><b>Ρύθμιση 7 / ημέρες</b>: δίνει ένα τιμολόγιο κάθε 7 ημέρες<br /><b>Ρύθμιση 3 / μήνες</b>: δίνει ένα τιμολόγιο κάθε 3 μήνες
 NextDateToExecution=Ημερομηνία δημιουργίας του επόμενου τιμολογίου
-DateLastGeneration=Date of latest generation
+DateLastGeneration=Ημερομηνία τελευταίας δημιουργίας
 MaxPeriodNumber=Μέγιστος αρ δημιουργηθλεντων τιμολογίων
 NbOfGenerationDone=Αρ. δημιουργηθέντων ολοκληρωμένων τιμολογίων
 MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
+InvoiceAutoValidate=Αυτόματη επικύρωση τιμολογίων
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
@@ -334,25 +334,25 @@ PaymentConditionShortRECEP=Άμεση
 PaymentConditionRECEP=Άμεση
 PaymentConditionShort30D=30 ημέρες
 PaymentCondition30D=30 ημέρες
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 ημέρες από το τέλος του μήνα
+PaymentCondition30DENDMONTH=Μέσα στις 30 ημέρες που ακολουθούν από το τέλος του μήνα
 PaymentConditionShort60D=60 ημέρες
 PaymentCondition60D=60 ημέρες
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 ημέρες από το τέλος του μήνα
+PaymentCondition60DENDMONTH=Μέσα στις 60 ημέρες που ακολουθούν από το τέλος του μήνα
 PaymentConditionShortPT_DELIVERY=Αποστολή
 PaymentConditionPT_DELIVERY=Με αντικαταβολή
 PaymentConditionShortPT_ORDER=Παραγγελία
 PaymentConditionPT_ORDER=Κατόπιν παραγγελίας
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% προκαταβολικά, 50%% κατά την παράδοση
-FixAmount=Διορθώσετε το ποσό
+FixAmount=Διορθώση ποσού
 VarAmount=Μεταβλητή ποσού (%% tot.)
 # PaymentType
 PaymentTypeVIR=Τραπεζική μεταφορά
 PaymentTypeShortVIR=Τραπεζική μεταφορά
-PaymentTypePRE=Εντολή τραπέζης
-PaymentTypeShortPRE=Εντολή τραπέζης
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Μετρητά
 PaymentTypeShortLIQ=Μετρητά
 PaymentTypeCB=Πιστωτική κάρτα
@@ -380,11 +380,12 @@ BICNumber=BIC/SWIFT number
 ExtraInfos=Επιπρόσθετες Πληροφορίες
 RegulatedOn=Ρυθμιζόμενη για
 ChequeNumber=Αριθμός Επιταγής
-ChequeOrTransferNumber=Check/Transfer N°
+ChequeOrTransferNumber=Αρ. Επιταγής/Μεταφοράς
+ChequeBordereau=Check schedule
 ChequeMaker=Έλεγχος/Μεταφορά διαβιβαστής 
-ChequeBank=Τραπεζική Επιταγή
+ChequeBank=Τράπεζα Επιταγής
 CheckBank=Επιταγή
-NetToBePaid=Φόρος που πρέπει να πληρωθεί
+NetToBePaid=Φόρος προς πληρωμή
 PhoneNumber=Τηλ
 FullPhoneNumber=Τηλέφωνο
 TeleFax=Φαξ
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Πληρωθείτε αυτό το ποσό
 ClosePaidInvoicesAutomatically=Κατατάσσουν "Καταβάλλονται" όλα τα στάνταρ, κατάσταση ή την αντικατάσταση των τιμολογίων βαρύνει εξ ολοκλήρου.
 ClosePaidCreditNotesAutomatically=Ταξινομήσει τα "Πληρωμένα" όλα τα πιστωτικά τιμολόγια που καταβάλλονται εξ ολοκλήρου πίσω.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Όλα τα τιμολόγια χωρίς υπόλοιπο για πληρωμή θα κλείσουν αυτόματα σε κατάσταση "Πληρωμένα".
 ToMakePayment=Πληρωμή
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Κατάλογος των απλήρωτων τιμολογίων
 NoteListOfYourUnpaidInvoices=Σημείωση: Αυτή η λίστα περιέχει μόνο τα τιμολόγια για λογαριασμό Πελ./Προμ. που συνδέονται με τον εκπρόσωπο πώλησης.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=Αυτή η επιλογή είναι διαθέσιμη όταν δημιουργήσετε τιμολόγιο από την καρτέλα "πελάτης" από άλλους κατασκευαστές 
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Τιμολόγιο πρότυπο PDF Crabe. Ένα πλήρες πρότυπο τιμολογίου (συνιστώμενο πρότυπο)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -461,7 +464,7 @@ SituationAmount=Κατάσταση τιμολογίου ποσό (καθαρό)
 SituationDeduction=Αφαίρεση κατάστασης
 ModifyAllLines=Τροποποίηση σε όλες τις γραμμές
 CreateNextSituationInvoice=Δημιουργήστε την επόμενη κατάσταση
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
+NotLastInCycle=Το τιμολόγιο δεν είναι το τελευταίο της σειράς και δεν πρέπει να τροποποιηθεί
 DisabledBecauseNotLastInCycle=Η επόμενη κατάσταση υπάρχει ήδη.
 DisabledBecauseFinal=Η κατάσταση αυτή είναι οριστική.
 CantBeLessThanMinPercent=Η πρόοδος δεν μπορεί να είναι μικρότερη από την αξία του στην προηγούμενη κατάσταση.
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Σφάλμα : ενημέρωση τιμή
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index 12f2cfd5005..5598cdf42bf 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -38,8 +38,8 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Τελευταία %s τροποποίηση δωρεών
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
 BoxGoodCustomers=Καλοί πελάτες
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Προσφορές ανά μήνα
 NoTooLowStockProducts=Κανένα προϊόν κάτω από το χαμηλό όριο του αποθέματος
 BoxProductDistribution=Κατανομή Προϊόντων/Υπηρεσιών
 BoxProductDistributionFor=Κατανομή των %s για %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Τιμολόγια Πελάτη
 ForCustomersOrders=Παραγγελίες πελατών
 ForProposals=Προσφορές
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 95c886d48ba..895db5ebd9d 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Πελ./Προμ.
 ShoppingCart=Καλάθι αγορών
 NewSell=Νέα Πώληση
-BackOffice=Back office
 AddThisArticle=Προσθέστε αυτό το προϊόν
 RestartSelling=Επιστρέψτε στην πώληση
-SellFinished=Ολοκλήρωση πώλησης
+SellFinished=Sale complete
 PrintTicket=Εκτύπωση Απόδειξης
 NoProductFound=Το προϊόν δεν βρέθηκε
 ProductFound=Το προϊόν βρέθηκε
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 82cc77b8f6b..4da49b88614 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Πελάτ
 MembersCategoriesArea=Πεδίο Ετικέτα/Κατηγορία Μελών
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
 NewCategory=Νέα Ετικέτα/Κατηγορία
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Προσθήκη σε ετικέτα/κατηγορία
 NotCategorized=Χωρίς ετικέτα/κατηγορία
 CategoryExistsAtSameLevel=Η κατηγορία αυτή υπάρχει ήδη με αυτό το όνομα
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Προϊόντα ετικέτες/κατ
 MembersCategoriesShort=Μέλη ετικέτες/κατ
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Αυτή η κατηγορία δεν περιέχει κανένα προϊόν.
 ThisCategoryHasNoSupplier=Αυτή η κατηγορία δεν περιέχει κανένα προμηθευτή.
 ThisCategoryHasNoCustomer=Αυτή η κατηγορία δεν περιέχει κανένα πελάτη.
 ThisCategoryHasNoMember=Αυτή η κατηγορία δεν περιέχει κανένα μέλος.
 ThisCategoryHasNoContact=Αυτή η κατηγορία δεν περιέχει καμία επαφή.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Ετικέτα/κατηγορία id
 CatSupList=Λίστα προμηθευτή ετικέτες/κατηγορίες
 CatCusList=Λίστα πελάτη/προοπτικής ετικέτες/κατηγορίες
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Σύνδεση μεταξύ προμηθευτών και ετικετών/κατηγοριών
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Αφαίρεση αυτής της ετικέτας/κατηγορίας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
 CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 4eba4a80f37..a4d9644f886 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -11,12 +11,12 @@ AddAction=Δημιουργία συμβάντος
 AddAnAction=Δημιουργία συμβάντος
 AddActionRendezVous=Δημιουργήστε μια εκδήλωση ραντεβού
 ConfirmDeleteAction=Είστε σίγουρος ότι θέλετε να διαγράψετε αυτό το γεγονός;
-CardAction=Καρτέλα Ενέργειας
+CardAction=Καρτέλα Συμβάντος
 ActionOnCompany=Related company
 ActionOnContact=Related contact
 TaskRDVWith=Συνάντηση με %s
 ShowTask=Εμφάνιση Εργασίας
-ShowAction=Εμφάνιση Ενέργειας
+ShowAction=Εμφάνιση Συμβάντος
 ActionsReport=Αναφορά Ενεργειών
 ThirdPartiesOfSaleRepresentative=Στοιχείο με τον αντιπρόσωπο πωλήσεων
 SalesRepresentative=Αντιπρόσωπος πωλήσεων
@@ -28,18 +28,18 @@ ShowCustomer=Εμφάνιση Πελάτη
 ShowProspect=Εμφάνιση Προοπτικής
 ListOfProspects=Λίστα Προοπτικών
 ListOfCustomers=Λίστα Πελατών
-LastDoneTasks=Latest %s completed tasks
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=Ολοκληρωμένες και τρέχουσες ενέργειες
-DoneActions=Ολοκληρωμένες Ενέργειες
-ToDoActions=Ημιτελείς Ενέργειες
+LastDoneTasks=Τελευταίες %s ολοκληρωμένες εργασίες
+LastActionsToDo=Παλαιότερες %s ημιτελείς ενέργειες
+DoneAndToDoActions=Ολοκληρωμένα και τρέχοντα συμβάντα
+DoneActions=Ολοκληρωμένα συμβάντα
+ToDoActions=Ημιτελή συμβάντα
 SendPropalRef=Υποβολή των προσφορών %s
 SendOrderRef=Υποβολή της παραγγελίας %s
-StatusNotApplicable=Δεν ισχύει
+StatusNotApplicable=Χωρίς δυνατότητα εφαρμογής
 StatusActionToDo=Να γίνουν
 StatusActionDone=Ολοκληρωμένη
 StatusActionInProcess=Σε εξέλιξη
-TasksHistoryForThisContact=Ενέργειες για το πρόσωπο επικοινωνίας
+TasksHistoryForThisContact=Γεγονότα για το πρόσωπο επικοινωνίας
 LastProspectDoNotContact=Να μην γίνει επικοινωνία
 LastProspectNeverContacted=Δεν έχει γίνει επικοινωνία
 LastProspectToContact=Να γίνει επικοινωνία
@@ -62,9 +62,9 @@ ActionAC_SHIP=Αποστολή αποστολής με e-mail
 ActionAC_SUP_ORD=Αποστολή παραγγελίας προμηθευτή με email
 ActionAC_SUP_INV=Αποστολή τιμολογίου προμηθευτή με email
 ActionAC_OTH=Άλλο
-ActionAC_OTH_AUTO=Άλλο (εισάγεται αυτόματα συμβάντα)
-ActionAC_MANUAL=Χειροκίνητη εισαγωγή γεγονότων
-ActionAC_AUTO=Αυτόματη εισαγωγή γεγονότων
+ActionAC_OTH_AUTO=Άλλο (αυτόματα εισηγμένα συμβάντα)
+ActionAC_MANUAL=Χειροκίνητα εισηγμένα συμβάντα
+ActionAC_AUTO=Αυτόματα εισηγμένα συμβάντα
 Stats=Στατιστικά πωλήσεων
 StatusProsp=Κατάσταση προοπτικής
 DraftPropals=Σχέδιο εμπορικών προσφορών
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 9527aafd93c..b8b42d7b8cb 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Νέος Ιδιώτης
 NewCompany=Νέα εταιρία (προοπτική, πελάτης, προμηθευτής))
 NewThirdParty=Νέος Πελ./Προμ. (προοπτική, πελάτης, προμηθευτής)
 CreateDolibarrThirdPartySupplier=Δημιουργήστε ένα Πελ.Προμ. (προμηθευτής)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Περιοχή προοπτικής
 IdThirdParty=Αναγνωριστικό
 IdCompany=Αναγνωριστικό εταιρίας
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Προμηθευτές
 ThirdPartyType=Τύπος Πελ./Προμ.
 Company/Fundation=Εταιρία/Οργανισμός
 Individual=Ιδιώτης
-ToCreateContactWithSameName=Θα δημιουργηθεί αυτόματα ένας φυσικός αντιπρόσωπος με τις ίδιες πληροφορίες
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Γονική εταιρία
 Subsidiaries=Θυγατρικές
 ReportByCustomers=Αναφορά ανά πελάτες
@@ -47,7 +49,7 @@ CivilityCode=Προσφωνήσεις
 RegisteredOffice=Έδρα της εταιρείας
 Lastname=Επίθετο
 Firstname=Όνομα
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Τίτλος
 Address=Διεύθυνση
 State=Πολιτεία/Επαρχία
@@ -64,7 +66,7 @@ Chat=Συνομιλία
 PhonePro=Επαγγ. τηλέφωνο
 PhonePerso=Προσωπ. τηλέφωνο
 PhoneMobile=Κιν. τηλέφωνο
-No_Email=Μην στέλνετε μαζική αποστολή e-mail
+No_Email=Refuse mass e-mailings
 Fax=Φαξ
 Zip=Ταχ. Κώδικας
 Town=Πόλη
@@ -73,7 +75,7 @@ Poste= Θέση
 DefaultLang=Γλώσσα
 VATIsUsed=Χρήση ΦΠΑ
 VATIsNotUsed=Χωρίς ΦΠΑ
-CopyAddressFromSoc=Συμπληρώστε τη διεύθυνση με τη διεύθυνση του Πελ./Προμ.
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Χρησιμοποιήστε το δεύτερο φόρο
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Α.Φ.Μ
 VATIntraShort=Α.Φ.Μ.
 VATIntraSyntaxIsValid=Το συντακτικό είναι έγκυρο
-VATIntraValueIsValid=Η τιμή είναι έγκυρη
 ProspectCustomer=Προοπτική / Πελάτης
 Prospect=Προοπτική
 CustomerCard=Καρτέλα Πελάτη
@@ -261,7 +262,9 @@ AddContactAddress=Δημιουργία επαφής/διεύθυνση
 EditContact=Επεξεργασία επαφής
 EditContactAddress=Επεξεργασία επαφής/διεύθυνσης
 Contact=Υπεύθυνος επικοινωνίας
+ContactId=Contact id
 ContactsAddresses=Επαφές/Διευθύνσεις
+FromContactName=Name:
 NoContactDefinedForThirdParty=Δεν έχει ορισθεί πρόσωπο επικοινωνίας για αυτόν τον Πελ/Προμ
 NoContactDefined=Δεν έχει ορισθεί πρόσωπο επικοινωνίας
 DefaultContact=Προκαθορισμένος εκπρόσωπος/διεύθυνση
@@ -284,7 +287,7 @@ CompanyDeleted="%s" διαγράφηκε από την βάση δεδομένω
 ListOfContacts=Λίστα αντιπροσώπων
 ListOfContactsAddresses=Κατάλογος των επαφών/διευθύνσεων
 ListOfThirdParties=Λίστα στοιχείων
-ShowCompany=Εμφάνιση Πελ./Προμ.
+ShowCompany=Show third party
 ShowContact=Εμφάνιση Προσώπου Επικοινωνίας
 ContactsAllShort=Όλα (Χωρίς Φίλτρο)
 ContactType=Τύπος αντιπροσώπου επικοινωνίας
@@ -294,6 +297,7 @@ ContactForProposals=Αντιπρόσωπος επικοινωνίας για π
 ContactForContracts=Αντιπρόσωπος επικοινωνίας για συμβόλαιο
 ContactForInvoices=Αντιπρόσωπος επικοινωνίας για τιμολόγιο
 NoContactForAnyOrder=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε καμία παραγγελία
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε καμία εμπορική πρόταση
 NoContactForAnyContract=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε  κανένα συμβόλαιο
 NoContactForAnyInvoice=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε  κανένα τιμολόγιο
@@ -311,7 +315,7 @@ VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site
 VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Ούτε προοπτική ούτε πελάτης
-JuridicalStatus=Legal form
+JuridicalStatus=Νομικό καθεστώς
 Staff=Προσωπικό
 ProspectLevelShort=Δυναμική
 ProspectLevel=Δυναμική προοπτικής
@@ -338,7 +342,7 @@ TE_PRIVATE=Ανεξάρτητο πρόσωπο
 TE_OTHER=Άλλο
 StatusProspect-1=Να μην γίνει επικοινωνία
 StatusProspect0=Δεν έγινε ποτε επικοινωνία
-StatusProspect1=To be contacted
+StatusProspect1=Προς επικοινωνία
 StatusProspect2=Επικοινωνία σε εξέλιξη
 StatusProspect3=Η επικοινωνία πραγματοποιήθηκε
 ChangeDoNotContact=Αλλαγή κατάστασης σε 'Να μην γίνει επικοινωνία'
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Ο αντιπρόσωπος δεν αντιστοιχεί σε κάποιο στοιχείο
 DolibarrLogin=Είσοδος Dolibarr
 NoDolibarrAccess=Χωρίς πρόσβαση στο Dolibarr
-ExportDataset_company_1=Πελ./Προμ. (εταιρείες / ιδρύματα / φυσικά πρόσωπα) και ιδιότητες
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Αντιπρόσωποι και ιδιότητες
-ImportDataset_company_1=Πελ./Προμ. (εταιρείες / ιδρύματα / φυσικά πρόσωπα) και ιδιότητες
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Επαφές / Διευθύνσεις (από Πελ./Προμ. ή όχι) και χαρακτηριστικά
 ImportDataset_company_3=Στοιχεία τραπεζικού λογαριασμού
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -365,7 +369,7 @@ SupplierCategory=Κατηγορία Προμηθευτή
 JuridicalStatus200=Independent
 DeleteFile=Διαγραφή Αρχείου
 ConfirmDeleteFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο;
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Έχει αποδοθεί σε αντιπρόσωπο πωλήσεων
 Organization=Οργανισμός
 FiscalYearInformation=Πληροφορίες Οικονομικού Έτους
 FiscalMonthStart=Μήνας Εκκίνησης Οικονομικού Έτους
@@ -375,7 +379,7 @@ ListSuppliersShort=Λίστα Προμηθευτών
 ListProspectsShort=Λίστα Προοπτικών
 ListCustomersShort=Λίστα Πελατών
 ThirdPartiesArea=Περιοχή Πελ./Προμ. και επαφών
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Τελευταία %s τροποποιημένα στοιχεία
 UniqueThirdParties=Σύνολο μοναδικών Πελ./Προμ.
 InActivity=Ανοιχτό
 ActivityCeased=Κλειστό
@@ -391,5 +395,7 @@ MergeThirdparties=Συγχώνευση  Πελ./Προμ.
 ConfirmMergeThirdparties=Είστε σίγουροι ότι θέλετε να συγχωνεύσετε το Πελ./Προμ. στην τρέχουσα; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μεταφερθεί στο τωρινό Πελ./Προμ., έτσι θα είστε σε θέση να διαγράψετε το διπλότυπο.
 ThirdpartiesMergeSuccess= Πελ./Προμ. έχουν συγχωνευθεί
 SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+SaleRepresentativeFirstname=Όνομα αντιπροσώπου πωλήσεων
+SaleRepresentativeLastname=Επίθετο αντιπροσώπου πωλήσεων
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index 841394efd5e..30df382aaa6 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -45,22 +45,24 @@ LT1SupplierES=RE αγορές
 VATCollected=VAT collected
 ToPay=Προς πληρωμή
 SpecialExpensesArea=Περιοχή για όλες τις ειδικές πληρωμές
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
+SocialContribution=Κοινωνική ή φορολογική εισφορά
+SocialContributions=Κοινωνικές ή φορολογικές εισφορές
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Ειδικά έξοδα
 MenuTaxAndDividends=Taxes and dividends
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Accountancy/Treasury area
+MenuSocialContributions=Κοινωνικές/φορολογικές εισφορές
+MenuNewSocialContribution=Νέα Κοιν/Φορ εισφορά
+NewSocialContribution=Νέα Κοινωνική/Φορολογική εισφορά
+ContributionsToPay=Κοινωνικές/Φορολογικές εισφορές προς πληρωμή
+AccountancyTreasuryArea=Περιοχή Οικονομικών/Περιουσιακών Στοιχείων
 NewPayment=Νέα Πληρωμή
 Payments=Πληρωμές
 PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
-PaymentSocialContribution=Σίγουρα θέλετε να μαρκάρετε αυτό το αξιόγραφο σαν απορριφθέν;
-PaymentVat=Πληρωμή Φόρου
+PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
+PaymentVat=Πληρωμή Φ.Π.Α.
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
 DateStartPeriod=Ημερομηνία έναρξης περιόδου
@@ -81,7 +83,7 @@ VATPayment=Sales tax payment
 VATPayments=Sales tax payments
 VATRefund=Sales tax refund Refund
 Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
 ShowVatPayment=Εμφάνιση πληρωμής φόρου
 TotalToPay=Σύνολο πληρωμής
 CustomerAccountancyCode=Λογιστικός κωδικός πελάτη
@@ -93,7 +95,7 @@ NewAccount=Νέος Λογαριασμός
 SalesTurnover=Κύκλος εργασιών πωλήσεων
 SalesTurnoverMinimum=Ελάχιστος κύκλος εργασιών των πωλήσεων
 ByExpenseIncome=By expenses & incomes
-ByThirdParties=από στοιχεία
+ByThirdParties=Ανά στοιχεία
 ByUserAuthorOfInvoice=Ανά συντάκτη τιμολογίου
 CheckReceipt=Έλεγχος Πίστωσης
 CheckReceiptShort=Check deposit
@@ -104,11 +106,11 @@ NewCheckDepositOn=Create receipt for deposit on account: %s
 NoWaitingChecks=No checks awaiting deposit.
 DateChequeReceived=Check reception input date
 NbOfCheques=Πλήθος επιταγών
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
+PaySocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
+ConfirmPaySocialContribution=Είστε σίγουροι ότι θέλετε να χαρακτηριστεί αυτή η Κοινωνική/Φορολογική εισφορά ως πληρωμένη;
+DeleteSocialContribution=Διαγραφή Κοινωνικής/Φορολογικής εισφοράς
+ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την Κοινωνική/Φορολογική εισφορά;
+ExportDataset_tax_1=Κοινωνικές/Φορολογικές εισφορές και πληρωμές
 CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
 CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
 CalcModeDebt=Κατάσταση <b>%sΑπαιτήσεις-Οφειλές%s</b> δήλωσε <b>Λογιστικών υποχρεώσεων</b>.
@@ -151,7 +153,7 @@ RulesVATDueServices=- Για τις υπηρεσίες, η έκθεση περι
 RulesVATDueProducts=- Για τα υλικά περιουσιακά στοιχεία, περιλαμβάνει τα τιμολόγια ΦΠΑ, με βάση την ημερομηνία έκδοσης του τιμολογίου.
 OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
 PercentOfInvoice=%%/τιμολόγιο
-NotUsedForGoods=Not used on goods
+NotUsedForGoods=Δεν γίνεται χρήση σε υλικά αγαθά
 ProposalStats=Στατιστικά στοιχεία σχετικά με τις προτάσεις
 OrderStats=Στατιστικά στοιχεία για τις παραγγελίες
 InvoiceStats=Στατιστικά στοιχεία για τους λογαριασμούς
@@ -163,7 +165,7 @@ SellsJournal=Ημερολόγιο πωλήσεων
 PurchasesJournal=Ημερολόγιο Αγορών
 DescSellsJournal=Ημερολόγιο πωλήσεων
 DescPurchasesJournal=Ημερολόγιο Αγορών
-InvoiceRef=Τιμολόγιο ref.
+InvoiceRef=Αρ. Τιμολογίου
 CodeNotDef=Δεν προσδιορίζεται
 WarningDepositsNotIncluded=Καταθέσεις τιμολόγια δεν περιλαμβάνονται σε αυτή την έκδοση με αυτή την ενότητα λογιστικής.
 DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
@@ -176,11 +178,11 @@ RefExt=Εξωτερικές αναφορές
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
 LinkedOrder=Σύνδεση με παραγγελία
 Mode1=Μέθοδος 1
-Mode2=Τρόπος 2
+Mode2=Μέθοδος 2
 CalculationRuleDesc=Για να υπολογιστεί το συνολικό ΦΠΑ, υπάρχουν δύο μέθοδοι: <br> Μέθοδος 1 στρογγυλοποίηση ΦΠΑ για κάθε γραμμή, στη συνέχεια, αθροίζοντας τους. <br> Μέθοδος 2 αθροίζοντας όλων των ΦΠΑ σε κάθε γραμμή, τότε η στρογγυλοποίηση είναι στο αποτέλεσμα. <br> Το τελικό αποτέλεσμα μπορεί να διαφέρει από λίγα λεπτά. Προεπιλεγμένη λειτουργία είναι η λειτουργία <b>%s</b>.
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Αναφορά του κύκλου εργασιών ανά προϊόν, όταν χρησιμοποιείτε <b>ταμειακή λογιστική</b> η λειτουργία δεν είναι σχετική. Η αναφορά αυτή είναι διαθέσιμη μόνο όταν χρησιμοποιείτε <b>λογιστική δέσμευση</b> τρόπος (ανατρέξτε τη Ρύθμιση του module λογιστικής).
-CalculationMode=Τρόπο υπολογισμού
+CalculationMode=Τρόπος υπολογισμού
 AccountancyJournal=Λογιστικος Κωδικός περιοδικό
 ACCOUNTING_VAT_SOLD_ACCOUNT=Προεπιλεγμένος κωδικός λογιστικής για τη συλλογή ΦΠΑ (ΦΠΑ πωλήσεων)
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT (VAT on purchases)
@@ -189,7 +191,7 @@ ACCOUNTING_ACCOUNT_CUSTOMER=Κωδικός Λογιστικής από προε
 ACCOUNTING_ACCOUNT_SUPPLIER=Κωδικός Λογιστικής από προεπιλογή για τους προμηθευτές
 CloneTax=Clone a social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
-CloneTaxForNextMonth=Κλώνος για τον επόμενο μήνα
+CloneTaxForNextMonth=Κλώνοποίηση στον επόμενο μήνα
 SimpleReport=Απλή αναφορά
 AddExtraReport=Επιπλέον αναφορές
 OtherCountriesCustomersReport=Αναφορά για πελάτες εξωτερικού
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 15c1c203084..11d1241acbe 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -2,18 +2,18 @@
 ContractsArea=Περιοχή Συμβολαίων
 ListOfContracts=Λίστα Συμβολαίων
 AllContracts=Όλα τα συμβόλαια
-ContractCard=Κάρτέλα  Συμβολαίου
-ContractStatusNotRunning=Ανενεργό
+ContractCard=Καρτέλα  Συμβολαίου
+ContractStatusNotRunning=Σε αργία
 ContractStatusDraft=Προσχέδιο
-ContractStatusValidated=Επικυρωμένο
-ContractStatusClosed=Κλειστό
-ServiceStatusInitial=Ανενεργή
-ServiceStatusRunning=Ενεργή
-ServiceStatusNotLate=Ενεργή, δεν έχει λήξει
+ContractStatusValidated=Επικυρώθηκε
+ContractStatusClosed=Έκλεισε
+ServiceStatusInitial=Σε αργία
+ServiceStatusRunning=Σε εξέλιξη
+ServiceStatusNotLate=Σε εξέλιξη, δεν έχει λήξει
 ServiceStatusNotLateShort=Δεν έχει λήξει
-ServiceStatusLate=Ενεργή, Έληξε
+ServiceStatusLate=Σε εξέλιξη, Έληξε
 ServiceStatusLateShort=Έληξε
-ServiceStatusClosed=Τερματισμένη
+ServiceStatusClosed=Έκλεισε
 ShowContractOfService=Show contract of service
 Contracts=Συμβόλαια
 ContractsSubscriptions=Συμβάσεις/Συνδρομές
@@ -32,16 +32,16 @@ NewContractSubscription=Νέα σύμβαση/συνδρομή
 AddContract=Δημιουργία σύμβασης
 DeleteAContract=Διαγραφή Συμβολαίου
 CloseAContract=Τερματισμός Συμβολαίου
-ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ?
-ConfirmValidateContract=Are you sure you want to validate this contract ?
-ConfirmCloseContract=This will close all services (active or not). Are you sure you want to close this contract ?
+ConfirmDeleteAContract=Είστε σίγουροι ότι θέλετε να διαγράψετε το συμβόλαιο και όλες τις υπηρεσίες;
+ConfirmValidateContract=Είστε σίγουροι ότι θέλετε να επικυρώσετε το συμβόλαιο;
+ConfirmCloseContract=Η ενέργεια θα κλείσει όλες τις υπηρεσίες (ενεργές ή μη). Είστε σίγουροι ότι θέλετε να κλείεσετε το συμβόλαιο;
 ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b> ?
-ValidateAContract=Validate a contract
+ValidateAContract=Επικύρωση συμβολαίου
 ActivateService=Ενεργοποίηση Υπηρεσίας
 ConfirmActivateService=Are you sure you want to activate this service with date <b>%s</b> ?
-RefContract=Contract reference
-DateContract=Contract date
-DateServiceActivate=Service activation date
+RefContract=Αναφορά συμβολαίου
+DateContract=Ημερομηνία συμβολαίου
+DateServiceActivate=Ημερομηνία ενεργοποίησης υπηρεσίας
 ShowContract=Εμφάνιση συμβολαίου
 ListOfServices=Λίστα υπηρεσιών
 ListOfInactiveServices=Λίστα μη ενεργών υπηρεσιών
@@ -50,7 +50,7 @@ ListOfClosedServices=Λίστα κλεισμένων υπηρεσιών
 ListOfRunningServices=Λίστα τρέχουσων υπηρεσιών
 NotActivatedServices=Inactive services (among validated contracts)
 BoardNotActivatedServices=Υπηρεσίες προς ενεργοποίηση σε επικυρωμένα συμβόλαια
-LastContracts=Latest %s contracts
+LastContracts=Τελευταία %s Συμβόλαια
 LastModifiedServices=Latest %s modified services
 ContractStartDate=Ημερ. έναρξης
 ContractEndDate=Ημερ. τέλους
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 151cc06ff1c..02338e8515b 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Διαγραφή προγραμματισμένης εργασ
 Permission23104 = Εκτέλεση προγραμματισμένης εργασίας
 # Admin
 CronSetup= Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
-URLToLaunchCronJobs=URL για να ελέγξετε και να ξεκινήσει μια περιοδική εργασία, εφόσον απαιτείται
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Ή να ελέγξετε και να ξεκινήσει μία συγκεκριμένη εργασία
 KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξεκινήσει η εργασία cron
 FileToLaunchCronJobs=Γραμμής εντολών για να ξεκινήσει τις εργασίες
@@ -23,7 +23,7 @@ CronCommand=Εντολή
 CronList=Προγραμματισμένες εργασίες
 CronDelete=Διαγραφή προγραμματισμένων εργασιών
 CronConfirmDelete=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτές τις προγραμματισμένες εργασίες;
-CronExecute=Εκτέλεση προγραμματισμένων εργασιών
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Εργασία
@@ -39,7 +39,7 @@ CronMethod=Μέθοδος
 CronModule=Module
 CronNoJobs=Δεν έχουν καταχωρηθεί εργασίες
 CronPriority=Προτεραιότητα
-CronLabel=Περιγραφή
+CronLabel=Label
 CronNbRun=Nb. έναρξης
 CronMaxRun=Max nb. launch
 CronEach=Κάθε
@@ -74,5 +74,6 @@ CronType_command=Εντολή Shell
 CronCannotLoadClass=Cannot load class %s or object %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
 JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
+MakeLocalDatabaseDumpShort=Αντίγραφο ασφαλείας τοπικής βάσης δεδομένων
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 6b876b2088a..8564741de31 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -33,17 +33,17 @@ ErrorBadSupplierCodeSyntax=Bad σύνταξη για τον κωδικό προ
 ErrorSupplierCodeRequired=Κωδικός προμηθευτή που απαιτούνται
 ErrorSupplierCodeAlreadyUsed=Κωδικός προμηθευτή που ήδη χρησιμοποιείται
 ErrorBadParameters=Λάθος παράμετρος
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
+ErrorBadValueForParameter=Η τιμή '%s' δεν είναι έγγυρη για την παράμετρο '%s'
 ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια υποστηριζόμενη μορφή (Η PHP σας δεν υποστηρίζει λειτουργίες για να μετατρέψετε τις εικόνες αυτής της μορφής)
-ErrorBadDateFormat=«%s« Αξία έχει λάθος μορφή ημερομηνίας
+ErrorBadDateFormat=Η τιμή «%s« δεν έχει σωστή μορφή ημερομηνίας
 ErrorWrongDate=Η ημερομηνία δεν είναι σωστή!
-ErrorFailedToWriteInDir=Αποτυχία εγγραφής στο %s κατάλογο
-ErrorFoundBadEmailInFile=Βρέθηκαν εσφαλμένη σύνταξη e-mail για %s γραμμές στο αρχείο (%s γραμμή παράδειγμα με e-mail = %s)
-ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
-ErrorFieldsRequired=Ορισμένα από τα απαιτούμενα πεδία δεν είχαν πληρωθεί.
-ErrorFailedToCreateDir=Απέτυχε να δημιουργήσει έναν κατάλογο. Βεβαιωθείτε ότι το Web server χρήστης έχει δικαιώματα να γράψει στο κατάλογο Dolibarr έγγραφα. Αν <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για το PHP, ελέγξτε ότι Dolibarr αρχεία php κατέχει σε web server χρήστη (ή ομάδα).
-ErrorNoMailDefinedForThisUser=Δεν mail έχει οριστεί για αυτόν το χρήστη
-ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό χρειάζεται javascript να ενεργοποιηθεί στην εργασία. Αλλαγή σε αυτό το setup - οθόνη.
+ErrorFailedToWriteInDir=Αποτυχία εγγραφής στον %s φάκελο
+ErrorFoundBadEmailInFile=Βρέθηκε εσφαλμένη σύνταξη e-mail για %s γραμμές στο αρχείο (%s γραμμή παράδειγμα με e-mail = %s)
+ErrorUserCannotBeDelete=Ο χρήστης δεν μπορεί να διαγραφεί. Μπορεί να σχετίζεται με οντότητες του Dolibarr.
+ErrorFieldsRequired=Ορισμένα από τα απαιτούμενα πεδία δεν έχουν συμπληρωθεί.
+ErrorFailedToCreateDir=Αποτυχία δημιουργίας φακέλου. Βεβαιωθείτε ότι ο Web server χρήστης έχει δικαιώματα να γράψει στο φάκελο εγγράφων του Dolibarr. Αν η <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για την PHP, ελέγξτε ότι τα αρχεία php του Dolibarr ανήκουν στον web server χρήστη (ή ομάδα).
+ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
+ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό χρειάζεται ενεργοποιημένη την javascript. Αλλάξτε την ρύθμιση στο Ρυθμίσεις - Εμφάνιση.
 ErrorTopMenuMustHaveAParentWithId0=Ένα μενού του «Top» τύπου δεν μπορεί να έχει ένα μενού γονέα. Βάλτε 0 στο μενού του γονέα ή να επιλέξετε ένα μενού του τύπου «αριστερά».
 ErrorLeftMenuMustHaveAParentId=Ένα μενού της «Αριστεράς» τύπου πρέπει να έχει ένα id γονέα.
 ErrorFileNotFound=Το αρχείο δεν βρέθηκε <b>%s</b> (Λανθασμένη διαδρομή, λανθασμένη δικαιώματα ή δεν επιτρέπεται η πρόσβαση από την PHP openbasedir ή safe_mode παράμετρος)
@@ -51,22 +51,22 @@ ErrorDirNotFound=<b>%s</b> Directory δεν βρέθηκε (Bad μονοπάτι
 ErrorFunctionNotAvailableInPHP=<b>%s</b> Λειτουργία απαιτείται για αυτό το χαρακτηριστικό, αλλά δεν είναι διαθέσιμα σε αυτή την έκδοση / setup της PHP.
 ErrorDirAlreadyExists=Ένας κατάλογος με αυτό το όνομα υπάρχει ήδη.
 ErrorFileAlreadyExists=Ένα αρχείο με αυτό το όνομα υπάρχει ήδη.
-ErrorPartialFile=Το αρχείο δεν έλαβε πλήρως από τον διακομιστή.
-ErrorNoTmpDir=Προσωρινή %s directy δεν υπάρχει.
-ErrorUploadBlockedByAddon=Ανεβάστε μπλοκαριστεί από ένα PHP / Apache plugin.
-ErrorFileSizeTooLarge=Μέγεθος αρχείου είναι πολύ μεγάλο.
-ErrorSizeTooLongForIntType=Μέγεθος υπερβολικά μεγάλο χρονικό διάστημα για int τύπου (%s μέγιστη ψηφία)
-ErrorSizeTooLongForVarcharType=Μέγεθος υπερβολικά μεγάλο χρονικό διάστημα για τον τύπο εγχόρδων (%s μέγιστο χαρακτήρες)
-ErrorNoValueForSelectType=Please fill value for select list
-ErrorNoValueForCheckBoxType=Please fill value for checkbox list
-ErrorNoValueForRadioType=Please fill value for radio list
+ErrorPartialFile=Ο διακομιστής δεν έλαβε ολόκληρο το αρχείο.
+ErrorNoTmpDir=Ο προσωρινός φάκελος %s δεν υπάρχει.
+ErrorUploadBlockedByAddon=Η μεταφόρτωση απετράπει από ένα PHP / Apache plugin.
+ErrorFileSizeTooLarge=Το μέγεθος του αρχείου είναι πολύ μεγάλο.
+ErrorSizeTooLongForIntType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου ακεραίου (%s είναι το μέγιστο πλήθος ψηφίων)
+ErrorSizeTooLongForVarcharType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου αλφαριθμητικού (%s είναι το μέγιστο πλήθος χαρακτήρων)
+ErrorNoValueForSelectType=Παρακαλούμε συμπληρώστε τιμή για την αναδυόμενη λίστα επιλογής
+ErrorNoValueForCheckBoxType=Παρακαλούμε συμπληρώστε τιμή για την λίστα επιλογής
+ErrorNoValueForRadioType=Παρακαλούμε συμπληρώστε τιμή για την λίστα επιλογής μίας επιλογής
 ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> πεδίου δεν πρέπει να περιέχει ειδικούς χαρακτήρες.
+ErrorFieldCanNotContainSpecialCharacters=Το πεδίο <b>%s</b> δεν πρέπει να περιέχει ειδικούς χαρακτήρες.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorNoAccountancyModuleLoaded=Δεν λογιστική μονάδα ενεργοποιηθεί
+ErrorNoAccountancyModuleLoaded=Δεν έχει ενεργοποιηθεί λογιστική μονάδα
 ErrorExportDuplicateProfil=Αυτό το όνομα προφίλ υπάρχει ήδη για αυτό το σύνολο των εξαγωγών.
-ErrorLDAPSetupNotComplete=Dolibarr-LDAP αντιστοίχιση δεν είναι πλήρης.
-ErrorLDAPMakeManualTest=Ένα αρχείο. Ldif έχει δημιουργηθεί σε %s κατάλογο. Προσπαθήστε να το φορτώσετε χειροκίνητα από την γραμμή εντολών για να έχουν περισσότερες πληροφορίες σχετικά με τα σφάλματα.
+ErrorLDAPSetupNotComplete=Η αντιστοίχιση Dolibarr-LDAP δεν είναι πλήρης.
+ErrorLDAPMakeManualTest=Ένα αρχείο. Ldif έχει δημιουργηθεί στον φάκελο %s. Προσπαθήστε να το φορτώσετε χειροκίνητα από την γραμμή εντολών για να έχετε περισσότερες πληροφορίες σχετικά με τα σφάλματα.
 ErrorCantSaveADoneUserWithZeroPercentage=Δεν μπορεί να σώσει μια ενέργεια με &quot;δεν statut ξεκίνησε&quot; αν πεδίο &quot;γίνεται από&quot; είναι επίσης γεμάτη.
 ErrorRefAlreadyExists=Κωδικός που χρησιμοποιείται για τη δημιουργία ήδη υπάρχει.
 ErrorPleaseTypeBankTransactionReportName=Πληκτρολογείστε όνομα απόδειξη της τράπεζας όπου συναλλαγής αναφέρεται (Format YYYYMM ή ΕΕΕΕΜΜΗΗ)
@@ -123,13 +123,13 @@ ErrorNewValueCantMatchOldValue=New value can't be equal to old one
 ErrorFailedToValidatePasswordReset=Failed to reinit password. May be the reinit was already done (this link can be used only one time). If not, try to restart the reinit process.
 ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check Mysql server is running (in most cases, you can launch it from command line with 'sudo /etc/init.d/mysql start').
 ErrorFailedToAddContact=Failed to add contact
-ErrorDateMustBeBeforeToday=The date cannot be greater than today
+ErrorDateMustBeBeforeToday=Η ημερομηνία δεν μπορεί να είναι μεταγενέστερη από τη σημερινή
 ErrorPaymentModeDefinedToWithoutSetup=A payment mode was set to type %s but setup of module Invoice was not completed to define information to show for this payment mode.
 ErrorPHPNeedModule=Σφάλμα, η PHP σας πρέπει να έχει το module <b>%s</ b> εγκατεστημένο για να χρησιμοποιήσετε αυτήν τη δυνατότητα.
 ErrorOpenIDSetupNotComplete=Μπορείτε να ρυθμίσετε το Dolibarr αρχείο config να επιτρέψει OpenID ταυτότητα, αλλά το URL OpenID υπηρεσίας δεν ορίζεται σε συνεχή %s
 ErrorWarehouseMustDiffers=Η πηγή και ο στόχος των αποθηκών πρέπει να είναι διαφορετικός.
 ErrorBadFormat=Κακή μορφή!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Σφάλμα, το μέλος αυτό δεν έχει ακόμη συνδεθεί με οποιουσδήποτε άλλους κατασκευαστές. Μέλος του συνδέσμου σε έναν υπάρχοντα Πελ./Προμ. ή να δημιουργήσετε ένα νέο κατασκευαστή πριν από τη δημιουργία τιμολογίου με συνδρομή.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Σφάλμα υπάρχουν κάποιες παραδόσεις που συνδέονται με την εν λόγω αποστολή. Η διαγραφή απορρίφθηκε.
 ErrorCantDeletePaymentReconciliated=Δεν μπορείτε να διαγράψετε μια πληρωμή με τραπεζική συναλλαγή που είχε φτάσει σε συμβιβασμό
 ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν μπορείτε να διαγράψετε μια πληρωμή που σχετίζεται με ένα τουλάχιστον τιμολόγιο με καθεστώς πληρωμένο
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index a2a7f038c48..d400c74186b 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -38,7 +38,7 @@ FormatedExportDesc2=First step is to choose a predefined dataset, then to choose
 FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
 Sheet=Sheet
 NoImportableData=No importable data (no module with definitions to allow data imports)
-FileSuccessfullyBuilt=File generated
+FileSuccessfullyBuilt=Το αρχείο δημιουργήθηκε
 SQLUsedForExport=SQL Request used to build export file
 LineId=Id of line
 LineLabel=Ετικέτα της γραμμής
@@ -93,7 +93,7 @@ NbOfLinesImported=Number of lines successfully imported: <b>%s</b>.
 DataComeFromNoWhere=Value to insert comes from nowhere in source file.
 DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
 DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the objet <b>%s</b> that has the ref. from source file must exists into Dolibarr).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Ο κωδικός που προέρχεται από πεδίο νούμερο <b>%s</b> του πηγαίου αρχείου θα χρησιμοποιηθεί ώστε να βρεθεί η ταυτότητα id του μητρικού αντικειμένου προς χρήση (Οπότε, ο κωδικός από το πηγαίο αρχείο πρέπει να βρίσκεται στο κατάλογο <b>%s</b>). Εάν γνωρίζεται την ταυτότητα id, μπορείτε να την χρησιμοποιήσετε αντί του κωδικού. Η εισαγωγή θα πραγματοποιηθεί και στις δύο περιπτώσεις.
 DataIsInsertedInto=Data coming from source file will be inserted into the following field:
 DataIDSourceIsInsertedInto=The id of parent object found using the data in source file, will be inserted into the following field:
 DataCodeIDSourceIsInsertedInto=Η ταυτότητα του γονέα που βρέθηκαν γραμμή από τον κώδικα, θα πρέπει να προστεθεί στο παρακάτω πεδίο:
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 6cffdafd306..6666499ee6b 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -20,7 +20,7 @@ ReviewedByCP=Θα πρέπει να επανεξεταστεί από
 DescCP=Περιγραφή
 SendRequestCP=Δημιουργήστε το αίτημα άδειας
 DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον <b>%s ημέρα(ες)</b> πριν από τις.
-MenuConfCP=Ισορροπία αποχωρήσεων
+MenuConfCP=Ισορροπία αδειών
 SoldeCPUser=Η ισορροπία των αδειών είναι <b>%s</b> ημέρες.
 ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης.
 ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας:
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index a94f680c90a..b73466bd8ab 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -9,8 +9,8 @@ ConfirmDeleteEstablishment=Είστε σίγουρος ότι θέλετε να
 OpenEtablishment=Άνοιγμα εγκατάστασης
 CloseEtablishment=Κλείσιμο εγκατάστασης
 # Dictionary
-DictionaryDepartment=HRM - Λίστα διαμερισμάτων
-DictionaryFunction=HRM - Λίστα συναρτλησεων
+DictionaryDepartment=HRM - Λίστα τμημάτων
+DictionaryFunction=HRM - Λίστα συναρτήσεων
 # Module
 Employees=Εργαζόμενοι
 Employee=Υπάλληλος
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 9684d893260..d629f1b7d93 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
 PHPSupportPOSTGETOk=Η PHP υποστηρίζει μεταβλητές POST και GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Αυτή η PHP υποστηρίζει UTF8 λειτουργίες.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Κατάλογος %s δεν υπάρχει.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -76,7 +78,7 @@ SetupEnd=End of setup
 SystemIsInstalled=This installation is complete.
 SystemIsUpgraded=Dolibarr has been upgraded successfully.
 YouNeedToPersonalizeSetup=You need to configure Dolibarr to suit your needs (appearance, features, ...). To do this, please follow the link below:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+AdminLoginCreatedSuccessfuly=Επιτυχής δημουργία  σύνδεσης του διαχειριστή '<b>%s</b>' στο Dolibarr
 GoToDolibarr=Go to Dolibarr
 GoToSetupArea=Go to Dolibarr (setup area)
 MigrationNotFinished=Version of your database is not completely up to date, so you'll have to run the upgrade process again.
@@ -86,7 +88,7 @@ DirectoryRecommendation=It is recommanded to use a directory outside of your dir
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Αποτυχία δημιουργίας λογαριασμού διαχειριστή του Dolibarr.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, you should remove the <b>install<b> directory or rename it to <b>install.lock</b> in order to avoid its malicious use.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
@@ -131,8 +133,12 @@ MigrationFinished=Μετανάστευση τελειώσει
 LastStepDesc=<strong>Τελευταίο βήμα:</strong> Καθορίστε εδώ login και password που σκοπεύετε να χρησιμοποιήσετε για να συνδεθείτε με το λογισμικό. Να μην χάσετε αυτή, όπως είναι ο λογαριασμός για να επιτρέψει να διαχειριστεί όλες τις άλλες.
 ActivateModule=Ενεργοποίηση %s ενότητα
 ShowEditTechnicalParameters=Κάντε κλικ εδώ για να δείτε/επεξεργαστείτε προηγμένες παραμέτρους (κατάσταση έμπειρου χρήστη)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
-ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+WarningUpgrade=Προειδοποίηση:\nΔημιουργήσατε πρώτα ακτίγραφο ασφαλείας της βάσης δεδομένων;\nΑυτό είναι συμαντικό: για παράδειγμα, λόγω κάποιων σφαλμάτων  στα συστήμ,ατα των βάσεων δεδομένων (όπως mysql έκδοση 5.5.40/41/42/43), κάποια δεδομένα ή πίνακες μπορεί να χαθούν κατα την διεργασία, οποτε είναι συμαντικό να δημιουργήσετε ένα πλήρη αντίγραφο ασφαλείας της βάσης δεδομένων σας πριν αρχίσετε την μεταφορά.\n\nΠατήστε ΟΚ για να αρχείσει η διθαδικασία μεταφοράς
+ErrorDatabaseVersionForbiddenForMigration=Η έκδοση της βάσης δεδομένων είναι %s. Περιέχει κρίσιμο σφάλμα μπορεί να οδηγεί σε απώλεια δεδομένων σε περίπτωση αλλαγής της δομής της βάσης δεδομένων, όπως απαιτείται κατά την διαδικασία μεταφοράς. Για αυτό το λόγο, η μεταφορά της βάσης δεδομένων δε θα είναι επιτρεπτή μέχρι την αναβάθμισή της νεότερη και διορθωμένη έκδοση (λίστα γνωστών εκδόσεων με σφάλματα: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -142,7 +148,7 @@ MigrationSupplierOrder=Data migration for supplier's orders
 MigrationProposal=Data migration for commercial proposals
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Επιτυχής αναβάθμιση
 MigrationUpdateFailed=Failed upgrade process
 MigrationRelationshipTables=Data migration for relationship tables (%s)
 MigrationPaymentsUpdate=Payment data correction
@@ -156,7 +162,7 @@ MigrationContractsLineCreation=Create contract line for contract ref %s
 MigrationContractsNothingToUpdate=No more things to do
 MigrationContractsFieldDontExist=Field fk_facture does not exists anymore. Nothing to do.
 MigrationContractsEmptyDatesUpdate=Contract empty date correction
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Επιτυχής διόρθωση κενής ημερομηνίας συμβολαίου
 MigrationContractsEmptyDatesNothingToUpdate=No contract empty date to correct
 MigrationContractsEmptyCreationDatesNothingToUpdate=No contract creation date to correct
 MigrationContractsInvalidDatesUpdate=Bad value date contract correction
@@ -164,7 +170,7 @@ MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting
 MigrationContractsInvalidDatesNumber=%s contracts modified
 MigrationContractsInvalidDatesNothingToUpdate=No date with bad value to correct
 MigrationContractsIncoherentCreationDateUpdate=Bad value contract creation date correction
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateUpdateSuccess=Επιτυχής διόρθωση εσφαλμένης τιμής ημερομηνίας δημιουργίας συμβολαίου
 MigrationContractsIncoherentCreationDateNothingToUpdate=No bad value for contract creation date to correct
 MigrationReopeningContracts=Open contract closed by error
 MigrationReopenThisContract=Reopen contract %s
@@ -185,7 +191,9 @@ MigrationActioncommElement=Ενημέρωση στοιχεία για τις δ
 MigrationPaymentMode=Η μεταφορά δεδομένων για την κατάσταση πληρωμής
 MigrationCategorieAssociation=Μετακίνηση των κατηγοριών
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Επαναφόρτωση ενθεμάτων %s
 ShowNotAvailableOptions=Εμφάνιση μη διαθέσιμων επιλογών
 HideNotAvailableOptions=Απόκρυψη μη μη διαθέσιμων επιλογών
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
+ErrorFoundDuringMigration=Αναφέρθηκε σφάλμα κατά τη διαδικασία μεταφοράς, οπότε το επόμενο βήμα δεν είναι δυνατό. Για να αγνοήστε το σφάλμα, μπορείτε να <a href="%s">πατήσετε εδώ</a>, αλλά η εφαρμογή ή κάποιες λειτουργείες μπορεί να μην λειτουργού σωστά μέχρι να διορθωθεί.
diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
index d77a860bebc..3fb1de7c111 100644
--- a/htdocs/langs/el_GR/interventions.lang
+++ b/htdocs/langs/el_GR/interventions.lang
@@ -6,7 +6,7 @@ NewIntervention=Νέα παρέμβαση
 AddIntervention=Δημιουργία παρέμβασης
 ListOfInterventions=Λίστα παρεμβάσεων
 ActionsOnFicheInter=Δράσεις για την παρέμβαση
-LastInterventions=Latest %s interventions
+LastInterventions=Τελευταίες %s παρεμβάσεις
 AllInterventions=Όλες οι παρεμβάσεις
 CreateDraftIntervention=Δημιουργία πρόχειρη
 InterventionContact=Παρέμβαση επαφής
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Σε συνέχεια επαφή με τ
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=παρεμβάσεις που προέρχονται από παραγγελίες
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Στατιστικά παρεμβάσεων
 NbOfinterventions=Αρ. καρτών παρέμβασης
 NumberOfInterventionsByMonth=Αρ. καρτών παρέμβασης  ανά μήνα (ημερομηνία επικύρωσης)
diff --git a/htdocs/langs/el_GR/ldap.lang b/htdocs/langs/el_GR/ldap.lang
index d0a0da3521d..f84ed504d55 100644
--- a/htdocs/langs/el_GR/ldap.lang
+++ b/htdocs/langs/el_GR/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Πρώτη ημερομηνία εγγραφής
 LDAPFieldFirstSubscriptionAmount=Πρώτο ποσό εγγραφής
 LDAPFieldLastSubscriptionDate=Τελευταία ημερομηνία εγγραφής
 LDAPFieldLastSubscriptionAmount=Τελευταίο ποσό συνδρομής
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Συγχρονισμένος χρήστης
 GroupSynchronized=Συγχρονισμένη ομάδα
 MemberSynchronized=Συγχρονισμένο μέλος
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 26681b5e872..5a98266289a 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Ανάγνωση
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail αποστέλλονται στους παραλήπτες %s.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> παραλήπτες που προστέθηκαν στο κατάλογο των στόχων
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Αρ. επιλεγμένων
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 8e2da5f0e5f..89bc82aaf91 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -25,10 +25,10 @@ FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Σύνδεση Βάσης Δεδομένων
 NoTemplateDefined=Δεν υπάρχει καθορισμένο πρότυπο γι' αυτόν τον τύπο email
-AvailableVariables=Available substitution variables
+AvailableVariables=Διαθέσιμες μεταβλητές αντικατάστασης
 NoTranslation=Δεν μεταφράστηκε
 NoRecordFound=Δεν υπάρχουν καταχωρημένα στοιχεία
-NotEnoughDataYet=Not enough data
+NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκεί
 NoError=Κανένα Σφάλμα
 Error=Σφάλμα
 Errors=Λάθη
@@ -67,10 +67,11 @@ SelectDate=Επιλέξτε μια ημερομηνία
 SeeAlso=Δείτε επίσης %s
 SeeHere=Δείτε εδώ
 BackgroundColorByDefault=Προκαθορισμένο χρώμα φόντου
+FileRenamed=The file was successfully renamed
 FileUploaded=Το αρχείο ανέβηκε με επιτυχία
 FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύναψη, αλλά δεν έχει μεταφερθεί ακόμη. Πατήστε στο "Επισύναψη Αρχείου".
 NbOfEntries=Πλήθος εγγραφών
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=Online βοήθεια (απαιτείται σύνδεση στο internet)
 GoToHelpPage=Βοήθεια
 RecordSaved=Η εγγραφή αποθηκεύτηκε
 RecordDeleted=Η εγγραφή διγραφηκε
@@ -84,20 +85,20 @@ SeeAbove=Δείτε παραπάνω
 HomeArea=Αρχική
 LastConnexion=Τελευταία Σύνδεση
 PreviousConnexion=Προηγούμενη Σύνδεση
-PreviousValue=Previous value
+PreviousValue=Προηγούμενη τιμή
 ConnectedOnMultiCompany=Σύνδεση στην οντότητα
 ConnectedSince=Σύνδεση από
 AuthenticationMode=Μέθοδος πσιτοποίησης
 RequestedUrl=Ζητούμενο Url
 DatabaseTypeManager=Τύπος διαχειριστή βάσης δεδομένων
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+RequestLastAccessInError=Σφάλμα στην αίτηση πρόσβασης της τελευταία βάσης δεδομένων
+ReturnCodeLastAccessInError=Επιστρεφόμενος κωδικός για το σφάλμα στην αίτηση πρόσβασης της τελευταίας βάση δεδομένων
+InformationLastAccessInError=Πληροφορίες για το σφάλμα στην αίτηση πρόσβασης της τελευταίας βάση δεδομένων
 DolibarrHasDetectedError=Το Dolibarr ανίχνευσε τεχνικό σφάλμα
-InformationToHelpDiagnose=This information can be useful for diagnostic
+InformationToHelpDiagnose=Αυτή η πληροφορία μπορεί να είναι χρήσιμη για διάγνωση
 MoreInformation=Περισσότερς Πληροφορίες
 TechnicalInformation=Τεχνικές πληροφορίες
-TechnicalID=Technical ID
+TechnicalID=Τεχνική ταυτότητα ID
 NotePublic=Σημειώσεις (δημόσιες)
 NotePrivate=Σημειώσεις (προσωπικές)
 PrecisionUnitIsLimitedToXDecimals=Το Dolibarr ρυθμίστηκε να περιορίζει την ακρίβεια των τιμών σε <b>%s</b> δεκαδικά ψηφία.
@@ -223,9 +224,9 @@ HourStart=Έναρξη ωρών
 Date=Ημερομηνία
 DateAndHour=Ημερομηνία και ώρα
 DateToday=Σημερινή ημερομηνία
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
+DateReference=Ημερομηνία αναφοράς
+DateStart=Ημερομηνία έναρξης
+DateEnd=Ημερομηνία λήξης
 DateCreation=Ημερομηνία Δημιουργίας
 DateCreationShort=Ημερομηνία δημιουργίας
 DateModification=Ημερομηνία Τροποποίησης
@@ -245,6 +246,10 @@ DateBuild=Αναφορά ημερομηνία κατασκευής
 DatePayment=Ημερομηνία πληρωμής
 DateApprove=Ημερομηνία έγκρισης
 DateApprove2=Ημερομηνία έγκρισης (δεύτερο έγκριση)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=έτος
 DurationMonth=μήνας
 DurationWeek=εβδομάδα
@@ -255,7 +260,8 @@ DurationWeeks=εβδομάδες
 DurationDays=ημέρες
 Year=Έτος
 Month=Μήνας
-Week=Εμδομάδα
+Week=Εβδομάδα
+WeekShort=Εβδομάδα
 Day=Ημέρα
 Hour=Ώρα
 Minute=Λεπτό
@@ -278,6 +284,7 @@ MonthOfDay=Μήνας από την ημέρα
 HourShort=Ω
 MinuteShort=εκ
 Rate=Βαθμός
+CurrencyRate=Currency conversion rate
 UseLocalTax=με Φ.Π.Α
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -300,7 +307,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
 PriceUHT=Τιμή μον.
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P. (νόμισμα)
 PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
@@ -310,9 +317,9 @@ AmountTTCShort=Ποσό (με Φ.Π.Α.)
 AmountHT=Ποσό (χ. Φ.Π.Α.)
 AmountTTC=Ποσό (με Φ.Π.Α.)
 AmountVAT=Ποσό Φόρου
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
+MulticurrencyAmountHT=Ποσό (χωρίς φόρους), επίσημο νόμισμα
+MulticurrencyAmountTTC=Ποσό (με φόρους), επίσιμο νόμισμα
+MulticurrencyAmountVAT=Ποσό φόρων, επίσημο νόμισμα
 AmountLT1=Ποσό Φόρου 2
 AmountLT2=Ποσό Φόρου 3
 AmountLT1ES=Ποσό RE
@@ -324,11 +331,11 @@ Percentage=Ποσοστό
 Total=Σύνολο
 SubTotal=Υποσύνολο
 TotalHTShort=Σύνολο (χ. Φ.Π.Α.)
-TotalHTShortCurrency=Total (net in currency)
+TotalHTShortCurrency=Σύνολο (καθαρή αξία σε νόμισμα)
 TotalTTCShort=Σύνολο (με Φ.Π.Α.)
 TotalHT=Σύνολο (χ. Φ.Π.Α.)
 TotalHTforthispage=Σύνολο (μετά από φόρους) για αυτή τη σελίδα
-Totalforthispage=Total for this page
+Totalforthispage=Σύνολο για αυτή τη σελίδα
 TotalTTC=Σύνολο (με Φ.Π.Α.)
 TotalTTCToYourCredit=Total (inc. tax) to your credit
 TotalVAT=Συνολικός Φ.Π.Α.
@@ -371,8 +378,8 @@ ActionRunningShort=Σε εξέλιξη
 ActionDoneShort=Ολοκληρωμένες
 ActionUncomplete=Μη ολοκληρωμένη
 CompanyFoundation=Εταιρία/Οργανισμός
-ContactsForCompany=Επαφές/Διευθύνσεις για αυτό το στοιχείο
-ContactsAddressesForCompany=Επαφές/διευθύνσεις για αυτό τον Πελ./Προμ.
+ContactsForCompany=Επαφές για αυτό το στοιχείο
+ContactsAddressesForCompany=Επαφές/Διευθύνσεις για αυτό το στοιχείο.
 AddressesForCompany=Διευθύνσεις για αυτό τον Πελ./Προμ.
 ActionsOnCompany=Ενέργειες για αυτό το στοιχείο
 ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος
@@ -457,18 +464,18 @@ September=Σεπτέμβριος
 October=Οκτώβριος
 November=Νοέμβριος
 December=Δεκέμβριος
-JanuaryMin=Jan
-FebruaryMin=Φεβρουάριος
-MarchMin=Mar
-AprilMin=Απρίλιος
-MayMin=Μάιος
-JuneMin=Ιούνιος
-JulyMin=Ιούλιος
-AugustMin=Αύγουστος
-SeptemberMin=Σεπτέμβριος
-OctoberMin=Οκτώβριος
-NovemberMin=Νοέμβριος
-DecemberMin=Δεκέμβριος
+JanuaryMin=Ιαν
+FebruaryMin=Φεβ
+MarchMin=Μαρ
+AprilMin=Απρ
+MayMin=Μάι
+JuneMin=Ιούν
+JulyMin=Ιούλ
+AugustMin=Αύγ
+SeptemberMin=Σεπ
+OctoberMin=Οκτ
+NovemberMin=Νοέ
+DecemberMin=Δεκ
 Month01=Ιανουάριος
 Month02=Φεβρουάριος
 Month03=Μάρτιος
@@ -502,7 +509,7 @@ ReportName=Όνομα Αναφοράς
 ReportPeriod=Περίοδος Αναφοράς
 ReportDescription=Περιγραφή
 Report=Αναφορά
-Keyword=Keyword
+Keyword=Λέξη κλειδί
 Legend=Ετικέτα
 Fill=Συμπληρώστε
 Reset=Επαναφορά
@@ -519,7 +526,7 @@ NbOfThirdParties=Αριθμός στοιχείων
 NbOfLines=Αριθμός Γραμμών
 NbOfObjects=Αριθμός Αντικειμένων
 NbOfObjectReferers=Number of related items
-Referers=Related items
+Referers=Σχετιζόμενα αντικείμενα
 TotalQuantity=Συνολική ποσότητα
 DateFromTo=Από %s μέχρι %s
 DateFrom=Από %s
@@ -554,7 +561,7 @@ Priority=Προτεραιότητα
 SendByMail=Αποστολή με email
 MailSentBy=Το email στάλθηκε από
 TextUsedInTheMessageBody=Κείμενο email
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=Αποστολή emil επιβεβαίωσης
 EMail=E-mail
 NoEMail=Χωρίς email
 NoMobilePhone=Χωρείς κινητό τηλέφωνο
@@ -565,16 +572,20 @@ BackToList=Επιστροφή στη Λίστα
 GoBack=Επιστροφή
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Τροποποιήσιμο αν δεν είναι έγκυρο
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Η εγγραφή τροποποιήθηκε με επιτυχία
 RecordsModified=%s τροποιιμενα αρχεια
+RecordsDeleted=%s records deleted
 AutomaticCode=Αυτόματος Κωδικός
 FeatureDisabled=Η δυνατότητα είναι απενεργοποιημένη
-MoveBox=Move widget
+MoveBox=Μετακίνηση widget
 Offered=Προσφέρθηκε
 NotEnoughPermissions=Δεν έχετε τα απαραίτητα δικαιώματα
 SessionName=Όνομα συνόδου
 Method=Μέθοδος
 Receive=Παραλαβή
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Μερική
 TotalWoman=Συνολικές
 NeverReceived=Δεν παραλήφθηκε
@@ -598,6 +609,7 @@ DisabledModules=Απενεργοποιημένες Μονάδες
 For=Για
 ForCustomer=Για τον πελάτη
 Signature=Υπογραφή
+DateOfSignature=Date of signature
 HidePassword=Εμφάνιση πραγματικής εντολής με απόκρυψη του κωδικού
 UnHidePassword=Εμφάνιση πραγματικής εντολής με εμφάνιση του κωδικού
 Root=Ρίζα
@@ -640,7 +652,16 @@ IM=Άμεσων μηνυμάτων
 NewAttribute=Νέο χαρακτηριστικό
 AttributeCode=Κωδικός Ιδιότητα
 URLPhoto=URL της φωτογραφία / λογότυπο
-SetLinkToAnotherThirdParty=Link to another third party
+SetLinkToAnotherThirdParty=Σύνδεση με άλλο Στοιχείο
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Δημιουργία σχεδίου
 SetToDraft=Επιστροφή στο προσχέδιο
 ClickToEdit=Κάντε κλικ για να επεξεργαστείτε
@@ -690,17 +711,20 @@ Genderwoman=Γυναίκα
 ViewList=Προβολή λίστας
 Mandatory=Υποχρεωτικό
 Hello=Χαίρετε
-Sincerely=Sincerely
+Sincerely=Ειλικρινώς
 DeleteLine=Διαγραφή γραμμής
 ConfirmDeleteLine=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη γραμμή;
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
 TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
+RelatedObjects=Σχετικά Αντικείμενα
+ClassifyBilled=Χαρακτηρισμός ως τιμολογημένο
+Progress=Πρόοδος
 ClickHere=Click εδώ
+FrontOffice=Front office
+BackOffice=Back office
+View=Προβολή
 # Week day
 Monday=Δευτέρα
 Tuesday=Τρίτη
@@ -743,17 +767,17 @@ SearchIntoThirdparties=Thirdparties
 SearchIntoContacts=Επαφές
 SearchIntoMembers=Μέλη
 SearchIntoUsers=Χρήστες
-SearchIntoProductsOrServices=Products or services
+SearchIntoProductsOrServices=Προϊόντα ή Υπηρεσίες
 SearchIntoProjects=Έργα
 SearchIntoTasks=Tasks
 SearchIntoCustomerInvoices=Τιμολόγια πελατών
 SearchIntoSupplierInvoices=Τιμολόγια προμηθευτών
 SearchIntoCustomerOrders=Παραγγελίες πελατών
 SearchIntoSupplierOrders=Παραγγελίες προμηθευτών
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
+SearchIntoCustomerProposals=Προσφορές πελατών
+SearchIntoSupplierProposals=Προσφορές προμηθευτών
 SearchIntoInterventions=Παρεμβάσεις
 SearchIntoContracts=Συμβόλαια
-SearchIntoCustomerShipments=Customer shipments
+SearchIntoCustomerShipments=Αποστολές Πελάτη
 SearchIntoExpenseReports=Αναφορές εξόδων
-SearchIntoLeaves=Leaves
+SearchIntoLeaves=Άδειες
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index c31cb0a04f8..cb5a80a0c49 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Βαθμολογήστε πρέπει να είναι μια 
 markRateShouldBeLesserThan100=Το ποσοστό πρέπει να είναι χαμηλότερη από 100
 ShowMarginInfos=Δείτε πληροφορίες για τα περιθώρια
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index ff42a97f5e5..01f526c7f75 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -92,14 +92,14 @@ BlankSubscriptionFormDesc=Dolibarr μπορεί να σας παρέχει μι
 EnablePublicSubscriptionForm=Ενεργοποιήστε το κοινό αυτόματη συνδρομή μορφή
 ExportDataset_member_1=Members and subscriptions
 ImportDataset_member_1=Μέλη
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Τελευταία %s μέλη που τροποποιήθηκαν
+LastSubscriptionsModified=Τελευταίες %s συνδρομές που τροποποιήθηκαν
 String=String
 Text=Text
 Int=Int
 DateAndTime=Date and time
 PublicMemberCard=Member public card
-SubscriptionNotRecorded=Subscription not recorded
+SubscriptionNotRecorded=Η συνδρομή δεν καταγράφηκε
 AddSubscription=Δημιουργία εγγραφής
 ShowSubscription=Show subscription
 SendAnEMailToMember=Send information email to member
@@ -168,5 +168,5 @@ MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά 
 MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη κατά περιοχή.
 VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
 NoVatOnSubscription=No TVA for subscriptions
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
+MEMBER_PAYONLINE_SENDEMAIL=Χρήση email για χρήση ενημέρωσης όταν το Dolibarr λαμβάνει επιβεβαίωση για πιστοποιημένη πληρωμή συνδρομής (Παράδειγμα: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Το προϊόν χρησιμοποιείται για τη γραμμή από συνδρομές στο τιμολόγιο: %s
diff --git a/htdocs/langs/el_GR/oauth.lang b/htdocs/langs/el_GR/oauth.lang
index 0ec44a36511..d4179352224 100644
--- a/htdocs/langs/el_GR/oauth.lang
+++ b/htdocs/langs/el_GR/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/el_GR/opensurvey.lang b/htdocs/langs/el_GR/opensurvey.lang
index f2aa9b931ff..7c290c6f67e 100644
--- a/htdocs/langs/el_GR/opensurvey.lang
+++ b/htdocs/langs/el_GR/opensurvey.lang
@@ -55,5 +55,5 @@ ErrorOpenSurveyFillFirstSection=Δεν έχετε συμπληρώσει το π
 ErrorOpenSurveyOneChoice=Εισάγετε τουλάχιστον μία επιλογή
 ErrorInsertingComment=Υπήρξε ένα σφάλμα κατά την εισαγωγή του σχόλιου σας
 MoreChoices=Εισάγετε περισσότερες επιλογές για τους ψηφοφόρους
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+SurveyExpiredInfo=Η δημοσκόπηση αυτή έχει λήξει ή ο χρόνος ψηφοφορίας έληξε.
 EmailSomeoneVoted=%s έχει γεμίσει μια γραμμή. \nΜπορείτε να βρείτε τη δημοσκόπηση σας στο σύνδεσμο:\n %s
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index 0a7f260bb4a..3a8e6035ba6 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Οι παραγγελίες σας έχουν δημιουργηθ
 OrderFail=Ένα σφάλμα συνέβη κατά τη διάρκεια την δημιουργία τις παραγγελίες
 CreateOrders=Δημιουργία παραγγελιών
 ToBillSeveralOrderSelectCustomer=Για να δημιουργήσετε ένα τιμολόγιο για αρκετές παραγγελίες, κάντε κλικ πρώτα στον πελάτη, στη συνέχεια, επιλέξτε "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/el_GR/printing.lang b/htdocs/langs/el_GR/printing.lang
index 287fa21c4cd..6aa3bb3d80f 100644
--- a/htdocs/langs/el_GR/printing.lang
+++ b/htdocs/langs/el_GR/printing.lang
@@ -18,10 +18,6 @@ UserConf=Ρύθμισης ανά χρήστη
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Επικύρωση
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Αυτό το πρόγραμμα οδήγησης επιτρέπει να στείλετε έγγραφα απευθείας σε έναν εκτυπωτή του Google Cloud Print.
 GCP_Name=Όνομα
 GCP_displayName=Εμφανιζόμενο όνομα
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index b0ec9d5665f..22403a644bf 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Αρ. παρτίδας/Σειριακός
 atleast1batchfield=Ημερομηνία λήξης Αρ. Παρτίδας/σειριακού
 batch_number=Αρ. Παρτίδας/σειριακός αριθμός
 BatchNumberShort=Αρ. παρτίδας/Σειριακός
-l_eatby=Φάτε ημερομηνία λήξης
-l_sellby=Ημερομηνία πώλησης
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Χαρακτηριστικά Αρ. παρτίδας/σειριακός 
 DetailBatchFormat=Αρ. Παρτίδας/σειριακός: %s - Ημερομηνία λήξης: %s - : %s (Ημέρες : %d)
 printBatch=Αρ. Παρτίδας/σειριακός: %s
@@ -19,3 +19,6 @@ printQty=Ποσότητα: %d
 AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής
 WhenProductBatchModuleOnOptionAreForced=Όταν ο Αρ. παρτίδας/σειριακόςείναι ενεργοποιημένος η αύξηση/μείωση σ5την κατάσταση αποθεμάτων είναι στην τελευταία επιλογή και δεν μπορεί να μεταβληθεί. Όλες οι άλλες επιλογές ορίζονται όπως θέλετε
 ProductDoesNotUseBatchSerial=Αυτό το προιόν δεν χρησιμοποιεί Αρ. Παρτίδας/σειριακό
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 63f34ca1a49..4c766e2c08d 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Μαζική αλλαγή ΦΠΑ
 ProductVatMassChangeDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για να τροποποιήσει τον συντελεστή ΦΠΑ που ορίζεται για τα προϊόντα ή τις υπηρεσίες από μια τιμή σε μια άλλη. Προσοχή, αυτή η αλλαγή γίνεται σε όλες τις βάσης δεδομένων.
 MassBarcodeInit=Μαζική barcode init
 MassBarcodeInitDesc=Αυτή η σελίδα μπορεί να χρησιμοποιείται για να προετοιμάσει ένα barcode σε αντικείμενα που δεν έχουν barcode. Ελέγξτε πριν από την εγκατάσταση του module barcode αν έχει ολοκληρωθεί.
-ProductAccountancyBuyCode=Λογιστικός κωδικός (αγορά)
-ProductAccountancySellCode=Λογιστικός κωδικός (πώληση)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Προϊόν ή Υπηρεσία
 ProductsAndServices=Προϊόντα και Υπηρεσίες
 ProductsOrServices=Προϊόντα ή Υπηρεσίες
@@ -30,8 +30,8 @@ ServicesOnSell=Υπηρεσίες για πώληση ή αγορά
 ServicesNotOnSell=Η Υπηρεσία δεν προορίζεται για Πώληση
 ServicesOnSellAndOnBuy=Υπηρεσίες προς πώληση και για αγορά
 LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
+LastRecordedProducts=%s τελευταία εγγεγραμμένα προϊόντα
+LastRecordedServices=%s τελευταία εγγεγραμμένες υπηρεσίες
 CardProduct0=Product card
 CardProduct1=Service card
 Stock=Απόθεμα
@@ -50,8 +50,8 @@ ProductStatusOnBuy=Προς Αγορά
 ProductStatusNotOnBuy=Δεν είναι προς Αγορά
 ProductStatusOnBuyShort=Προς Αγορά
 ProductStatusNotOnBuyShort=Δεν είναι προς Αγορά
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
+UpdateVAT=Νέος Φόρος
+UpdateDefaultPrice=Νέα Προεπιλεγμένη Τιμή
 UpdateLevelPrices=Update prices for each level
 AppliedPricesFrom=Εφαρμοσμένες Τιμές από
 SellingPrice=Τιμή Πώλησης
@@ -59,6 +59,8 @@ SellingPriceHT=Τιμή Πώλησης (χωρίς Φ.Π.Α.)
 SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Νέα Τιμή
 MinPrice=Ελάχιστη Τιμή Πώλησης
 CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι μικρότερη από την ορισμένη ελάχιστη τιμή πώλησης (%s χωρίς Φ.Π.Α.)
@@ -149,15 +151,15 @@ CountryOrigin=Χώρα προέλευσης
 Nature=Nature
 ShortLabel=Σύντομη ετικέτα
 Unit=Μονάδα
-p=u.
+p=Μονάδα
 set=Σετ
 se=Σετ
 second=Δευτερόλεπτο
-s=s
+s=Δευτερόλεπτα
 hour=Ώρα
-h=h
+h=Ώρα
 day=Ημέρα
-d=d
+d=Ημέρα
 kilogram=Κιλό
 kg=Κιλό
 gram=Γραμμάριο
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Εκτυπώστε αρκετά αυτοκόλλητα 
 BuildPageToPrint=Δημιουργία σελίδας για εκτύπωση
 FillBarCodeTypeAndValueManually=Συμπληρώστε τον τύπο barcode και την αξία χειροκίνητα.
 FillBarCodeTypeAndValueFromProduct=Συμπληρώστε τον τύπο barcode και αξία από το barcode του προϊόντος.
-FillBarCodeTypeAndValueFromThirdParty=Συμπληρώστε τον τύπο barcode και αξία από το barcode του από άλλους κατασκευαστές.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Ορισμός του τύπου ή της αξίας του barcode δεν έχει ολοκληρωθεί για το προϊόν %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Ορισμός του τύπου ή της αξίας του barcode είναι μη πλήρης για άλλους κατασκευαστές %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Πληροφορίες barcode του προϊόντος %s :
-BarCodeDataForThirdparty=Πληροφορίες Barcode από άλλους κατασκευαστές %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Ορίστε την αξία barcode για όλα τα αρχεία (προσοχή, θα επαναφέρει επίσης την αξία barcode που έχουν ήδη καθοριστεί με νέες τιμές)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
@@ -238,7 +240,7 @@ CorrectlyUpdated=Correctly updated
 PropalMergePdfProductActualFile=Αρχείο/α που θα προστεθούν στο AZUR pdf
 PropalMergePdfProductChooseFile=Επιλογή αρχείων pdf
 IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
+DefaultPriceRealPriceMayDependOnCustomer=Προεπιλεγμένη τιμή, η πραγματική τιμή μπορεί να εξαρτάται από τον πελάτη
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Μονάδα
 NbOfQtyInProposals=Qty in proposals
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index d36bd2897c9..2d122a55549 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -8,7 +8,7 @@ Projects=Έργα
 ProjectsArea=Περιοχή έργων
 ProjectStatus=Κατάσταση έργου
 SharedProject=Όλοι
-PrivateProject=Project contacts
+PrivateProject=Αντιπρόσωποι του έργου
 MyProjectsDesc=Η άποψη αυτή περιορίζονται σε έργα που είναι σε μια επαφή για την (όποια είναι ο τύπος).
 ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -28,7 +28,7 @@ DeleteAProject=Διαγραφή Έργου
 DeleteATask=Διαγραφή Εργασίας
 ConfirmDeleteAProject=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο;
 ConfirmDeleteATask=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο;
-OpenedProjects=Open projects
+OpenedProjects=Ανοιχτά έργα
 OpenedTasks=Open tasks
 OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
 OpportunitiesStatusForProjects=Opportunities amount of projects by status
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
-ListOrdersAssociatedProject=Κατάλογος των ενταλμάτων του πελάτη που σχετίζονται με το έργο
-ListInvoicesAssociatedProject=Κατάλογος των τιμολογίων των πελατών που συνδέονται με το έργο
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Κατάλογος των ενταλμάτων προμηθευτή που συνδέονται με το έργο
-ListSupplierInvoicesAssociatedProject=Κατάλογος των τιμολογίων του προμηθευτή που συνδέονται με το έργο
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Κατάλογος των συμβάσεων που συνδέονται με το έργο
 ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων που σχετίζονται με το έργο
 ListExpenseReportsAssociatedProject=Λίστα αναφορών των δαπανών που σχετίζονται με το έργο
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Έργο %s δημιουργήθηκε
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Εργασία %s δημιουργήθηκε
 TaskModifiedInDolibarr=Εργασία %s τροποποιήθηκε
 TaskDeletedInDolibarr=Εργασία %s διαγράφηκε
@@ -151,9 +152,9 @@ DocumentModelBeluga=Project template for linked objects overview
 DocumentModelBaleine=Project report template for tasks
 PlannedWorkload=Σχέδιο φόρτου εργασίας
 PlannedWorkloadShort=Φόρτος εργασίας
-ProjectReferers=Related items
+ProjectReferers=Σχετικά αντικείμενα
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Εισαγωγή ανά ημέρα
 InputPerWeek=Εισαγωγή ανά εβδομάδα
 InputPerAction=Εισαγωγή ανά ενέργεια
@@ -174,10 +175,10 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
+OnlyOpportunitiesShort=Μόνο ευκαιρίες
+OpenedOpportunitiesShort=Ανοιχτές ευαιρίες
 NotAnOpportunityShort=Not an opportunity
 OpportunityTotalAmount=Opportunities total amount
 OpportunityPonderatedAmount=Opportunities weighted amount
@@ -185,7 +186,7 @@ OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
 OppStatusPROSP=Prospection
 OppStatusQUAL=Qualification
 OppStatusPROPO=Πρόταση
-OppStatusNEGO=Negociation
+OppStatusNEGO=Διαπραγμάτευση
 OppStatusPENDING=Εκκρεμεί
 OppStatusWON=Won
 OppStatusLOST=Lost
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 3a485e500c0..526f666b245 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Νέα μισθοδοσία
 SalaryPayment=Μισθός
 SalariesPayments=Πληρωμές μισθών
 ShowSalaryPayment=Εμφάνιση μισθοδοσίας
-THM=Η μέση ωριαία τιμή
-TJM=Η μέση ημερήσια τιμή
+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
+TJMDescription=Αυτή η τιμή εμφανίζεται μόνο σαν πληροφορία και δεν χρησιμοποιείται για κανένα υπολογισμό
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index e7020c11ae7..e7a2a3adcf6 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -10,7 +10,7 @@ Receivings=Απόδειξεις παράδοσης
 SendingsArea=Περιοχή αποστολών 
 ListOfSendings=Κατάλογος των αποστολών
 SendingMethod=Μέθοδο αποστολής
-LastSendings=Latest %s shipments
+LastSendings=Τελευταίες %s αποστολές
 StatisticsOfSendings=Στατιστικά στοιχεία για τις αποστολές
 NbOfSendings=Αριθμός των αποστολών
 NumberOfShipmentsByMonth=Αριθμός αποστολών ανά μήνα
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index d46d6a93bb5..9ccacb73d6d 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Διαγραφή αποστολή
 Stock=Χρηματιστήριο
 Stocks=Αποθέματα
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Κινήματα
 ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται
 ListOfWarehouses=Κατάλογος των αποθηκών
@@ -30,7 +32,7 @@ Units=Μονάδες
 Unit=Μονάδα
 StockCorrection=Σωστή απόθεμα
 StockTransfer=Transfer stock
-MassStockTransferShort=Mass stock transfer
+MassStockTransferShort=Μαζική μεταφορά αποθέματος
 StockMovement=Stock movement
 StockMovements=Stock movements
 LabelMovement=Ετικέτα
@@ -43,6 +45,7 @@ PMPValue=Μέση σταθμική τιμή
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Αποθήκες αξία
 UserWarehouseAutoCreate=Δημιουργήστε μια αποθήκη αυτόματα κατά τη δημιουργία ενός χρήστη
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Το απόθεμα προϊόντος και απόθεμα υποπροϊόντος είναι ανεξάρτητα
 QtyDispatched=Ποσότητα αποστέλλονται
 QtyDispatchedShort=Απεσταλμένη ποσότητα
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index 80e70d15720..88a7286999e 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -30,7 +30,7 @@ SupplierProposalStatusNotSigned=Refused
 SupplierProposalStatusDraftShort=Πρόχειρο
 SupplierProposalStatusClosedShort=Κλειστό
 SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
+SupplierProposalStatusNotSignedShort=Αρνήθηκε
 CopyAskFrom=Create price request by copying existing a request
 CreateEmptyAsk=Create blank request
 CloneAsk=Clone price request
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 48d21719ebf..9738e553182 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -7,13 +7,13 @@ History=Ιστορικό
 ListOfSuppliers=Λίστα προμηθευτών
 ShowSupplier=Εμφάνιση προμηθευτή
 OrderDate=Ημερ. παραγγελίας
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Ορισμένα υπο-προϊόντα δεν έχουν καμία τιμή που να ορίζεται
-AddSupplierPrice=Προσθήκη τιμή προμηθευτή
-ChangeSupplierPrice=Αλλαγή τιμής προμηθευτή
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ο προμηθευτής αναφοράς έχει ήδη συσχετιστεί με μια αναφορά: %s
 NoRecordedSuppliers=Δεν υπάρχουν προμηθευτές
 SupplierPayment=Πληρωμή προμηθευτή
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Λίστα παραγγελιών των προμηθευτ
 MenuOrdersSupplierToBill=Παραγγελίες προμηθευτών για τιμολόγηση
 NbDaysToDelivery=Καθυστέρηση παράδοσης σε ημέρες
 DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση παραδόσεων των προϊόντων από αυτή τη παραγγελία
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index f205a24e00e..e3a4897820c 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
+ExpenseReport=Αναφορά εξόδων
 ExpenseReports=Αναφορές εξόδων
 Trips=Αναφορές εξόδων
 TripsAndExpenses=Αναφορές εξόδων
 TripsAndExpensesStatistics=Στατιστικές αναφορές εξόδων
-TripCard=Expense report card
-AddTrip=Create expense report
+TripCard=Κάρτα αναφοράς εξόδων
+AddTrip=Δημιουργία αναφοράς εξόδων
 ListOfTrips=Λίστα αναφορών εξόδων
 ListOfFees=Λίστα φόρων
 ShowTrip=Show expense report
-NewTrip=New expense report
+NewTrip=Νέα αναφορά εξόδων
 CompanyVisited=Έγινε επίσκεψη σε εταιρία/οργανισμό
 FeesKilometersOrAmout=Σύνολο χλμ
 DeleteTrip=Διαγραφή αναφοράς εξόδων
 ConfirmDeleteTrip=Είστε σίγουρος ότι θέλετε να διαγράψετε αυτή την αναφορά εξόδων;
 ListTripsAndExpenses=Λίστα αναφορών εξόδων
-ListToApprove=Waiting for approval
+ListToApprove=Αναμονή έγγρισης
 ExpensesArea=Περιοχή αναφοράς εξόδων
-ClassifyRefunded=Ταξινομήστε «επιστραφεί»
+ClassifyRefunded=Κατηγοριοποίηση ως «επιστράφει»
 ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
 ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
 TripId=Id expense report
@@ -47,13 +47,13 @@ VALIDATOR=User responsible for approval
 VALIDOR=Εγκρίθηκε από
 AUTHOR=Αποθηκεύτηκε από
 AUTHORPAIEMENT=Πληρώθηκε από
-REFUSEUR=Denied by
+REFUSEUR=Απορρίφθηκε από
 CANCEL_USER=Διαγράφηκε από
 
 MOTIF_REFUS=Αιτία
 MOTIF_CANCEL=Αιτία
 
-DATE_REFUS=Deny date
+DATE_REFUS=Ημερομηνία απόρριψης
 DATE_SAVE=Ημερομηνία Επικύρωσης
 DATE_CANCEL=Ημερομηνία ακύρωσης
 DATE_PAIEMENT=Ημερομηνία πληρωμής
@@ -77,7 +77,7 @@ ConfirmCancelTrip=Είστε σίγουροι ότι θέλετε να ακυρ
 BrouillonnerTrip=Move back expense report to status "Draft"
 ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
 
-SaveTrip=Validate expense report
+SaveTrip=Επικύρωση αναφοράς εξόδων
 ConfirmSaveTrip=Are you sure you want to validate this expense report ?
 
 NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 309539279f2..56eede598c0 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -45,8 +45,8 @@ RemoveFromGroup=Αφαίρεση από την ομάδα
 PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
 PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
 MenuUsersAndGroups=Χρήστες και Ομάδες
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Τελευταίες %s ομάδες που δημιουργήθηκαν
+LastUsersCreated=Τελευταίοι %s χρήστε που δημιουργήθηκαν
 ShowGroup=Εμφάνιση ομάδας
 ShowUser=Εμφάνιση χρήστη
 NonAffectedUsers=Non affected users
@@ -100,3 +100,6 @@ WeeklyHours=Εβδομαδιαίες ώρες
 ColorUser=Χρώμα του χρήστη
 DisabledInMonoUserMode=Απενεργοποιημένο σε κατάσταση συντήρησης
 UserAccountancyCode=Κωδικός λογιστικής χρήστη
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index 12addc04fed..dcdd676dfdc 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -8,10 +8,11 @@ WEBSITE_CSS_URL=URL of external CSS file
 WEBSITE_CSS_INLINE=Περιεχόμενο CSS
 MediaFiles=Media library
 EditCss=Edit Style/CSS
-EditMenu=Edit menu
+EditMenu=Επεξεργασία μενού
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index 042be8b3689..baff23f02c1 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Οι πελάτες πάγιες εντολές περιοχή
-StandingOrders=Πάγιες εντολές
-StandingOrder=Πάγιες εντολές
-NewStandingOrder=Νέα πάγια εντολή
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Για την διαδικασία
-WithdrawalsReceipts=Απόσυρση εισπράξεις
-WithdrawalReceipt=Απόσυρση παραλαβή
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Απόσυρση γραμμές
-RequestStandingOrderToTreat=Αίτηση πάγιων εντολών για επεξεργασία
-RequestStandingOrderTreated=Αίτηση πάγιων εντολών επεξεργασίας
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Δεν είναι ακόμη δυνατή. Ανακαλούν το καθεστώς πρέπει να ρυθμιστεί ώστε να «πιστωθεί» πριν δηλώσει απόρριψη στις συγκεκριμένες γραμμές.
-NbOfInvoiceToWithdraw=Nb. του τιμολογίου με το αίτημα απόσυρσης
-NbOfInvoiceToWithdrawWithInfo=Nb. του τιμολογίου με το αίτημα απόσυρσης για τους πελάτες που έχουν οριστεί τα στοιχεία του τραπεζικού λογαριασμού
-InvoiceWaitingWithdraw=Τιμολόγιο περιμένει να αποσύρει
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Ποσό για την απόσυρση
-WithdrawsRefused=Αναλήψεις αρνήθηκε
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Δεν τιμολόγιο του πελάτη στη λειτουργία πληρωμής &quot;αποσύρει&quot; περιμένει. Πηγαίνετε στο &quot;Ανάληψη&quot; καρτέλα στο τιμολόγιο κάρτα για να υποβάλουν σχετική αίτηση.
 ResponsibleUser=Υπεύθυνος χρήστη
-WithdrawalsSetup=Setup Απόσυρση
-WithdrawStatistics=Αποσύρετε τα στατιστικά στοιχεία
-WithdrawRejectStatistics=Ανάληψη απορρίψει τα στατιστικά στοιχεία
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Κάντε αποσύρει το αίτημά
 ThirdPartyBankCode=Τρίτο κόμμα τραπεζικός κωδικός
 NoInvoiceCouldBeWithdrawed=Δεν τιμολόγιο αποσύρθηκε με επιτυχία. Βεβαιωθείτε ότι το τιμολόγιο είναι για τις επιχειρήσεις με έγκυρη απαγόρευση.
@@ -46,7 +47,7 @@ StatusRefused=Αρνήθηκε
 StatusMotif0=Απροσδιόριστο
 StatusMotif1=Ανεπαρκή κεφάλαια
 StatusMotif2=Αίτηση προσβαλλόμενη
-StatusMotif3=Καμία παραγγελία δεν Απόσυρση
+StatusMotif3=No direct debit payment order
 StatusMotif4=Παραγγελία του πελάτη
 StatusMotif5=RIB άχρηστα
 StatusMotif6=Λογαριασμός χωρίς ισορροπία
@@ -61,28 +62,43 @@ NotifyCredit=Πιστωτικές Απόσυρση
 NumeroNationalEmetter=Εθνικό Αριθμός Transmitter
 WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν RIB
 WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Τραπεζικός λογαριασμός για να λάβετε αποσύρει
+BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=Πιστωτικές με
 WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
 ShowWithdraw=Εμφάνιση Ανάληψη
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο δεν έχει τουλάχιστον μία πληρωμή απόσυρσης ακόμη σε επεξεργασία, δεν θα πρέπει να οριστεί ως καταβληθέν θα επιτρέψει εκ των προτέρων την απόσυρση από την διαχείριση.
-DoStandingOrdersBeforePayments=Αυτή η καρτέλα σας επιτρέπει να ζητήσετε μια πάγια εντολή. Μόλις γίνει αυτό, πηγαίνετε στο μενού Τράπεζα->Withdrawal για τη διαχείριση της πάγιας εντολής. Όταν η πάγια εντολή κλείνει, η πληρωμή στο τιμολόγιο θα καταγραφεί αυτόματα, και το τιμολόγιο κλείνει εάν το υπόλοιπο είναι μηδενικό.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
 ThisWillAlsoAddPaymentOnInvoice=Αυτό θα ισχύει επίσης για τις πληρωμές προς τα τιμολόγια και θα τα χαρακτηρίσουν ως "Πληρωμένα"
 StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Η πληρωμή των πάγιων %s ώστε από την τράπεζα
-InfoCreditMessage=Η διαρκής %s ώστε έχει καταβληθεί από την τράπεζα <br> Στοιχεία πληρωμής: %s
-InfoTransSubject=Η μετάδοση της μόνιμης %s προκειμένου να τράπεζα
-InfoTransMessage=Η πάγια εντολή %s έχει σταλεί σε τράπεζα από %s %s.<br><br>
+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>
 InfoTransData=Ποσό: %s<br>Μέθοδος: %s<br>Ημερομηνία: %s
-InfoRejectSubject=Μόνιμη προκειμένου αρνήθηκε
-InfoRejectMessage=Γεια σας, <br><br> η πάγια εντολή του τιμολογίου %s που σχετίζεται με την εταιρία %s, με το ποσό των %s έχει απορριφθεί από την τράπεζα. <br><br> -- <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
 ModeWarning=Επιλογή για την πραγματική κατάσταση, δεν είχε καθοριστεί, σταματάμε μετά από αυτή την προσομοίωση
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 348df6063c6..2bde723177e 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Ροής εργασίας ρύθμιση μονάδας
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Κατατάσσει που συνδέονται με παραγγελία (ες) του πελάτη να χρεωθεί όταν το τιμολόγιο του πελάτη έχει οριστεί να καταβληθεί
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Κατατάσσει που συνδέονται με παραγγελία (ες) του πελάτη να χρεωθεί όταν το τιμολόγιο του πελάτη έχει επικυρωθεί
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
new file mode 100644
index 00000000000..22f36b26563
--- /dev/null
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ProductsBinding=Products bindings
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 3b3785a0b41..ee62528b3ea 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -6,7 +6,6 @@ ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<
 HideAnyVATInformationOnPDF=Hide all information related to GST on generated PDF
 OldVATRates=Old GST rate
 NewVATRates=New GST rate
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 DictionaryVAT=GST Rates or Sales Tax Rates
 VATManagement=GST Management
 VATIsNotUsedDesc=By default the proposed GST rate is 0 which can be used for cases like associations, individuals and small companies.
@@ -14,11 +13,7 @@ LocalTax1IsUsedDesc=Use a second type of tax (other than GST)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than GST)
 LocalTax2IsUsedDesc=Use a third type of tax (other than GST)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than GST)
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-TranslationSetup=Translation Configuration
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 OptionVatMode=GST due
 YourCompanyDoesNotUseVAT=Your company has been defined to not use GST (Home - Setup - Company/Foundation), so there is no GST options to setup.
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
 TextTitleColor=Colour of page title
 LinkColor=Colour of links
diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
index 5c58190cb73..9f31c7c53e9 100644
--- a/htdocs/langs/en_AU/companies.lang
+++ b/htdocs/langs/en_AU/companies.lang
@@ -2,4 +2,3 @@
 VATIsUsed=GST is used
 VATIsNotUsed=GST is not used
 VATIntraCheck=Cheque
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/en_AU/mails.lang b/htdocs/langs/en_AU/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/en_AU/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/en_AU/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
index 503597bc8ec..ebcabe21448 100644
--- a/htdocs/langs/en_AU/withdrawals.lang
+++ b/htdocs/langs/en_AU/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 ThirdPartyBankCode=Third party bank code or BSB
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
new file mode 100644
index 00000000000..22f36b26563
--- /dev/null
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ProductsBinding=Products bindings
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index 04c5cf552b6..9bf5497f19b 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -2,12 +2,8 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 VATManagement=GST Management
 LocalTax1IsUsedDesc=Use a second tax (PST)
 LocalTax1IsNotUsedDesc=Do not use second tax (PST)
 LocalTax1Management=PST Management
 LocalTax2IsNotUsedDesc=Do not use second tax (PST)
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
index e92e5a8de6f..985f125d7de 100644
--- a/htdocs/langs/en_CA/companies.lang
+++ b/htdocs/langs/en_CA/companies.lang
@@ -3,4 +3,3 @@ VATIsUsed=GST is used
 VATIsNotUsed=GST is not use
 LocalTax1IsUsedES=PST is used
 LocalTax1IsNotUsedES=GST is not used
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/en_CA/mails.lang b/htdocs/langs/en_CA/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/en_CA/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/en_CA/stocks.lang b/htdocs/langs/en_CA/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/en_CA/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/en_CA/withdrawals.lang b/htdocs/langs/en_CA/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/en_CA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
new file mode 100644
index 00000000000..22f36b26563
--- /dev/null
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ProductsBinding=Products bindings
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index ca2d10fe17f..0e5d27e124c 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -3,11 +3,7 @@ AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamsca
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 GenbarcodeLocation=Barcode generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index 9c55c36a932..bd9870721fc 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -2,7 +2,6 @@
 RIBControlError=Integrity check of values fails. This means the account details are incomplete or wrong (check country, numbers and IBAN).
 ConfirmDeleteAccount=Are you sure you want to delete this account?
 RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category?
-TransferDesc=Transfer from one account to another one. Dolibarr will write two records, a debit in source account and a credit in target account, for the same amount. The same label and date will be used for each record.
 CheckTransmitter=Drawer
 ValidateCheckReceipt=Validate this cheque receipt?
 ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt? No change will be possible once this is done.
@@ -16,7 +15,6 @@ FutureTransaction=Transaction in future: cannot be reconciled
 SelectChequeTransactionAndGenerate=Select/filter cheques to include in the cheque deposit receipt, then click "Create".
 InputReceiptNumber=Identify the bank statement to reconcile. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Specify a category in which to classify the records, if required
-ToConciliate=Select line
 ThenCheckLinesAndConciliate=Select the lines shown on the bank statement and click
 DefaultRIB=Default bank account
 AllRIB=All bank accounts
diff --git a/htdocs/langs/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
index 0b90649a09b..5c10101a1e1 100644
--- a/htdocs/langs/en_GB/companies.lang
+++ b/htdocs/langs/en_GB/companies.lang
@@ -2,4 +2,3 @@
 Zip=Postcode
 Gencod=Barcode
 VATIntraCheck=Cheque
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/en_GB/mails.lang b/htdocs/langs/en_GB/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/en_GB/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
index c3a4f83a4a0..398b1e76bde 100644
--- a/htdocs/langs/en_GB/products.lang
+++ b/htdocs/langs/en_GB/products.lang
@@ -3,4 +3,3 @@ BarCodePrintsheet=Print barcode
 PageToGenerateBarCodeSheets=With this tool, you can print sheets of barcode labels. Choose format of your label page, type of barcode and value of barcode, then click on button <b>%s</b>.
 PrintsheetForOneBarCode=Print several labels for one barcode
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of barcode not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of barcode non complete for thirdparty %s.
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/en_GB/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/en_GB/withdrawals.lang b/htdocs/langs/en_GB/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/en_GB/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
new file mode 100644
index 00000000000..22f36b26563
--- /dev/null
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ProductsBinding=Products bindings
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
deleted file mode 100644
index d2e0b40c0e5..00000000000
--- a/htdocs/langs/en_IN/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/en_IN/mails.lang b/htdocs/langs/en_IN/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/en_IN/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/en_IN/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/en_IN/withdrawals.lang b/htdocs/langs/en_IN/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/en_IN/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index f5f7cad0402..e4b9519b51e 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -8,7 +8,7 @@ ACCOUNTING_EXPORT_AMOUNT=Export amount
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
- 
+
 ConfigAccountingExpert=Configuration of the module accounting expert
 Journaux=Journals
 JournalFinancial=Financial journals
@@ -25,7 +25,7 @@ AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accoun
 AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.    
 AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.    
 AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
-    
+
 AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
 AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
 AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
@@ -36,14 +36,11 @@ AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
 Ventilation=Binding to accounts
-ProductsBinding=Products bindings
+ProductsBinding=Products binding
 
 MenuAccountancy=Accountancy
 CustomersVentilation=Customer invoice binding
 SuppliersVentilation=Supplier invoice binding
-Reports=Reports
-NewAccount=New accounting account
-Create=Create
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 WriteBookKeeping=Record operations in General Ledger
@@ -109,8 +106,6 @@ DelJournal=Journal to delete
 ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
 ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-DescSellsJournal=Sales journal
-DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
 DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
@@ -127,12 +122,10 @@ ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
 ReportThirdParty=List third party account
 DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
-
 ListAccounts=List of the accounting accounts
 
 Pcgtype=Class of account
 Pcgsubtype=Under class of account
-Accountparent=Root of the account
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -201,4 +194,3 @@ Binded=Lines bound
 ToBind=Lines to bind
 
 WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version. 
-
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 0384e063a91..9e48d0d5c09 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1107,7 +1107,6 @@ CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Mandatory to create third parties ?
 MustBeInvoiceMandatory=Mandatory to validate invoices ?
-Miscellaneous=Miscellaneous
 ##### Webcal setup #####
 WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
 ##### Invoices #####
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 4f745f56bcf..7ff43dc7af6 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -3,7 +3,6 @@ IdAgenda=ID event
 Actions=Events
 Agenda=Agenda
 Agendas=Agendas
-Calendar=Calendar
 LocalAgenda=Internal calendar
 ActionsOwnedBy=Event owned by 
 ActionsOwnedByShort=Owner 
@@ -34,11 +33,27 @@ AgendaAutoActionDesc= Define here events for which you want Dolibarr to create a
 AgendaSetupOtherDesc= This page provides options to allow export of your Dolibarr events into an external calendar (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=This page allows to declare external sources of calendars to see their events into Dolibarr agenda.
 ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+##### Agenda event labels #####
+NewCompanyToDolibarr=Third party %s created
+ContractValidatedInDolibarr=Contract %s validated
+PropalClosedSignedInDolibarr=Proposal %s signed
+PropalClosedRefusedInDolibarr=Proposal %s refused
 PropalValidatedInDolibarr=Proposal %s validated
+PropalClassifiedBilledInDolibarr=Proposal %s classified billed
 InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
 InvoiceBackToDraftInDolibarr=Invoice %s go back to draft status
 InvoiceDeleteDolibarr=Invoice %s deleted
+InvoicePaidInDolibarr=Invoice %s changed to paid
+InvoiceCanceledInDolibarr=Invoice %s canceled
+MemberValidatedInDolibarr=Member %s validated
+MemberResiliatedInDolibarr=Member %s resiliated
+MemberDeletedInDolibarr=Member %s deleted
+MemberSubscriptionAddedInDolibarr=Subscription for member %s added
+ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentClassifyClosedInDolibarr=Shipment %s classify billed
+ShipmentUnClassifyCloseddInDolibarr=Shipment %s classify reopened
+ShipmentDeletedInDolibarr=Shipment %s deleted
 OrderValidatedInDolibarr=Order %s validated
 OrderDeliveredInDolibarr=Order %s classified delivered
 OrderCanceledInDolibarr=Order %s canceled
@@ -57,9 +72,9 @@ InterventionSentByEMail=Intervention %s sent by EMail
 ProposalDeleted=Proposal deleted
 OrderDeleted=Order deleted
 InvoiceDeleted=Invoice deleted
-NewCompanyToDolibarr= Third party created
-DateActionStart= Start date
-DateActionEnd= End date
+##### End agenda events #####
+DateActionStart=Start date
+DateActionEnd=End date
 AgendaUrlOptions1=You can also add following parameters to filter output:
 AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
 AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 62e2baa3a98..85d4c122543 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -41,7 +41,7 @@ BankAccountOwner=Account owner name
 BankAccountOwnerAddress=Account owner address
 RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
 CreateAccount=Create account
-NewAccount=New account
+NewBankAccount=New account
 NewFinancialAccount=New financial account
 MenuNewFinancialAccount=New financial account
 EditFinancialAccount=Edit account
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 3a7cd41386f..34312730822 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -91,7 +91,7 @@ SupplierAccountancyCode=Supplier accountancy code
 CustomerAccountancyCodeShort=Cust. account. code
 SupplierAccountancyCodeShort=Sup. account. code
 AccountNumber=Account number
-NewAccount=New account
+NewAccountingAccount=New account
 SalesTurnover=Sales turnover
 SalesTurnoverMinimum=Minimum sales turnover
 ByExpenseIncome=By expenses & incomes
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 1f19562af27..ed1f11ff054 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -41,4 +41,3 @@ CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some
 ECMFileManager=File manager
 ECMSelectASection=Select a directory on left tree...
 DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
- 
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 55e592dc91d..3d798b3db66 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -26,8 +26,6 @@ FieldTitle=Field title
 NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file...
 AvailableFormats=Available formats
 LibraryShort=Library
-LibraryUsed=Library used
-LibraryVersion=Version
 Step=Step
 FormatedImport=Import assistant
 FormatedImportDesc1=This area allows to import personalized data, using an assistant to help you in process without technical knowledge.
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index cbe453ef245..4022a8cc7ce 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -62,7 +62,6 @@ KeepEmptyIfNoPassword=Leave empty if user has no password (avoid this)
 SaveConfigurationFile=Save values
 ServerConnection=Server connection
 DatabaseCreation=Database creation
-UserCreation=User creation
 CreateDatabaseObjects=Database objects creation
 ReferenceDataLoading=Reference data loading
 TablesAndPrimaryKeysCreation=Tables and Primary keys creation
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index ec7840e9680..e96d79466bc 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -725,6 +725,10 @@ ClickHere=Click here
 FrontOffice=Front office
 BackOffice=Back office
 View=View
+Export=Export
+Exports=Exports
+Miscellaneous=Miscellaneous
+Calendar=Calendar
 # Week day
 Monday=Monday
 Tuesday=Tuesday
@@ -756,7 +760,7 @@ ShortSaturday=S
 ShortSunday=S
 SelectMailModel=Select email template
 SetRef=Set ref
-Select2ResultFoundUseArrows=
+Select2ResultFoundUseArrows=Some results found. Use arrows to select.
 Select2NotFound=No result found
 Select2Enter=Enter
 Select2MoreCharacter=or more character
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 527a5bd7db3..d1f8b364c58 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -152,7 +152,6 @@ MenuMembersStats=Statistics
 LastMemberDate=Last member date
 Nature=Nature
 Public=Information are public
-Exports=Exports
 NewMemberbyWeb=New member added. Awaiting approval
 NewMemberForm=New member form
 SubscriptionsStatistics=Statistics on subscriptions
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
index a338ab4d5df..f4df2dc3dda 100644
--- a/htdocs/langs/en_US/oauth.lang
+++ b/htdocs/langs/en_US/oauth.lang
@@ -11,7 +11,6 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-TOKEN_ACCESS=
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token expired
 TOKEN_EXPIRE_AT=Token expire at
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 1d0452a2596..561ec02cab6 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Security code
-Calendar=Calendar
 NumberingShort=N°
 Tools=Tools
 ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
@@ -55,7 +54,6 @@ TotalSizeOfAttachedFiles=Total size of attached files/documents
 MaxSize=Maximum size
 AttachANewFile=Attach a new file/document
 LinkedObject=Linked object
-Miscellaneous=Miscellaneous
 NbOfActiveNotifications=Number of notifications (nb of recipient emails)
 PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
 PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
@@ -201,33 +199,13 @@ IfAmountHigherThan=If amount higher than <strong>%s</strong>
 SourcesRepository=Repository for sources
 Chart=Chart
 
-##### Calendar common #####
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classify billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classify reopened
-ShipmentDeletedInDolibarr=Shipment %s deleted
 ##### Export #####
-Export=Export
 ExportsArea=Exports area
 AvailableFormats=Available formats
-LibraryUsed=Librairy used
-LibraryVersion=Version
+LibraryUsed=Library used
+LibraryVersion=Library version
 ExportableDatas=Exportable data
 NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
-NewExport=New export
 ##### External sites #####
 WebsiteSetup=Setup of module website
 WEBSITE_PAGEURL=URL of page
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
deleted file mode 100644
index d2e0b40c0e5..00000000000
--- a/htdocs/langs/es_AR/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_AR/mails.lang b/htdocs/langs/es_AR/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_AR/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_AR/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_AR/withdrawals.lang b/htdocs/langs/es_AR/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_AR/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_BO/companies.lang b/htdocs/langs/es_BO/companies.lang
deleted file mode 100644
index d2e0b40c0e5..00000000000
--- a/htdocs/langs/es_BO/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_BO/mails.lang b/htdocs/langs/es_BO/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_BO/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_BO/stocks.lang b/htdocs/langs/es_BO/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_BO/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_BO/withdrawals.lang b/htdocs/langs/es_BO/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_BO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 77c5342abc2..229e3dd2941 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -5,7 +5,6 @@ AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 Module20Name=Cotizaciones
 Module20Desc=Gestión de cotizaciones/propuestas comerciales
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 Module1400Name=Contabilidad
 Permission21=Consultar cotizaciones
 Permission22=Crear/modificar cotizaciones
@@ -16,12 +15,9 @@ Permission27=Eliminar cotizaciones
 Permission28=Exportar las cotizaciones
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones a cerrar
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancia de retraso antes de la alerta (en días) sobre cotizaciones no facturadas
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 PropalSetup=Configuración del módulo Cotizaciones
 ProposalsNumberingModules=Módulos de numeración de cotizaciones
 ProposalsPDFModules=Modelos de documentos de cotizaciones
 FreeLegalTextOnProposal=Texto libre en cotizaciones
 WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
 FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
index 1df2eeffa49..f60b33b70bd 100644
--- a/htdocs/langs/es_CL/boxes.lang
+++ b/htdocs/langs/es_CL/boxes.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxLastProposals=Últimas cotizaciones
 NoRecordedProposals=Sin cotizaciones registradas
 BoxProposalsPerMonth=Cotizaciones por mes
 ForProposals=Cotizaciones
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index f61cdce940c..5a3be368047 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -2,5 +2,4 @@
 Prospect=Cliente
 ContactForProposals=Contacto de cotizaciones
 NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
 InActivity=Abierto
diff --git a/htdocs/langs/es_CL/mails.lang b/htdocs/langs/es_CL/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_CL/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_CL/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_CL/withdrawals.lang b/htdocs/langs/es_CL/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_CL/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index fd05e19b41e..86b4852990c 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -4,7 +4,6 @@ ConfirmDeleteContact=¿Está seguro de querer eliminar este contacto y toda la i
 ParentCompany=Sede principal
 Subsidiaries=Sucursales
 RegisteredOffice=Domicilio principal
-PostOrFunction=Cargo/función
 State=Departamento
 PhonePerso=Teléf. personal
 ProfId2CO=Identificación (CC, NIT, CE)
@@ -19,6 +18,5 @@ VATIntraCheckURL=http://www.rues.org.co/RUES_Web/Consultas#tabs-3
 VATIntraCheckableOnEUSite=Verificar en la web
 VATIntraManualCheck=Puede también realizar una verificación manual en la web <a href="%s" target="_blank">%s</a>
 ConfirmDeleteFile=¿Está seguro que quiere eliminar este archivo?
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
 ThirdPartiesArea=Área Terceros
 ManagingDirectors=Administrador(es) (CEO, gerente, director, presidente, etc.)
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_CO/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_CO/salaries.lang b/htdocs/langs/es_CO/salaries.lang
index a9438eb4f66..4e9dbf5efed 100644
--- a/htdocs/langs/es_CO/salaries.lang
+++ b/htdocs/langs/es_CO/salaries.lang
@@ -1,5 +1,3 @@
 # Dolibarr language file - Source file is en_US - salaries
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Código contable para pagos de salarios
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Código contable para cargo financiero
-THM=Valor de hora promedio
-TJM=Valor día promedio
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_CO/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 5aac922ed78..218ed2e23af 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -5,7 +5,6 @@ ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el ITBIS en la generación de los PDF
 OldVATRates=Tasa de ITBIS antigua
 NewVATRates=Tasa de ITBIS nueva
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 Permission91=Consultar impuestos e ITBIS
 Permission92=Crear/modificar impuestos e ITBIS
 Permission93=Eliminar impuestos e ITBIS
@@ -16,13 +15,10 @@ VATIsUsedExampleFR=En Francia, se trata de las sociedades u organismos que elige
 VATIsNotUsedExampleFR=En Francia, se trata de asociaciones exentas de ITBIS o sociedades, organismos o profesiones liberales que han elegido el régimen fiscal de módulos (ITBIS en franquicia), pagando un ITBIS en franquicia sin hacer declaración de IVA. Esta elección hace aparecer la anotación  "IVA no aplicable - art-293B del CGI" en las facturas.
 LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
 LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
 UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 OptionVatMode=Opción de carga de ITBIS
 OptionVatDefaultDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del ITBIS es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
 SummaryOfVatExigibilityUsedByDefault=Tiempo de exigibilidad de ITBIS por defecto según la opción eligida
 YourCompanyDoesNotUseVAT=Su empresa está configurada como no sujeta al ITBIS (Inicio - Configuración - Empresa/Institución), por lo que no hay opción para la paremetrización del ITBIS.
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
deleted file mode 100644
index d2e0b40c0e5..00000000000
--- a/htdocs/langs/es_DO/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_DO/mails.lang b/htdocs/langs/es_DO/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_DO/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_DO/stocks.lang b/htdocs/langs/es_DO/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_DO/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_DO/withdrawals.lang b/htdocs/langs/es_DO/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_DO/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
deleted file mode 100644
index d2e0b40c0e5..00000000000
--- a/htdocs/langs/es_EC/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_EC/mails.lang b/htdocs/langs/es_EC/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_EC/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_EC/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_EC/withdrawals.lang b/htdocs/langs/es_EC/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_EC/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index f9e47b39db5..641d98e75fc 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -3,9 +3,9 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas en el archivo de exportaci
 ACCOUNTING_EXPORT_DATE=Formato de fecha en el archivo de exportación
 ACCOUNTING_EXPORT_PIECE=Exportar el número de asiento
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportar con la cuenta global
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=Exportar etiqueta
+ACCOUNTING_EXPORT_AMOUNT=Exportar importe
+ACCOUNTING_EXPORT_DEVISE=Exportar divisa
 Selectformat=Seleccione el formato del archivo
 ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique el prefijo del nombre de archivo
 
@@ -14,48 +14,69 @@ Journaux=Diarios
 JournalFinancial=Diarios financieros
 BackToChartofaccounts=Volver al plan contable
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Seleccione un plan contable
 Addanaccount=Añadir una cuenta contable
 AccountAccounting=Cuenta contable
 AccountAccountingShort=Cuenta
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Contabilizar
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Contabilidad
-CustomersVentilation=Contabilizar clientes
-SuppliersVentilation=Contabilizar proveedores
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Informes
 NewAccount=Nueva cuenta contable
 Create=Crear
-CreateMvts=Crear movimiento
-UpdateMvts=Modificar un movimiento
-WriteBookKeeping=Registrar los asientos en el libro mayor
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Libro Mayor
 AccountBalance=Saldo de la cuenta
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Líneas de factura para contabilizar
-InvoiceLinesDone=Líneas de facturas contabilizadas
-IntoAccount=Contabilizar en la cuenta
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Contabilizar
+Ventilate=Bind
 
 Processing=Tratamiento
 EndProcessing=Final del tratamiento
-AnyLineVentilate=No hay líneas para contabilizar
+AnyLineVentilate=Any lines to bind
 SelectedLines=Líneas seleccionadas
 Lineofinvoice=Línea de la factura
-VentilatedinAccount=Contabilizada con éxito en la cuenta contable
-NotVentilatedinAccount=Cuenta sin contabilizar en la contabilidad
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a contabilizar que se muestran por página (máximo recomendado: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ordenar las páginas de contabilización "A contabilizar" por los elementos más recientes
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "Contabilizadas" por los elementos más recientes
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Longitud para la visualización de productos y servicios en los listados (Ideal = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longitud para la visualización de la descripción de productos y servicios en los listados (Ideal = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Longitud de las cuentas generales
 ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas
+ACCOUNTING_MANAGE_ZERO=Administrar el cero al final de una cuenta contable. Necesaria por algunos países. Desactivada por defecto. Tener cuidado con la función "longitud de las cuentas".
+BANK_DISABLE_DIRECT_INPUT=Desactivar entrada libre de transacciones bancarias (Activadas por defecto con este módulo)
 
 ACCOUNTING_SELL_JOURNAL=Diario de ventas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -81,32 +102,31 @@ Sens=Sentido
 Codejournal=Diario
 NumPiece=Apunte
 AccountingCategory=Categoría contable
-
-NotMatch=Not Set
-
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+NotMatch=No establecido
+DeleteMvt=Eliminar líneas del Libro Mayor
+DelYear=Año a eliminar
+DelJournal=Diario a eliminar
+ConfirmDeleteMvt=Esto borrará todas las líneas del libro de mayor del año y/o de los diarios específicos
+ConfirmDeleteMvtPartial=Esto borrará todas las líneas seleccionadas del libro de mayor
 DelBookKeeping=Eliminar los registros del Diario Mayor
-
 DescSellsJournal=Diario de ventas
 DescPurchasesJournal=Diario de compras
 FinanceJournal=Diario financiero
 DescFinanceJournal=El diario financiero incluye todos los tipos de pagos por cuenta bancaria
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Cobro de factura a cliente
-
 ThirdPartyAccount=Cuenta de tercero
-
-NewAccountingMvt=Nuevo movimiento
-NumMvts=Número del movimiento
-ListeMvts=Listado del movimiento
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debe y Haber no pueden contener un valor al mismo tiempo
 
-ReportThirdParty=Listado cuentas de terceros
-DescThirdPartyReport=Consulte aquí el listado de clientes y proveedores y sus códigos contables
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Listado de cuentas contables
 
@@ -114,22 +134,29 @@ Pcgtype=Tipo del plan
 Pcgsubtype=Subcuenta
 Accountparent=Padre de la cuenta
 
-DescVentilCustomer=Consulte aquí la contabilización anual de sus facturas a clientes
 TotalVente=Total facturación antes de impuestos
 TotalMarge=Total margen ventas
-DescVentilDoneCustomer=Consulte aquí las líneas de facturas a clientes y sus cuentas contables
-DescVentilTodoCustomer=Contabilice sus líneas de facturas a clientes con una cuenta contable
-ChangeAccount=Cambie la cuenta para las líneas seleccionadas a la cuenta:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consulte aquí la contabilidad anual de sus facturas de proveedores
-DescVentilDoneSupplier=Consulte aquí la lista de facturas de proveedores y sus cuentas contables
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validar automáticamente
+ValidateHistory=Vincular automáticamente
+AutomaticBindingDone=Vinculación automática finalizada
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
 MvtNotCorrectlyBalanced=Movimiento descuadrado. Debe = %s. Haber = %s
-FicheVentilation=Ficha contable
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Aplicar categorías en masa
@@ -147,16 +174,18 @@ Modelcsv_bob50=Exportar hacia Sage BOB 50
 Modelcsv_ciel=Exportar hacia Sage Ciel Compta o Compta Evolution
 Modelcsv_quadratus=Exportar hacia Quadratus QuadraCompta
 Modelcsv_ebp=Exportar a EBP
-Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_cogilog=Eportar a Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Iniciar contabilidad
-InitAccountancyDesc=Esta página puede usarse para inicializar una cuenta contable en productos y servicios que no tienen definida cuenta contable de ventas y compras. Compruebe antes de que la configuración del módulo contabilidad está completa.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Opciones
 OptionModeProductSell=Modo ventas
 OptionModeProductBuy=Modo compras
 OptionModeProductSellDesc=Mostrar todos los productos sin cuenta contable definida para ventas.
 OptionModeProductBuyDesc=Mostrar todos los productos sin cuenta contable definida para compras.
+CleanFixHistory=Eliminar código contable de las líneas que no existen en el plan contable
+CleanHistory=Resetear todos los vínculos del año seleccionado
 
 ## Dictionary
 Range=Rango de cuenta contable
@@ -166,4 +195,10 @@ Formula=Fórmula
 ## Error
 ErrorNoAccountingCategoryForThisCountry=Sin categorías contables para este país
 ExportNotSupported=El formato de exportación configurado no es soportado en esta página
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+BookeppingLineAlreayExists=Lineas ya existentes en la contabilidad
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 51b0257dc74..f7c6fd3e618 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Desarrollo
 VersionUnknown=Desconocida
 VersionRecommanded=Recomendada
-FileCheck=Integridad archivos
+FileCheck=Comprobador de integridad de archivos
+FileCheckDesc=Esta herramienta le permite comprobar la integridad de los archivos de la aplicación, comparando cada archivo con los oficiales. Se puede utilizar esta herramienta para detectar si algunos archivos fueron modificados por un hacker por ejemplo.
+MakeIntegrityAnalysisFrom=Realizar el análisis de la integridad de los archivos de la aplicación desde
+LocalSignature=Firma local incrustada (menos segura)
+RemoteSignature=Firma remota (más segura)
 FilesMissing=Archivos no encontrados
 FilesUpdated=Archivos actualizados
-FileCheckDolibarr=Comprobar la integridad de los Archivos Dolibarr
-XmlNotFound=Archivo xml de Integridad Dolibarr no encontrado
+FileCheckDolibarr=Comprobar la integradad de los archivos de la aplicación
+AvailableOnlyOnPackagedVersions=El archivo local para la comprobación de integridad sólo está disponible cuando la aplicación se instala desde un paquete certificado
+XmlNotFound=No se encuentra el archivo xml
 SessionId=ID sesión
 SessionSaveHandler=Modalidad de salvaguardado de sesiones
 SessionSavePath=Localización salvaguardado de sesiones
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, las precisiones superiores a <b>%s</b>
 DictionarySetup=Diccionarios
 Dictionary=Diccionarios
 Chartofaccounts=Plan contable
-Fiscalyear=Años fiscales
+Fiscalyear=Año fiscal
 ErrorReservedTypeSystemSystemAuto=El uso del tipo 'system' y 'systemauto' está reservado. Puede utilizar 'user' como valor para añadir su propio registro
 ErrorCodeCantContainZero=El código no puede contener el valor 0
 DisableJavascript=Deshabilitar Javascript y funciones Ajax (Recomendado para personas ciegas o navegadores de texto)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar
 DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de la lista combinada de contactos (Esto puede incrementar el rendimiento si tiene un gran número de contactos) 
 NumberOfKeyToSearch=Nº de caracteres para desencadenar la búsqueda: %s
 NotAvailableWhenAjaxDisabled=No disponible cuando Ajax esté desactivado
-AllowToSelectProjectFromOtherCompany=En documentos de un tercero, puede elegir un proyecto vinculado a otro tercero
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Javascript desactivado
 UsePreviewTabs=Ver fichas "vista previa"
 ShowPreview=Ver vista previa
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Codificar los campos binarios en hexadecimal
 IgnoreDuplicateRecords=Ignorar los errores de duplicación (INSERT IGNORE)
 AutoDetectLang=Autodetección (navegador)
 FeatureDisabledInDemo=Opción deshabilitada en demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permisos
 BoxesDesc=Los paneles son componentes que muestran algunos datos que pueden añadirse para personalizar algunas páginas. Puede elegir entre mostrar o no el panel mediante la selección de la página de destino y haciendo clic en 'Activar', o haciendo clic en la papelera para desactivarlo.
 OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
-ModulesDesc=Los módulos Dolibarr definen las funcionalidades disponibles en la aplicación. Algunos módulos requieren permisos que deberán indicarse a los usuarios para que puedan acceder a sus funcionalidades.
+ModulesDesc=Los módulos de Dolibarr definen qué funcionalidad está habilitada en el software. Algunos módulos requieren permisos que se deben conceder a los usuarios después de activar el módulo. Haga clic en el botón de encendido/apagado para activar un módulo/función.
 ModulesMarketPlaceDesc=Puede encontrar más módulos para descargar en sitios web externos en Internet ...
 ModulesMarketPlaces=Más módulos...
 DoliStoreDesc=DoliStore, el sitio oficial de módulos complementarios y para Dolibarr ERP/CRM
@@ -234,7 +240,7 @@ MAIN_MAIL_SENDMODE=Método de envío de e-mails
 MAIN_MAIL_SMTPS_ID=ID de autentificación SMTP  si se requiere autenticación SMTP
 MAIN_MAIL_SMTPS_PW=Contraseña autentificación SMTP si se requiere autentificación SMTP
 MAIN_MAIL_EMAIL_TLS= Uso de encriptación TLS (SSL)
-MAIN_MAIL_EMAIL_STARTTLS= Uso de encriptación TLS (SSL)
+MAIN_MAIL_EMAIL_STARTTLS= Uso de encriptación TLS (STARTTLS)
 MAIN_DISABLE_ALL_SMS=Desactivar globalmente todo envío de SMS (para modo de pruebas o demo)
 MAIN_SMS_SENDMODE=Método de envío de SMS
 MAIN_MAIL_SMS_FROM=Número de teléfono por defecto para los envíos SMS
@@ -273,9 +279,10 @@ YouCanSubmitFile=Para este paso, puede enviar el paquete usando esta herramienta
 CurrentVersion=Versión actual de Dolibarr
 CallUpdatePage=Ir a la página de actualización de la estructura de la base de datos y sus datos: %s.
 LastStableVersion=Última versión estable
+LastActivationDate=Última fecha de activación
 UpdateServerOffline=Actualizar servidor offline
 GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:<br><b>{000000} </b> corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. <br> <b> {000000+000}</ b> Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia {yy}{mm} o {yyyy}{mm} también es necesaria. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> año en 2, 4 ó 1 cifra.<br>
-GenericMaskCodes2=<b>{cccc}</b> código de cliente con n caracteres<br><b>{cccc000}</b> código de cliente con n caracteres es seguido por un contador dedicado a clientes. Este contador dedicado a clientes se reseteará al mismo tiempo que el contador global.<br><b>{tttt}</b> El código del tipo de empresa con n caracteres (vea diccionarios->tipos de empresa).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
 GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
 GenericMaskCodes4b=<u>Ejemplo sobre un tercero creado el 31/03/2007:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Seguridad de las URLs
 SecurityTokenIsUnique=¿Usar un parámetro securekey único para cada URL?
 EnterRefToBuildUrl=Introduzca la referencia del objeto %s
 GetSecuredUrl=Obtener la URL calculada
-ButtonHideUnauthorized=Ocultar los botones de acciones no autorizadas en vez de mostrarlos atenuados
+ButtonHideUnauthorized=Ocultar a los usuarios no administradores los botones de acciones no autorizadas en vez de mostrarlos atenuados
 OldVATRates=Tasa de IVA antigua
 NewVATRates=Tasa de IVA nueva
 PriceBaseTypeToChange=Cambiar el precio cuya referencia de base es
@@ -349,6 +356,7 @@ ExtrafieldMail = Correo
 ExtrafieldSelect = Lista de selección
 ExtrafieldSelectList = Lista desde una tabla
 ExtrafieldSeparator=Separador
+ExtrafieldPassword=Contraseña
 ExtrafieldCheckBox=Casilla de verificación
 ExtrafieldRadio=Botón de selección excluyente
 ExtrafieldCheckBoxFromList= Casilla de selección de tabla
@@ -383,11 +391,14 @@ EnableFileCache=Habilitar caché de archivos
 ShowDetailsInPDFPageFoot=Añadir más detalles al pie de página de los archivos PDF, como la dirección de la compañía, o los nombres de los gestores (para completar los Identificadores Profesionales, capital de la Empresa y el Número de IVA).
 NoDetails=No hay más detalles al pie de página
 DisplayCompanyInfo=Mostrar dirección de la empresa
-DisplayCompanyInfoAndManagers=Mostrar empresa y nombres de los gestores
+DisplayCompanyManagers=Mostrar nombres de los gestores
+DisplayCompanyInfoAndManagers=Mostrar dirección de la empresa y nombres de los gestores
 EnableAndSetupModuleCron=Si desea tener esta factura recurrente para generarla automáticamente, el módulo *%s* debe estar activado y configurado correctamente. De lo contrario, la generación de facturas debe hacerse manualmente desde esta plantilla con el botón  *Crear*. Tenga en cuenta que incluso si se habilita la generación automática, todavía puede lanzarla generación manual. No es posible la generación de duplicados para el mismo período.
 ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de<br>%s seguido del código tercero de proveedor para el código contable de proveedor,<br>%s seguido del código tercero de cliente para el código contable de cliente.
 ModuleCompanyCodePanicum=Devuelve un código contable vacío.
 ModuleCompanyCodeDigitaria=Devuelve un código contable compuesto siguiendo el código de tercero. El código está formado por carácter ' C ' en primera posición seguido de los 5 primeros caracteres del código tercero.
+Use3StepsApproval=Por defecto los pedidos a proveedor necesitan crearse y aprobarse por dos usuarios diferentes (un paso/usuario para crear y un usuario/paso para aprobar. Si un usuario dispone de permisos para crear y aprobar,  un paso/usuario podría ser suficiente). Puede consultar esta opción un tercer paso/usuario de aprobación si el importe es mayor a un valor dedicado (entonces serán necesarios 3 pasos: 1=validación, 2=primera aprobación, 3=segunda aprobación si el importe es mayor)<br>Dejar vacío si una aprobación (2 pasos) es suficiente, indicar un valor bajo (0.1) si siempre es necesaria una segunda aprobación
+UseDoubleApproval=Usar 3 pasos de aprobación si el importe (sin IVA) es mayor que...
 
 # Modules
 Module0Name=Usuarios y grupos
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Pagos especiales
 Module500Desc=Gestión de gastos especiales (impuestos, gastos sociales, dividendos)
-Module510Name=Salarios
-Module510Desc=Gestión de salarios y pagos
+Module510Name=Contratos de empleados  y salarios
+Module510Desc=Gestión de contratos de empleados, salarios y pagos
 Module520Name=Crédito
 Module520Desc=Gestión de créditos
 Module600Name=Notificaciones
-Module600Desc=Enviar notificaciones por e-mail (desencadenados por algunos eventos) a los usuarios (configuración definida para cada usuario), los contactos de terceros (configuración definida en cada tercero) o e-mails fijos
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donaciones
 Module700Desc=Gestión de donaciones
 Module770Name=Informes de gastos
@@ -606,10 +617,10 @@ Permission142=Crear/modificar todos los proyectos y tareas (incluidos proyectos
 Permission144=Eliminar todos los proyectos y tareas (incluidos los proyectos privados de los que no soy contacto)
 Permission146=Consultar proveedores
 Permission147=Consultar estadísticas
-Permission151=Consultar domiciliaciones
+Permission151=Leer domiciliaciones
 Permission152=Crear/modificar domiciliaciones
-Permission153=Enviar domiciliaciones
-Permission154=Abonar/devolver domiciliaciones
+Permission153=Enviar/Trasmitir domiciliaciones
+Permission154=Registrar Abonos/Devoluciones de domiciliaciones
 Permission161=Consultar contratos/suscripciones
 Permission162=Crear/modificar contratos/suscripciones
 Permission163=Activar un servicio/suscripción de un contrato
@@ -747,6 +758,7 @@ Permission1236=Exportar facturas de proveedores, atributos y pagos
 Permission1237=Exportar pedidos de proveedores junto con sus detalles
 Permission1251=Lanzar las importaciones en masa a la base de datos (carga de datos)
 Permission1321=Exportar facturas a clientes, atributos y cobros
+Permission1322=Reopen a paid bill
 Permission1421=Exportar pedidos de clientes y atributos
 Permission20001=Leer peticiones días retribuidos (suyos y subordinados)
 Permission20002=Cear/modificar sus días retribuidos
@@ -780,6 +792,10 @@ Permission55002=Crear/modificar encuestas
 Permission59001=Leer márgenes comerciales
 Permission59002=Definir márgenes comerciales
 Permission59003=Leer cualquier margen de usuario
+Permission63001=Leer recursos
+Permission63002=Crear/modificar recursos
+Permission63003=Eliminar recursos
+Permission63004=Enlazar recursos a eventos de la agenda
 DictionaryCompanyType=Tipos de terceros
 DictionaryCompanyJuridicalType=Formas jurídicas de terceros
 DictionaryProspectLevel=Perspectiva nivel cliente potencial
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etiqueta que se utilizará si no se encuentra traducción par
 LabelOnDocuments=Etiqueta sobre documentos
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
+CurrentNext=Current/Next
 Offset=Decálogo
 AlwaysActive=Siempre activo
 Upgrade=Actualización
@@ -950,7 +967,7 @@ LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí.
 AreaForAdminOnly=Estas funciones solo son accesibles a un usuario administrador.
 SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores.
 SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área.
-CompanyFundationDesc=Modifique en esta página toda la información conocida sobre la empresa o asociación a administrar (para ello haga clic en el botón "Modificar" a pie de página)
+CompanyFundationDesc=Edite en esta página toda la información conocida de la empresa o institución que necesita gestionar (Para ello haga click en el botón "Modificar" o "Grabar" a pie de página)
 DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr
 AvailableModules=Módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Atención, en algunos sistemas Linux, con este método
 PathToDocuments=Rutas de acceso a documentos
 PathDirectory=Directorio
 SendmailOptionMayHurtBuggedMTA=La funcionalidad de enviar correo electrónico a través del "correo directo PHP" genera una solicitud que puede ser mal interpretado por algunos servidores de correo. Esto se traduce en mensajes de correo electrónico ilegibles para las personas alojadas en estas plataformas. Este es el caso de clientes en ciertos proveedores de servicios de Internet (Ej: Orange). Esto no es un problema ni de Dolibarr ni de PHP, pero sí del servidor de correo. Sin embargo, puede agregar la opción MAIN_FIX_FOR_BUGGED_MTA con valor 1 en configuración-varios para tratar que Dolibarr evite el error. Otra solución (recomendada) es utilizar el método de envío por SMTP que no tiene este inconveniente.
-TranslationSetup=Configuración traducción
-TranslationDesc=Cómo establecer el idioma de la aplicación<br> *Sistema: menú <strong> Inicio - Configuración - Entorno</strong> <br> *Por usuario:<strong>Interfaz usuario</strong>de la ficha de usuario (haga clic en el nombre del usuario en en la parte superior de la pantalla).
-TranslationOverwriteDesc=\nTambién puede reemplazar las cadenas llenando la siguiente tabla. Elija su idioma en la lista desplegable "%s", inserter la clave del archivo lang (langs/xx_XX/somefile.lang) en "%s" y su nueva traducción en "%s".
+TranslationSetup=Configuración de traducciones
+TranslationKeySearch=Buscar una clave de traducción o cadena
+TranslationOverwriteKey=Sobreescribir una cadena traducida
+TranslationDesc=Cómo se establece el idioma de la aplicación a usar: :<br>* Sistema: menu <strong>Inicio - Configuración - Entorno</strong><br>* Por usario: pestaña <strong>Interfaz usuario</strong> de la ficha del usuario (clic en el nombre de usuario en la parte superior de la pantalla).
+TranslationOverwriteDesc=También puede reemplazar cadenas llenando la tabla siguiente. Elija su idioma en la lista desplegable "%s",  inserte la clave de la traducción en "%s" y su nueva traducción en "%s"
+TranslationOverwriteDesc2=Puede utilizar otra pestaña para ayudarle a saber clave a utilizar
+TranslationString=Cadena traducida
+CurrentTranslationString=Cadena traducida actual
+WarningAtLeastKeyOrTranslationRequired=Se necesita un criterio de búsqueda al menos por cadena de clave o traducción
+NewTranslationStringToShow=Nueva cadena traducida a mostrar
+OriginalValueWas=La traducción original se ha sobreescrito. El valor original era was:<br><br>%s
 TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
@@ -1070,7 +1095,7 @@ HRMSetup=Setup del módulo RRHH
 CompanySetup=Configuración del módulo terceros
 CompanyCodeChecker=Módulo de generación y control de los códigos de terceros (clientes/proveedores)
 AccountCodeManager=Módulo de generación de los códigos contables (clientes/proveedores)
-NotificationsDesc=Las notificaciones por e-mail le permite enviar e-mails silencios automáticamente, para algunos eventos Dolibarr. Se pueden definir los destinatarios:
+NotificationsDesc=Las notificaciones por e-mail le permite enviar silenciosamente e-mails  automáticos, para algunos eventos Dolibarr. Se pueden definir los destinatarios:
 NotificationsDescUser=* por usuarios, un usuario a la vez.
 NotificationsDescContact=* por contactos de terceros (clientes o proveedores), un contacto a la vez.
 NotificationsDescGlobal=* o configurando destinatarios globlalmente en la configuración del módulo.
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Usuario TLS
 LDAPServerUseTLSExample=Su servidor utiliza TLS
 LDAPServerDn=DN del servidor
 LDAPAdminDn=DN del administrador
-LDAPAdminDnExample=DN completo (ej: cn=adminldap,dc=example,dc=com)
+LDAPAdminDnExample=DN compleot (ej: cn=admin,dc=example,dc=com o cn=Administrator,cn=Users,dc=example,dc=com para active directory)
 LDAPPassword=Contraseña del administrador
 LDAPUserDn=DN de los usuarios
 LDAPUserDnExample=DN completo (ej: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Ejemplo : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Ejemplo : objectsid
 LDAPFieldEndLastSubscription=Fecha finalización como miembro
-LDAPFieldTitle=Puesto/Función
+LDAPFieldTitle=Puesto de trabajo
 LDAPFieldTitleExample=Ejemplo:titulo
 LDAPSetupNotComplete=Configuración LDAP incompleta (a completar en las otras pestañas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contraseña no indicados. Los accesos LDAP serán anónimos y en solo lectura.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Configuración de los módulos Productos y Servicios
 NumberOfProductShowInSelect=Nº de productos máx. en las listas (0=sin límite)
 ViewProductDescInFormAbility=Visualización de las descripciones de los productos en los formularios
 MergePropalProductCard=Activar en el producto/servicio la pestaña Documentos una opción para fusionar documentos PDF de productos al presupuesto PDF azur si el producto/servicio se encuentra en el presupuesto
-ViewProductDescInThirdpartyLanguageAbility=Visualización de las descripciones de productos en el idioma del tercero
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=También si usted tiene una gran cantidad de producto (> 100 000), puede aumentar la velocidad mediante el establecimiento PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 en Configuración-> Otros. La búsqueda será limitada a la creación de cadena.
 UseSearchToSelectProduct=Utilice un formulario de búsqueda para elegir un producto (en lugar de una lista desplegable).
 SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defecto para los productos
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Abrir año fiscal
 CloseFiscalYear=Cerrar año fiscal
 DeleteFiscalYear=Eliminar año fiscal
 ConfirmDeleteFiscalYear=¿Está seguro de querer eliminar este año fiscal?
+ShowFiscalYear=Mostrar año fiscal
 AlwaysEditable=Puede editarse siempre
 MAIN_APPLICATION_TITLE=Forzar visibilidad del nombre de aplicación (advertencia: indicar su propio nombre aquí puede romper la característica de relleno automático de inicio de sesión al utilizar la aplicación móvil DoliDroid)
 NbMajMin=Número mínimo de caracteres en mayúsculas
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=Listado de notificaciones por usuario*
 ListOfNotificationsPerUserOrContact=Listado de notificaciones por usuario* o por contacto**
 ListOfFixedNotifications=Listado de notificaciones fijas
 GoOntoUserCardToAddMore=Vaya a la pestaña "Notificaciones" de un usuario para añadir o elliminar notificaciones a usuarios
-GoOntoContactCardToAddMore=Vaya a la pestaña "Notificaciones" de un contacto de tercero para añadir o eliminar notificaciones para contactos/direcciones
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Valor mínimo/umbral
 BackupDumpWizard=Asistente para crear una copia de seguridad de la base de datos
 SomethingMakeInstallFromWebNotPossible=No es posible la instalación de módulos externos desde la interfaz web por la siguiente razón:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por enci
 TextTitleColor=Color para la página de título
 LinkColor=Color para los enlaces
 PressF5AfterChangingThis=Una vez cambiado este valor, pulse F5 en el teclado para hacerlo efectivo
-NotSupportedByAllThemes=Funciona con el tema eldy, pero no es soportado por todos los temas
+NotSupportedByAllThemes=Funciona con temas del core, puede no funcionar con temas externos
 BackgroundColor=Color de fondo
 TopMenuBackgroundColor=Color de fondo para el Menú superior
+TopMenuDisableImages=Ocultar imágenes en el Menú superior
 LeftMenuBackgroundColor=Color de fondo para el Menú izquierdo
 BackgroundTableTitleColor=Color de fondo para Tabla título línea
 BackgroundTableLineOddColor=Color de fondo para líneas de tabla odd
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Para enviar intervención
 MailToSendSupplierRequestForQuotation=Para enviar solicitud de presupuesto de proveedor
 MailToSendSupplierOrder=Para enviar pedido a proveedor
 MailToSendSupplierInvoice=Para enviar factura de proveedor
-MailToThirdparty=Para enviar e-mail desde la página del tercero
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Mostrar por defecto en modo lista
 YouUseLastStableVersion=Debe usar la última versión estable
 TitleExampleForMajorRelease=Ejemplo de mensaje que puede usar para anunciar esta release mayor (no dude en usarlo en sus sitios web)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url para conseguir tokens para usar API (una vez recibido e
 ListOfAvailableAPIs=Listado de APIs disponibles
 activateModuleDependNotSatisfied=El módulo "%s" depende del módulo "%s" que falta, por lo que el módulo "%1$s" puede no funcionar correctamente. Instale el módulo "%2$s" o desactive el módulo "%1$s" si no quiere sorpresas
 CommandIsNotInsideAllowedCommands=El comando que intenta ejecutar no se encuentra en el listado de comandos permitidos en el parámetro<strong> $dolibarr_main_restrict_os_commands</strong> en el archivo <strong>conf.php</strong>.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=El módulo ha sido activado. Los permisos para los módulos activados se dan solamente a los usuarios administradores. Deberá otorgar permisos manualmente a otros usuarios si es necesario.
+UserHasNoPermissions=Este usuario no tiene permisos definidos
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index e0f0a4a9494..5ec51f09ba5 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -27,11 +27,7 @@ AllTime=Mostrar saldo desde el inicio
 Reconciliation=Conciliación
 RIB=Cuenta bancaria
 IBAN=Identificador IBAN
-IbanValid=IBAN Válido
-IbanNotValid=IBAN No Válido
 BIC=Identificador BIC/SWIFT
-SwiftValid=BIC/SWIFT Válido
-SwiftNotValid=BIC/SWIFT No Válido
 StandingOrders=Domiciliaciones
 StandingOrder=Domiciliación
 AccountStatement=Extracto
@@ -78,6 +74,7 @@ AccountToCredit=Cuenta de crédito
 AccountToDebit=Cuenta de débito
 DisableConciliation=Desactivar la función de conciliación para esta cuenta
 ConciliationDisabled=Función de conciliación desactivada
+LinkedToAConciliatedTransaction=Enlazado a una transacción conciliada
 StatusAccountOpened=Abierta
 StatusAccountClosed=Cerrada
 AccountIdShort=Número
@@ -87,14 +84,17 @@ AddBankRecordLong=Realizar un registro manual fuera de una factura
 ConciliatedBy=Conciliado por
 DateConciliating=Fecha conciliación
 BankLineConciliated=Registro conciliado
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Cobro a cliente
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
+SupplierInvoicePayment=Pago a proveedor
+SubscriptionPayment=Pago cuota
 WithdrawalPayment=Cobro de domiciliación
 SocialContributionPayment=Pago impuesto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
-TransferDesc=Al crear una transferencia de una de sus cuentas bancarias hacia otra, Dolibarr crea dos registros contables (uno de débito en una cuenta y otro de crédito, del mismo importe, en la otra cuenta. Se utiliza para los dos registros la misma etiqueta de transferencia y la misma fecha)
+MenuBankInternalTransfer=Transferencia interna
+TransferDesc=Transferir de una cuenta a otra, Dolibarr escribirá dos registros (uno de débito en la cuenta de origen y uno de crédito en la cuenta destino con el mismo importe, etiqueta y fecha para dicha transancción)
 TransferFrom=De
 TransferTo=Hacia
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s se ha creado.
@@ -129,7 +129,7 @@ FutureTransaction=Transacción futura. No es posible conciliar.
 SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en la remesa y haga clic en "Crear".
 InputReceiptNumber=Indique el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable: YYYYMM o YYYYMMDD
 EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar los registros
-ToConciliate=¿A conciliar?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic
 DefaultRIB=Cuenta bancaria por defecto
 AllRIB=Todas las cuentas bancarias
@@ -142,3 +142,6 @@ ConfirmRejectCheck=¿Está seguro de querer marcar este cheque como rechazado?
 RejectCheckDate=Fecha de devolución del cheque
 CheckRejected=Cheque devuelto
 CheckRejectedAndInvoicesReopened=Cheque devuelto y facturas reabiertas
+BankAccountModelModule=Modelos de documentos para cuentas bancarias
+DocumentModelSepaMandate=Plantilla de mandato SEPA, usable únicamente para paises miembros de la UEE
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index f0a680133c2..1edb77629e2 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no es posible cancelar un
 BillFrom=Emisor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
-RecurringInvoiceTemplate=Factura recurrente
+RecurringInvoiceTemplate=Plantilla/Factura recurrente
 NoQualifiedRecurringInvoiceTemplateFound=Sin plantilla de factura recurrente apta para la generación
 FoundXQualifiedRecurringInvoiceTemplate=Encontradas %s plantilllas de facturas recurrentes aptas para la generación
 NotARecurringInvoiceTemplate=No es una plantilla de factura recurrente
@@ -351,7 +351,7 @@ VarAmount=Importe variable (%% total)
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
-PaymentTypePRE=Domiciliación bancaria
+PaymentTypePRE=Domiciliación
 PaymentTypeShortPRE=Domiciliación
 PaymentTypeLIQ=Efectivo
 PaymentTypeShortLIQ=Efectivo
@@ -381,6 +381,7 @@ ExtraInfos=Informaciones complementarias
 RegulatedOn=Pagar el
 ChequeNumber=Cheque nº
 ChequeOrTransferNumber=Cheque/Transferencia nº
+ChequeBordereau=Comprobar
 ChequeMaker=Transmisor Cheque/Transferencia
 ChequeBank=Banco del cheque
 CheckBank=Verificar
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=No se puede eliminar un pago conciliado
 PayedByThisPayment=Pagada por este pago
 ClosePaidInvoicesAutomatically=Clasificar como "Pagadas" las facturas, facturas de situación y facturas rectificativas completamente pagadas.
 ClosePaidCreditNotesAutomatically=Clasificar automáticamente como "Pagados" los abonos completamente reembolsados
+ClosePaidContributionsAutomatically=Clasificar como "Pagadas" todas las tasas fiscales o sociales completamente pagadas
 AllCompletelyPayedInvoiceWillBeClosed=Todas las facturas con un resto a pagar 0 serán automáticamente cerradas al estado "Pagada".
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Listado de facturas impagadas
 NoteListOfYourUnpaidInvoices=Nota: Este listado incluye solamente los terceros de los que usted es comercial.
 RevenueStamp=Timbre fiscal
-YouMustCreateInvoiceFromThird=Esta opción está solo disponible en la creación de facturas desde la pestaña "cliente" de un tercero
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Tiene que crear una factura estandar antes de convertirla a "plantilla" para crear una nueva plantilla de factura
 PDFCrabeDescription=Modelo de factura completo (modelo recomendado por defecto)
 PDFCrevetteDescription=Modelo PDF de factura Crevette. Un completo modelo de facturas de situación
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error: Actualización de precio en línea
 ToCreateARecurringInvoice=Para crear una factura recurrente para este contrato, primero cree la factura en borrador, seguidamente conviértala en plantilla y defina la frecuencia de generación de las próximas facturas.
 ToCreateARecurringInvoiceGene=Para generar las facturas futuras regularmente y manualmente, vaya al menú <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Si necesita generar facturas automáticamente, dígale a su administrador que active y configure el módulo <strong>%s</strong>. Tenga en cuenta que los dos métodos (manual y automático) pueden usarse conjuntamente sin ningún riesgo de duplicación.
+DeleteRepeatableInvoice=Eliminar plantilla de factura
+ConfirmDeleteRepeatableInvoice=¿Está seguro de querer eliminar esta plantilla de factura?
 
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 3ffff864908..ea8494cd2eb 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -5,7 +5,7 @@ BoxProductsAlertStock=Alertas de stock para productos
 BoxLastProductsInContract=Últimos %s productos/servicios contratados
 BoxLastSupplierBills=Últimas facturas de proveedores
 BoxLastCustomerBills=Últimas facturas a clientes
-BoxOldestUnpaidCustomerBills=Facturas a clientes más antiguras pendientes de cobro
+BoxOldestUnpaidCustomerBills=Facturas a clientes más antiguas pendientes de cobro
 BoxOldestUnpaidSupplierBills=Facturas de proveedores más antiguas pendientes de pago
 BoxLastProposals=Últimos presupuestos
 BoxLastProspects=Últimos clientes potenciales modificados
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Mis últimos %s marcadores
 BoxOldestExpiredServices=Servicios antiguos expirados
 BoxLastExpiredServices=Últimos %s contratos más antiguos con servicios expirados
 BoxTitleLastActionsToDo=Últimas %s acciones a realizar
-BoxTitleLastContracts=Últimos %s contratos
+BoxTitleLastContracts=Últimos %s contratos modificados
 BoxTitleLastModifiedDonations=Últimas %s donaciones modificadas
 BoxTitleLastModifiedExpenses=Últimos %s informes de gastos modificados
 BoxGlobalActivity=Actividad global
@@ -72,6 +72,11 @@ BoxProposalsPerMonth=Presupuestos por mes
 NoTooLowStockProducts=Sin productos por debajo del stock mínimo
 BoxProductDistribution=Distribución de productos/servicios
 BoxProductDistributionFor=Distribución de %s para %s
+BoxTitleLastModifiedSupplierBills=Útimas %s facturas de proveedor modificadas
+BoxTitleLatestModifiedSupplierOrders=Últimos %s pedidos a proveedor modificados
+BoxTitleLastModifiedCustomerBills=Últimas %s facturas a clientes modificadas
+BoxTitleLastModifiedCustomerOrders=Últimos %s pedidos de clientes modificados
+BoxTitleLastModifiedPropals=Últimos %s presupuestos modificados
 ForCustomersInvoices=Facturas a clientes
 ForCustomersOrders=Pedidos de clientes
 ForProposals=Presupuestos
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index d18774d973d..5bc30e0154b 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=de
 CashDeskThirdParty=Tercero
 ShoppingCart=Cesta
 NewSell=Nueva venta
-BackOffice=Back office
 AddThisArticle=Añadir este artículo
 RestartSelling=Retomar la venta
-SellFinished=Venta terminada
+SellFinished=Venta completada
 PrintTicket=Imprimir
 NoProductFound=Ningún artículo encontrado
 ProductFound=Producto encontrado
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 6b0f9745740..02902341549 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Área etiquetas/categorías Clientes
 MembersCategoriesArea=Área etiquetas/categorías Miembros
 ContactsCategoriesArea=Área etiquetas/categorías de contactos
 AccountsCategoriesArea=Área categorías contables
+ProjectsCategoriesArea=Área etiquetas/categorías Proyectos
 SubCats=Subcategorías
 CatList=Listado de etiquetas/categorías
 NewCategory=Nueva etiqueta/categoría
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Este tercero se encuentra en las siguientes etiqu
 MemberIsInCategories=Este miembro se encuentra en las siguientes etiquetas/categorías
 ContactIsInCategories=Este contacto se encuentra en las siguientes etiquetas/categorías de contactos
 ProductHasNoCategory=Este producto/servicio no se encuentra en ninguna etiqueta/categoría en particular
-CompanyHasNoCategory=Este tercero no se encuentra en ninguna etiqueta/categoría
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Este miembro no se encuentra en ninguna etiqueta/categoría en particular
 ContactHasNoCategory=Este contacto no se encuentra en ninguna etiqueta/categoría
+ProjectHasNoCategory=Este proyecto no se encuentra en ninguna etiqueta/categoría
 ClassifyInCategory=Añadir a una etiqueta/categoría
 NotCategorized=Sin etiqueta/categoría
 CategoryExistsAtSameLevel=Esta categoría ya existe para esta referencia
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Etiquetas/categorías de productos
 MembersCategoriesShort=Etiquetas/categorías de miembros
 ContactCategoriesShort=Etiquetas/categorías de contactos
 AccountsCategoriesShort=Categorías contables
+ProjectsCategoriesShort=Etiquetas/categorías de Proyectos
 ThisCategoryHasNoProduct=Esta categoría no contiene ningún producto.
 ThisCategoryHasNoSupplier=Esta categoría no contiene ningún proveedor.
 ThisCategoryHasNoCustomer=Esta categoría no contiene ningún cliente.
 ThisCategoryHasNoMember=Esta categoría no contiene ningún miembro.
 ThisCategoryHasNoContact=Esta categoría no contiene contactos
 ThisCategoryHasNoAccount=Esta categoría no contiene ninguna cuenta
+ThisCategoryHasNoProject=Esta categoría no contiene ningún proyecto
 CategId=Id etiqueta/categoría
 CatSupList=Listado de etiquetas/categorías de proveedores
 CatCusList=Listado de etiquetas/categorías de clientes
@@ -71,6 +75,7 @@ CatContactList=Listado de etiquetas/categorías de contactos
 CatSupLinks=Enlaces entre proveedores y etiquetas/categorías
 CatCusLinks=Enlaces entre clientes/clientes potenciales y etiquetas/categorías
 CatProdLinks=Enlaces entre productos/servicios y etiquetas/categorías
+CatProJectLinks=Enlaces entre proyectos y etiquetas/categorías
 DeleteFromCat=Eliminar de la etiqueta/categoría
 ExtraFieldsCategories=Atributos complementarios
 CategoriesSetup=Configuración de etiquetas/categorías
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index b798b871994..8e48329022c 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nuevo particular
 NewCompany=Nueva empresa (cliente potencial, cliente, proveedor)
 NewThirdParty=Nuevo tercero (cliente potencial, cliente, proveedor)
 CreateDolibarrThirdPartySupplier=Crear un tercero (proveedor)
+CreateThirdPartyOnly=Crear tercero
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Área de prospección
 IdThirdParty=ID tercero
 IdCompany=Id empresa
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Proveedores
 ThirdPartyType=Tipo de tercero
 Company/Fundation=Empresa/asociación
 Individual=Particular
-ToCreateContactWithSameName=Creará automáticamente un contacto físico con la misma información
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Sede central
 Subsidiaries=Filiales
 ReportByCustomers=Informe por cliente
@@ -47,7 +49,7 @@ CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apellidos
 Firstname=Nombre
-PostOrFunction=Puesto/función
+PostOrFunction=Puesto de trabajo
 UserTitle=Título de cortesía
 Address=Dirección
 State=Provincia
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Teléf. trabajo
 PhonePerso=Teléf. particular
 PhoneMobile=Móvil
-No_Email=No enviar e-mails masivos
+No_Email=Rechazar e-mails masivos
 Fax=Fax
 Zip=Código postal
 Town=Población
@@ -73,7 +75,7 @@ Poste= Puesto
 DefaultLang=Idioma por defecto
 VATIsUsed=Sujeto a IVA
 VATIsNotUsed=No sujeto a IVA
-CopyAddressFromSoc=Copiar dirección de la empresa
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tercero que no es cliente ni proveedor, sin objetos referenciados
 ##### Local Taxes #####
 LocalTax1IsUsed=Usar segunda tasa
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=NIF intracomunitario
 VATIntraShort=NIF intra.
 VATIntraSyntaxIsValid=Sintaxis válida
-VATIntraValueIsValid=Valor válido
 ProspectCustomer=Cliente potencial/Cliente
 Prospect=Cliente potencial
 CustomerCard=Ficha cliente
@@ -261,7 +262,9 @@ AddContactAddress=Crear contacto/dirección
 EditContact=Editar contacto
 EditContactAddress=Editar contacto/dirección
 Contact=Contacto
+ContactId=Id contacto
 ContactsAddresses=Contactos/Direcciones
+FromContactName=Nombre:
 NoContactDefinedForThirdParty=Ningún contacto definido para este tercero
 NoContactDefined=Ningún contacto definido
 DefaultContact=Contacto por defecto
@@ -284,7 +287,7 @@ CompanyDeleted=La empresa "%s" ha sido eliminada
 ListOfContacts=Listado de contactos
 ListOfContactsAddresses=Listado de contactos/direcciones
 ListOfThirdParties=Listado de terceros
-ShowCompany=Mostrar tercero
+ShowCompany=Show third party
 ShowContact=Mostrar contacto
 ContactsAllShort=Todos (sin filtro)
 ContactType=Tipo de contacto
@@ -294,6 +297,7 @@ ContactForProposals=Contacto de presupuestos
 ContactForContracts=Contacto de contratos
 ContactForInvoices=Contacto de facturas
 NoContactForAnyOrder=Este contacto no es contacto de ningún pedido
+NoContactForAnyOrderOrShipments=Este contacto no es contacto de ningún pedido o envío
 NoContactForAnyProposal=Este contacto no es contacto de ningún presupuesto
 NoContactForAnyContract=Este contacto no es contacto de ningún contrato
 NoContactForAnyInvoice=Este contacto no es contacto de ninguna factura
@@ -352,9 +356,9 @@ ExportCardToFormat=Exportar ficha a formato
 ContactNotLinkedToCompany=Contacto no vinculado a un tercero
 DolibarrLogin=Login usuario
 NoDolibarrAccess=Sin acceso de usuario
-ExportDataset_company_1=Terceros (Empresas/asociaciones/personas físicas) y propiedades
+ExportDataset_company_1=Terceros (Empresas / asociaciones / particulares) y propiedades
 ExportDataset_company_2=Contactos de terceros y atributos
-ImportDataset_company_1=Terceros (Empresas/asociaciones/personas físicas) y propiedades
+ImportDataset_company_1=Terceros (Empresas / asociaciones / particulares) y propiedades
 ImportDataset_company_2=Contactos/Direcciones (de terceros o no) y atributos
 ImportDataset_company_3=Cuentas bancarias
 ImportDataset_company_4=Terceros/Comerciales (Afecta a los usuarios comerciales de terceros)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Los terceros han sido fusionados
 SaleRepresentativeLogin=Inicio de sesión del comercial
 SaleRepresentativeFirstname=Nombre del comercial
 SaleRepresentativeLastname=Apellidos del comercial
+ErrorThirdpartiesMerge=Se produjo un error al eliminar los terceros. Por favor, compruebe el log. Los cambios han sido anulados.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index b6d3a1e4cdf..492c5ff7f27 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Impuestos sociales o fiscales
 SocialContributions=Impuestos sociales o fiscales
 SocialContributionsDeductibles=Impuestos sociales o fiscales deducibles
 SocialContributionsNondeductibles=Impuestos sociales o fiscales no deducibles
+LabelContrib=Etiqueta
+TypeContrib=Tipo
 MenuSpecialExpenses=Pagos especiales
 MenuTaxAndDividends=Impuestos y cargas
 MenuSocialContributions=Impuestos sociales/fiscales
@@ -77,9 +79,9 @@ LT1PaymentES=Pago de RE
 LT1PaymentsES=Pagos de RE
 LT2PaymentES=Pago IRPF
 LT2PaymentsES=Pagos IRPF
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATPayment=Pago IVA
+VATPayments=Pagos IVA
+VATRefund=Devolución IVA
 Refund=Devolución
 SocialContributionsPayments=Pagos tasas sociales/fiscales
 ShowVatPayment=Ver pagos IVA
@@ -197,6 +199,6 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basado en
 SameCountryCustomersWithVAT=Informe de clientes nacionales
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basado en que las dos primeras letras del IVA intracomunitario sean las mismas que el código de país de su empresa
 LinkedFichinter=Enlazar a una intervención
-ImportDataset_tax_contrib=Import social/fiscal taxes
-ImportDataset_tax_vat=Import vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+ImportDataset_tax_contrib=Importe impuestos sociales/fiscales
+ImportDataset_tax_vat=Importe pagos IVA
+ErrorBankAccountNotFound=Error: No se encuentra la cuenta bancaria
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 8701a36b96a..7e8e1761115 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Borrar Tarea Programada
 Permission23104 = Ejecutar Taraea programada
 # Admin
 CronSetup= Configuración del módulo Programador
-URLToLaunchCronJobs=URL para ejecutar tareas Cron
+URLToLaunchCronJobs=URL para combrobar y ejecutar tareas
 OrToLaunchASpecificJob=O para ejecutar una tarea en concreto
 KeyForCronAccess=Clave para la URL para ejecutar tareas Cron
 FileToLaunchCronJobs=Comando para ejecutar tareas Cron
@@ -23,7 +23,7 @@ CronCommand=Comando
 CronList=Tareas programadas
 CronDelete=Borrar tareas programadas
 CronConfirmDelete=¿Está seguro de querer eliminar esta tarea programada?
-CronExecute=Lanzar tareas programadas
+CronExecute=Ejecutar tarea programada
 CronConfirmExecute=¿Está seguro de querer ejecutar esta tarea programada ahora?
 CronInfo=Tareas programadas le permite ejecutar tareas que han sido programadas
 CronTask=Tarea
@@ -39,7 +39,7 @@ CronMethod=Metodo
 CronModule=Modulo
 CronNoJobs=Sin trabajos registrados
 CronPriority=Prioridad
-CronLabel=Descripcion
+CronLabel=Etiqueta
 CronNbRun=Núm. ejec.
 CronMaxRun=Nº máximo ejecuciones
 CronEach=Toda(s)
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Vaya al menú "Inicio - Utilidades administraci
 JobDisabled=Tarea desactivada
 MakeLocalDatabaseDumpShort=Copia local de la base de datos
 MakeLocalDatabaseDump=Crear una copia local de la base de datos
+WarningCronDelayed=Atención: para mejorar el rendimiento, cualquiera que sea la próxima fecha de ejecución de las tareas activas, sus tareas pueden retrasarse un máximo de %s horas antes de ejecutarse
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 75493860f21..f7cbc1e3a8d 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, su PHP debe tener instalado el módulo <b>%s</b> para
 ErrorOpenIDSetupNotComplete=Ha configurado Dolibarr para aceptar la autentificación OpenID, pero la URL del servicio OpenID no se encuentra definida en la constante %s
 ErrorWarehouseMustDiffers=El almacén de origen y destino deben de ser diferentes
 ErrorBadFormat=¡El formato es erróneo!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, este miembro aún no está enlazado a un tercero. Enlace el miembro a un tercero existente o cree un tercero nuevo antes de crear la suscripción con la factura.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, hay entregas vinculadas a este envío. No se puede eliminar.
 ErrorCantDeletePaymentReconciliated=No se puede eliminar un pago que ha generado una transacción bancaria que se encuentra conciliada
 ErrorCantDeletePaymentSharedWithPayedInvoice=No se puede eliminar un pago de varias factura con alguna factura con estado Pagada
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=No hay stock suficiente del producto %s
 ErrorStockIsNotEnoughToAddProductOnInvoice=No hay stock suficiente del producto %s para añadirlo a una nueva factura.
 ErrorStockIsNotEnoughToAddProductOnShipment=No hay stock suficiente del producto %s para añadirlo a un nuevo envío.
 ErrorStockIsNotEnoughToAddProductOnProposal=No hay stock suficiente del producto %s para añadirlo a un nuevo presupuesto.
+ErrorFailedToLoadLoginFileForMode=No se puede obtener el archivo de login para el modo '%s'.
+ErrorModuleNotFound=No se ha encontrado el archivo del módulo.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index e5cc6fae98d..75c8157cad9 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Últimos %s días retribuidos
 HolidaysMonthlyUpdate=Actualización mensual
 ManualUpdate=Actualización manual
 HolidaysCancelation=Anulación días libres
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Apellidos empleado
+EmployeeFirstname=Nombre empleado
 
 ## Configuration du Module ##
 LastUpdateCP=Última actualización automática de días retribuidos
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 2be55a711f9..02e3065d30b 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Este PHP soporta sesiones
 PHPSupportPOSTGETOk=Este PHP soporta bien las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que este PHP no soporte las variables POST y/o GET. Compruebe el parámetro <b>variables_order</b> del php.ini.
 PHPSupportGD=Este PHP soporta las funciones gráficas GD.
+PHPSupportCurl=Este PHP soporta Curl
 PHPSupportUTF8=Este PHP soporta las funciones UTF8.
 PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto debería ser suficiente.
 PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
 Recheck=Haga click aquí para realizar un test más exhaustivo
 ErrorPHPDoesNotSupportSessions=Su instalación PHP no soporta las sesiones. Esta funcionalidad es necesaria para hacer funcionar a Dolibarr. Compruebe su configuración de PHP.
 ErrorPHPDoesNotSupportGD=Este PHP no soporta las funciones gráficas GD. Ningún gráfico estará disponible.
+ErrorPHPDoesNotSupportCurl=Su PHP no soporta Curl.
 ErrorPHPDoesNotSupportUTF8=Este PHP no soporta las funciones UTF8. Resuelva el problema antes de instalar Dolibarr ya que no podrá funcionar correctamente.
 ErrorDirDoesNotExists=El directorio <b>%s</b> no existe o no es accesible.
 ErrorGoBackAndCorrectParameters=Vuelva atrás y corrija los parámetros inválidos...
@@ -133,6 +135,10 @@ ActivateModule=Activación del módulo %s
 ShowEditTechnicalParameters=Pulse aquí para ver/editar los parámetros técnicos (modo experto)
 WarningUpgrade=Advertencia: \n¿Ha realizado una copia de seguridad de su base de datos antes? \nEsto es altamente recomendado: por ejemplo, debido a algunos errores en los sistemas de bases de datos (por ejemplo MySQL versión 5.5.40/41/42/43), algunos datos o tablas pueden perderse durante este proceso, por lo que es altamente recomendado tener un volcado completo de la base de datos antes de iniciar la actualización.\n\nHaga clic en Aceptar para iniciar el proceso de actualización...
 ErrorDatabaseVersionForbiddenForMigration=Su versión de base de datos es la %s. Tiene un error crítico que hace que pierda los datos si cambia la estructura de la base de datos, como esto es necesario para el proceso de actualización, este no se va a realizar hasta que actualice su base de datos a una versión mayor con el error subsanado (listado de versiones conocidas con este error: %s)
+KeepDefaultValuesWamp=Está utilizando el asistente de instalación DoliWamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
+KeepDefaultValuesDeb=Está utilizando el asistente de instalación Dolibarr de un paquete Linux (Ubuntu, Debian, Fedora...), los valores propuestos aquí están optimizados. Sólo será necesaria la contraseña del propietario de la base de datos a crear. Cambie la otra información sólamente si está seguro de ello.
+KeepDefaultValuesMamp=Está utilizando el asistente de instalación DoliMamp, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
+KeepDefaultValuesProxmox=Está utilizando el asistente de instalación Dolibarr desde una máquina virtual Proxmox, los valores propuestos aquí están optimizados. Cambielos solamente si está seguro de ello.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Actualización de los datos de acciones sobre element
 MigrationPaymentMode=Actualización de los modos de pago
 MigrationCategorieAssociation=Actualización de las categorías
 MigrationEvents=Migración de eventos para agregar propietario de evento en la tabla de asignacion
+MigrationRemiseEntity=Actualizando el campo entity de llx_societe_remise
+MigrationRemiseExceptEntity=Actualizando el campo entity de llx_societe_remise_except
 MigrationReloadModule=Recargar módulo %s
 ShowNotAvailableOptions=Mostrar opciones no disponibles
 HideNotAvailableOptions=Ocultar opciones no disponibles
diff --git a/htdocs/langs/es_ES/interventions.lang b/htdocs/langs/es_ES/interventions.lang
index e71d26cc0ae..2dbfdd65649 100644
--- a/htdocs/langs/es_ES/interventions.lang
+++ b/htdocs/langs/es_ES/interventions.lang
@@ -14,12 +14,12 @@ DeleteIntervention=Eliminar intervención
 ValidateIntervention=Validar intervención
 ModifyIntervention=Modificar intervención
 DeleteInterventionLine=Eliminar línea de intervención
-CloneIntervention=Clone intervention
+CloneIntervention=Cerrar intervención
 ConfirmDeleteIntervention=¿Está seguro de querer eliminar esta intervención?
 ConfirmValidateIntervention=¿Está seguro de querer validar esta intervención bajo la referencia <b>%s</b>?
 ConfirmModifyIntervention=¿Está seguro de querer modificar esta intervención?
 ConfirmDeleteInterventionLine=¿Está seguro de querer eliminar esta linea?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention ?
+ConfirmCloneIntervention=¿Está seguro de querer cerrar esta intervención?
 NameAndSignatureOfInternalContact=Nombre y firma del participante:
 NameAndSignatureOfExternalContact=Nombre y firma del cliente:
 DocumentModelStandard=Documento modelo estándar para intervenciones
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Contacto cliente seguimiento intervenci
 # Modele numérotation
 PrintProductsOnFichinter=Imprimir también líneas de tipo "producto" (no solamente servicios) en las fichas de intervención
 PrintProductsOnFichinterDetails=Intervenciones generadas desde pedidos
+UseServicesDurationOnFichinter=Usar la duración de los servicios para las intervenciones generadas de de los pedidos
 InterventionStatistics=Estadísticas de intervenciones
 NbOfinterventions=Nº de fichas de intervención
 NumberOfInterventionsByMonth=Nº de fichas de intervención por mes (fecha de validación)
diff --git a/htdocs/langs/es_ES/ldap.lang b/htdocs/langs/es_ES/ldap.lang
index 007722b8fa1..b0ec3358ba8 100644
--- a/htdocs/langs/es_ES/ldap.lang
+++ b/htdocs/langs/es_ES/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Fecha primera adhesión
 LDAPFieldFirstSubscriptionAmount=Importe primera adhesión
 LDAPFieldLastSubscriptionDate=Fecha última adhesión
 LDAPFieldLastSubscriptionAmount=Importe última adhesión
+LDAPFieldSkype=Id Skype
+LDAPFieldSkypeExample=Ejemplo: nombreskype
 UserSynchronized=Usuario sincronizado
 GroupSynchronized=Grupo sincronizado
 MemberSynchronized=Miembro sincronizado
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index 87dbe9625aa..db0bdbcff65 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Leido
 YourMailUnsubcribeOK=El correo electrónico <b>%s</b> es correcta desuscribe.
 ActivateCheckReadKey=Clave usada para cifrar la URL utilizada para la función de "Darse de baja"
 EMailSentToNRecipients=E-Mail enviado a %s destinatarios.
+EMailSentForNElements=E-Mail enviado a %s elementos.
 XTargetsAdded=<b>%s</b> destinatarios agregados a la lista
-OnlyPDFattachmentSupported=Si el documento PDF ya se generó para la factura, se adjuntará al e-mail. Si no, no se enviará ningún correo electrónico (también, tenga en cuenta que en esta versión sólo se admiten pdf de facturas como archivo adjunto en envío masivo).
+OnlyPDFattachmentSupported=Si el el documento PDF ya ha sido generado por el objeto a enviar, se adjuntará al e-mail, de lo contrario no se enviará el e-mail. (tenga en cuenta que en esta versión sólo se adminten documentos PDFcomo archivos adjuntos  para e-mails en masa).
 AllRecipientSelected=Todos los terceros seleccionados y si hay e-mail definido
 ResultOfMailSending=Resultado del envío masivo de e-mails
 NbSelected=Nº seleccionados
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Valor máxio
 AdvTgtSearchDtHelp=Use un intervalo para seleccionar una fecha
 AdvTgtStartDt=Fecha inicio
 AdvTgtEndDt=Fecha fin
-AdvTgtTypeOfIncudeHelp=Destinatario el e-mail del tercero y el e-mail del contacto del tercero, o solamente el e-mail del tercero o el e-mail del contacto
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Tipo de e-mail destinatario
 AdvTgtContactHelp=Usar solamente si ha escogido contacto en "Tipo de e-mail destinatario"
 AddAll=Añadir todo
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index cf2b2a82bb7..a047165d33e 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -67,6 +67,7 @@ SelectDate=Seleccione una fecha
 SeeAlso=Ver también %s
 SeeHere=Vea aquí
 BackgroundColorByDefault=Color de fondo
+FileRenamed=El archivo ha sido renombrado correctamente
 FileUploaded=El archivo se ha subido correctamente
 FileWasNotUploaded=Un archivo ha sido seleccionado para adjuntarlo, pero aún no se ha subido. Haga clic en "Adjuntar este archivo" para ello.
 NbOfEntries=Nº de entradas
@@ -245,6 +246,10 @@ DateBuild=Fecha generación del informe
 DatePayment=Fecha pago
 DateApprove=Fecha de aprobación
 DateApprove2=Fecha de aprobación (segunda aprobación)
+UserCreation=Usuario creador
+UserModification=Usuario modificador
+UserCreationShort=U. Crea.
+UserModificationShort=U. Modif.
 DurationYear=año
 DurationMonth=mes
 DurationWeek=semana
@@ -256,6 +261,7 @@ DurationDays=días
 Year=Año
 Month=Mes
 Week=Semana
+WeekShort=Semana
 Day=Día
 Hour=Hora
 Minute=Minuto
@@ -278,6 +284,7 @@ MonthOfDay=Mes del día
 HourShort=H
 MinuteShort=min
 Rate=Tipo
+CurrencyRate=Tasa de conversión de moneda
 UseLocalTax=Incluir tasas
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Volver al listado
 GoBack=Volver atrás
 CanBeModifiedIfOk=Puede modificarse si es valido
 CanBeModifiedIfKo=Puede modificarse si no es valido
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Registro modificado con éxito
 RecordsModified=%s registros modificados
+RecordsDeleted=%s registros eliminados
 AutomaticCode=Creación automática de código
 FeatureDisabled=Función desactivada
 MoveBox=Mover panel
@@ -575,6 +585,7 @@ NotEnoughPermissions=No tiene permisos para esta acción
 SessionName=Nombre sesión
 Method=Método
 Receive=Recepción
+CompleteOrNoMoreReceptionExpected=Completado o no se espera más
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca recibido
@@ -598,6 +609,7 @@ DisabledModules=Módulos desactivados
 For=Para
 ForCustomer=Para cliente
 Signature=Firma
+DateOfSignature=Fecha de la firma
 HidePassword=Mostrar comando con contraseña oculta
 UnHidePassword=Mostrar comando con contraseña a la vista
 Root=Raíz
@@ -641,6 +653,15 @@ NewAttribute=Nuevo atributo
 AttributeCode=Código atributo
 URLPhoto=Url de la foto/logo
 SetLinkToAnotherThirdParty=Vincular a otro tercero
+LinkTo=Enlazar a
+LinkToProposal=Enlazar a pedido
+LinkToOrder=Enlazar a pedido
+LinkToInvoice=Enlazar a factura
+LinkToSupplierOrder=Enlazar a pedido a proveedor
+LinkToSupplierProposal=Enlazar a presupuesto de proveedor
+LinkToSupplierInvoice=Enlazar a factura de proveedor
+LinkToContract=Enlazar a contrato
+LinkToIntervention=Enlazar a intervención
 CreateDraft=Crear borrador
 SetToDraft=Volver a borrador
 ClickToEdit=Clic para editar
@@ -701,6 +722,9 @@ RelatedObjects=Objetos relacionados
 ClassifyBilled=Clasificar facturado
 Progress=Progreso
 ClickHere=Haga clic aquí
+FrontOffice=Front office
+BackOffice=Back office
+View=Ver
 # Week day
 Monday=Lunes
 Tuesday=Martes
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 5e9f736b3ea..31cc6821bbf 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=El margen  debe ser un valor numérico
 markRateShouldBeLesserThan100=El margen tiene que ser menor que 100
 ShowMarginInfos=Mostrar info de márgenes
 CheckMargins=Detalles de márgenes
+MarginPerSaleRepresentativeWarning=El informe de margen por usuario usa el enlace entre terceros y comerciales para calcular el margen de cada usuario. Debido a que algunos terceros pueden no estar vinculados a un comercial y algunos terceros pueden estar relacionados con varios usuarios, algunos márgenes pueden no aparecer en este informe o podrá aparecer en varias líneas diferentes.
diff --git a/htdocs/langs/es_ES/oauth.lang b/htdocs/langs/es_ES/oauth.lang
index 07324dc2217..fd0c14775ae 100644
--- a/htdocs/langs/es_ES/oauth.lang
+++ b/htdocs/langs/es_ES/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configuración Oauth
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No hay token de acceso guardado en la base de datos local
 HasAccessToken=Se ha generado y guardado en la base de datos local un token
 NewTokenStored=Token recibido y guardado
@@ -9,7 +11,16 @@ RequestAccess=Haga clic aquí para consultar/renovar acceso y recibir un nuevo t
 DeleteAccess=Haga clic aquí para eliminar el token
 UseTheFollowingUrlAsRedirectURI=Utilice la siguiente dirección URL como redireccionamiento URI al crear su credencial de su proveedor OAuth:
 ListOfSupportedOauthProviders=Indique aquí la credencial proporcionada por su proveedor de OAuth2. Sólo son mostrados los proveedores OAuth2 soportados. Esta configuración puede ser usada por otros módulos que requieren autenticación OAuth2.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secreto
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 4191cbb0aee..f47030a10bc 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Sus pedidos han sido creados
 OrderFail=Se ha producido un error durante la creación de sus pedidos
 CreateOrders=Crear pedidos
 ToBillSeveralOrderSelectCustomer=Para crear una factura para numerosos pedidos, haga primero click sobre el cliente y luego elija "%s".
+CloseReceivedSupplierOrdersAutomatically=Cerrar el pedido automáticamente a "%s" si se han recibido todos los productos
diff --git a/htdocs/langs/es_ES/printing.lang b/htdocs/langs/es_ES/printing.lang
index 89ca89f5804..48865a736a7 100644
--- a/htdocs/langs/es_ES/printing.lang
+++ b/htdocs/langs/es_ES/printing.lang
@@ -18,10 +18,6 @@ UserConf=Configuración por usuario
 PRINTGCP_INFO=Configuración de la API de Google OAuth
 PRINTGCP_AUTHLINK=Autenticación
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token expirado
-PRINTGCP_TOKEN_EXPIRE_AT=Token expira el 
-PRINTGCP_DELETE_TOKEN=Eliminar token guardado
 PrintGCPDesc=Este driver le permite enviar documentos directamente a una impresora con Google Cloud Print.
 GCP_Name=Nombre
 GCP_displayName=Nombre a mostrar
@@ -51,5 +47,5 @@ IPP_Supported=Tipo de comunicación
 DirectPrintingJobsDesc=Esta página lista los trabajos encontrados en las impresoras disponibles.
 GoogleAuthNotConfigured=Configuración de Google OAuth no realizada. Habilite el módulo de OAuth y establezca un Google ID / Secreto.
 GoogleAuthConfigured=Encontrada credenciales de Google OAuth en la configuración del módulo de OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintingDriverDescprintgcp=Configuración variables del driver de impresión Google Cloud Print.
+PrintTestDescprintgcp=Listado de impresoras para Google Cloud Print.
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 47b2eb3cba7..2b6c38c3492 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lote/Serie
 atleast1batchfield=Fecha de caducidad o Fecha de venta o Lote/Numero de Serie
 batch_number=Número Lote/Serie
 BatchNumberShort=Lote/Serie
-l_eatby=Fecha de caducidad
-l_sellby=Fecha límite de venta
+EatByDate=Fecha de caducidad
+SellByDate=Fecha límite de venta
 DetailBatchNumber=Detalles del lote/serie
 DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
 printBatch=Lote/Serie %s
@@ -19,3 +19,6 @@ printQty=Cant.: %d
 AddDispatchBatchLine=Añada una línea para despacho por caducidad
 WhenProductBatchModuleOnOptionAreForced=Si el módulo de Lotes/Series está activado, el incremento/decremento de stock es forzado a lo último escogido y no puede editarse. Otras opciones pueden definirse si se necesita
 ProductDoesNotUseBatchSerial=Este producto no usa lotes/series
+ProductLotSetup=Configuración del módulo lotes/series
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 8cadfeaf6c6..3bbdd71f92a 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -32,8 +32,8 @@ ServicesOnSellAndOnBuy=Servicios a la venta o en compra
 LastModifiedProductsAndServices=Últimos %s productos/servicios modificados
 LastRecordedProducts=Últimos %s productos registrados
 LastRecordedServices=Últimos %s servicios registrados
-CardProduct0=Product card
-CardProduct1=Service card
+CardProduct0=Ficha producto
+CardProduct1=Ficha servicio
 Stock=Stock
 Stocks=Stocks
 Movements=Movimientos
@@ -59,6 +59,8 @@ SellingPriceHT=PVP sin IVA
 SellingPriceTTC=PVP con IVA
 CostPriceDescription=Este precio (neto de impuestos) se puede utilizar para almacenar la cantidad promedio de este costo del producto para su empresa. Puede ser cualquier precio calculado por usted, por ejemplo, desde el precio medio de compra, más costo promedio de producción y distribución.
 CostPriceUsage=En una versión futura, este valor podría ser utilizado para el cálculo del margen.
+SoldAmount=Importe ventas
+PurchasedAmount=Importe compras
 NewPrice=Nuevo precio
 MinPrice=Precio de venta mín.
 CantBeLessThanMinPrice=El precio de venta no debe ser inferior al mínimo para este producto (%s sin IVA). Este mensaje puede estar causado por un descuento muy grande.
@@ -85,7 +87,7 @@ SetDefaultBarcodeType=Defina el tipo de código de barras
 BarcodeValue=Valor del código de barras
 NoteNotVisibleOnBill=Nota (no visible en las facturas, presupuestos, etc.)
 ServiceLimitedDuration=Si el servicio es de duración limitada :
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Varios segmentos de precios por producto/servicio (cada cliente está en un segmento)
 MultiPricesNumPrices=Nº de precios
 AssociatedProductsAbility=Activar productos compuestos
 AssociatedProducts=Producto compuesto
@@ -176,13 +178,13 @@ AlwaysUseNewPrice=Usar siempre el precio actual
 AlwaysUseFixedPrice=Usar el precio fijado
 PriceByQuantity=Precios diferentes por cantidad
 PriceByQuantityRange=Rango cantidad
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
+MultipriceRules=Reglas para segmento de precios
+UseMultipriceRules=Use las reglas de segmentación de precios (definidas en la configuración de módulo de productos) para autocalcular los precios de todos los demás segmentos de acuerdo con el primer segmento
 PercentVariationOver=%% variación sobre %s
 PercentDiscountOver=%% descuento sobre %s
 ### composition fabrication
 Build=Fabricar
-ProductsMultiPrice=Products and prices for each price segment
+ProductsMultiPrice=Productos y precios para cada segmento de precios
 ProductsOrServiceMultiPrice=Precios a clientes (productos o servicios, multiprecios)
 ProductSellByQuarterHT=Facturación trimestral de productos antes de impuestos
 ServiceSellByQuarterHT=Facturación trimestral de servicios antes de impuestos
@@ -197,15 +199,15 @@ PrintsheetForOneBarCode=Imprimir varias etiquetas por código de barras
 BuildPageToPrint=Generar página a imprimir
 FillBarCodeTypeAndValueManually=Rellenar tipo y valor del código de barras manualmente.
 FillBarCodeTypeAndValueFromProduct=Rellenar tipo y valor del código de barras de un producto.
-FillBarCodeTypeAndValueFromThirdParty=Rellenar tipo y el valor del código de barras de un tercero
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definición de tipo o valor de código de barras incompleta en el producto %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definición de tipo o valor de código de barras incompleta en el tercero %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Información del código de barras del producto %s:
-BarCodeDataForThirdparty=Información del código de barras del tercero %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definir códigos de barras para todos los registros (machacará los valores de códigos de barras ya registrados)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
+PriceByCustomer=Cambiar precios para cada cliente
+PriceCatalogue=Un precio único de venta por producto/servicio
+PricingRule=Reglas para precios de venta
 AddCustomerPrice=Añadir precio a cliente
 ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes
 PriceByCustomerLog=Historial de precios a clientes
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 1a39a589e76..b98cfd71041 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=Listado de tareas
 GoToListOfTimeConsumed=Ir al listado de tiempos consumidos
 GoToListOfTasks=Ir al listado de tareas
 ListProposalsAssociatedProject=Listado de presupuestos asociados al proyecto
-ListOrdersAssociatedProject=Listado de pedidos asociados al proyecto
-ListInvoicesAssociatedProject=Listado de facturas asociadas al proyecto
-ListPredefinedInvoicesAssociatedProject=Listado de plantillas de facturas a clientes asociadas al proyecto
-ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedores asociados al proyecto
-ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedor asociados al proyecto
+ListOrdersAssociatedProject=Listado de pedidos de clientes asociados al proyecto
+ListInvoicesAssociatedProject=Listado de facturas a clientes asociadas al proyecto
+ListPredefinedInvoicesAssociatedProject=Listado de facturas predefinidas asociadas al proyecto
+ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedor asociados al proyecto
+ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedores asociadas al proyecto
 ListContractAssociatedProject=Listado de contratos asociados al proyecto
 ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto
 ListExpenseReportsAssociatedProject=Listado de informes de gastos asociados al proyecto
@@ -123,6 +123,7 @@ ProjectReportDate=Cambiar las fechas de las tareas en función de la fecha de in
 ErrorShiftTaskDate=Se ha producido un error en el cambio de las fechas de las tareas
 ProjectsAndTasksLines=Proyectos y tareas
 ProjectCreatedInDolibarr=Proyecto %s creado
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=La tarea %s fue creada
 TaskModifiedInDolibarr=La tarea %s fue modificada
 TaskDeletedInDolibarr=La tarea %s fue eliminada
@@ -153,7 +154,7 @@ PlannedWorkload=Carga de trabajo prevista
 PlannedWorkloadShort=Carga de trabajo
 ProjectReferers=Items relacionados
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
-FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempos
+FirstAddRessourceToAllocateTime=Asignar un usuario a la tarea para asignar tiempo
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
 InputPerAction=Entrada por acción
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Proyectos/oportunidades abiertos por estado opor
 ProjectsStatistics=Estadísticas de proyectos/leads
 TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en esta tarea.
 IdTaskTime=Id
-YouCanCompleteRef=Si quiere completar la referencia con alguna información (para usarla como filtros de búsqueda), se recomienda añadir un caracter - como separación, por lo que la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir añadir claves de búsqueda en la etiqueta.
+YouCanCompleteRef=Si desea completar la referencia con alguna información (para usarlo como filtros de búsqueda), se recomienda añadir un caracter - para separarlo, la numeración automática seguirá funcionando correctamente para los próximos proyectos. Por ejemplo %s-ABC. También puede preferir añadir claves de búsqueda en la etiqueta. Pero la mejor práctica puede ser añadir un campo dedicado, también llamados atributos adicionales.
 OpenedProjectsByThirdparties=Proyectos abiertos por terceros
 OnlyOpportunitiesShort=Solamente oportunidades
 OpenedOpportunitiesShort=Oportunidades abiertas
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index 4e37236cc57..941cce6e6ae 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nuevo pago
 SalaryPayment=Pago de salario
 SalariesPayments=Pagos de salarios
 ShowSalaryPayment=Ver pago
-THM=Precio medio por hora
-TJM=Precio medio por día
+THM=Tasa media por hora
+TJM=Tasa media por día
 CurrentSalary=Salario actual
 THMDescription=Este valor puede ser usado para calcular los costos de tiempo consumidos en un proyecto indicados por los usuarios si se utiliza el módulo proyectos
 TJMDescription=Este valor actualmente es informativo y no se utiliza para realizar cualquier tipo de cálculo
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index d86d1ca53dd..ddf748f6223 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Eliminar envío
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks por lotes/serie
+LotSerial=Lotes/Series
+LotSerialList=Listado de lotes/series
 Movements=Movimientos
 ErrorWarehouseRefRequired=El nombre de referencia del almacén es obligatorio
 ListOfWarehouses=Listado de almacenes
@@ -43,6 +45,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
+AllowAddLimitStockByWarehouse=Permitir indicar límite y stock deseado por producto y almacén
 IndependantSubProductStock=Stock del producto y stock del subproducto son independientes
 QtyDispatched=Cantidad recibida
 QtyDispatchedShort=Cant. recibida
@@ -132,3 +135,9 @@ OpenAll=Abierto para todas las acciones
 OpenInternal=Abierto para acciones internas
 OpenShipping=Abierto para envíos
 OpenDispatch=Abierto para despachar
+UseDispatchStatus=Usar estado de envío (aprobado/rechazado)
+OptionMULTIPRICESIsOn=La opción "varios precios por segmento" está activada. Esto significa que un producto tiene varios precio de venta, por lo que el valor de venta no puede calcularse
+ProductStockWarehouseCreated=Límite stock para alertas y stock óptimo deseado creado correctamente
+ProductStockWarehouseUpdated=Límite stock para alertas y stock óptimo deseado actualizado correctamente
+ProductStockWarehouseDeleted=Límite stock para alertas y stock óptimo deseado eliminado correctamente
+AddNewProductStockWarehouse=Indicar nuevo límite para alertas y stock óptimo deseado
diff --git a/htdocs/langs/es_ES/supplier_proposal.lang b/htdocs/langs/es_ES/supplier_proposal.lang
index 51e701e4f4b..39dda9016ac 100644
--- a/htdocs/langs/es_ES/supplier_proposal.lang
+++ b/htdocs/langs/es_ES/supplier_proposal.lang
@@ -12,7 +12,7 @@ RequestsOpened=Presupuestos abiertos
 SupplierProposalArea=Área presupuestos de proveedores
 SupplierProposalShort=Presupuesto de proveedor
 SupplierProposals=Presupuestos de proveedor
-SupplierProposalsShort=Supplier proposals
+SupplierProposalsShort=Presupuestos de proveedor
 NewAskPrice=Nuevo presupuesto
 ShowSupplierProposal=Mostrar presupuesto
 AddSupplierProposal=Crear un presupuesto
@@ -47,7 +47,8 @@ DefaultModelSupplierProposalCreate=Modelo por defecto
 DefaultModelSupplierProposalToBill=Modelo por defecto al cerrar un presupuesto (aceptado)
 DefaultModelSupplierProposalClosed=Modelo por defecto al cerrar un presupuesto (rechazado)
 ListOfSupplierProposal=Listado de presupuestos de proveedores
+ListSupplierProposalsAssociatedProject=Listado de presupuestos de proveedores asociados al proyecto
 SupplierProposalsToClose=Presupuestos de proveedor a cerrar
 SupplierProposalsToProcess=Presupuestos de proveedor a procesar
-LastSupplierProposals=Last price requests
-AllPriceRequests=All requests
+LastSupplierProposals=Últimos presupuestos
+AllPriceRequests=Todos los presupuestos
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index eec3e7a33f9..9c7253e3c02 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -7,13 +7,13 @@ History=Histórico
 ListOfSuppliers=Listado de proveedores
 ShowSupplier=Mostrar proveedor
 OrderDate=Fecha de pedido
-BuyingPriceMin=Precio mínimo de compra
-BuyingPriceMinShort=Precio de compra mín.
+BuyingPriceMin=Mejor precio de compra
+BuyingPriceMinShort=Mejor precio de compra
 TotalBuyingPriceMinShort=Total de los precios de compra de los subproductos
 TotalSellingPriceMinShort=Total de los precios de venta de los subproductos
 SomeSubProductHaveNoPrices=Algunos subproductos no tienen precio definido
-AddSupplierPrice=Añadir precio de proveedor
-ChangeSupplierPrice=Modificar precio de proveedor
+AddSupplierPrice=Añadir precio de compra
+ChangeSupplierPrice=Cambiar precio de compra
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de proveedor ya está asociada a la referencia: %s
 NoRecordedSuppliers=Sin proveedores registrados
 SupplierPayment=Pago a proveedor
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Listado de pedidos a proveedor
 MenuOrdersSupplierToBill=Pedidos a proveedor a facturar
 NbDaysToDelivery=Tiempo de entrega en días
 DescNbDaysToDelivery=El mayor retraso en las entregas de productos de este pedido
-UseDoubleApproval=Usar doble aprobación si la base imponible (sin IVA) es mayor que (La segunda aprobación puede ser realizada por cualquier usuario con permisos. Dejar a 0 para que no haya doble aprobación)
 SupplierReputation=Reputación del proveedor
 DoNotOrderThisProductToThisSupplier=No realizar pedidos
 NotTheGoodQualitySupplier=Mala calidad
 ReputationForThisProduct=Reputación
+BuyerName=Nombre del comprador
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 751f745a6dc..c6e279f4ad9 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Horas semanales
 ColorUser=Color para el usuario
 DisabledInMonoUserMode=Desactivado en modo mantenimiento
 UserAccountancyCode=Código contable usuario
+UserLogoff=Usuario desconectado
+UserLogged=Usuario conectado
+DateEmployment=Fecha de contratación
diff --git a/htdocs/langs/es_ES/website.lang b/htdocs/langs/es_ES/website.lang
index 3753822618b..030523ecee5 100644
--- a/htdocs/langs/es_ES/website.lang
+++ b/htdocs/langs/es_ES/website.lang
@@ -12,6 +12,7 @@ EditMenu=Editar menu
 EditPageMeta=Editar Meta
 EditPageContent=Editar contenido
 Website=Sitio web
+Webpage=Página web
 AddPage=Añadir página
 PreviewOfSiteNotYetAvailable=Vista previa de su sitio web <strong>%s</strong> todavía no disponible. Debe de añadir primero una página.
 RequestedPageHasNoContentYet=La página solicitada con id %s no tiene contenido o el archivo de cache .tlp.php ha sido eliminado. Edite el contenido de la página para solucionarlo
@@ -22,4 +23,6 @@ ViewPageInNewTab=Ver página en una pestaña nueva
 SetAsHomePage=Establecer como Página de inicio
 RealURL=URL Real
 ViewWebsiteInProduction=Ver sitio web usando la URL de inicio
-SetHereVirtualHost=Si puede establecer, en su servidor web, un servidor virtual dedicado con un directorio raíz en <strong>%s</strong>, defina aquí el nombre de host virtual para la vista previa que hará uso de este acceso directo en lugar de la envolura Dolibarr.
+SetHereVirtualHost=Si se puede establecer, en su servidor web, un servidor virtual dedicado con un directorio raíz en <strong>%s</strong>, indique aquí el nombre de host virtual para poder realizar la vista previa, se puede hacer también uso de este acceso al servidor web directo y no sólo usando el servidor Dolibarr.
+PreviewSiteServedByWebServer=Vista previa de %s en una nueva pestaña. %s será servido por un servidor web externo (como Apache, Nginx, IIS). Antes debe instalar y configurar este servidor<br> URL de %s servido por el servidor externo: <br> <Strong>%s</strong>
+PreviewSiteServedByDolibarr=Vista previa de %s en una nueva pestaña. %s será servido por Dolivarr y no se necesitará un servidor web externo (como Apache, Nginx, IIS). El inconveniente será que las URL de las páginas usarán la ruta de su Dolibarr<br> URL de %s servido por el Dolibarr: <br> <Strong>%s</strong>
diff --git a/htdocs/langs/es_ES/withdrawals.lang b/htdocs/langs/es_ES/withdrawals.lang
index 22b2b562e23..d4a6a4ef2a2 100644
--- a/htdocs/langs/es_ES/withdrawals.lang
+++ b/htdocs/langs/es_ES/withdrawals.lang
@@ -1,12 +1,13 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Área domiciliaciones de clientes
+CustomersStandingOrdersArea=Área domiciliaciones
+SuppliersStandingOrdersArea=Área domiciliaciones
 StandingOrders=Domiciliaciones
 StandingOrder=Domiciliación
 NewStandingOrder=Nueva domiciliación
 StandingOrderToProcess=A procesar
-WithdrawalsReceipts=Órdenes domiciliadas
-WithdrawalReceipt=Orden domiciliación
-LastWithdrawalReceipts=Últimas %s órdenes domiciliadas
+WithdrawalsReceipts=Domiciliaciones
+WithdrawalReceipt=Domiciliación
+LastWithdrawalReceipts=Últimas %s domiciliaciones
 WithdrawalsLines=Lineas de domiciliación
 RequestStandingOrderToTreat=Peticiones de domiciliaciones a procesar
 RequestStandingOrderTreated=Peticiones de domiciliaciones procesadas
@@ -21,7 +22,7 @@ ResponsibleUser=Usuario responsable de las domiciliaciones
 WithdrawalsSetup=Configuración de las domiciliaciones
 WithdrawStatistics=Estadísticas de domiciliaciones
 WithdrawRejectStatistics=Estadísticas de domiciliaciones devueltas
-LastWithdrawalReceipt=Últimas %s órdenes domiciliadas
+LastWithdrawalReceipt=Las %s últimas domiciliaciones
 MakeWithdrawRequest=Realizar una petición de domiciliación
 ThirdPartyBankCode=Código banco del tercero
 NoInvoiceCouldBeWithdrawed=No se ha domiciliado ninguna factura. Asegúrese de que las facturas son de empresas con los datos de cuentas bancarias correctos.
@@ -46,7 +47,7 @@ StatusRefused=Devuelta
 StatusMotif0=No especificado
 StatusMotif1=Provisión insuficiente
 StatusMotif2=Orden del cliente
-StatusMotif3=Sin orden de domiciliación
+StatusMotif3=Sin domiciliaciones
 StatusMotif4=Cuenta bloqueada
 StatusMotif5=Cuenta inexistente
 StatusMotif6=Cuenta sin saldo
@@ -61,7 +62,7 @@ NotifyCredit=Abono de domiciliación
 NumeroNationalEmetter=Número Nacional del Emisor
 WithBankUsingRIB=Para las cuentas bancarias que utilizan CCC
 WithBankUsingBANBIC=Para las cuentas bancarias que utilizan el código BAN/BIC/SWIFT
-BankToReceiveWithdraw=Cuenta bancaria receptora de las domiciliaciones
+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
@@ -72,10 +73,25 @@ SetToStatusSent=Clasificar como "Archivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Se crearán los pagos de las facturas y las clasificará como pagadas
 StatisticsByLineStatus=Estadísticas por estados de líneas
 RUM=RUM
+RUMLong=Referencia Única de Mandato
 RUMWillBeGenerated=El número RUM se generará una vez que se guarde la información de la cuenta bancaria
 WithdrawMode=Modo domiciliación (FRST o RECUR)
 WithdrawRequestAmount=Importe petición domiciliación:
 WithdrawRequestErrorNilAmount=No es posible crear una petición de domiciliación con importe nulo
+SepaMandate=Mandato SEPA
+SepaMandateShort=SEPA Mandate
+PleaseReturnMandate=Please return this mandate form by email to %s or by mail to
+SEPALegalText=Al firmar este mandato, autoriza (A) %s a enviar instrucciones a su banco para cargar en su cuenta y (B) a su banco para cargar en su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a una devolución en los términos y condiciones de su contrato con su banco. Una devolución debe reclamarse dentro de 8 semanas a partir de la fecha en que se hizo el cargo a su cuenta. Sus derechos con respecto al mandato anterior se explican en un comunicado que se puede obtener de su banco.
+CreditorIdentifier=Identificador Acreedor
+CreditorName=Nombre acreedor
+SEPAFillForm=(B) Rellene todos los campos marcados c *
+SEPAFormYourName=Su nombre
+SEPAFormYourBAN=IBAN de su banco
+SEPAFormYourBIC=BIC de su banco
+SEPAFrstOrRecur=Tipo de pago
+ModeRECUR=Pago recurrente
+ModeFRST=Pago único
+PleaseCheckOne=Escoja solamente uno
 
 ### Notifications
 InfoCreditSubject=Abono de domiciliación %s por el banco
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index c2b2220eaba..8ef90865590 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuración del módulo Flujo de trabajo
 WorkflowDesc=Este módulo está diseñado para modificar el comportamiento de acciones automáticas en la aplicación. Por defecto, el flujo de trabajo está abierto (se pueden hacer cosas en el orden que se desee). Puede activar las acciones automáticas que le interesen.
 ThereIsNoWorkflowToModify=No hay disponibles modificaciones de flujo de trabajo de los módulos activados.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamen
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturado el presupuesto cuando el pedido de cliente relacionado se clasifique como pagado
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasificar como facturados los pedidos cuando la factura relacionada se clasifique como pagada
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar como facturados los pedidos de cliente relacionados cuando la factura sea validada
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Clasificar como facturado el presupuesto relacionado cuando la factura a cliente sea validada
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Clasificar como enviado el pedido origen en la validación del envío si la cantidad enviada es la misma que la del pedido
diff --git a/htdocs/langs/es_MX/accountancy.lang b/htdocs/langs/es_MX/accountancy.lang
index 0915125fc8f..b25be13345e 100644
--- a/htdocs/langs/es_MX/accountancy.lang
+++ b/htdocs/langs/es_MX/accountancy.lang
@@ -4,30 +4,15 @@ ACCOUNTING_EXPORT_DATE=Formato de fecha para el archivo de exportación
 ACCOUNTING_EXPORT_PIECE=Exportar el número de pieza
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportación con cuenta global
 AccountAccountingSuggest=Sugerencia de cuenta contable
-Ventilation=Desglose
-CustomersVentilation=Desglose de clientes
-SuppliersVentilation=Desglose de proveedores
 Reports=Reportes
-UpdateMvts=Modificación de un movimiento
-WriteBookKeeping=Cuentas de registro en el libro mayor
 Bookkeeping=Libro mayor
 CAHTF=Total de compra al proveedor antes de impuestos
-InvoiceLines=Partidas de factura por contabilizar
-InvoiceLinesDone=Partidas de factura contabilizadas
-IntoAccount=Contabilizar en la cuenta contable
 Processing=Procesando
 EndProcessing=Fin del proceso
-AnyLineVentilate=No hay partidas por contabilizar
 SelectedLines=Partidas seleccionadas
 Lineofinvoice=Partida de factura
-VentilatedinAccount=Contabilizado exitosamente en la cuenta contable
-NotVentilatedinAccount=No contabilizado en la cuenta contable
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a ser desglosados mostrados por página (máximo recomendado: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Empezar el orden de páginas desglosadas "Debe ser desglosado" por los elementos más recientes
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Empezar el orden de páginas desglosadas "Desglose" por los elementos más recientes
 ACCOUNTING_LENGTH_DESCRIPTION=Longitud para mostrar la descripción de productos y servicios en los listados (Ideal = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longitud para mostrar el formato de descripción de la cuenta de productos y servicios en listados (Ideal = 50)
-ACCOUNTING_LENGTH_AACCOUNT=Longitud de las cuentas de terceros
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de varios
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diario de reporte de gastos
 ACCOUNTING_SOCIAL_JOURNAL=Diario Social
@@ -41,22 +26,11 @@ Labelcompte=Descripción de la cuenta
 Sens=Significado
 DelBookKeeping=Borrar los registros del libro mayor
 DescFinanceJournal=Diario financiero incluyendo todos los tipos de pagos por cuenta bancaria
-NumMvts=Número de movimiento
-ListeMvts=Lista del movimiento
 ErrorDebitCredit=Débito y Crédito no pueden tener un valor al mismo tiempo
-DescThirdPartyReport=Consulte aquí la lista de clientes y proveedores y sus cuentas contables
 Pcgtype=Tipo de cuenta
 Pcgsubtype=Subtipo de cuenta
-DescVentilCustomer=Consulte aquí el desglose contable anual de sus facturas a clientes
 TotalVente=Facturación total antes de impuestos
 TotalMarge=Margen de ventas total
-DescVentilDoneCustomer=Consulte aquí la lista de partidas de facturas a clientes y sus cuentas contables
-DescVentilTodoCustomer=Contabilice sus partidas de factura a cliente con una cuenta contable
-ChangeAccount=Cambie la cuenta contable para las partidas seleccionadas por la cuenta:
-DescVentilSupplier=Consulte aquí el desglose contable anual de sus facturas a proveedores
-DescVentilDoneSupplier=Consulte aquí la lista de partidas de las facturas a proveedores y sus cuentas contables
-ValidateHistory=Validar Automáticamente
 ErrorAccountancyCodeIsAlreadyUse=Error, no es posible eliminar ésta cuenta contable porque está siendo usada
 MvtNotCorrectlyBalanced=Movimiento balanceado incorrectamente. Crédito = %s. Débito = %s
-FicheVentilation=Ficha de desglose
 GeneralLedgerIsWritten=Las operaciones son escritas en el libro mayor
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index aa63be09b4f..e5f3981e73a 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -1,8 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
-VersionProgram=Programa de versión
-VersionUnknown=Desconocido
-VersionRecommanded=Recomendado
+VersionProgram=Versión del programa
 SessionId=ID de sesión
+SessionSaveHandler=Modalidad para guardar sesiones
 SessionSavePath=Ubicación de la sesión guardada
 PurgeSessions=Depuración de sesiones
 ConfirmPurgeSessions=¿Realmente deseas depurar todas las sesiones? Ésto desconectará a todos los usuarios (excepto a ti).
@@ -52,14 +51,10 @@ SetupShort=Configuración
 Position=Puesto
 URL=Vínculo
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 Module770Name=Reporte de gastos
 Module1400Name=Contabilidad
 DictionaryCanton=Estado/Provincia
 Upgrade=Actualizar
 MenuCompanySetup=Empresa/Fundación
 CompanyName=Nombre
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 LDAPFieldFirstName=Nombre(s)
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index 2a000dd547a..cb585733a55 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -13,10 +13,6 @@ ShowAllTimeBalance=Mostrar saldo desde el principio
 AllTime=Desde el principio
 Reconciliation=Reconciliación
 RIB=Número de cuenta bancaria
-IbanValid=CLABE Interbancaria es válida
-IbanNotValid=CLABE Interbancaria No es válida
-SwiftValid=BIC/SWIFT es válido
-SwiftNotValid=BIC/SWIFT No es válido
 AccountStatement=Estado de cuenta
 AccountStatementShort=Estado
 AccountStatements=Estados de cuenta
@@ -44,6 +40,7 @@ Conciliable=Puede ser conciliado
 OnlyOpenedAccount=Sólo las cuentas abiertas
 DisableConciliation=Desactivar función de conciliación para esta cuenta
 ConciliationDisabled=Característica conciliación deshabilitada
+LinkedToAConciliatedTransaction=Ligado a una transacción conciliada
 LineRecord=Transacción
 AddBankRecord=Añadir transacción
 AddBankRecordLong=Añadir transacción manualmente
@@ -52,7 +49,7 @@ BankLineConciliated=Transacción conciliada
 CustomerInvoicePayment=Pago de cliente
 WithdrawalPayment=Pago de retiro
 SocialContributionPayment=Pago de impuesto social/fiscal
-TransferDesc=Transfiere de una cuenta a otra, Dolibarr escribirá dos registros (uno de débito en la cuenta de origen y uno de crédito en la cuenta de destino, por la misma cantidad. La misma etiqueta y la fecha será utilizada para esta transacción)
+TransferDesc=Al crear una transferencia de una de sus cuentas bancarias hacia otra, Dolibarr crea dos registros contables (uno de débito en una cuenta y otro de crédito, del mismo importe, en la otra cuenta. Se utiliza para los dos registros la misma etiqueta de transferencia y la misma fecha)
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s ha sido registrada.
 ValidateCheckReceipt=¿Validar este recibo de cheque?
 ConfirmValidateCheckReceipt=¿Seguro que deseas validar este recibo de cheque? Ningún cambio será posible una vez que se valide
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 38684f923b3..78b8924a327 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -18,7 +18,6 @@ CountryIsInEEC=El país está dentro de la Comunidad Económica Europea
 ThirdPartyName=Nombre de tercero
 ThirdPartyCustomersWithIdProf12=Clientes con %s o %s
 Company/Fundation=Empresa/Fundación
-ToCreateContactWithSameName=Creará automáticamente un contacto físico con las mismas informaciones
 ParentCompany=Empresa matriz
 ReportByCustomers=Reporte por clientes
 ReportByQuarter=Reporte por tasa
@@ -26,17 +25,14 @@ CivilityCode=Código de civilidad
 RegisteredOffice=Oficina registrada
 Lastname=Apellido
 Firstname=Nombre(s)
-PostOrFunction=Puesto/Función
 State=Estado/Provincia
 CountryCode=Código de país
 CountryId=ID de país
 PhonePro=Teléfono trabajo
 PhonePerso=Teléfono particular
 PhoneMobile=Celular
-No_Email=No enviar e-mailings masivos
 Town=Ciudad
 Web=Página de internet
-CopyAddressFromSoc=Rellenar la dirección con la dirección del tercero
 LocalTax1IsUsed=Usar segundo impuesto
 LocalTax2IsUsed=Usar tercer impuesto
 WrongCustomerCode=Código de cliente inválido
@@ -90,7 +86,6 @@ ProfId3MA=Id Prof. 3 (I.F.)
 ProfId4MA=ID Prof. 4 (C.N.S.S.)
 ProfId2MX=R.P. IMSS
 VATIntraSyntaxIsValid=La sintaxis es válida
-VATIntraValueIsValid=El valor es válido
 ProspectCustomer=Cliente potencial / Cliente
 CustomerCard=Ficha del cliente
 CustomerRelativeDiscount=Descuento relativo del cliente
@@ -139,9 +134,7 @@ ChangeContactInProcess=Cambiar estado a 'Contacto en proceso'
 ChangeContactDone=Cambiar estado a 'Contacto realizado'
 NoParentCompany=Ninguno
 DolibarrLogin=Login de usuario
-ExportDataset_company_1=Terceros (Empresas/fundaciones/personas físicas) y propiedades
 ExportDataset_company_2=Contactos y propiedades
-ImportDataset_company_1=Terceros (Empresas/fundaciones/personas físicas) y propiedades
 ImportDataset_company_2=Contactos/Direciones (de terceros o no) y atributos
 ImportDataset_company_3=Datos bancarios
 ImportDataset_company_4=Terceros/Representantes de ventas (Afecta los usuarios representantes de ventas a empresas)
@@ -150,7 +143,6 @@ ConfirmDeleteFile=¿Seguro que quieres borrar este archivo?
 Organization=Organización
 FiscalYearInformation=Información sobre el año fiscal
 FiscalMonthStart=Més de inicio del año fiscal
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
 ListSuppliersShort=Lista de proveedores
 ListProspectsShort=Lista de clientes potenciales
 ListCustomersShort=Lista de clientes
diff --git a/htdocs/langs/es_MX/cron.lang b/htdocs/langs/es_MX/cron.lang
index 89903be54bc..bd7c9cb94be 100644
--- a/htdocs/langs/es_MX/cron.lang
+++ b/htdocs/langs/es_MX/cron.lang
@@ -2,6 +2,5 @@
 CronNone=Ninguno
 CronMethod=Método
 CronModule=Módulo
-CronLabel=Descripción
 CronArgs=Parámetros
 CronStatusInactiveBtn=Desactivar
diff --git a/htdocs/langs/es_MX/mails.lang b/htdocs/langs/es_MX/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_MX/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 8d49704563f..15a19991313 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -175,6 +175,7 @@ NoExample=Ningún ejemplo
 FindBug=Reportar un bug
 NbOfLines=Número de líneas
 DateFrom=Desde %s
+Check=Cheque
 Uncheck=Desmarcar
 Internals=Interno
 Externals=Externo
diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
index ac5e47d4f87..d1579ea863a 100644
--- a/htdocs/langs/es_MX/stocks.lang
+++ b/htdocs/langs/es_MX/stocks.lang
@@ -1,5 +1,2 @@
 # Dolibarr language file - Source file is en_US - stocks
 Location=Ubicación
-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)
diff --git a/htdocs/langs/es_MX/users.lang b/htdocs/langs/es_MX/users.lang
index 3e96baed58c..10850911bca 100644
--- a/htdocs/langs/es_MX/users.lang
+++ b/htdocs/langs/es_MX/users.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - users
-LastName=Nombre
 FirstName=Nombre(s)
diff --git a/htdocs/langs/es_MX/withdrawals.lang b/htdocs/langs/es_MX/withdrawals.lang
index 9843b1e36c2..902ace98f26 100644
--- a/htdocs/langs/es_MX/withdrawals.lang
+++ b/htdocs/langs/es_MX/withdrawals.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 StatusRefused=Rechazado
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_PA/companies.lang b/htdocs/langs/es_PA/companies.lang
deleted file mode 100644
index d2e0b40c0e5..00000000000
--- a/htdocs/langs/es_PA/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_PA/mails.lang b/htdocs/langs/es_PA/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_PA/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_PA/stocks.lang b/htdocs/langs/es_PA/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_PA/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_PA/withdrawals.lang b/htdocs/langs/es_PA/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_PA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_PE/accountancy.lang b/htdocs/langs/es_PE/accountancy.lang
index 7700f24ec2e..ddd943295ab 100644
--- a/htdocs/langs/es_PE/accountancy.lang
+++ b/htdocs/langs/es_PE/accountancy.lang
@@ -15,8 +15,5 @@ BackToChartofaccounts=Retornar gráfico de cuentas
 Selectchartofaccounts=Seleccionar un gráfico de cuentas
 Addanaccount=Agregar una cuenta contable
 AccountAccountingSuggest=Cuenta contable sugerida
-Ventilation=Desglose
-CustomersVentilation=Desglose de clientes
-SuppliersVentilation=Desglose de proveedores
 Reports=Reportes
 OptionsDeactivatedForThisExportModel=Para este modelo de exportación, las opciones están desactivadas
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 5b411e5412a..a0de2107bec 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -2,17 +2,13 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 Permission91=Consultar impuestos e IGV
 Permission92=Crear/modificar impuestos e IGV
 Permission93=Eliminar impuestos e IGV
 DictionaryVAT=Tasa de IGV (Impuesto sobre ventas en EEUU)
 VATManagement=Gestión IGV
 VATIsNotUsedDesc=El tipo de IGV propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
 UnitPriceOfProduct=Precio unitario sin IGV de un producto
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
 OptionVatMode=Opción de carga de IGV
 OptionVatDefaultDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre el pago por los servicios
 OptionVatDebitOptionDesc=La carga del IGV es: <br>-en el envío de los bienes (en la práctica se usa la fecha de la factura)<br>-sobre la facturación de los servicios
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang
index 4f85d26fa01..539eedb232e 100644
--- a/htdocs/langs/es_PE/companies.lang
+++ b/htdocs/langs/es_PE/companies.lang
@@ -3,4 +3,3 @@ VATIsUsed=Sujeto a IGV
 VATIsNotUsed=No sujeto a IGV
 VATIntra=RUC
 VATIntraShort=RUC
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_PE/mails.lang b/htdocs/langs/es_PE/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_PE/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_PE/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_PE/withdrawals.lang b/htdocs/langs/es_PE/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_PE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index 87f50f8f47a..1c53b65c99c 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -2,7 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
index 5c5c0e67de2..f99446d8dc2 100644
--- a/htdocs/langs/es_PY/companies.lang
+++ b/htdocs/langs/es_PY/companies.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - companies
 VATIntra=RUC
 VATIntraShort=RUC
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_PY/mails.lang b/htdocs/langs/es_PY/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_PY/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_PY/stocks.lang b/htdocs/langs/es_PY/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_PY/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_PY/withdrawals.lang b/htdocs/langs/es_PY/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_PY/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 13ec197ca8b..c7b39e23831 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -2,7 +2,5 @@
 DelaiedFullListToSelectCompany=Esperar a que presione una tecla antes de cargar el contenido de los terceros en el combo (Esto puede incrementar el rendimiento si tiene un gran número de terceros)
 DelaiedFullListToSelectContact=Esperar a que presione una tecla antes de cargar el contenido de los contactos en el combo (Esto puede incrementar el rendimiento si tiene un gran número de contactos)
 ModuleFamilyCrm=Gestión cliente (CRM)
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
 Permission2402=Crear/eliminar acciones (eventos o tareas) vinculadas a su cuenta
 Permission2403=Modificar acciones (eventos o tareas) vinculadas a su cuenta
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
diff --git a/htdocs/langs/es_VE/boxes.lang b/htdocs/langs/es_VE/boxes.lang
index b3617d242f9..589a165803f 100644
--- a/htdocs/langs/es_VE/boxes.lang
+++ b/htdocs/langs/es_VE/boxes.lang
@@ -1,2 +1,4 @@
 # Dolibarr language file - Source file is en_US - boxes
+BoxTitleOldestUnpaidCustomerBills=%s facturas a clientes más antiguras pendientes de cobro
+BoxTitleOldestUnpaidSupplierBills=%s facturas de proveedores más antiguas pendientes de pago
 BoxTitleCurrentAccounts=Balances de cuentas abiertas
diff --git a/htdocs/langs/es_VE/companies.lang b/htdocs/langs/es_VE/companies.lang
index 0edcd50c14c..32ebeacbce8 100644
--- a/htdocs/langs/es_VE/companies.lang
+++ b/htdocs/langs/es_VE/companies.lang
@@ -20,4 +20,3 @@ VATIntraCheckDesc=El link <b>%s</b> permite consultar al SENIAT el RIF. Se requi
 VATIntraCheckURL=http://contribuyente.seniat.gob.ve/BuscaRif/BuscaRif.jsp
 VATIntraCheckableOnEUSite=Verificar en la web del SENIAT
 VATIntraManualCheck=Puede también realizar una verificación manual en la página del SENIAT <a href="%s" target="_blank">%s</a>
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
diff --git a/htdocs/langs/es_VE/mails.lang b/htdocs/langs/es_VE/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/es_VE/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/es_VE/stocks.lang b/htdocs/langs/es_VE/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/es_VE/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/es_VE/withdrawals.lang b/htdocs/langs/es_VE/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/es_VE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 83f281a9e02..edd10c4a043 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sales journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 3a80b113e4f..63614a39400 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Eksperimentaalne
 VersionDevelopment=Arendusversioon
 VersionUnknown=Teadmata
 VersionRecommanded=Soovitatav
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sessiooni ID
 SessionSaveHandler=Sessioonide töötleja
 SessionSavePath=Salvestuse sessiooni lokaliseerimine
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Viga, suurem täpsus kui <b>%s</b> ei ole toe
 DictionarySetup=Sõnaraamatu seadistamine
 Dictionary=Sõnaraamatud
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Tüübi väärtused 'system' ja 'systemauto' on reserveeritud. Omaloodud kirje väärtuseks võib kasutada väärtust 'user'.
 ErrorCodeCantContainZero=Kood ei või sisaldada väärtust 0
 DisableJavascript=Lülita JavaScripti ja Ajaxi funktsioonid välja (soovitatav vaegnägijate või tekstibrauserite jaoks)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Sisestatud märkide arv otsingu käivitamiseks: %s
 NotAvailableWhenAjaxDisabled=Ei ole saadaval, kui Ajax on välja lülitatud
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript on välja lülitatud
 UsePreviewTabs=Kasuta eelvaate sakke
 ShowPreview=Kuva eelvaade
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Kodeeri binaarsed andmed kuueteistkümnendsüsteemis
 IgnoreDuplicateRecords=Ignoreeri duplikaatkirjete põhjustatud vead (INSERT IGNORE)
 AutoDetectLang=Tuvasta automaatselt (brauseri keel)
 FeatureDisabledInDemo=Demoversioonis blokeeritud funktsionaalsus
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Õigused
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Näidatakse ainult elemente <a href="%s">sisse lülitatud moodulitest</a>.
-ModulesDesc=Dolibarri moodulid määravad, millist funktsionaalsust tarkvara võimaldab. Mõned moodulite puhul tuleb pärast mooduli sisse lülitamist lubada kasutajatele nende kasutamine. Klõpsa sisse/välja nupul "Staatus" veerus, et moodulit/funktsionaalsust sisse lülitada.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Rohkem mooduleid...
 DoliStoreDesc=DoliStore on ametlik Dolibarr ERP/CRM moodulite müümiseks kasutatav koht
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarri praegune versioo
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Sa võid sisestada suvalise numeratsiooni maski. Järgnevas maskis saab kasutada järgmisi silte:<br><b>{000000}</b> vastab arvule, mida suurendatakse iga sündmuse %s korral. Sisesta niipalju nulle, kui soovid loenduri pikkuseks. Loendurile lisatakse vasakult alates niipalju nulle, et ta oleks maskiga sama pikk.<br><b>{000000+000}</b> on eelmisega sama, kuid esimesele %s lisatakse nihe, mis vastab + märgist paremal asuvale arvule.<br><b>{000000@x}</b> on eelmisega sama, ent kuuni x jõudmisel nullitakse loendur (x on 1 ja 12 vahel, või 0 seadistuses määratletud majandusaasta alguse kasutamiseks, või 99 loenduri nullimiseks iga kuu alguses). Kui kasutad seda funktsiooni ja x on 2 või kõrgem, siis on jada {yy}{mm} or {yyyy}{mm} nõutud.<br><b>{dd}</b> päev (01 kuni 31).<br><b>{mm}</b> kuu (01 kuni 12).<br><b>{yy}</b>, <b>{yyyy}</b> või <b>{y}</b> aasta 2, 4 või 1 numbri kasutamisks.<br>
-GenericMaskCodes2=<b>{cccc}</b> kliendi kood, n tähemärki<br><b>{cccc000}</b> n tähemärgiga kliendi koodile järgneb kliendile määratletud loenduri väärtus. Kliendile määratletud loendur lähtestatakse koos üldise loenduriga.<br><b>{tttt}</b> Kolmanda isiku koodi liik n tähemärgiga (vt Sõnastik->Kolmandate isikute liigid)<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Kõik teised maskis olevad tähemärgid jäävad puutuamata.<br>Tühikud ei ole lubatud.<br>
 GenericMaskCodes4a=<u>Näiteks 99ndal %s tegi kolmas isik KolmasIsik 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Näiteks 2007-03-01 loodud kolmas isik:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=URLide turvamise parameetrid
 SecurityTokenIsUnique=Kasuta iga URLi jaoks unikaalset turvalise võtme parameetrit
 EnterRefToBuildUrl=Sisesta viide objektile %s
 GetSecuredUrl=Saada arvutatud URL
-ButtonHideUnauthorized=Ära näita mittetöötavaid nuppe, vaid peida need
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Vana käibemaksumäär
 NewVATRates=Uus käibemaksumäär
 PriceBaseTypeToChange=Muuda hindadel, mille baasväärtus on defineeritud kui
@@ -349,6 +356,7 @@ ExtrafieldMail = E-post
 ExtrafieldSelect = Valikute nimekiri
 ExtrafieldSelectList = Vali tabelist
 ExtrafieldSeparator=Eraldaja
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Märkeruut
 ExtrafieldRadio=Raadionupp
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Kasutajad ja grupid
@@ -428,8 +439,8 @@ Module55Name=Vöötkoodid
 Module55Desc=Vöötkoodide haldamine
 Module56Name=Telefonitehnika
 Module56Desc=Telefonitehnika integratsioon
-Module57Name=Püsikorraldused
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial süsteemiga (Asterisk jne) integreerimine
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=WebCalendari integratsioon
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Palgad
-Module510Desc=Töötajate palkade ja palkade maksmise haldamine
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Teated
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Annetused
 Module700Desc=Annetuste haldamine
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Pakkujate vaatamine
 Permission147=Statistika vaatamine
-Permission151=Püsikorralduste vaatamine
-Permission152=Püsikorralduste nõuete loomine/muutmine
-Permission153=Püsikorralduste kviitungite saatmine
-Permission154=Püsikorralduste kviitungite krediteerimine/keeldumine
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Ostuarvete, atribuutide ja maksete eksport
 Permission1237=Ostutellimuste ja ostuinfo eksport
 Permission1251=Väliste andmete massiline import andmebaasi (andmete laadimine)
 Permission1321=Müügiarvete, atribuutide ja maksete eksport
+Permission1322=Reopen a paid bill
 Permission1421=Müügitellimuste ja atribuutide eksport
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Küsitluste loomine/muutmine
 Permission59001=Marginaalide vaatamine
 Permission59002=Marginaalide määratlemine
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Huvilise huvitatuse tase
@@ -853,6 +869,7 @@ LabelUsedByDefault=Vaikimisi kasutatav silt, kui koodile ei leitud tõlke vastet
 LabelOnDocuments=Dokumentide silt
 NbOfDays=Päevade arv
 AtEndOfMonth=Kuu lõpus
+CurrentNext=Current/Next
 Offset=Nihe
 AlwaysActive=Alati aktiivne
 Upgrade=Uuenda
@@ -950,7 +967,7 @@ LogEventDesc=Siin saab sisse lülitada Dolibarri turvalisusega seotud sündmuste
 AreaForAdminOnly=Hoiatus: neid võimalusi saavad kasutada vaid <b>administraatorid</b>.
 SystemInfoDesc=Süsteemi info sisaldab mitmesugust tehnilist infot, mida ei saa muuta ning mis on nähtav vaid administraatoritele.
 SystemAreaForAdminOnly=Sellele alale saavad ligi ainult administraatorid. Ükski Dolibarri õigus ei saa seda piirangut eemaldada.
-CompanyFundationDesc=Sellel lehel saab muuta kogu hallatava ettevõtte või ühenduse infot (selleks klõpsa lehe alumises osas asuvale "Muuda" nupule)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Siit saab muuta iga parameetrit, mis on seotud Dolibarri kujundusega
 AvailableModules=Saadaval olevad moodulid
 ToActivateModule=Moodulite aktiveerimiseks mine süsteemi seadistusesse (Kodu->Seadistamine->Moodulid).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Hoiatus: mõnedel Linuxi süsteemidel peab e-kirja saa
 PathToDocuments=Dokumentide rada
 PathDirectory=Kaust
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Tõlke seadistus
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Pead vähemalt 1 mooduli sisse lülitama
 ClassNotFoundIntoPathWarning=Klassi %s ei ole PHP rajas
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Kasuta TLSi
 LDAPServerUseTLSExample=LDAPi server kasutab TLSi
 LDAPServerDn=Serveri DN
 LDAPAdminDn=Administraatori DN
-LDAPAdminDnExample=Täielik DN (nt: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administraatori parool
 LDAPUserDn=Kasutajate DN
 LDAPUserDnExample=Täielik DN (nt: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Näide: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Näide: objectsid
 LDAPFieldEndLastSubscription=Tellimuse lõpu kuupäev
-LDAPFieldTitle=Ametikoht
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Näide: tiitel
 LDAPSetupNotComplete=LDAP setup ei ole täielik (mine sakile Muu)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administraatorit või parooli pole sisestatud. LDAPi ligipääs on anonüümne ja ainult lugemisrežiimis.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Toodete ja teenuste mooduli seadistamine
 NumberOfProductShowInSelect=Maksimaalne toodete arv liitbokside nimekirjades (0=piirangut ei ole)
 ViewProductDescInFormAbility=Toodete kirjelduste visualiseerimine vormides (hüpikaknas)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Toodete kirjelduste visualiseerimine kolmanda isiku keeles
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Suure toodete arvu korral (> 100 000) saab kiiruse suurendamiseks seadistada Seadistamine->Muu menüüs konstandi PRODUCT_DONOTSEARCH_ANYWHERE väärtuseks 1. Sellisel juhul piirdub otsing sõne algusega.
 UseSearchToSelectProduct=Kasuta toote valimiseks otsinguvormi (rippmenüü asemel).
 SetDefaultBarcodeTypeProducts=Vaikimisi vöötkoodi tüüp toodetel
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Sisemine mootor
 BarCodeNumberManager=Automaatselt määratletud vöötkoodide haldamine
 ##### Prelevements #####
-WithdrawalsSetup=Väljamaksete mooduli seadistami
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Välise RSS impordi seadistamine
 NewRSS=Uus RSS voog
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Ava majandusaasta
 CloseFiscalYear=Sulge majandusaasta
 DeleteFiscalYear=Kustuta majandusaasta
 ConfirmDeleteFiscalYear=Kas oled kindel, et soovid selle majandusaasta kustutada?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index c4c4d0454ab..112d3338103 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Vastavusse viimine
 RIB=Arvelduskonto number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Püsikorraldused
-StandingOrder=Püsikorraldus
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Konto väljavõte
 AccountStatementShort=Väljavõte
 AccountStatements=Kontoväljavõtted
@@ -78,6 +74,7 @@ AccountToCredit=Krediteeritav konto
 AccountToDebit=Debiteeritav konto
 DisableConciliation=Keela sellel kontol vastavusse viimise funktsioonid
 ConciliationDisabled=Vastavusse viimine on keelatud
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Suletud
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Lisa tehing käsitsi
 ConciliatedBy=Tehingu kandis sisse
 DateConciliating=Vastavusse viimise kuupäev
 BankLineConciliated=Tehing vastavusse viidud
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Kliendi laekumi
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Väljamakse
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Pangaülekanne
 BankTransfers=Pangaülekanded
-TransferDesc=Kanne ühelt kontolt teisele. Dolibarr kirjutab kaks kannet (debiteerib lähtekonto ja krediteerib sihtkonto samas summas. Tehingu teostamiseks kasutatakse sama silti ja kuupäeva)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Kust
 TransferTo=Kuhu
 TransferFromToDone=Kanne kontolt <b>%s</b> kontole <b>%s</b> väärtuses <b>%s</b> %s on registreeritud.
@@ -129,7 +129,7 @@ FutureTransaction=Tehing toimub tulevikus, ajaline ühitamine pole võimalik.
 SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
-ToConciliate=Vii vastavusse?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Siis märgista konto väljavõttel asuvad read ja klõpsa
 DefaultRIB=Vaikimisi BAN
 AllRIB=Kõik BANid
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index 1f24a135a9e..0b2d7bacd85 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -79,8 +79,8 @@ IdPaymentMode=Payment type (id)
 LabelPaymentMode=Payment type (label)
 PaymentModeShort=Payment type
 PaymentTerm=Maksetähtaeg
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentConditions=Maksetingimused
+PaymentConditionsShort=Maksetingimused
 PaymentAmount=Makse summa
 ValidatePayment=Kinnita makse
 PaymentHigherThanReminderToPay=Makse on suurem, kui makstava summa jääk
@@ -105,7 +105,7 @@ DoPaymentBack=Soorita tagasimakse
 ConvertToReduc=Teisenda tuleviku allahindluseks
 EnterPaymentReceivedFromCustomer=Sisesta kliendilt saadud makse
 EnterPaymentDueToCustomer=Soorita kliendile makse
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Keelatud, sest järele jäänud maksmata on null
 PriceBase=Baashind
 BillStatus=Arve staatus
 StatusOfGeneratedInvoices=Status of generated invoices
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Viga: ei saa tühistada arvet, m
 BillFrom=Kellelt
 BillTo=Kellele
 ActionsOnBill=Tegevused arvel
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -199,9 +199,9 @@ AlreadyPaid=Juba makstud
 AlreadyPaidBack=Juba tagasi makstud
 AlreadyPaidNoCreditNotesNoDeposits=Juba makstud (kreeditarvete ja deposiitideta)
 Abandoned=Hüljatud
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPay=Jäänud tasuda
+RemainderToTake=Jäänud laekuda
+RemainderToPayBack=Jäänud tagasi maksta
 Rest=Ootel
 AmountExpected=Väidetav väärtus
 ExcessReceived=Liigne saadud
@@ -209,8 +209,8 @@ EscompteOffered=Soodustus pakutud (makse enne tähtaega)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Püsikorraldused
-StandingOrder=Püsikorraldus
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Arvete mustandeid ei ole
 NoOtherDraftBills=Muid arvete mustandeid ei ole
 NoDraftInvoices=Arvete mustandeid ei ole
@@ -228,20 +228,20 @@ DatePointOfTax=Point of tax
 NoInvoice=Ühtki arvet ei ole
 ClassifyBill=Liigita arve
 SupplierBillsToPay=Unpaid supplier invoices
-CustomerBillsUnpaid=Unpaid customer invoices
+CustomerBillsUnpaid=Maksmata kliendiarved
 NonPercuRecuperable=Tagastamatu
 SetConditions=Määra maksetingimusi
 SetMode=Määra makseviis
 SetRevenuStamp=Set revenue stamp
 Billed=Arve esitatud
 RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Arve mall
+RepeatableInvoices=Arvete mallid
+Repeatable=Mall
+Repeatables=Mallid
+ChangeIntoRepeatableInvoice=Muuda arve malliks
+CreateRepeatableInvoice=Loo arve mall
+CreateFromRepeatableInvoice=Loo arve mallist
 CustomersInvoicesAndInvoiceLines=Müügiarved ja arvete read
 CustomersInvoicesAndPayments=Müügiarved ja maksed
 ExportDataset_invoice_1=Müügiarvete nimekiri ja arvete read
@@ -334,7 +334,7 @@ PaymentConditionShortRECEP=Kohene
 PaymentConditionRECEP=Kohene
 PaymentConditionShort30D=30 päeva
 PaymentCondition30D=30 päeva
-PaymentConditionShort30DENDMONTH=30 days of month-end
+PaymentConditionShort30DENDMONTH=30 päeva kuu lõpust
 PaymentCondition30DENDMONTH=Within 30 days following the end of the month
 PaymentConditionShort60D=60 päeva
 PaymentCondition60D=60 päeva
@@ -351,8 +351,8 @@ VarAmount=Muutuv summa (%% kogusummast)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Maksekorraldus
-PaymentTypeShortPRE=Maksekorraldus
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Sularaha
 PaymentTypeShortLIQ=Sularaha
 PaymentTypeCB=Krediitkaart
@@ -381,6 +381,7 @@ ExtraInfos=Lisainfo
 RegulatedOn=Reguleeritud üksusel
 ChequeNumber=Tšeki nr
 ChequeOrTransferNumber=Tšeki/ülekande nr
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Tšeki pank
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Makstud selle maksega
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Liigita kõik täielikult tagasi makstud kreeditarved makstuks.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Kõik arved, mille kohta ei ole makstavat jääki, märgitakse makstuks.
 ToMakePayment=Maksa
 ToMakePaymentBack=Maksa tagasi
 ListOfYourUnpaidInvoices=Maksmata arvete nimekiri
 NoteListOfYourUnpaidInvoices=Märkus: see nimekiri sisaldab vaid nende kolmandate isikute arveid, kelle jaoks Sa oled märgitud müügiesindajaks.
 RevenueStamp=Maksumärk
-YouMustCreateInvoiceFromThird=Lisavõimalus on saadaval vaid juhul, kui arve luuakse kolmanda isiku sakilt "Klient"
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=PDF mall Crabe arvete jaoks. Täielik arve mall (soovitatav mall).
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/et_EE/boxes.lang b/htdocs/langs/et_EE/boxes.lang
index 4d9cfb1f0e0..1bf5c70df24 100644
--- a/htdocs/langs/et_EE/boxes.lang
+++ b/htdocs/langs/et_EE/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Vanimad aktiivsed aegunud teenused
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Üldine tegevus (arved, pakkumised, tellimused)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Pakkumisi kuus
 NoTooLowStockProducts=Ühegi toote laojääk ei ole alla piiri
 BoxProductDistribution=Toodete/teenuste jaotus
 BoxProductDistributionFor=%s jaotus %s kaupa
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Müügiarved
 ForCustomersOrders=Müügiarved
 ForProposals=Pakkumised
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/et_EE/cashdesk.lang b/htdocs/langs/et_EE/cashdesk.lang
index e98c3724840..25bad3fb73d 100644
--- a/htdocs/langs/et_EE/cashdesk.lang
+++ b/htdocs/langs/et_EE/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=kohta
 CashDeskThirdParty=Kolmas isik
 ShoppingCart=Ostukorv
 NewSell=Uus müük
-BackOffice=Keskkontor
 AddThisArticle=Lisa see artikkel
 RestartSelling=Mine müümisel tagasi
-SellFinished=Müü lõpptooteid
+SellFinished=Sale complete
 PrintTicket=Trüki tšekk
 NoProductFound=Artiklit ei leitud
 ProductFound=toodet leitud
diff --git a/htdocs/langs/et_EE/categories.lang b/htdocs/langs/et_EE/categories.lang
index c85972cf761..0045f15a43d 100644
--- a/htdocs/langs/et_EE/categories.lang
+++ b/htdocs/langs/et_EE/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Alamkategooriad
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Sellise viitega kategooria on juba olemas
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Antud kategooria ei sisalda ühtki toodet.
 ThisCategoryHasNoSupplier=Antud kategooria ei sisalda ühtki hankijat.
 ThisCategoryHasNoCustomer=Antud kategooria ei sisalda ühtki klienti
 ThisCategoryHasNoMember=Antud kategooria ei sisalda ühtki liiget.
 ThisCategoryHasNoContact=Antud kategooria ei sisalda ühtki kontakti
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 6dd84b9ccd6..4992b907e5e 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Uus eraisik
 NewCompany=Uus ettevõte (pot klient, klient, hankija)
 NewThirdParty=Uus kolmas isik (pot klient, klient, hankija)
 CreateDolibarrThirdPartySupplier=Loo kolmas isik (hankija)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Huviliste ala
 IdThirdParty=Kolmanda osapoole ID
 IdCompany=Ettevõtte ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Hankijad
 ThirdPartyType=Kolmanda isiku tüüp
 Company/Fundation=Ettevõte/ühendus
 Individual=Eraisik
-ToCreateContactWithSameName=Loob automaatselt sama infoga kontaktisiku
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Emaettevõte
 Subsidiaries=Tütarettevõtted
 ReportByCustomers=Aruanne klientide alusel
@@ -47,7 +49,7 @@ CivilityCode=Sisekorraeeskiri
 RegisteredOffice=Peakontor
 Lastname=Perekonnanimi
 Firstname=Eesnimi
-PostOrFunction=Amet/funktsioon
+PostOrFunction=Job position
 UserTitle=Tiitel
 Address=Aadress
 State=Osariik/provints
@@ -64,7 +66,7 @@ Chat=Vestle
 PhonePro=Ametitelefon
 PhonePerso=Isiklik telefon
 PhoneMobile=Mobiiltelefon
-No_Email=Ära saada masspostitusega kirju
+No_Email=Refuse mass e-mailings
 Fax=Faks
 Zip=Postiindeks
 Town=Linn
@@ -73,7 +75,7 @@ Poste= Ametikoht
 DefaultLang=Vaikimisi keel
 VATIsUsed=Käibemaksuga
 VATIsNotUsed=Käibemaksuta
-CopyAddressFromSoc=Kasuta aadressivälja täitmiseks kolmanda isiku aadressi
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=KMKR number
 VATIntraShort=KMKR number
 VATIntraSyntaxIsValid=Süntaks on kehtiv
-VATIntraValueIsValid=Väärtus on kehtiv
 ProspectCustomer=Huviline/klient
 Prospect=Huviline
 CustomerCard=Kliendikaart
@@ -261,7 +262,9 @@ AddContactAddress=Uus kontakt/aadress
 EditContact=Muuda kontakti
 EditContactAddress=Muuda kontakti/aadressi
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontaktid/aadressid
+FromContactName=Name:
 NoContactDefinedForThirdParty=Antud kolmanda isikuga pole ühtki kontakti seotud
 NoContactDefined=Kontakti pole määratud
 DefaultContact=Vaikimisi kontakt/aadress
@@ -284,7 +287,7 @@ CompanyDeleted=Ettevõte &quot;%s&quot; on andmebaasist kustutatud.
 ListOfContacts=Kontaktide/aadresside nimekiri
 ListOfContactsAddresses=Kontaktide/aadresside nimekiri
 ListOfThirdParties=Kolmandate isikute nimekiri
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Näita kontakti
 ContactsAllShort=Kõik (filtrita)
 ContactType=Kontakti liik
@@ -294,6 +297,7 @@ ContactForProposals=Pakkumise kontakt
 ContactForContracts=Lepingu kontakt
 ContactForInvoices=Arve kontakt
 NoContactForAnyOrder=See kontakt ei ole ühegi tellimusega seotud
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=See kontakt ei ole ühegi pakkumisega seotud
 NoContactForAnyContract=See kontakt ei ole ühegi lepinguga seotud
 NoContactForAnyInvoice=See kontakt ei ole ühegi arvega seotud
@@ -352,9 +356,9 @@ ExportCardToFormat=Ekspordi kaart formaati
 ContactNotLinkedToCompany=Kontakt ole seotud ühegi kolmanda isikuga
 DolibarrLogin=Dolibarri kasutaja
 NoDolibarrAccess=Dolibarri ligipääs puudub
-ExportDataset_company_1=Kolmandad isikud (äriühingud/sihtasutused/füüsilised isikud) ja nende omadused
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontaktid ja omadused
-ImportDataset_company_1=Kolmandad isikud (äriühingud/sihtasutused/füüsilised isikud) ja nende omadused
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontaktid/aadressid (k.a kolmandad isikud) ja nende atribuudid
 ImportDataset_company_3=Pangarekvisiidid
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/et_EE/compta.lang b/htdocs/langs/et_EE/compta.lang
index 1de59dca433..5ec55e59dfd 100644
--- a/htdocs/langs/et_EE/compta.lang
+++ b/htdocs/langs/et_EE/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Erikulud
 MenuTaxAndDividends=Maksud ja dividendid
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index b68dd2552d4..4522e64bb5e 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Plaanitavata programmide haldamise seadistamine
-URLToLaunchCronJobs=Croni poolt kontrollitavate ja käivitatavate programmide jaoks vajalik URL
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Või mõne kindla programmi kontrollimiseks ja käivitamiseks
 KeyForCronAccess=Croni käivitatavate programmide URLile ligipääsu turvavõti
 FileToLaunchCronJobs=Käsurea käsk cron programmide käivitamiseks
@@ -23,7 +23,7 @@ CronCommand=Käsk
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Tegevus
@@ -39,7 +39,7 @@ CronMethod=Meetod
 CronModule=Moodul
 CronNoJobs=Pole ühtki registreeritud programm
 CronPriority=Prioriteet
-CronLabel=Kirjeldus
+CronLabel=Label
 CronNbRun=Käivituste arv
 CronMaxRun=Max nb. launch
 CronEach=Iga
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index c7acbb675da..9033990f6fa 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Viga: selle võimaluse kasutamiseks peab PHPs olema võimalda
 ErrorOpenIDSetupNotComplete=Dolibarri seadistusfail lubab OpenIDga autentimist, ent konstandis %s ei ole OpenID teenuse URL määratletud
 ErrorWarehouseMustDiffers=Lähteladu ja sihtladu peavad olema erinevad
 ErrorBadFormat=Vigane vorming!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index 0fc0a7228a4..f65d95e58fe 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Antud PHP toetab sessioone.
 PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET muutujaid.
 PHPSupportPOSTGETKo=On võimalik, et antud PHP seadistus ei toeta POST ja/või GET muutujaid. Kontrolli php.ini failis parameetri <b>variables_order</b> väärtust.
 PHPSupportGD=Antud PHP toetab GD graafilisi funktsioone.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Antud PHP toetab UTF8 funktsioone.
 PHPMemoryOK=Antud PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b>. See peaks olema piisav.
 PHPMemoryTooLow=PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b> baiti, mis on tõenäoselt liiga madal. Muuda <b>php.ini</b> failis <b>memory_limit</b> parameetrit vähemalt <b>%s</b> baidi suuruseks.
 Recheck=Klõpsa siia põhjalikumaks testiks
 ErrorPHPDoesNotSupportSessions=Antud PHP paigaldus ei toeta sessioone. Dolibarri töötamiseks peavad sessioonid olema võimaldatud. Kontrolli oma PHP paigaldust.
 ErrorPHPDoesNotSupportGD=Antud PHP paigaldus ei toeta GD graafilisi funktsioone. Ühtki graafikut ei saa kasutada.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Antud PHP paigaldus ei toeta UTF8 funktsioone. Dolibarr ei saa korralikult töötada. Palun lahenda see probleem enne Dolibarri paigaldamist.
 ErrorDirDoesNotExists=Kausta %s ei ole olemas.
 ErrorGoBackAndCorrectParameters=Mine tagasi ja parandada valed parameetrid.
@@ -86,6 +88,7 @@ DirectoryRecommendation=Soovitav on kasutada kausta, mis asub väljaspool veebil
 LoginAlreadyExists=On juba olemas
 DolibarrAdminLogin=Dolibarri administraatori kasutajanimi
 AdminLoginAlreadyExists=Dolibarri administraatori konto '<b>%s</b>' on juba olemas. Mine tagasi eelmisele lehele lisakasutaja loomiseks.
+FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
 WarningRemoveInstallDir=Hoiatus: turvalisuse huvides tuleb pärast paigaldus- või uuendusprotsessi lõpetamist lisada Dolibarri dokumentide kausta fail nimega <b>install.lock</b>. See keelab paigaldusutiliitide kasutamise, et keegi ei saaks neid pahatahtlikel eesmärkidel kasutada.
 FunctionNotAvailableInThisPHP=Pole saadaval antud PHP paigaldusel
 ChoosedMigrateScript=Vali migratsiooni skript
@@ -188,6 +191,8 @@ MigrationActioncommElement=Uuenda tegevuste andmec
 MigrationPaymentMode=Maksete režiimi andmete migreerimine
 MigrationCategorieAssociation=Kategooriate migreerimine
 MigrationEvents=Sündmuste migreerimine sündmuse omaniku lisamiseks seoste tabelisse
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Näita mitte saadaval olevaid lisavalikuid
 HideNotAvailableOptions=Peida mitte saadaval olevad lisavalikud
diff --git a/htdocs/langs/et_EE/interventions.lang b/htdocs/langs/et_EE/interventions.lang
index 00558874a3c..736f7a8b23c 100644
--- a/htdocs/langs/et_EE/interventions.lang
+++ b/htdocs/langs/et_EE/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Kliendi kontakt järelkajaks
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/et_EE/ldap.lang b/htdocs/langs/et_EE/ldap.lang
index 4f6b18df9b2..f64253a5676 100644
--- a/htdocs/langs/et_EE/ldap.lang
+++ b/htdocs/langs/et_EE/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Esimese tellimuse kuupäev
 LDAPFieldFirstSubscriptionAmount=Esimese tellimuse kogus
 LDAPFieldLastSubscriptionDate=Viimase tellimuse kuupäev
 LDAPFieldLastSubscriptionAmount=Viimse tellimuse kogus
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Kasutaja sünkroniseeritud
 GroupSynchronized=Grupp sünkroniseeritud
 MemberSynchronized=Liige sünkroniseeritud
diff --git a/htdocs/langs/et_EE/mails.lang b/htdocs/langs/et_EE/mails.lang
index e4ba4cc9ca2..24e35ef3f34 100644
--- a/htdocs/langs/et_EE/mails.lang
+++ b/htdocs/langs/et_EE/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Loe
 YourMailUnsubcribeOK=E-posti aadress <b>%s</b> on edukalt oma tellimuse meililistist eemaldanud
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-kiri saadetud %s aadressile.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 03a1a9ee2a0..cba83e97cd9 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -67,6 +67,7 @@ SelectDate=Vali kuupäev
 SeeAlso=Vaata lisaks %s
 SeeHere=Vaata siia
 BackgroundColorByDefault=Vaikimisi taustavärv
+FileRenamed=The file was successfully renamed
 FileUploaded=Fail on edukalt üles laetud
 FileWasNotUploaded=Fail on valitud manustamiseks, kuid on veel üles laadimata. Klõpsa &quot;Lisa fail&quot; nupul selle lisamiseks.
 NbOfEntries=Kannete arv
@@ -245,6 +246,10 @@ DateBuild=Aruande koostamise kuupäev
 DatePayment=Maksekuupäev
 DateApprove=Heakskiitmise kuupäev
 DateApprove2=Heakskiitmise kuupäev (teine nõuseolek)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=aasta
 DurationMonth=kuu
 DurationWeek=nädal
@@ -256,6 +261,7 @@ DurationDays=päeva
 Year=Aasta
 Month=Kuu
 Week=Nädal
+WeekShort=Week
 Day=Päev
 Hour=Tund
 Minute=Minut
@@ -278,6 +284,7 @@ MonthOfDay=Kuu päev
 HourShort=H
 MinuteShort=mn
 Rate=Määr
+CurrencyRate=Currency conversion rate
 UseLocalTax=Maks sisse arvestatud
 Bytes=Baiti
 KiloBytes=Kilobaiti
@@ -565,8 +572,11 @@ BackToList=Tagasi nimekirja
 GoBack=Mine tagasi
 CanBeModifiedIfOk=Õige väärtuse korral saab neid muuta
 CanBeModifiedIfKo=Vigase väärtuse korral saab neid muuta
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Kirje edukalt muudetud
 RecordsModified=%s kirjet muudetud
+RecordsDeleted=%s records deleted
 AutomaticCode=Automaatne kood
 FeatureDisabled=Funktsioon välja lülitatud
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Selle tegevuse sooritamiseks puuduvad õigused
 SessionName=Sessiooni nimi
 Method=Meetod
 Receive=Võta vastu
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Osaline
 TotalWoman=Täielik
 NeverReceived=Pole vastu võetud
@@ -598,6 +609,7 @@ DisabledModules=Välja lülitatud moodulid
 For=Jaoks
 ForCustomer=Kliendi jaoks
 Signature=Allkiri
+DateOfSignature=Date of signature
 HidePassword=Näita käsku peidetud parooliga
 UnHidePassword=Näita käsku koos parooliga
 Root=Juur
@@ -641,6 +653,15 @@ NewAttribute=Uus atribuut
 AttributeCode=Atribuudi kood
 URLPhoto=Foto/logo URL
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Loo mustand
 SetToDraft=Tagasi mustandiks
 ClickToEdit=Klõpsa muutmiseks
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Esmaspäev
 Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/margins.lang b/htdocs/langs/et_EE/margins.lang
index 21a8477a3a1..87052863c9e 100644
--- a/htdocs/langs/et_EE/margins.lang
+++ b/htdocs/langs/et_EE/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/et_EE/oauth.lang b/htdocs/langs/et_EE/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/et_EE/oauth.lang
+++ b/htdocs/langs/et_EE/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index d195ddda0e4..ead1d6c2ae6 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Sinu tellimused on loodud
 OrderFail=Sinu tellimuste loomise ajal tekkis viga
 CreateOrders=Loo tellimused
 ToBillSeveralOrderSelectCustomer=Mitme erineva tellimuse põhjal müügiarve loomiseks klõpsa kõigepealt kliendi kaardile ning seejärel vali "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/et_EE/printing.lang b/htdocs/langs/et_EE/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/et_EE/printing.lang
+++ b/htdocs/langs/et_EE/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 60cb7ab64f4..e203a8bb123 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Raamatupidamise kood (ost)
-ProductAccountancySellCode=Raamatupidamise kood (müük)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Toode või teenus
 ProductsAndServices=Tooted ja teenused
 ProductsOrServices=Tooted või teenused
@@ -59,6 +59,8 @@ SellingPriceHT=Müügihind (km-ta)
 SellingPriceTTC=Müügihinna (km-ga)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Uus hind
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Müügihind ei saa olla madalam kui selle toote minimaalne lubatud hind (%s km-ta). Antud sõnumit näidatakse ka siis, kui sisestad liiga suure allahindluse.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Prindi ühe vöötkoodi jaoks mitu etiketti
 BuildPageToPrint=Loo prinditav leht
 FillBarCodeTypeAndValueManually=Täida vöötkoodi tüüp ja väärtus käsitsi
 FillBarCodeTypeAndValueFromProduct=Täida vöötkoodi tüüp ja väärtus toote vöötkoodi välja abil
-FillBarCodeTypeAndValueFromThirdParty=Täida vöötkoodi tüüp ja väärtus kolmanda isiku vöötkoodi välja abil
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index b8e23768525..f67d1470c6e 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Antud projektiga seotud pakkumised
-ListOrdersAssociatedProject=Antud projektiga seotud müügitellimuste nimekiri
-ListInvoicesAssociatedProject=Antud projektiga seotud müügiarvete nimekiri
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Antud projektiga seotud ostutellimuste nimekiri
-ListSupplierInvoicesAssociatedProject=Antud projektiga seotud ostuarvete nimekiri
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Antud projektiga seotud lepingute nimekiri
 ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Muuda ülesande kuupäeva vastavalt projekti alguskuupäevale
 ErrorShiftTaskDate=Ülesande kuupäeva ei ole võimalik nihutada vastavalt uuele projekti alguskuupäevale
 ProjectsAndTasksLines=Projektid ja ülesanded
 ProjectCreatedInDolibarr=Projekt %s on loodud
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Ülesanne %s on loodud
 TaskModifiedInDolibarr=Ülesannet %s on muudetud
 TaskDeletedInDolibarr=Ülesanne %s on kustutatud
@@ -153,7 +154,7 @@ PlannedWorkload=Planeeritav koormus
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index c6ef7d69986..64b7fdf52d2 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Uus palga makse
 SalaryPayment=Palga makse
 SalariesPayments=Palkade maksed
 ShowSalaryPayment=Näita palga makset
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 8e7e434ffca..2ea9f1724bf 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Kustuta saatmine
 Stock=Laojääk
 Stocks=Laojäägid
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Liikumised
 ErrorWarehouseRefRequired=Lao viide on nõutud
 ListOfWarehouses=Ladude nimekiri
@@ -43,6 +45,7 @@ PMPValue=Kaalutud keskmine hind
 PMPValueShort=KKH
 EnhancedValueOfWarehouses=Ladude väärtus
 UserWarehouseAutoCreate=Loo kasutaja loomisel automaatselt ladu
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Saadetud kogus
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/et_EE/supplier_proposal.lang b/htdocs/langs/et_EE/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/et_EE/supplier_proposal.lang
+++ b/htdocs/langs/et_EE/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 79f11be0da6..25403a893ce 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -7,13 +7,13 @@ History=Ajalugu
 ListOfSuppliers=Hankijate nimekiri
 ShowSupplier=Kuva hankija
 OrderDate=Tellimuse kuupäev
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Mõnedel alatoodetel pole määratletud hinda
-AddSupplierPrice=Lisa hankija hind
-ChangeSupplierPrice=Muuda hankija hinda
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=See hankija viide on juba seotud viitega: %s
 NoRecordedSuppliers=Ühtki hankijat pole salvestatud
 SupplierPayment=Hankija makse
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/et_EE/users.lang b/htdocs/langs/et_EE/users.lang
index 5c2405d0a1a..8004fc6d1c6 100644
--- a/htdocs/langs/et_EE/users.lang
+++ b/htdocs/langs/et_EE/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/et_EE/website.lang b/htdocs/langs/et_EE/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/et_EE/website.lang
+++ b/htdocs/langs/et_EE/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index c6787099e58..6a1985dea2e 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Klientide püsikorralduste ala
-StandingOrders=Püsikorraldused
-StandingOrder=Püsikorraldused
-NewStandingOrder=Uus püsikorraldus
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Töödelda
-WithdrawalsReceipts=Väljamaksete kviitungid
-WithdrawalReceipt=Väljamakse kviitung
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Väljamaksete read
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Väljamakse taotlusega seotud arveid
-NbOfInvoiceToWithdrawWithInfo=Väljamakse taotlusega seotud arveid, millega seotud kliendil on määratletud pangakonto info
-InvoiceWaitingWithdraw=Arve ootab väljamakset
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Väljamaksmise summa
-WithdrawsRefused=Keeldutd väljamakseid
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Pole ühtki müügiarvet, mis oleks maksestaatuses 'Väljamakse'. Mine müügiarve kaardile 'Väljamakse' nõudmise esitamiseks.
 ResponsibleUser=Vastutav kasutaja
-WithdrawalsSetup=Väljamaksete seadistamine
-WithdrawStatistics=Väljamaksete statistika
-WithdrawRejectStatistics=Keeldutud väljamaksete statistika
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Loo väljamakse taotlus
 ThirdPartyBankCode=Kolmanda isiku pangakood
 NoInvoiceCouldBeWithdrawed=Ei õnnestunud ühegi arvega seotud väljamakset teha. Kontrolli, et arve on seotud kehtiva BANiga ettevõttega.
@@ -46,7 +47,7 @@ StatusRefused=Keeldutud
 StatusMotif0=Määramata
 StatusMotif1=Pole piisavalt raha
 StatusMotif2=Nõue vaidlustatud
-StatusMotif3=Väljamakse order puudub
+StatusMotif3=No direct debit payment order
 StatusMotif4=Kliendi tellimus
 StatusMotif5=RIB pole kasutuskõlbulik
 StatusMotif6=Saldota konto
@@ -61,28 +62,43 @@ NotifyCredit=Väljamakse kreedit
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=Pankadele, mis kasutavad RIB
 WithBankUsingBANBIC=Pankadele, mis kasutavad IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Pangakonto, kuhu väljamakse teha
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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'
 ThisWillAlsoAddPaymentOnInvoice=See rakendub ka arvetega seotud maksetele ja liigitab nad "Makstud"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Otsekorralduse makse %s panga poolt
-InfoCreditMessage=Otsekorralduse %s makstud panga poolt <br> Makse andmed: %s
-InfoTransSubject=Otsekorralduse %s saatmine panka
-InfoTransMessage=Püsikorraldus %s on saadetud panka üksuse %s %s poolt.<br><br>
+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>
 InfoTransData=Summa: %s<br>Meetod: %s<br>Kuupäev: %s
-InfoRejectSubject=Püsikorraldus tagasi lükatud
-InfoRejectMessage=Tere,<br><br>arvega %s seotud püsikorralduse makse ettevõttest %s, summas %s on panga poolt tagasi lükatud.<br><br>--<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
 ModeWarning=Tootmisrežiim ei olnud seadistatud, pärast seda peatatakse simulatsioon
diff --git a/htdocs/langs/et_EE/workflow.lang b/htdocs/langs/et_EE/workflow.lang
index 02fecaddc7d..a5c56ac3cd2 100644
--- a/htdocs/langs/et_EE/workflow.lang
+++ b/htdocs/langs/et_EE/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Töövoo mooduli seaded
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Pärast tellimusega seotud makse laekumist määra tellimusega seotud pakkumise staatuseks 'Arve esitatud'
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Kui müügiarve staatuseks on määratud 'Makstud', siis määra seotud tellimus(t)e staatuseks 'Arve esitatud'
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Kui müügiarve on kinnitatud, siis määra seotud tellimus(t)e staatuseks 'Arve esitatud'
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 5bc663a9acc..fc12ac9134c 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Esperimentala
 VersionDevelopment=Garapena
 VersionUnknown=Ezezaguna
 VersionRecommanded=Gomendatua
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesioaren ID
 SessionSaveHandler=Kudeatzailea sesioak gordetzeko
 SessionSavePath=Sesio biltegiaren kokapena
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Kodeak ezin du 0 balioa izan
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Ajax ezgaituta dagoenean ez dago erabilgarri
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript ezgaituta
 UsePreviewTabs=Aurreikuspen fitxak erabili
 ShowPreview=Aurreikuspena aurkeztu
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Berez antzeman (nabigatzailean hizkuntza)
 FeatureDisabledInDemo=Demo-an ezgaitutako aukera
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Baimenak
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Modulu gehiago...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr-en uneko bertsioa
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=%s objektuen erreferentzia sartu
 GetSecuredUrl=Kalkulatutako URL-a hartu
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = E-posta
 ExtrafieldSelect = Aukeren zerrenda
 ExtrafieldSelectList = Taulatik aukeratu
 ExtrafieldSeparator=Bereizlea
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio botoia
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Erabiltzaileak & Taldeak
@@ -428,8 +439,8 @@ Module55Name=Barra-kodeak
 Module55Desc=Barra-kodeak kudeatzea
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Web-egutegia
 Module410Desc=Web-egutegiaren integrazioa
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Jakinarazpenak
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Diru-emateak
 Module700Desc=Diru-emateak kudeatzea
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Barne-eragilea
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=RSS kanal berria
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 0e7349b7638..bc6406fff6c 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/eu_ES/boxes.lang b/htdocs/langs/eu_ES/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/eu_ES/boxes.lang
+++ b/htdocs/langs/eu_ES/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/eu_ES/cashdesk.lang b/htdocs/langs/eu_ES/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/eu_ES/cashdesk.lang
+++ b/htdocs/langs/eu_ES/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/eu_ES/categories.lang b/htdocs/langs/eu_ES/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/eu_ES/categories.lang
+++ b/htdocs/langs/eu_ES/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index f513bcc7b20..3dea93f86d6 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=BEZ zenbakia
 VATIntraShort=BEZ zenbakia
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Kontua/helbidea sortu
 EditContact=Kontaktua editatu
 EditContactAddress=Kontaktua/helbidea editatu
 Contact=Kontaktua
+ContactId=Contact id
 ContactsAddresses=Kontaktua/helbidea
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/eu_ES/compta.lang b/htdocs/langs/eu_ES/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/eu_ES/compta.lang
+++ b/htdocs/langs/eu_ES/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/eu_ES/interventions.lang b/htdocs/langs/eu_ES/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/eu_ES/interventions.lang
+++ b/htdocs/langs/eu_ES/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/eu_ES/ldap.lang b/htdocs/langs/eu_ES/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/eu_ES/ldap.lang
+++ b/htdocs/langs/eu_ES/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/eu_ES/mails.lang b/htdocs/langs/eu_ES/mails.lang
index d6224bf2346..8fd8f520bb0 100644
--- a/htdocs/langs/eu_ES/mails.lang
+++ b/htdocs/langs/eu_ES/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index c6835a79e12..7e7e83cbafc 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/eu_ES/margins.lang
+++ b/htdocs/langs/eu_ES/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/eu_ES/oauth.lang b/htdocs/langs/eu_ES/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/eu_ES/oauth.lang
+++ b/htdocs/langs/eu_ES/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/eu_ES/printing.lang b/htdocs/langs/eu_ES/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/eu_ES/printing.lang
+++ b/htdocs/langs/eu_ES/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index 3010d9a5c61..ff7bebe2b46 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Soldata ordainketa berria
 SalaryPayment=Soldata ordainketa
 SalariesPayments=Soldaten ordainketak
 ShowSalaryPayment=Soldataren ordainketa erakutsi
-THM=Batezbesteko orduko prezioa
-TJM=Batezbesteko eguneko prezioa
+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
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/eu_ES/supplier_proposal.lang b/htdocs/langs/eu_ES/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/eu_ES/supplier_proposal.lang
+++ b/htdocs/langs/eu_ES/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/eu_ES/users.lang b/htdocs/langs/eu_ES/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/eu_ES/users.lang
+++ b/htdocs/langs/eu_ES/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/eu_ES/website.lang b/htdocs/langs/eu_ES/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/eu_ES/website.lang
+++ b/htdocs/langs/eu_ES/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/eu_ES/withdrawals.lang b/htdocs/langs/eu_ES/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/eu_ES/withdrawals.lang
+++ b/htdocs/langs/eu_ES/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/eu_ES/workflow.lang b/htdocs/langs/eu_ES/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/eu_ES/workflow.lang
+++ b/htdocs/langs/eu_ES/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index cb432f8e637..f9661aaa00a 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=مجلات
 JournalFinancial=مجلات مالی
 BackToChartofaccounts=برگردان جدول حساب ها
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=انتخاب یک جدول از حساب ها
 Addanaccount=اضافه کردن یک حساب حسابداری
 AccountAccounting=حساب حسابداری
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=ورشکستگی
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=مشتریان ورشکسته
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=گزارش ها
 NewAccount=حساب حسابداری جدید
 Create=ایجاد کردن
-CreateMvts=Create movement
-UpdateMvts=اصلاح نقل و انتقال
-WriteBookKeeping=ثبت حساب ها در دفتر کل
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=دفتر کل
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=SENS
 Codejournal=روزنامه
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=حذف پرونده از دفتر کل
-
 DescSellsJournal=مجله فروش
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=پرداخت صورت حساب مشتری
-
 ThirdPartyAccount=حساب Thirdparty
-
-NewAccountingMvt=انتقال جدید
-NumMvts=تعداد  انتقالها
-ListeMvts=فهرست انتقالها
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=بدهی و اعتبار نمی توانند بطور همزمان حاوی مقدار باشند
 
-ReportThirdParty=لیست حساب thirdparty
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=فهرست حساب های حسابداری
 
@@ -114,22 +134,29 @@ Pcgtype=کلاس حساب
 Pcgsubtype=تحت دسته از حساب
 Accountparent=ریشه حساب
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=حاشیه فروش کل
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index b88f676ba69..4fde1c70a9d 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=تجربی
 VersionDevelopment=توسعه
 VersionUnknown=ناشناخته
 VersionRecommanded=توصیه شده
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=بروزرسانی فایلها
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=شناسه جلسه
 SessionSaveHandler=هندلر برای صرفه جویی در جلسات
 SessionSavePath=محلی سازی را وارد نمایید و ذخیره سازی
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=خطا، دقت بالاتر <b>از٪ s</b>
 DictionarySetup=راه اندازی فرهنگ لغت
 Dictionary=واژه نامه ها
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=ارزش 'سیستم' و 'systemauto برای نوع محفوظ است. شما می توانید 'کاربر' به عنوان ارزش برای اضافه کردن رکورد خود استفاده کنید
 ErrorCodeCantContainZero=کد می تواند مقدار 0 را شامل نمی شود
 DisableJavascript=توابع غیر فعال کردن جاوا اسکریپت و آژاکس (توصیه شده برای فرد نابینا یا مرورگرهای متنی)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=اسمشو نبر از شخصیت های به ماشه جستجو:٪ s را
 NotAvailableWhenAjaxDisabled=در دسترس نیست زمانی که آژاکس غیر فعال است
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=جاوا اسکریپت غیر فعال شده
 UsePreviewTabs=استفاده از زبانه ها پیش نمایش
 ShowPreview=نشان دادن پیش نمایش
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=رمز داده های باینری در مبنای شان
 IgnoreDuplicateRecords=نادیده گرفتن خطا از رکورد تکراری (INSERT نادیده بگیرند)
 AutoDetectLang=آشکارسازی خودکار (زبان مرورگر)
 FeatureDisabledInDemo=از ویژگی های غیر فعال در نسخه ی نمایشی
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=مجوز
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=تنها عناصر از <a href="%s">ماژول های فعال</a> نمایش داده می شود.
-ModulesDesc=ماژول های Dolibarr تعریف که قابلیت در نرم افزار را فعال کنید. برخی از ماژول نیاز به مجوز شما باید به کاربران عطا کند، پس از فعال کردن ماژول. بر روی دکمه روشن / خاموش در ستون "وضعیت" را کلیک کنید برای فعال کردن یک ماژول / ویژگی.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=ماژول های بیشتر ...
 DoliStoreDesc=DoliStore، محل رسمی بازار برای ماژول های خارجی Dolibarr ERP / CRM
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=نسخه فعلی Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=بروزرسانی آفلاین سرور
 GenericMaskCodes=شما می توانید ماسک شماره را وارد کنید. در این ماسک، تگ های زیر می تواند مورد استفاده قرار گیرد: <br> <b>{000000}</b> مربوط به تعداد خواهد شد که در هر یک از٪ s را افزایش مییابد. به عنوان بسیاری از صفر را وارد کنید به عنوان طول مورد نظر از ضد. شمارنده خواهد شد صفر از سمت چپ به منظور به صفر کرده اند و بسیاری از ماسک به پایان رسید. <br> <b>{000.000 +000}</b> همان قبلی است اما جبران مربوطه را به شماره در سمت راست علامت + شروع به کار رفته در اولین٪ است. <br> <b>{000000 @ X}</b> همان قبلی است اما شمارنده به صفر زمانی که ماه X برسد (x بین 1 و 12، و یا 0 به استفاده از ماه های اولیه سال مالی تعیین شده در تنظیمات خود را، و یا 99 به صفر هر ماه ). اگر این گزینه استفاده می شود و x است 2 یا بالاتر، و سپس دنباله {YY} {میلی متر} یا {تاریخ برای ورود yyyy} {میلی متر} نیز مورد نیاز است. <br> <b>{تولد}</b> روز (01 تا 31). <br> <b>{میلی متر}</b> ماه (01 تا 12). <br> <b>{YY}، {تاریخ برای ورود yyyy}</b> یا <b>{Y}</b> سال بیش از 2، 4 و یا 1 عدد. <br>
-GenericMaskCodes2=<b>{CCCC}</b> کد مشتری در تعداد کاراکتر <br> <b>{cccc000}</b> کد مشتری در تعداد کاراکتر توسط شمارنده اختصاص داده شده برای مشتری است. این مبارزه اختصاص داده شده به مشتری است که در همان زمان از مبارزه جهانی بازنشانی کنید. <br> <b>{TTTT}</b> کد از نوع thirdparty در تعداد شخصیت (نگاه کنید به انواع فرهنگ لغت-thirdparty). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=تمام شخصیت های دیگر در ماسک دست نخورده باقی خواهد ماند. <br> فضاهای امکان پذیر نیست. <br>
 GenericMaskCodes4a=<u>به عنوان مثال در 99٪ از TheCompany شخص ثالث انجام می شود 2007/1/31:</u> <br>
 GenericMaskCodes4b=<u>به عنوان مثال در شخص ثالث ایجاد شده در 2007/03/01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=پارامترهای به امن آدرس
 SecurityTokenIsUnique=استفاده از یک پارامتر securekey منحصر به فرد برای هر URL
 EnterRefToBuildUrl=مرجع را برای شی از٪ s
 GetSecuredUrl=دریافت URL محاسبه
-ButtonHideUnauthorized=مخفی کردن دکمه های برای اقدامات غیر مجاز به جای نشان دادن دکمه های غیر فعال
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=قدیمی نرخ مالیات بر ارزش افزوده
 NewVATRates=نرخ مالیات بر ارزش افزوده جدید
 PriceBaseTypeToChange=تغییر در قیمت با ارزش پایه مرجع تعریف شده در
@@ -349,6 +356,7 @@ ExtrafieldMail = پست الکترونیک
 ExtrafieldSelect = لیست انتخاب کنید
 ExtrafieldSelectList = انتخاب از جدول
 ExtrafieldSeparator=تفکیک کننده
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=جعبه
 ExtrafieldRadio=دکمه های رادیویی
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=کاربران و گروه های
@@ -428,8 +439,8 @@ Module55Name=بارکد
 Module55Desc=مدیریت بارکد
 Module56Name=تلفن
 Module56Desc=یکپارچه سازی تلفن
-Module57Name=سفارشات ایستاده
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=کلیک برای تماس
 Module58Desc=یکپارچه سازی سیستم ClickToDial (ستاره، ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=ادغام Webcalendar
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=حقوق
-Module510Desc=مدیریت کارکنان حقوق و پرداخت
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=اطلاعیه ها
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=کمک های مالی
 Module700Desc=مدیریت کمک مالی
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=خوانده شده ارائه دهندگان
 Permission147=دفعات بازدید: آمار
-Permission151=خوانده شده سفارشات ایستاده
-Permission152=ایجاد / تغییر درخواست سفارشات ایستاده
-Permission153=سفارشات ایستاده انتقال رسید
-Permission154=اعتبار / امتناع ایستاده سفارشات رسید
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=فاکتورها منبع صادرات، صفات و پرداخت
 Permission1237=سفارشات عرضه کننده کالا صادرات و مشخصات آنها
 Permission1251=اجرای واردات انبوه از داده های خارجی به پایگاه داده (بار داده ها)
 Permission1321=فاکتورها صادرات به مشتریان، ویژگی ها و پرداخت ها
+Permission1322=Reopen a paid bill
 Permission1421=سفارشات صادرات مشتری و ویژگی های
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=ایجاد / تغییر نظر سنجی
 Permission59001=دفعات بازدید: حاشیه های تجاری
 Permission59002=تعریف حاشیه های تجاری
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=سطح بالقوه چشم انداز
@@ -853,6 +869,7 @@ LabelUsedByDefault=برچسب استفاده می شود به طور پیش فر
 LabelOnDocuments=برچسب در اسناد
 NbOfDays=Nb در روز
 AtEndOfMonth=در پایان ماه
+CurrentNext=Current/Next
 Offset=افست
 AlwaysActive=همیشه فعال
 Upgrade=به روز رسانی
@@ -950,7 +967,7 @@ LogEventDesc=شما می توانید در اینجا قادر به ورود ب
 AreaForAdminOnly=این ویژگی را می توان تنها <b>کاربران مدیر</b> استفاده می شود.
 SystemInfoDesc=اطلاعات سیستم اطلاعات فنی موارد دیگر شما در حالت فقط خواندنی و قابل مشاهده فقط برای مدیران دریافت می باشد.
 SystemAreaForAdminOnly=این منطقه در دسترس است فقط برای کاربران مدیر سیستم باشد. هیچ یک از مجوز Dolibarr می تواند از این حد کاهش دهد.
-CompanyFundationDesc=ویرایش شده در این صفحه تمام اطلاعات شناخته شده از این شرکت و یا پایه شما نیاز به مدیریت (برای این کار، بر روی "اصلاح" را فشار دهید در پایین صفحه کلیک کنید)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=شما می توانید هر پارامتر مربوط به نگاه Dolibarr را انتخاب کنید و احساس می کنید در اینجا
 AvailableModules=ماژول های موجود
 ToActivateModule=برای فعال کردن ماژول ها، رفتن در منطقه راه اندازی (صفحه اصلی> راه اندازی-> ماژول).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=اخطار، در برخی از سیستم های لی
 PathToDocuments=مسیر اسناد
 PathDirectory=دایرکتوری
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=پیکربندی د لا traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=شما باید حداقل قادر می سازد 1 ماژول
 ClassNotFoundIntoPathWarning=کلاس٪ s ​​را به مسیر PHP یافت نشد
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=استفاده از TLS
 LDAPServerUseTLSExample=LDAP شما استفاده از سرور TLS
 LDAPServerDn=سرور DN
 LDAPAdminDn=مدير DN
-LDAPAdminDnExample=کامل DN (سابق: CN = ADMIN، DC = عنوان مثال، DC = کام)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=رمز عبور مدیر
 LDAPUserDn=DN کاربران
 LDAPUserDnExample=کامل DN (سابق: OU = کاربران، DC = عنوان مثال، DC = کام)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=به عنوان مثال: O
 LDAPFieldSid=SID
 LDAPFieldSidExample=به عنوان مثال: objectsid
 LDAPFieldEndLastSubscription=تاریخ پایان اشتراک
-LDAPFieldTitle=ارسال / تابع
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=به عنوان مثال: عنوان
 LDAPSetupNotComplete=راه اندازی LDAP کامل نیست (به به دیگران زبانه)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=هیچ مدیر یا کلمه عبور ارائه شده است. دسترسی LDAP ناشناس و در حالت فقط خواندنی خواهد بود.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=راه اندازی محصولات و خدمات ماژول
 NumberOfProductShowInSelect=تعداد حداکثر از محصولات در combos را از لیست انتخاب کنید (0 = بدون محدودیت)
 ViewProductDescInFormAbility=تجسم از توصیف محصول در اشکال (در غیر این صورت به عنوان دوست پنجره)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=تجسم از محصولات توصیف در زبان thirdparty
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=همچنین اگر شما تعداد زیادی از محصول (> 100 000)، شما می توانید سرعت با تنظیم PRODUCT_DONOTSEARCH_ANYWHERE ثابت به 1 در راه اندازی-> دیگر افزایش دهد. جست و جو خواهد شد و سپس محدود به شروع از رشته است.
 UseSearchToSelectProduct=استفاده از یک فرم جستجو برای انتخاب یک محصول (و نه از لیست کشویی).
 SetDefaultBarcodeTypeProducts=فرض نوع بارکد استفاده برای محصولات
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=موتور داخلی
 BarCodeNumberManager=مدیر به صورت خودکار تعریف اعداد بارکد
 ##### Prelevements #####
-WithdrawalsSetup=راه اندازی ماژول برداشت
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=خارجی راه اندازی واردات RSS
 NewRSS=خوراک RSS جدید
@@ -1506,6 +1531,7 @@ OpenFiscalYear=سال مالی گسترش
 CloseFiscalYear=بستن سال مالی
 DeleteFiscalYear=حذف سال مالی
 ConfirmDeleteFiscalYear=آیا مطمئن هستید این سال مالی را حذف کنید؟
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index 800916211e8..5494b8425e6 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -27,13 +27,9 @@ AllTime=از شروع
 Reconciliation=مصالحه
 RIB=شماره حساب بانکی
 IBAN=شماره IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / تعداد SWIFT
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=سفارشات ایستاده
-StandingOrder=نظام نامه
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=بیانیه حساب
 AccountStatementShort=بيانيه
 AccountStatements=اظهارات حساب
@@ -78,6 +74,7 @@ AccountToCredit=حساب به اعتبار
 AccountToDebit=حساب به بدهی
 DisableConciliation=غیر فعال کردن ویژگی های آشتی برای این حساب
 ConciliationDisabled=از ویژگی های آشتی غیر فعال است
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=بسته شده
 AccountIdShort=شماره
@@ -87,6 +84,8 @@ AddBankRecordLong=اضافه کردن معامله دستی
 ConciliatedBy=آشتی با
 DateConciliating=تاريخ آشتی
 BankLineConciliated=معامله آشتی
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=پرداخت با مشتری
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=پرداخت برداشت
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=انتقال بانک
 BankTransfers=نقل و انتقالات بانکی
-TransferDesc=انتقال از یک حساب به دیگری، Dolibarr دو پرونده ارسال (بدهی در حساب منبع و اعتبار در حساب هدف، از همان مقدار. همان برچسب و تاریخ را برای این معامله استفاده می شود)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=از
 TransferTo=به
 TransferFromToDone=ونقل من هناك إلى ٪ <b>٪ ق ق ق ٪</b> ٪ وقد سجلت ق.
@@ -129,7 +129,7 @@ FutureTransaction=معامله در futur. هیچ راهی برای مصالحه
 SelectChequeTransactionAndGenerate=انتخاب چک / فیلتر به چک دریافت سپرده شامل و کلیک بر روی "ایجاد".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=در نهایت، تعیین یک دسته بندی است که در آن برای طبقه بندی پرونده
-ToConciliate=به مصالحه؟
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=سپس، بررسی خطوط موجود در صورت حساب بانکی و کلیک کنید
 DefaultRIB=به طور پیش فرض BAN
 AllRIB=همه BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 11ad52018f5..6d5caf0df50 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=خطا، می تواند یک ف
 BillFrom=از
 BillTo=به
 ActionsOnBill=عملیات در فاکتور
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=تخفیف ارائه شده (پرداخت قبل از ترم)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=سفارشات ایستاده
-StandingOrder=نظام نامه
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=بدون پیش نویس فاکتورها
 NoOtherDraftBills=بدون پیش نویس دیگر فاکتورها
 NoDraftInvoices=بدون پیش نویس فاکتورها
@@ -351,8 +351,8 @@ VarAmount=مقدار متغیر (٪٪ جمع.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=منظور بانک
-PaymentTypeShortPRE=منظور بانک
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=پول نقد
 PaymentTypeShortLIQ=پول نقد
 PaymentTypeCB=کارت های اعتباری
@@ -381,6 +381,7 @@ ExtraInfos=ساعات اضافی
 RegulatedOn=تنظیم در
 ChequeNumber=چک N °
 ChequeOrTransferNumber=بررسی / انتقال N °
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=بانک مرکزی ورود
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=پرداخت شده توسط این پرداخت
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=طبقه بندی "پرداخت" تمام یادداشت های اعتباری به طور کامل دوباره پرداخت می شود.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=همه فاکتور بدون باقی می ماند به پرداخت به طور خودکار به وضعیت "پرداخت" بسته است.
 ToMakePayment=پرداخت
 ToMakePaymentBack=پرداخت
 ListOfYourUnpaidInvoices=فهرست فاکتورها پرداخت نشده
 NoteListOfYourUnpaidInvoices=توجه: این لیست فقط شامل صورت حساب برای اشخاص ثالث به شما به عنوان یک نماینده فروش مرتبط است.
 RevenueStamp=تمبر درآمد
-YouMustCreateInvoiceFromThird=این گزینه تنها زمانی ایجاد فاکتور از تب "مشتری" از thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=فاکتور PDF قالب Crabe. قالب فاکتور کامل (قالب توصیه می شود)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/fa_IR/boxes.lang b/htdocs/langs/fa_IR/boxes.lang
index 237d949f870..f81be5d5321 100644
--- a/htdocs/langs/fa_IR/boxes.lang
+++ b/htdocs/langs/fa_IR/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=قدیمی تر خدمات منقضی فعال
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=فعالیت های جهانی (فاکتورها، پیشنهادات، سفارشات)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=پیشنهادات در هر ماه
 NoTooLowStockProducts=هیچ محصولی در زیر حد سهام کم
 BoxProductDistribution=محصولات / خدمات توزیع
 BoxProductDistributionFor=توزیع از٪ s را برای٪ s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=مشتریان فاکتورها
 ForCustomersOrders=سفارشات مشتریان
 ForProposals=پیشنهادات
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/fa_IR/cashdesk.lang b/htdocs/langs/fa_IR/cashdesk.lang
index 336779d3aed..1bf172907eb 100644
--- a/htdocs/langs/fa_IR/cashdesk.lang
+++ b/htdocs/langs/fa_IR/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=بر
 CashDeskThirdParty=شخص ثالث
 ShoppingCart=سبد خرید
 NewSell=فروش جدید
-BackOffice=دفتر برگشت
 AddThisArticle=اضافه کردن این مقاله
 RestartSelling=بازگشت در فروش
-SellFinished=فروش به پایان رسید
+SellFinished=Sale complete
 PrintTicket=چاپ بلیط
 NoProductFound=مقاله ای یافت نشد.
 ProductFound=محصول یافته شده
diff --git a/htdocs/langs/fa_IR/categories.lang b/htdocs/langs/fa_IR/categories.lang
index 4ea6987c48c..676beb26a90 100644
--- a/htdocs/langs/fa_IR/categories.lang
+++ b/htdocs/langs/fa_IR/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=زیر شاخه ها
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=این رده در حال حاضر با این کد عکس وجود دارد
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=این رده در کل حاوی هر محصول نیست.
 ThisCategoryHasNoSupplier=این رده در هیچ منبع نیست.
 ThisCategoryHasNoCustomer=این رده در کل حاوی هر مشتری نیست.
 ThisCategoryHasNoMember=این رده در هیچ عضو نیست.
 ThisCategoryHasNoContact=این رده در کل حاوی هر گونه ارتباط نیست.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=ویژگی های مکمل
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index bc01024cf64..124fc9a36ba 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=فردی خصوصی جدید
 NewCompany=شرکت جدید (چشم انداز، مشتری، عرضه کننده کالا)
 NewThirdParty=شخص ثالث جدید (چشم انداز، مشتری، عرضه کننده کالا)
 CreateDolibarrThirdPartySupplier=ایجاد یک حزب سوم (منبع)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=منطقه Prospection
 IdThirdParty=کد های شخص ثالث
 IdCompany=شرکت آیدی
@@ -38,7 +40,7 @@ ThirdPartySuppliers=تامین کنندگان
 ThirdPartyType=نوع شخص ثالث
 Company/Fundation=شرکت / بنیاد
 Individual=فردی خصوصی
-ToCreateContactWithSameName=به طور خودکار ایجاد یک تماس فیزیکی با همان اطلاعات
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=شرکت مادر
 Subsidiaries=شرکتهای تابعه
 ReportByCustomers=گزارش های مشتریان
@@ -47,7 +49,7 @@ CivilityCode=کد تمدن
 RegisteredOffice=دفتر ثبت نام
 Lastname=نام خانوادگی
 Firstname=نام
-PostOrFunction=ارسال / تابع
+PostOrFunction=Job position
 UserTitle=عنوان
 Address=نشانی
 State=ایالت / استان
@@ -64,7 +66,7 @@ Chat=انجمن
 PhonePro=تلفن پروفسور
 PhonePerso=شخصی سازی. تلفن
 PhoneMobile=تلفن همراه
-No_Email=آیا توده ایمیلها ارسال کنید
+No_Email=Refuse mass e-mailings
 Fax=فکس
 Zip=کد پستی
 Town=شهرستان
@@ -73,7 +75,7 @@ Poste= درجه
 DefaultLang=زبان پیش فرض
 VATIsUsed=مالیات بر ارزش افزوده استفاده شده است
 VATIsNotUsed=مالیات بر ارزش افزوده استفاده نمی شود
-CopyAddressFromSoc=آدرس با آدرس thirdparty را پر کنید
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=تعداد مالیات بر ارزش افزوده
 VATIntraShort=تعداد مالیات بر ارزش افزوده
 VATIntraSyntaxIsValid=نحو معتبر است
-VATIntraValueIsValid=ارزش معتبر است
 ProspectCustomer=چشم انداز / مشتریان
 Prospect=چشم انداز
 CustomerCard=کارت به مشتری
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=ویرایش مخاطب
 EditContactAddress=ویرایش مخاطب / آدرس
 Contact=تماس با
+ContactId=Contact id
 ContactsAddresses=تماس / آدرس
+FromContactName=Name:
 NoContactDefinedForThirdParty=بدون تماس تعریف شده برای این حزب سوم
 NoContactDefined=بدون تماس تعریف
 DefaultContact=پیش فرض تماس با ما / آدرس
@@ -284,7 +287,7 @@ CompanyDeleted=شرکت "٪ s" را حذف از پایگاه داده.
 ListOfContacts=لیست مخاطبین / آدرس
 ListOfContactsAddresses=لیست مخاطبین / آدرس
 ListOfThirdParties=فهرست اشخاص ثالث
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=نمایش تماس
 ContactsAllShort=همه (بدون فیلتر)
 ContactType=تماس با نوع
@@ -294,6 +297,7 @@ ContactForProposals=تماس پیشنهاد را
 ContactForContracts=تماس قرارداد را
 ContactForInvoices=تماس با فاکتور را
 NoContactForAnyOrder=این تماس یک تماس برای هر سفارش نمی
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=این تماس یک تماس برای هر پیشنهاد تجاری
 NoContactForAnyContract=این تماس یک تماس برای هر قرارداد
 NoContactForAnyInvoice=این تماس یک تماس برای هر فاکتور نمی
@@ -352,9 +356,9 @@ ExportCardToFormat=کارت صادرات به فرمت
 ContactNotLinkedToCompany=تماس با به هر شخص ثالث مرتبط نیست
 DolibarrLogin=ورود Dolibarr
 NoDolibarrAccess=بدون دسترسی Dolibarr
-ExportDataset_company_1=احزاب سوم (شرکت / پایه / مردم فیزیکی) و خواص
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=اطلاعات تماس و خواص
-ImportDataset_company_1=احزاب سوم (شرکت / پایه / مردم فیزیکی) و خواص
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=تماس / آدرس (از thirdparties یا نه) و ویژگی
 ImportDataset_company_3=جزئیات بانک
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/fa_IR/compta.lang b/htdocs/langs/fa_IR/compta.lang
index 44515210ac9..699295404b5 100644
--- a/htdocs/langs/fa_IR/compta.lang
+++ b/htdocs/langs/fa_IR/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=هزینه های ویژه
 MenuTaxAndDividends=مالیات و سود سهام
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index 5b30db28ebe..15faee6fdc5 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= برنامه ریزی راه اندازی مدیریت کار
-URLToLaunchCronJobs=URL برای بررسی و راه اندازی کارهای cron در صورت لزوم
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=و یا برای بررسی و راه اندازی یک کار خاص
 KeyForCronAccess=کلید امنیتی برای URL برای راه اندازی کارهای cron
 FileToLaunchCronJobs=خط فرمان برای راه اندازی کارهای cron
@@ -23,7 +23,7 @@ CronCommand=فرمان
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=کار
@@ -39,7 +39,7 @@ CronMethod=روش
 CronModule=واحد
 CronNoJobs=بدون شغل ثبت نام
 CronPriority=اولویت
-CronLabel=توصیف
+CronLabel=Label
 CronNbRun=نیوبیوم. راه اندازی
 CronMaxRun=Max nb. launch
 CronEach=هر
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index be5fa716053..42fde565819 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=خطا، PHP شما باید <b>بخش٪ s</b> نصب کرد
 ErrorOpenIDSetupNotComplete=شما راه اندازی Dolibarr فایل پیکربندی اجازه می دهد تا احراز هویت ایجاد حساب کاربری، اما URL خدمات ایجاد حساب کاربری به٪ ثابت تعریف نشده
 ErrorWarehouseMustDiffers=منبع و هدف انبارها باید متفاوت
 ErrorBadFormat=فرمت بد!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=خطا، این عضو هنوز رتبهدهی نشده است به هر thirdparty مرتبط است. عضو لینک به یک شخص ثالث موجود یا ایجاد یک thirdparty جدید قبل از ایجاد اشتراک با فاکتور.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=خطا، برخی از زایمان مرتبط با این حمل و نقل وجود دارد. حذف خودداری کرد.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 261fb231133..f620afc9cac 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=این جلسات PHP پشتیبانی می کند.
 PHPSupportPOSTGETOk=این PHP پشتیبانی از متغیر های POST و GET.
 PHPSupportPOSTGETKo=این امکان وجود دارد راه اندازی PHP شما از متغیر های POST پشتیبانی نمی کند و / یا. بررسی کنید <b>variables_order</b> پارامتر خود را در php.ini.
 PHPSupportGD=این GD پشتیبانی از PHP توابع گرافیکی.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=این پشتیبانی از PHP توابع UTF8.
 PHPMemoryOK=PHP حداکثر شما حافظه جلسه <b>به٪ s</b> تنظیم شده است. این باید به اندازه کافی باشد.
 PHPMemoryTooLow=PHP حداکثر شما حافظه را وارد نمایید <b>به٪ s</b> بایت تنظیم شده است. این باید بسیار کم باشد. تغییر <b>فایل php.ini</b> خود را به تنظیم پارامتر <b>memory_limit را</b> به <b>حداقل٪ s</b> بایت.
 Recheck=برای تست نشانگر بیشتر اینجا را کلیک کنید
 ErrorPHPDoesNotSupportSessions=نصب و راه اندازی PHP شما جلسات را پشتیبانی نمی کند. این ویژگی مورد نیاز است تا Dolibarr کار. راه اندازی PHP خود را چک کنید.
 ErrorPHPDoesNotSupportGD=نصب و راه اندازی PHP شما از عملکرد گرافیکی GD پشتیبانی نمی کند. بدون نمودار در دسترس خواهد بود.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=نصب و راه اندازی PHP شما توابع UTF8 را پشتیبانی نمی کند. Dolibarr نمی تواند به درستی کار می کنند. حل این قبل از نصب Dolibarr.
 ErrorDirDoesNotExists=شاخه٪ s وجود ندارد.
 ErrorGoBackAndCorrectParameters=برو به عقب و اصلاح پارامترهای اشتباه است.
@@ -133,6 +135,10 @@ ActivateModule=فعال بخش٪ s
 ShowEditTechnicalParameters=برای نشان دادن پارامترهای پیشرفته / ویرایش اینجا را کلیک کنید (حالت کارشناسی)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=به روز کردن اطلاعات در مورد ا
 MigrationPaymentMode=اطلاعات مهاجرت برای حالت پرداخت
 MigrationCategorieAssociation=مهاجرت از دسته
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=نمایش گزینه های در دسترس نیست
 HideNotAvailableOptions=پنهان کردن گزینه های در دسترس نیست
diff --git a/htdocs/langs/fa_IR/interventions.lang b/htdocs/langs/fa_IR/interventions.lang
index 1c1e5dba6b4..78cde95958b 100644
--- a/htdocs/langs/fa_IR/interventions.lang
+++ b/htdocs/langs/fa_IR/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=پس تا مشتری تماس
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/fa_IR/ldap.lang b/htdocs/langs/fa_IR/ldap.lang
index 333b99bd31c..e089b2a73da 100644
--- a/htdocs/langs/fa_IR/ldap.lang
+++ b/htdocs/langs/fa_IR/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=تاریخ اولین عضویت
 LDAPFieldFirstSubscriptionAmount=اولین مبلغ آبونمان
 LDAPFieldLastSubscriptionDate=آخرین تاریخ اشتراک
 LDAPFieldLastSubscriptionAmount=تاریخ و زمان آخرین مبلغ آبونمان
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=تعریف کاربر
 GroupSynchronized=تعریف گروه
 MemberSynchronized=تعریف کاربران
diff --git a/htdocs/langs/fa_IR/mails.lang b/htdocs/langs/fa_IR/mails.lang
index 55e9ad9ed15..c002d3ee77a 100644
--- a/htdocs/langs/fa_IR/mails.lang
+++ b/htdocs/langs/fa_IR/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=خواندن
 YourMailUnsubcribeOK=ایمیل <b>به٪ s</b> درست را از لیست پستی unsubcribe است
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=ارسال به٪ s را دریافت کنندگان ارسال می شود.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>٪ s را</b> دریافت کنندگان اضافه به لیست هدف
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 85e1a554158..a0d7d3b5424 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -67,6 +67,7 @@ SelectDate=یک تاریخ را انتخاب کنید
 SeeAlso=همچنین نگاه کنید به٪ s را
 SeeHere=See here
 BackgroundColorByDefault=رنگ به طور پیش فرض پس زمینه
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=فایل برای پیوست انتخاب شده، اما هنوز ارسال نشده. بر روی "فایل ضمیمه" برای این کلیک کنید.
 NbOfEntries=Nb و از نوشته
@@ -245,6 +246,10 @@ DateBuild=تاریخ گزارش ساخت
 DatePayment=تاریخ پرداخت
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=سال
 DurationMonth=ماه
 DurationWeek=هفته
@@ -256,6 +261,7 @@ DurationDays=روز
 Year=سال
 Month=ماه
 Week=هفته
+WeekShort=Week
 Day=روز
 Hour=ساعت
 Minute=دقیقه
@@ -278,6 +284,7 @@ MonthOfDay=ماه از روز
 HourShort=H
 MinuteShort=mn
 Rate=نرخ
+CurrencyRate=Currency conversion rate
 UseLocalTax=شامل مالیات
 Bytes=بایت
 KiloBytes=کیلوبایت
@@ -565,8 +572,11 @@ BackToList=بازگشت به لیست
 GoBack=بازگشت
 CanBeModifiedIfOk=می تواند اصلاح شود اگر معتبر
 CanBeModifiedIfKo=می تواند اصلاح شود اگر معتبر نیست
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=رکورد موفقیت اصلاح شده
 RecordsModified=٪ پرونده اصلاح شده
+RecordsDeleted=%s records deleted
 AutomaticCode=کد به صورت خودکار
 FeatureDisabled=از ویژگی های غیر فعال
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=شما اجازه دسترسی به این اقدام ند
 SessionName=نام و نام خانوادگی را وارد نمایید
 Method=روش
 Receive=دریافت
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=بخشی
 TotalWoman=کل
 NeverReceived=هرگز دریافت
@@ -598,6 +609,7 @@ DisabledModules=ماژول های غیر فعال
 For=برای
 ForCustomer=برای مشتری
 Signature=امضا
+DateOfSignature=Date of signature
 HidePassword=نمایش دستور با رمز پنهان
 UnHidePassword=نمایش دستور واقعی با رمز عبور روشن
 Root=ریشه
@@ -641,6 +653,15 @@ NewAttribute=ویژگی های جدید
 AttributeCode=ویژگی کد
 URLPhoto=URL عکس / آرم
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=ایجاد پیش نویس
 SetToDraft=Back to draft
 ClickToEdit=برای ویرایش کلیک کنید
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=دوشنبه
 Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index 5f76d985789..a5221d46cdf 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/fa_IR/oauth.lang b/htdocs/langs/fa_IR/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/fa_IR/oauth.lang
+++ b/htdocs/langs/fa_IR/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index 17e9c8ae2f1..e928d2e9dc9 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=سفارشات شما ساخته شده است
 OrderFail=خطا در هنگام ایجاد سفارشات شما اتفاق افتاده است
 CreateOrders=ایجاد سفارشات
 ToBillSeveralOrderSelectCustomer=برای ایجاد یک فاکتور برای چند دستور، برای اولین بار بر روی مشتری را کلیک کنید، و سپس "٪ s" را انتخاب کنید.
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/fa_IR/printing.lang b/htdocs/langs/fa_IR/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/fa_IR/printing.lang
+++ b/htdocs/langs/fa_IR/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 5f35c8280db..1a4db0f22ea 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=تغییر مالیات بر ارزش افزوده جرم
 ProductVatMassChangeDesc=اين صفحه را می توان مورد استفاده برای تغییر نرخ مالیات بر ارزش افزوده در محصولات یا خدمات از یک مقدار را به دیگری تعریف شده است. اخطار، این تغییر در تمام پایگاه داده انجام می شود.
 MassBarcodeInit=بارکد جرم init 
 MassBarcodeInitDesc=اين صفحه را می توان مورد استفاده قرار گيرد به مقداردهی اوليه يک بارکد بر روی اشياء می کند که بارکد تعريف ندارد. بررسی کنيد قبل از آن راه اندازی بارکد ماژول کامل است.
-ProductAccountancyBuyCode=کد حسابداری (فروش)
-ProductAccountancySellCode=کد حسابداری (فروش)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=محصولات و خدمات
 ProductsAndServices=محصولات و خدمات
 ProductsOrServices=محصولات و خدمات
@@ -59,6 +59,8 @@ SellingPriceHT=قیمت فروش (خالص از مالیات)
 SellingPriceTTC=قیمت فروش (مالیات شرکت)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=قیمت های جدید
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=قیمت فروش نمی تواند کمتر از حداقل مجاز برای این محصول (٪ بدون مالیات). این پیام همچنین می تواند به نظر می رسد اگر شما نوع تخفیف بیش از حد مهم است.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=چاپ چندین برچسب برای یک بارکد
 BuildPageToPrint=تولید صفحه چاپ
 FillBarCodeTypeAndValueManually=پر کردن بارکد از نوع و ارزش دستی.
 FillBarCodeTypeAndValueFromProduct=پر کردن بارکد از نوع و مقدار از بارکد از محصول می باشد.
-FillBarCodeTypeAndValueFromThirdParty=پر کردن بارکد از نوع و مقدار از بارکد از thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=تعریف نوع یا مقدار بارکد برای محصول٪ s را کامل کنه.
-DefinitionOfBarCodeForThirdpartyNotComplete=تعریف نوع و مقدار بار کد غیر کامل برای thirdparty٪ است.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=اطلاعات بارکد محصول٪ s را:
-BarCodeDataForThirdparty=اطلاعات بارکد از thirdparty٪ بازدید کنندگان:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=تعريف ارزش بارکد برای همه سوابق (اين نيز به ارزش بارکد در حال حاضر با ارزش های جديد تعريف شده تنظيم مجدد)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 64bcfda291d..b1af6e894ae 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=فهرست طرح تجاری مرتبط با پروژه
-ListOrdersAssociatedProject=لیست سفارشات مشتری در ارتباط با پروژه
-ListInvoicesAssociatedProject=فهرست فاکتورها مشتری در ارتباط با پروژه
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=فهرست سفارشات منبع در ارتباط با پروژه
-ListSupplierInvoicesAssociatedProject=فهرست فاکتورها منبع در ارتباط با پروژه
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=فهرست قرارداد در ارتباط با پروژه
 ListFichinterAssociatedProject=فهرست مداخلات مرتبط با پروژه
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=تاریخ کار تغییر بر اساس تاریخ شروع
 ErrorShiftTaskDate=غیر ممکن است به تغییر تاریخ کار با توجه به پروژه جدید تاریخ شروع
 ProjectsAndTasksLines=پروژه ها و وظایف
 ProjectCreatedInDolibarr=پروژه٪ s را ایجاد
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=وظیفه٪ s را ایجاد
 TaskModifiedInDolibarr=وظیفه٪ s تغییر
 TaskDeletedInDolibarr=وظیفه٪ s را حذف
@@ -153,7 +154,7 @@ PlannedWorkload=حجم کار برنامه ریزی شده
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index bd483e0f21a..4130b9b78a0 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=پرداخت حقوق و دستمزد جدید
 SalaryPayment=پرداخت حقوق و دستمزد
 SalariesPayments=حقوق پرداخت
 ShowSalaryPayment=نمایش پرداخت حقوق و دستمزد
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 833fbff39dd..86a068a9dd2 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=حذف ارسال
 Stock=موجودی
 Stocks=سهام
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=جنبش
 ErrorWarehouseRefRequired=نام انبار مرجع مورد نیاز است
 ListOfWarehouses=لیست انبار
@@ -43,6 +45,7 @@ PMPValue=قیمت به طور متوسط ​​وزنی
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=ارزش ساختمان و ذخیره سازی
 UserWarehouseAutoCreate=ایجاد یک انبار به طور خودکار در هنگام ایجاد یک کاربر
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=تعداد اعزام
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/fa_IR/supplier_proposal.lang b/htdocs/langs/fa_IR/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/fa_IR/supplier_proposal.lang
+++ b/htdocs/langs/fa_IR/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index a37e08ca23a..8e1df1f792a 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -7,13 +7,13 @@ History=تاریخ
 ListOfSuppliers=لیست تامین کنندگان
 ShowSupplier=منبع نمایش
 OrderDate=تاریخ سفارش
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=برخی از زیر محصولات هیچ قیمت تعریف شده
-AddSupplierPrice=اضافه کردن قیمت عرضه کننده کالا
-ChangeSupplierPrice=تغییر قیمت عرضه کننده کالا
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=این منبع مرجع در حال حاضر با یک مرجع در ارتباط است:٪ s را
 NoRecordedSuppliers=بدون تامین کنندگان ثبت
 SupplierPayment=پرداخت کننده
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index cf026250469..b90fcf821d1 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/fa_IR/website.lang b/htdocs/langs/fa_IR/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/fa_IR/website.lang
+++ b/htdocs/langs/fa_IR/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/fa_IR/withdrawals.lang b/htdocs/langs/fa_IR/withdrawals.lang
index ff4948fe468..9cc323c9e88 100644
--- a/htdocs/langs/fa_IR/withdrawals.lang
+++ b/htdocs/langs/fa_IR/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=مشتریان ایستاده منطقه سفارشات
-StandingOrders=سفارشات ایستاده
-StandingOrder=سفارشات ایستاده
-NewStandingOrder=منظور ایستاده جدید
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=به پردازش
-WithdrawalsReceipts=رسید برداشت
-WithdrawalReceipt=دریافت برداشت
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=خطوط برداشت
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=نیوبیوم. از فاکتور با برداشت درخواست
-NbOfInvoiceToWithdrawWithInfo=نیوبیوم. از فاکتور با درخواست مشتریان با اطلاعات حساب بانکی تعریف شده برداشت
-InvoiceWaitingWithdraw=سیاهه انتظار برای برداشت
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=مقدار برای برداشت
-WithdrawsRefused=خارج خودداری کرد
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=بدون فاکتور مشتری در حالت پرداخت "برداشت" در انتظار است. برو در تب 'برداشت' در کارت فاکتور به درخواست.
 ResponsibleUser=کاربر مسئول
-WithdrawalsSetup=راه اندازی برداشت
-WithdrawStatistics=آمار برداشت است
-WithdrawRejectStatistics=آمار برداشت رد در
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=یک درخواست برداشت
 ThirdPartyBankCode=کد های بانکی شخص ثالث
 NoInvoiceCouldBeWithdrawed=بدون فاکتور با موفقیت withdrawed. بررسی کنید که فاکتور در شرکت های با BAN معتبر هستند.
@@ -46,7 +47,7 @@ StatusRefused=رد
 StatusMotif0=نامشخص
 StatusMotif1=منابع مالی ناکافی
 StatusMotif2=درخواست اعتراض
-StatusMotif3=بدون منظور برداشت
+StatusMotif3=No direct debit payment order
 StatusMotif4=سفارش مشتری
 StatusMotif5=RIB غیر قابل استفاده
 StatusMotif6=حساب بدون موجودی
@@ -61,28 +62,43 @@ NotifyCredit=برداشت اعتباری
 NumeroNationalEmetter=شماره ملی فرستنده
 WithBankUsingRIB=برای حساب های بانکی با استفاده از RIB
 WithBankUsingBANBIC=برای حساب های بانکی با استفاده از IBAN / BIC / SWIFT
-BankToReceiveWithdraw=حساب بانکی برای دریافت خارج
+BankToReceiveWithdraw=Bank account to receive direct debit
 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 standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=تنظیم به وضعیت "فایل ارسال شد"
 ThisWillAlsoAddPaymentOnInvoice=این نیز خواهد پرداخت به فاکتورها اعمال می شود و آنها را طبقه بندی به عنوان "پرداخت"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=پرداخت سفارش ثابت٪ توسط بانک
-InfoCreditMessage=منظور ایستاده٪ بازدید کنندگان شده است توسط بانک پرداخت می شود <br> اطلاعات پرداخت:٪ s را
-InfoTransSubject=انتقال ایستاده منظور٪ به بانک
-InfoTransMessage=منظور ایستاده٪ s بر به بانک توسط٪ s٪ s ارسال شد. <br><br>
+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>
 InfoTransData=مقدار:٪ s را <br> روش: از٪ s <br> تاریخ:٪ s را
-InfoRejectSubject=منظور ایستاده خودداری کرد
-InfoRejectMessage=سلام، <br><br> به ترتیب ایستاده از فاکتور٪ s را مربوط به شرکت٪، با میزان٪ بازدید کنندگان شده است توسط بانک خودداری کرد. <br><br> - <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
 ModeWarning=انتخاب برای حالت واقعی تنظیم نشده بود، ما بعد از این شبیه سازی را متوقف کند
diff --git a/htdocs/langs/fa_IR/workflow.lang b/htdocs/langs/fa_IR/workflow.lang
index 760cfe87642..08963375c57 100644
--- a/htdocs/langs/fa_IR/workflow.lang
+++ b/htdocs/langs/fa_IR/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=راه اندازی ماژول گردش کار
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=طبقه بندی پیشنهاد منبع مربوط به صورتحساب در هنگام سفارش مشتری به پرداخت مجموعه
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=طبقه بندی مرتبط با سفارش مشتری منبع (بازدید کنندگان) صورتحساب زمانی که صورت حساب مشتری به پرداخت مجموعه
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=طبقه بندی مرتبط با سفارش مشتری منبع (بازدید کنندگان) صورتحساب زمانی که صورت حساب به مشتری اعتبار است
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index d9a48ec6121..863ef440ef8 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Kokeellinen
 VersionDevelopment=Kehitys
 VersionUnknown=Tuntematon
 VersionRecommanded=Suositeltava
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Istunnon tunnus
 SessionSaveHandler=Handler tallentaa istuntojen
 SessionSavePath=Varasto istuntojakson localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Virhe, tarkkuuden suurempi <b>kuin %s</b> ei
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr merkkien laukaista haku: %s
 NotAvailableWhenAjaxDisabled=Ole käytettävissä, kun Ajax vammaisten
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript pois päältä
 UsePreviewTabs=Käytä esikatsella välilehtiä
 ShowPreview=Näytä esikatselu
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Koodaus binary tiedot heksadesimaaleina
 IgnoreDuplicateRecords=Ohita virheitä kahdentuneet (INSERT Ignore)
 AutoDetectLang=Automaattisesti (selaimen kieli)
 FeatureDisabledInDemo=Feature vammaisten demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Oikeudet
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules määritellä, mitkä toiminnot on käytössä ohjelmistoja. Jotkut moduulit vaatia oikeuksia sinulla on myönnettävä käyttäjille jälkeen mahdollistaa moduulin.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Lisää moduuleja ...
 DoliStoreDesc=DoliStore, virallinen markkinapaikka Dolibarr ERP / CRM ulkoisten moduulien
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr nykyinen versio
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Kaikki muut merkit ja maski pysyy ennallaan. <br> Välilyönnit eivät ole sallittuja. <br>
 GenericMaskCodes4a=<u>Esimerkki on 99 %s on kolmannen osapuolen TheCompany tehnyt 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Esimerkki kolmannen osapuolen luotu 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametrit turvata URL
 SecurityTokenIsUnique=Käytä ainutlaatuinen securekey parametri jokaiselle URL
 EnterRefToBuildUrl=Kirjoita viittaus objektin %s
 GetSecuredUrl=Hanki lasketaan URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Käyttäjät & ryhmät
@@ -428,8 +439,8 @@ Module55Name=Viivakoodi
 Module55Desc=Viivakoodi hallinto
 Module56Name=Puhelimet
 Module56Desc=Puhelimet yhdentyminen
-Module57Name=Pysyvän tilaukset
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial yhdentyminen
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar yhdentyminen
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Ilmoitukset
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Lahjoitukset
 Module700Desc=Lahjoitukset hallinto
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lue tarjoajien
 Permission147=Lue stats
-Permission151=Lue pysyvän tilaukset
-Permission152=Setup pysyvän tilaukset
-Permission153=Lue pysyvän tilaukset kuitit
-Permission154=Luotto / kieltäytyä toistuvaissuoritukset kuitit
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Vienti toimittajan laskut, ominaisuudet ja maksut
 Permission1237=Export supplier orders and their details
 Permission1251=Suorita massa tuonnin ulkoisten tiedot tietokantaan (tiedot kuormitus)
 Permission1321=Vienti asiakkaan laskut, ominaisuudet ja maksut
+Permission1322=Reopen a paid bill
 Permission1421=Vienti asiakkaan tilaukset ja attribuutit
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label käyttää oletusarvoisesti, jos ei ole käännös löy
 LabelOnDocuments=Label asiakirjoihin
 NbOfDays=Nb päivää
 AtEndOfMonth=Kuukauden lopussa
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Aina aktiivinen
 Upgrade=Päivitys
@@ -950,7 +967,7 @@ LogEventDesc=Voit ottaa loki Dolibarr turvallisuus tapahtumia täältä. Järjes
 AreaForAdminOnly=Näitä toimintoja voi käyttää <b>järjestelmänvalvojan käyttäjät</b> vain. Administrator piirteet sekä auttaa todetaan Dolibarr ovat seuraavat picto:
 SystemInfoDesc=Järjestelmän tiedot ovat erinäiset tekniset tiedot saavat lukea vain tila ja näkyvissä vain järjestelmänvalvojat.
 SystemAreaForAdminOnly=Tämä alue on käytettävissä järjestelmänvalvojan käyttäjät vain. Ei mikään Dolibarr käyttöoikeudet voidaan vähentää tätä rajaa.
-CompanyFundationDesc=Muokkaa tämän sivun kaikkien tiedossa tietoa yrityksen tai fundation sinun täytyy hallita
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Voit valita kunkin parametrin yhteydessä Dolibarr näyttävät ja tuntuvat täällä
 AvailableModules=Saatavilla olevat moduulit
 ToActivateModule=Aktivoi moduulit, mennä setup-alueella.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Varoitus, joissakin Linux-järjestelmissä, lähettä
 PathToDocuments=Polku asiakirjoihin
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=TLS
 LDAPServerUseTLSExample=Sinun LDAP-palvelimen käyttö TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=Täydellinen DN (ex: cn= adminldap, dc= yhteiskunta, dc= com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Järjestelmänvalvojan salasana
 LDAPUserDn=Käyttäjien DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Täydellinen DN (ex: ou= users, dc= yhteiskunta, dc= com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Esimerkki: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Esimerkki: objectsid
 LDAPFieldEndLastSubscription=Päiväys merkintää varten
-LDAPFieldTitle=Virka / Tehtävä
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP-asetukset ole täydellinen (go muiden välilehdet)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=N: o ylläpitäjä tai salasana tarjotaan. LDAP pääsy on nimetön ja vain luku-tilassa.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Tuotteet ja palvelut moduulien asennus
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=Max numero tuotteiden yhdistelmät valitse listat (0= ei ylärajaa)
 ViewProductDescInFormAbility=Visualisointi tuotteen kuvaukset lomakkeiden (toisin kuin popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualisointi tuotteiden kuvausten thirdparty kielellä
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Oletus viivakoodi tyyppi käyttää tuotteita
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Purku-moduulin asetukset
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Ulkopuolinen RSS tuonnin setup
 NewRSS=Uusi RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 40446127374..8ab08315304 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -27,13 +27,9 @@ AllTime=Alkaen
 Reconciliation=Yhteensovittaminen
 RIB=Pankkitilin numero
 IBAN=IBAN-numero
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT-koodi
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Kestotilaus
-StandingOrder=Kestotilaus
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Tiliote
 AccountStatementShort=Laskelma
 AccountStatements=Tiliotteet
@@ -78,6 +74,7 @@ AccountToCredit=Luottotili
 AccountToDebit=Käteistili
 DisableConciliation=Poista sovittelu ominaisuus tämän tilin
 ConciliationDisabled=Sovittelukomitea ominaisuus pois päältä
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Suljettu
 AccountIdShort=Numero
@@ -87,6 +84,8 @@ AddBankRecordLong=Lisää tapahtuma manuaalisesti
 ConciliatedBy=Sovetteli
 DateConciliating=Sovittelupäivä
 BankLineConciliated=Tapahtuma soviteltu
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Asiakasmaksu
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Hyvitysmaksu
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Pankkisiirto
 BankTransfers=Pankkisiirrot
-TransferDesc=Siirtäminen tililtä toiselle yhden, Dolibarr kirjoittaa kaksi tietuetta (luottotililtä vuonna lähdetiliksi ja luottoa tavoite huomioon, että sama määrä. Sama merkki ja päivämäärä voidaan käyttää tästä tapahtumasta)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Mistä
 TransferTo=mihin
 TransferFromToDone=A <b>siirtää %s %s %s%</b> s on tallennettu.
@@ -129,7 +129,7 @@ FutureTransaction=Tapahtuma on tulevaisuudessa. Ei soviteltavissa.
 SelectChequeTransactionAndGenerate=Valitse / suodattaa tarkastuksiin sisällyttää osaksi tarkastus talletuksen vastaanottamisesta ja klikkaa &quot;Luo&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Oletun BAN
 AllRIB=Kaikki BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index 5e67119348d..6e7cc4f7906 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Virhe ei voi peruuttaa laskun, j
 BillFrom=Mistä
 BillTo=Billistä
 ActionsOnBill=Toimet lasku
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount tarjotaan (maksu ennen aikavälillä)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Pysyvän tilaukset
-StandingOrder=Kestotilaus
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Ei Luonnos laskut
 NoOtherDraftBills=Mikään muu luonnos laskut
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Pankin jotta
-PaymentTypeShortPRE=Pankin jotta
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Rahat
 PaymentTypeShortLIQ=Rahat
 PaymentTypeCB=Luottokortin
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Säännellään
 ChequeNumber=Cheque N
 ChequeOrTransferNumber=Cheque / Transfer N
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Pankki sekki
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Maksanut tämän maksun
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila &quot;maksanut&quot;.
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=Luettelo maksamattomista laskuista
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Laskun malli Crabe. Täydellinen laskun malli (Tuki alv vaihtoehto, alennukset, maksut edellytykset, logo, jne. ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/fi_FI/boxes.lang b/htdocs/langs/fi_FI/boxes.lang
index 66e7343528e..9db6a9d29e1 100644
--- a/htdocs/langs/fi_FI/boxes.lang
+++ b/htdocs/langs/fi_FI/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Vanhimat aktiiviset päättyneet palvelut
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Yleisaktiviteetit (laskut, ehdotukset, tilaukset)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Mahdollisuutta kuukausittain
 NoTooLowStockProducts=Ei tuotteita alle varaston hälytysrajan
 BoxProductDistribution=Tuotteiden/palveluiden jakelu
 BoxProductDistributionFor=%s jakelut %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Asiakkaiden laskut
 ForCustomersOrders=Asiakkaiden tilaukset
 ForProposals=Ehdotukset
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/fi_FI/cashdesk.lang b/htdocs/langs/fi_FI/cashdesk.lang
index 5ec50d5bee3..89cb6dae0ee 100644
--- a/htdocs/langs/fi_FI/cashdesk.lang
+++ b/htdocs/langs/fi_FI/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Kolmas osapuoli
 ShoppingCart=Ostoskori
 NewSell=Uusi myydä
-BackOffice=Back office
 AddThisArticle=Lisää tämä artikkeli
 RestartSelling=Mene takaisin myydä
-SellFinished=Myy valmis
+SellFinished=Sale complete
 PrintTicket=Tulosta lippu
 NoProductFound=Ei artikkeli löydetty
 ProductFound=Tuote löytyy
diff --git a/htdocs/langs/fi_FI/categories.lang b/htdocs/langs/fi_FI/categories.lang
index accc050efa8..882d3cb76bd 100644
--- a/htdocs/langs/fi_FI/categories.lang
+++ b/htdocs/langs/fi_FI/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Alaluokat
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Tämä luokka on jo olemassa samassa paikassa
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Tämä kategoria ei sisällä mitään tuotetta.
 ThisCategoryHasNoSupplier=Tämä kategoria ei sisällä mitään toimittaja.
 ThisCategoryHasNoCustomer=Tämä kategoria ei sisällä asiakkaalle.
 ThisCategoryHasNoMember=Tämä kategoria ei sisällä mitään jäsen.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 5162f15e2b5..5ee5d7168e8 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Uusi yksityishenkilö
 NewCompany=Uusi yhtiö (mahdollisuus, asiakas, toimittaja)
 NewThirdParty=Uusi kolmas osapuoli (mahdollisuus, asiakas, toimittaja)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Uusien mahdollisuuksien alue
 IdThirdParty=Kolmannen osapuolen tunnus
 IdCompany=Yritystunnus
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Tavarantoimittajat
 ThirdPartyType=Kolmannen osapuolen tyyppi
 Company/Fundation=Yritys / säätiö
 Individual=Yksityishenkilö
-ToCreateContactWithSameName=Luo automaattisesti fyysinen kontakti samalla informaatiolla
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Emoyhtiö
 Subsidiaries=Tytäryhtiöt
 ReportByCustomers=Raportti asiakkaiden mukaan
@@ -47,7 +49,7 @@ CivilityCode=Siviilisääty
 RegisteredOffice=Kotipaikka
 Lastname=Sukunimi
 Firstname=Etunimi
-PostOrFunction=Virka / Tehtävä
+PostOrFunction=Job position
 UserTitle=Titteli
 Address=Osoite
 State=Valtio / Lääni
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Työpuhelin
 PhonePerso=Henkilökohtainen puhelin
 PhoneMobile=Matkapuhelin
-No_Email=Älä lähetä massasähköposteja
+No_Email=Refuse mass e-mailings
 Fax=Faksi
 Zip=Postinumero
 Town=Postitoimipaikka
@@ -73,7 +75,7 @@ Poste= Asema
 DefaultLang=Oletuskieli
 VATIsUsed=Arvonlisävero käytössä
 VATIsNotUsed=Arvonlisävero ei ole käytössä
-CopyAddressFromSoc=Täytä kolmanen osapuolen osoite
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=ALV-numero
 VATIntraShort=ALV-numero
 VATIntraSyntaxIsValid=Syntaksi on voimassa
-VATIntraValueIsValid=Arvo on voimassa
 ProspectCustomer=Mahdollisuus / Asiakas
 Prospect=Mahdollisuus
 CustomerCard=Asiakaskortti
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Muokkaa yhteystiedot / osoite
 EditContactAddress=Edit contact/address
 Contact=Yhteydenotto
+ContactId=Contact id
 ContactsAddresses=Yhteystiedot / Osoitteet
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=Ei yhteystietoja määritelty tämän kolmannen osapuolen
 DefaultContact=Oletus kontakti / osoite
@@ -284,7 +287,7 @@ CompanyDeleted=Yritys " %s" poistettu tietokannasta.
 ListOfContacts=Luettelo yhteystiedot
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=Luettelo kolmansien osapuolten
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Näytä yhteystiedot
 ContactsAllShort=Kaikki (N: o suodatin)
 ContactType=Yhteystiedot tyyppi
@@ -294,6 +297,7 @@ ContactForProposals=Ehdotukset yhteystiedot
 ContactForContracts=Sopimukset yhteystiedot
 ContactForInvoices=Laskut yhteystiedot
 NoContactForAnyOrder=Tämä yhteyshenkilö ei ole yhteyttä mihinkään jotta
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Tämä yhteys ei ole yhteyttä mihinkään kaupalliseen ehdotus
 NoContactForAnyContract=Tämä yhteys ei ole yhteyttä mihinkään sopimukseen
 NoContactForAnyInvoice=Tämä yhteys ei ole yhteyttä mihinkään lasku
@@ -352,9 +356,9 @@ ExportCardToFormat=Vienti kortin muodossa
 ContactNotLinkedToCompany=Yhteystiedot eivät liity minkään kolmannen osapuolen
 DolibarrLogin=Dolibarr sisäänkirjoittautumissivuksesi
 NoDolibarrAccess=N: o Dolibarr pääsy
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Yhteystiedot ja ominaisuudet
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Pankkitiedot
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/fi_FI/compta.lang b/htdocs/langs/fi_FI/compta.lang
index 4d4b844820d..66293f05ed0 100644
--- a/htdocs/langs/fi_FI/compta.lang
+++ b/htdocs/langs/fi_FI/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Veroja ja osinkoja
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index 38a2c8a09f7..c43a01a5e8c 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Ajastettujen tehtävien asetusten hallinta
-URLToLaunchCronJobs=URL-osoite ajastettujen tehtävien tarkistamiseen ja ajamiseen tarvittaessa
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Tai tietyn tehtävän tarkistamiseen ja ajamiseen
 KeyForCronAccess=Turva avain ajastettujen  tehtävien ajamiseen URL-sta
 FileToLaunchCronJobs=Ajastettujen tehtävien komentorivi
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Menetelmä
 CronModule=Moduuli
 CronNoJobs=No jobs registered
 CronPriority=Prioriteetti
-CronLabel=Kuvaus
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index e4d342a2c5b..229ef2e25ad 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index 68e9499adaa..18616ddca20 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Tämä PHP tukee istuntoja.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja GET.
 PHPSupportPOSTGETKo=On mahdollista, sinun PHP asennusohjelma ei tue muuttujat POST tai GET. Tarkista parametri <b>variables_order</b> vuonna php.ini.
 PHPSupportGD=Tämä PHP tukea GD graafisia toimintoja.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Tämä PHP tukea UTF8 toimintoja.
 PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pitäisi olla tarpeeksi.
 PHPMemoryTooLow=Sinun PHP max istuntojakson muisti on <b>asetettu %s</b> tavua. Tämä olisi liian alhainen. Change your <b>php.ini</b> asettaa <b>memory_limit</b> parametri <b>vähintään %s</b> tavua.
 Recheck=Click here for a enemmän significative testi
 ErrorPHPDoesNotSupportSessions=Sinun PHP asennus ei tue istunnoissa. Tämä ominaisuus on velvollisuus tehdä Dolibarr toimi. Tarkista PHP-asetukset.
 ErrorPHPDoesNotSupportGD=Sinun PHP asennus ei tue graafisia toiminto GD. N: o kaavio on saatavilla.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Sinun PHP asennus ei tue UTF8 toimintoja. Dolibarr ei toimi oikein. Ratkaise tämä ennen asennusta Dolibarr.
 ErrorDirDoesNotExists=Hakemiston %s ei ole olemassa.
 ErrorGoBackAndCorrectParameters=Siirry taaksepäin ja korjata väärin parametrit.
@@ -133,6 +135,10 @@ ActivateModule=Aktivoi moduuli %s
 ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Päivitä tiedot toimista
 MigrationPaymentMode=Tiedot muuttoliike maksua tilassa
 MigrationCategorieAssociation=Kategorioiden siirto 
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Näytä ei saatavilla olevat valinnat
 HideNotAvailableOptions=Piilota ei saatavilla olevat valinnat
diff --git a/htdocs/langs/fi_FI/interventions.lang b/htdocs/langs/fi_FI/interventions.lang
index e1786e85bab..b8ee4fe5ab2 100644
--- a/htdocs/langs/fi_FI/interventions.lang
+++ b/htdocs/langs/fi_FI/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Seurata asiakkaiden yhteystiedot
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/fi_FI/ldap.lang b/htdocs/langs/fi_FI/ldap.lang
index e2aafcfb96e..d3981c4cb26 100644
--- a/htdocs/langs/fi_FI/ldap.lang
+++ b/htdocs/langs/fi_FI/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Ensimmäisen tilauksen päivämäärä
 LDAPFieldFirstSubscriptionAmount=Fist merkinnän määrästä
 LDAPFieldLastSubscriptionDate=Viimeisin tilaus päivämäärän
 LDAPFieldLastSubscriptionAmount=Viimeisin tilaus määrä
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Käyttäjän synkronoidaan
 GroupSynchronized=Ryhmän synkronoidaan
 MemberSynchronized=Jäsen synkronoidaan
diff --git a/htdocs/langs/fi_FI/mails.lang b/htdocs/langs/fi_FI/mails.lang
index 5aab8a0de8c..34d636c5d03 100644
--- a/htdocs/langs/fi_FI/mails.lang
+++ b/htdocs/langs/fi_FI/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Luettu
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 7ee7821f658..d6b18dd4533 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -67,6 +67,7 @@ SelectDate=Valitse päivä
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default taustaväri
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Tiedosto on valittu liite mutta ei ollut vielä ladattu. Klikkaa "Liitä tiedosto" tätä.
 NbOfEntries=Huom Merkintöjen
@@ -245,6 +246,10 @@ DateBuild=Raportti rakentaa päivämäärä
 DatePayment=Maksupäivä
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=vuosi
 DurationMonth=kuukausi
 DurationWeek=viikko
@@ -256,6 +261,7 @@ DurationDays=päivää
 Year=Vuosi
 Month=Kuukausi
 Week=Viikko
+WeekShort=Week
 Day=Päivä
 Hour=H
 Minute=Minuutti
@@ -278,6 +284,7 @@ MonthOfDay=Kuukaudenpäivä
 HourShort=H
 MinuteShort=mn
 Rate=Kurssi
+CurrencyRate=Currency conversion rate
 UseLocalTax=Sisältää veron
 Bytes=Tavua
 KiloBytes=Kilotavua
@@ -565,8 +572,11 @@ BackToList=Palaa luetteloon
 GoBack=Mene takaisin
 CanBeModifiedIfOk=Voidaan muuttaa, jos voimassa
 CanBeModifiedIfKo=Voidaan muuttaa, jos ei kelpaa
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Tietue muunnettu onnistuneesti
 RecordsModified=%s tietuetta muokattu
+RecordsDeleted=%s records deleted
 AutomaticCode=Automaattinen koodi
 FeatureDisabled=Ominaisuus pois päältä
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Sinulla ei ole lupaa tätä toimintaa varten
 SessionName=Istunnon nimi
 Method=Menetelmä
 Receive=Vastaanota
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Osittainen
 TotalWoman=Yhteensä
 NeverReceived=Ei ole saapunut
@@ -598,6 +609,7 @@ DisabledModules=Ei käytössä olevat moduulit
 For=Saat
 ForCustomer=Asiakkaan
 Signature=Allekirjoitus
+DateOfSignature=Date of signature
 HidePassword=Näytä komento salasana piilotettuna
 UnHidePassword=Näytä todellinen komento salasana näkyen
 Root=Juuri
@@ -641,6 +653,15 @@ NewAttribute=Uusi ominaisuus
 AttributeCode=Ominaisuuden koodi
 URLPhoto=Kuvan tai logon url
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Luo luonnos
 SetToDraft=Back to draft
 ClickToEdit=Klikkaa muokataksesi
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Maanantai
 Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index d831cbc2132..a7dc217581e 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/fi_FI/oauth.lang b/htdocs/langs/fi_FI/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/fi_FI/oauth.lang
+++ b/htdocs/langs/fi_FI/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index bba58d9f5d0..da44e5bb50a 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/fi_FI/printing.lang b/htdocs/langs/fi_FI/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/fi_FI/printing.lang
+++ b/htdocs/langs/fi_FI/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 9bbfcccc7b4..0f2d06b43df 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Kirjanpidon koodi (osta)
-ProductAccountancySellCode=Kirjanpidon koodi (myydä)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Tuote tai palvelu
 ProductsAndServices=Tuotteet ja palvelut
 ProductsOrServices=Tuotteet tai palvelut
@@ -59,6 +59,8 @@ SellingPriceHT=Myyntihinta (ilman veroja)
 SellingPriceTTC=Myyntihinta (sis. alv)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Uusi hinta
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Myyntihinta ei voi olla pienempi kuin pienin sallittu tämän tuotteen ( %s ilman veroja)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 3368e6c155e..afd8ffe5ab9 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Luettelot kaupallisen ehdotuksia hankkeeseen liittyvät
-ListOrdersAssociatedProject=Luettelot tilausten hankkeeseen liittyvät
-ListInvoicesAssociatedProject=Luettelot laskut liittyvät hankkeen
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Luettelo toimittajien tilaukset hankkeeseen liittyvät
-ListSupplierInvoicesAssociatedProject=Luettelo tavarantoimittajien laskut liittyvät hankkeen
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Luettelo sopimukset hankkeeseen liittyvät
 ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 50860e9d851..c79f098c5af 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Poista lähettäminen
 Stock=Kanta
 Stocks=Varastot
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Liikkeet
 ErrorWarehouseRefRequired=Warehouse viite nimi tarvitaan
 ListOfWarehouses=Luettelo varastoissa
@@ -43,6 +45,7 @@ PMPValue=Value
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Varastot arvo
 UserWarehouseAutoCreate=Luo varastossa automaattisesti luoda käyttäjä
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Määrä lähetysolosuhteita
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/fi_FI/supplier_proposal.lang b/htdocs/langs/fi_FI/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/fi_FI/supplier_proposal.lang
+++ b/htdocs/langs/fi_FI/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index c834260ec25..5a3eded0d69 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -7,13 +7,13 @@ History=Historia
 ListOfSuppliers=Luettelo toimittajista
 ShowSupplier=Näytä toimittaja
 OrderDate=Tilauspäivä
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Lisää toimittajan hinta
-ChangeSupplierPrice=Vaihda toimittajan hinta
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tämä viittaus toimittaja on jo liitetty viite: %s
 NoRecordedSuppliers=N: o toimittajat kirjataan
 SupplierPayment=Toimittaja maksu
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/fi_FI/users.lang b/htdocs/langs/fi_FI/users.lang
index e299d84847d..b52bcba9a26 100644
--- a/htdocs/langs/fi_FI/users.lang
+++ b/htdocs/langs/fi_FI/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/fi_FI/website.lang b/htdocs/langs/fi_FI/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/fi_FI/website.lang
+++ b/htdocs/langs/fi_FI/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/fi_FI/withdrawals.lang b/htdocs/langs/fi_FI/withdrawals.lang
index 163c8c625a1..1ae93bea133 100644
--- a/htdocs/langs/fi_FI/withdrawals.lang
+++ b/htdocs/langs/fi_FI/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Asiakkaat pysyvän tilaukset alueella
-StandingOrders=Pysyvän tilaukset
-StandingOrder=Pysyvän tilaukset
-NewStandingOrder=Uusi kestotilaus
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Jotta prosessi
-WithdrawalsReceipts=Nostot kuitit
-WithdrawalReceipt=Peruuttaminen vastaanottamisesta
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Nostot linjat
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Laskun odottaa peruuttaa
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Määrä peruuttaa
-WithdrawsRefused=Peruuttaa evätty
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Ei asiakasta laskun maksu mode "vetää" odottaa. Mene "Peruuta" välilehdessä laskun kortin pyytää.
 ResponsibleUser=Vastaava käyttäjä
-WithdrawalsSetup=Peruuttaminen setup
-WithdrawStatistics=Peruuttaa tilastot
-WithdrawRejectStatistics=Peruuta hylkää tilastot
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Tee peruuttaa pyynnön
 ThirdPartyBankCode=Kolmannen osapuolen pankin koodi
 NoInvoiceCouldBeWithdrawed=N: o laskun withdrawed menestyksekkäästi. Tarkista, että laskussa yrityksiin, joilla on voimassa oleva kielto.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Määrittelemätön
 StatusMotif1=Säännös insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=Ei vetäytyminen järjestys
+StatusMotif3=No direct debit payment order
 StatusMotif4=Asiakkaan tilauksen
 StatusMotif5=RIB inexploitable
 StatusMotif6=Huomioon ilman tasapaino
@@ -61,28 +62,43 @@ 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=Pankkitili saada vetäytyy
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Maksaminen kestotilaus %s pankin
-InfoCreditMessage=Kestotilaus %s on maksanut pankille <br> Tiedot maksu: %s
-InfoTransSubject=Toimittaminen kestotilaus %s pankkiin
-InfoTransMessage=Kestotilaus %s on transmited sen pankkiin %s %s. <br><br>
+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>
 InfoTransData=Määrä: %s <br> Metode: %s <br> Date: %s
-InfoRejectSubject=Pysyvä järjestyksessä kieltäytyi
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Vaihtoehto todellista tilaa ei ole asetettu, pysähdymme jälkeen simulointi
diff --git a/htdocs/langs/fi_FI/workflow.lang b/htdocs/langs/fi_FI/workflow.lang
index 0f2d4e19e8c..986915d91ee 100644
--- a/htdocs/langs/fi_FI/workflow.lang
+++ b/htdocs/langs/fi_FI/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow-moduuli asennus
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/fr_BE/accountancy.lang b/htdocs/langs/fr_BE/accountancy.lang
index 4b3cdfb11bb..f4190e6e567 100644
--- a/htdocs/langs/fr_BE/accountancy.lang
+++ b/htdocs/langs/fr_BE/accountancy.lang
@@ -1,23 +1,14 @@
 # Dolibarr language file - Source file is en_US - accountancy
 ConfigAccountingExpert=Configuration du module de compta expert
-Ventilation=Subdivision
-CustomersVentilation=Subdivision clients
-SuppliersVentilation=Subdivision fournisseurs
-UpdateMvts=Modification d'un mouvement
-InvoiceLinesDone=Lignes de facture ventilées
+ProductsBinding=Products bindings
 Processing=Exécution
 EndProcessing=Fin de l'exécution
 Lineofinvoice=Lignes de facture
-VentilatedinAccount=Ventilé(es) correctement dans le compte comptable
-NotVentilatedinAccount=Non ventilé(es) dans le compte comptable
 Doctype=Type de document
 ThirdPartyAccount=Compte tiers
 ErrorDebitCredit=Débit et crédit ne peuvent pas être non-nuls en même temps
-ReportThirdParty=Liste des comptes tiers
-DescThirdPartyReport=Consulter la liste des clients et fournisseurs tiers et de leur comptes comptables
 Pcgtype=Classe du compte
 Pcgsubtype=Sous-classe du compte
-DescVentilCustomer=Consulter la subdivision comptable annuelle de vos factures clients
 TotalMarge=Marge de ventes totale
 Selectmodelcsv=Sélectionnez un modèle d'export
 Modelcsv_normal=Export classique
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index da5757b1b06..94287f8c2ff 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -23,5 +23,3 @@ RemoveLock=Supprimez le fichier <b>%s</b> s'il existe pour autoriser l'utilisati
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/fr_BE/boxes.lang b/htdocs/langs/fr_BE/boxes.lang
index af2b5b8fd0c..85bda7e24e5 100644
--- a/htdocs/langs/fr_BE/boxes.lang
+++ b/htdocs/langs/fr_BE/boxes.lang
@@ -1,39 +1,10 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Information RSS
-BoxLastProducts=Derniers %s produits/services
-BoxProductsAlertStock=Alerte de produits en stock
-BoxLastProductsInContract=Derniers %s produits/services contractés
-BoxLastSupplierBills=Dernières factures fournisseur
-BoxOldestUnpaidCustomerBills=Plus vieilles factures client impayées
-BoxOldestUnpaidSupplierBills=Plus vieilles factures fournisseur impayées
-BoxLastCustomerOrders=Dernières commandes client
-BoxLastActions=Dernières actions
-BoxLastContacts=Derniers contrats/adresses
-BoxLastMembers=Derniers membres
-BoxTitleLastRssInfos=Dernières %s nouvelles de %s
-BoxTitleLastProducts=%s derniers produits/services
 BoxTitleProductsAlertStock=Alerte de produits en stock
-BoxTitleLastSuppliers=%s derniers fournisseurs enregistrés
-BoxTitleLastModifiedSuppliers=%s derniers fournisseurs modifiés
-BoxTitleLastModifiedCustomers=%s derniers clients modifiés
-BoxTitleLastCustomersOrProspects=%s derniers clients ou prospects
-BoxTitleLastCustomerBills=%s dernières factures client
-BoxTitleLastSupplierBills=%s dernières factures fournisseurs
-BoxTitleLastModifiedProspects=%s derniers prospects modifiés
-BoxTitleLastModifiedMembers=%s derniers membres
-BoxTitleLastFicheInter=%s dernières interventions modifiées
 BoxTitleOldestUnpaidCustomerBills=%s plus vieilles factures client impayées
 BoxTitleOldestUnpaidSupplierBills=%s plus vieilles factures fournisseur impayées
 BoxTitleCurrentAccounts=Balance des comptes ouverts
-BoxTitleLastModifiedContacts=%s derniers contacts/adresses modifié(e)s
-BoxMyLastBookmarks=Mes derniers marque-pages
-BoxLastExpiredServices=%s plus anciens contacts avec des services actifs expirés
-BoxTitleLastActionsToDo=%s dernières actions à faire
-BoxTitleLastContracts=%s derniers contrats
-BoxTitleLastModifiedDonations=%s derniers dons modifiés
 BoxGlobalActivity=Activité globale (factures, propales, commandes)
-FailedToRefreshDataInfoNotUpToDate=Impossible de rafraîchir le flux RSS. Dernière date de mise à jour: %s
-LastRefreshDate=Dernière date de mise à jour
 NoRecordedBookmarks=Aucun bookmark défini
 ClickToAdd=Cliquer ici pour ajouter
 NoRecordedCustomers=Aucun client enregistré
diff --git a/htdocs/langs/fr_BE/mails.lang b/htdocs/langs/fr_BE/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/fr_BE/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/fr_BE/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/fr_BE/withdrawals.lang b/htdocs/langs/fr_BE/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/fr_BE/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/fr_CA/accountancy.lang b/htdocs/langs/fr_CA/accountancy.lang
index 659b05cf7ee..f3d2ec419f0 100644
--- a/htdocs/langs/fr_CA/accountancy.lang
+++ b/htdocs/langs/fr_CA/accountancy.lang
@@ -6,21 +6,18 @@ ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporter avec compte global
 Selectformat=Sélectionner le format de date pour le fichier
 ACCOUNTING_EXPORT_PREFIX_SPEC=Spécifiez le préfixe du nom de fichier
 AccountAccountingSuggest=Compte comptable suggéré
+ProductsBinding=Products bindings
 AccountBalance=Solde du compte
 CAHTF=Total achats fournisseur avant taxes
-InvoiceLines=Lignes de factures à ventiler
-IntoAccount=Ventiler dans le compte de la comptabilité
 ACCOUNTING_LENGTH_DESCRIPTION=Longueur pour l'affichage des produits et services description dans les listes (valeur conseillée = 50 )
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longueur pour l'affichage des produits et services compte formulaire de description dans les listes (valeur conseillée = 50 )
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Note de frais
 FinanceJournal=Journal des finances
 DescFinanceJournal=Journal de banque comprenant tous les types de règlements autres que espèce\t
-NumMvts=Nombre de mouvement
 TotalVente=Chiffre d'affaires total avant taxes
 MvtNotCorrectlyBalanced=Le mouvement n'est pas correctement équilibré. Crédit = %s. Débit = %s
 GeneralLedgerIsWritten=Les opérations sont écrites dans le grand livre général
 InitAccountancy=Compabilité initiale
-InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui ne disposent pas de compte comptable défini pour les ventes et les achats . Vérifiez avant que l'installation du module de comptabilité est terminée.
 OptionModeProductSell=Mode de ventes
 OptionModeProductBuy=Mode d'achats
 OptionModeProductSellDesc=Voir tous les produits sans compte comptable défini pour les ventes.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 0c7ccba771b..010ca477b54 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 FilesUpdated=Mettre à jour les fichiers
-Fiscalyear=Année fiscale
 PurgeDeleteTemporaryFilesShort=Supprimer les fichiers temporaires
 InstrucToEncodePass=Pour chiffrer le mot de passe de la base dans le fichier de configuration <b>conf.php</b>, remplacer la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:..."</b><br>par<br><b>$dolibarr_main_db_pass="%s"</b>
@@ -29,6 +28,7 @@ Module75Name=Notes de frais et déplacements
 Module500Name=Dépenses spéciales (taxes, charges, dividendes)
 Module500Desc=Gestion des dépenses spéciales comme les taxes, charges sociales et dividendes
 Module770Name=Note de frais
+Module1120Name=Propositions commerciales founisseurs
 Module2600Name=services API / Web ( serveur SOAP )
 Module2600Desc=Active le serveur de Web Services de Dolibarr
 Module2610Name=services API / Web ( serveur REST )
@@ -129,7 +129,6 @@ HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque d
 HighlightLinesColor=Mettez en surbrillance la couleur de la ligne lorsque la souris passe au-dessus (gardez vide pour ne pas mettre en évidence)
 TextTitleColor=Couleur de la page titre
 PressF5AfterChangingThis=Appuyez sur F5 pour rafraichir la valeur modifiée
-NotSupportedByAllThemes=Nous travaillons avec le thème eldy mais il n'est pas pris en charge par tous les thèmes
 TopMenuBackgroundColor=Couleur de fond du menu haut
 LeftMenuBackgroundColor=Couleur de fond gauche
 BackgroundTableTitleColor=Couleur de fond pour le tableau ligne de titre
@@ -158,7 +157,6 @@ MailToSendIntervention=Envoyer l'intervention
 MailToSendSupplierRequestForQuotation=Pour envoyer demande de devis au fournisseur
 MailToSendSupplierOrder=Envoyer la commande fournisseur
 MailToSendSupplierInvoice=Envoyer la facture fournisseur
-MailToThirdparty=Envoyer un courriel de la page Tiers
 ByDefaultInList=Afficher par défaut sur la liste vue
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version majeure ( se sentir libre de l'utiliser sur vos sites web )
 TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser pour annoncer cette version de maintenance ( se sentir libre de l'utiliser sur vos sites web )
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index fe66ce3fd11..29860799f53 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -1,6 +1,12 @@
 # Dolibarr language file - Source file is en_US - banks
 OnlyOpenedAccount=Uniquement comptes ouverts
 SocialContributionPayment=Règlement charge sociale
+DefaultRIB=RIB par défaut
+AllRIB=Tous les RIB
+LabelRIB=Nom du RIB
+NoBANRecord=Aucun RIB enregistré
+DeleteARib=Supprimé RIB enregistré
+ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce RIB ?
 RejectCheck=Chèque renvoyé
 ConfirmRejectCheck=Etes-vous sûr que vous voulez marquer ce chèque comme rejeté ?
 RejectCheckDate=Date à laquelle le chèque a été retourné
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index 7adb3fdbd84..f0b61e1371b 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -30,6 +30,7 @@ MaxPeriodNumber=Nombre maximal de génération de facture
 NbOfGenerationDone=Nombre de génération de facture déjà faite
 GeneratedFromRecurringInvoice=Généré à partir du modèle facture récurrente %s
 InvoiceGeneratedFromTemplate=Facture %s générée depuis le modèle de facture %s récurrentes
+BankAccountNumberKey=Clé RIB
 ChequeMaker=Émetteur du chèque/transfert
 PaymentByChequeOrderedTo=Règlement (tx incl.) par chèque à l'ordre de %s envoyé à
 PaymentByChequeOrderedToShort=Règlement (tx incl.) par chèque à l'ordre de
diff --git a/htdocs/langs/fr_CA/boxes.lang b/htdocs/langs/fr_CA/boxes.lang
index 77f2157836b..5fc77750eb4 100644
--- a/htdocs/langs/fr_CA/boxes.lang
+++ b/htdocs/langs/fr_CA/boxes.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxCurrentAccounts=Soldes Comptes ouverts
-BoxTitleLastCustomersOrProspects=Les %s derniers prospects
 BoxTitleCurrentAccounts=Soldes des comptes ouverts
-BoxTitleLastModifiedExpenses=Les dernier %s rapports de dépenses modifiées
+BoxTitleGoodCustomers=%s Bons clients
diff --git a/htdocs/langs/fr_CA/categories.lang b/htdocs/langs/fr_CA/categories.lang
index 2c2c3973137..0737a652735 100644
--- a/htdocs/langs/fr_CA/categories.lang
+++ b/htdocs/langs/fr_CA/categories.lang
@@ -5,7 +5,6 @@ CompanyIsInCustomersCategories=Ce tiers appartient aux tags/catégories de clien
 CompanyIsInSuppliersCategories=Ce tiers appartient aux tags/catégories de fournisseurs suivant(e)s
 MemberIsInCategories=Ce membre appartient aux tags/catégories suivant(e)s
 ContactIsInCategories=Ce contact appartient aux tags/catégories suivant(e)s
-CompanyHasNoCategory=Ce tiers n'appartient à aucun tag/catégorie
 ClassifyInCategory=Classer dans le(a) tag/catégorie
 MembersCategoryShort=Tags/catégories de membres
 ProspectsCategoriesShort=Prospects tags/catégories
diff --git a/htdocs/langs/fr_CA/mails.lang b/htdocs/langs/fr_CA/mails.lang
index 40d5d213577..71ecef377dd 100644
--- a/htdocs/langs/fr_CA/mails.lang
+++ b/htdocs/langs/fr_CA/mails.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - mails
 MailingStatusValidated=Validée
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
index 8e760767abd..02cb3581458 100644
--- a/htdocs/langs/fr_CA/products.lang
+++ b/htdocs/langs/fr_CA/products.lang
@@ -3,8 +3,6 @@ ProductRef=Référence produit
 ProductLabel=Désignation du produit
 ProductServiceCard=Carte du produits/services
 ProductId=Identification du produit/service
-ProductAccountancyBuyCode=Code comptable (achat)
-ProductAccountancySellCode=Code comptable (vente)
 ProductOrService=Produit et service
 ProductsAndServices=Produits et services
 ProductsOrServices=Produits ou services
diff --git a/htdocs/langs/fr_CA/salaries.lang b/htdocs/langs/fr_CA/salaries.lang
index 27a8cbd717b..a1f85800ea0 100644
--- a/htdocs/langs/fr_CA/salaries.lang
+++ b/htdocs/langs/fr_CA/salaries.lang
@@ -5,8 +5,6 @@ NewSalaryPayment=Nouveau paiement de salaire
 SalaryPayment=Paiement Salaire
 SalariesPayments=Paiements salaires
 ShowSalaryPayment=Afficher paiement de salaires
-THM=Prix moyen horaire
-TJM=Prix moyen journalier
 CurrentSalary=Salaire actuel
 THMDescription=Cette valeur peut être utilisée pour calculer le coût du temps consommé sur un projet entré par les utilisateurs si le projet de module est utilisé
 TJMDescription=Cette valeur est actuellement à titre d'information seulement et ne sert pas à tout calcul
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/fr_CA/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/fr_CA/suppliers.lang b/htdocs/langs/fr_CA/suppliers.lang
index c222c4a5323..6e51169216c 100644
--- a/htdocs/langs/fr_CA/suppliers.lang
+++ b/htdocs/langs/fr_CA/suppliers.lang
@@ -1,11 +1,8 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SuppliersInvoice=Factures fournisseurs
+ShowSupplierInvoice=Afficher une facture fournisseur
 ListOfSuppliers=Liste fournisseurs
-BuyingPriceMin=Prix minimum d'achat
-BuyingPriceMinShort=Prix min. d'achat
 SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix défini
-AddSupplierPrice=Ajouter prix du fournisseur
-ChangeSupplierPrice=Changer le prix de fournisseur
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ce fournisseur de référence est déjà associé à une référence : %s
 NoRecordedSuppliers=Aucun fournisseurs enregistrés
 SupplierPayment=Règlement fournisseur
@@ -21,4 +18,3 @@ ListOfSupplierProductForSupplier=Liste des produits et des prix pour le fourniss
 SentToSuppliers=Envoyer aux fournisseurs
 MenuOrdersSupplierToBill=Commandes de fournisseur à facturer
 DescNbDaysToDelivery=Délai de livraison maximum pour les produits de cette commande
-UseDoubleApproval=Utilisez la double approbation lorsque montant (no tax.) est supérieur (La deuxième approbation peut être fait par tout utilisateur avec la permission dédié. Réglez à 0 si pas de double approbation nécessaire)
diff --git a/htdocs/langs/fr_CA/withdrawals.lang b/htdocs/langs/fr_CA/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/fr_CA/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/fr_CH/accountancy.lang b/htdocs/langs/fr_CH/accountancy.lang
new file mode 100644
index 00000000000..22f36b26563
--- /dev/null
+++ b/htdocs/langs/fr_CH/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ProductsBinding=Products bindings
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 404be0f58c6..1c53b65c99c 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -2,5 +2,3 @@
 AntiVirusCommandExample=Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
 AntiVirusParamExample=Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
diff --git a/htdocs/langs/fr_CH/mails.lang b/htdocs/langs/fr_CH/mails.lang
deleted file mode 100644
index cc3219b8470..00000000000
--- a/htdocs/langs/fr_CH/mails.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - mails
-ListOfActiveNotifications=List all active targets for email notification
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
deleted file mode 100644
index 00d43473692..00000000000
--- a/htdocs/langs/fr_CH/stocks.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-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)
diff --git a/htdocs/langs/fr_CH/withdrawals.lang b/htdocs/langs/fr_CH/withdrawals.lang
new file mode 100644
index 00000000000..a6f0f06fc82
--- /dev/null
+++ b/htdocs/langs/fr_CH/withdrawals.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index cd0e83cb415..19ec13c5d23 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journaux
 JournalFinancial=Journaux financiers
 BackToChartofaccounts=Retour au plan comptable
 
+AccountancyArea=Espace comptabilité
+AccountancyAreaDescIntro=L'utilisation du module de comptabilité se fait en plusieurs étapes:
+AccountancyAreaDescActionOnce=Les actions suivantes sont habituellement exécutées une seule fois, ou une fois par an ...
+AccountancyAreaDescActionFreq=Les actions suivantes sont habituellement exécutées chaque mois, semaine, ou jour pour les très grandes entreprises ...
+AccountancyAreaDescChart=STEP %s: Créer ou vérifier votre plan de compte dans le menu %s
+AccountancyAreaDescProd=STEP %s: Vérifier que la liaison entre les produits/services et le compte comptable est faite. Compléter les liaisons manquantes. Cela vous fera économiser du temps dans le futur pour les prochaines étapes en vous proposant le bon compte comptable par défaut sur vos lignes de facture. <br> Pour cela, vous pouvez utiliser l'entrée de menu %s.
+AccountancyAreaDescBank=STEP %s: Vérifier que la liaison entre les comptes bancaires et le compte comptable est faite. Compléter les liaisons manquantes. Cela vous fera économiser du temps dans le futur pour les prochaines étapes en vous proposant le bon compte comptable par défaut sur vos lignes de paiement. <br>Pour cela, rendez-vous sur la fiche de chaque compte financier. Vous pouvez commencer à partir de la page %s.
+AccountancyAreaDescVat=STEP %s: Vérifiez que la liaison entre le paiement de la TVA et le compte comptable est faite. Compléter les liaisons manquantes. Cela vous fera économiser du temps dans le futur pour les prochaines étapes en vous proposant le compte comptable par défaut correcte sur les enregistrements liés aux paiements de TVA.<br>Vous pouvez définir les comptes comptables à utiliser pour chaque taux de TVA sur la page %s.
+AccountancyAreaDescSal=STEP %s: Vérifier que la liaison entre les paiements de salaires et le compte comptable est faite. Compléter les liaisons manquantes. Cela vous fera économiser du temps dans le futur pour les prochaines étapes en vous proposant le bon compte comptable par défaut sur les enregistrements en rapport avec les paiements des salaires.<br>Pour cela, vous pouvez utiliser l'entrée de menu %s.
+AccountancyAreaDescContrib=STEP %s: Vérifier que la liaison entre les dépenses spéciales (cotisations sociales ou fiscales) et le compte comptable est faite. Compléter les liaisons manquantes. Cela vous fera économiser du temps dans le futur pour les prochaines étapes en vous proposant le bon compte comptable par défaut sur les enregistrements liés aux paiements des cotisations sociales.<br>Pour cela, vous pouvez utiliser l'entrée de menu %s.
+AccountancyAreaDescDonation=STEP %s: Vérifier que la liaison entre les paiements de dons et le compte comptable est faite. Compléter les liaisons manquantes. Cela vous fera économiser du temps dans le futur pour les prochaines étapes en vous proposant le bon compte comptable par défaut sur les enregistrements liés aux paiements de don. <br> Vous pouvez définir le compte dédié pour cela à partir de l'entrée de menu %s.
+
+AccountancyAreaDescCustomer=STEP %s: Vérifier que la liaison entre les lignes de factures client existantes et le compte comptable est faite. Compléter les liaisons manquantes. Une fois que la liaison est terminée, l'application sera en mesure d'enregistrer les transactions dans le Grand Livre en un seul clic.<br>Pour cela, vous pouvez utiliser l'entrée de menu %s.
+AccountancyAreaDescSupplier=STEP %s: Vérifier que la liaison entre les lignes de factures fournisseurs existantes et le compte comptable est faite. Compléter les liaisons manquantes. Une fois que la liaison est terminée, l'application sera en mesure d'enregistrer les transactions dans le Grand Livre en un seul clic. <br> Pour cela, vous pouvez utiliser l'entrée de menu %s.
+AccountancyAreaDescWriteRecords=STEP %s: Ecrire les transactions dans le Grand Livre. Ajouter ou modifier les transactions existantes et générer les rapports.
+
 Selectchartofaccounts=Sélectionner un plan comptable
 Addanaccount=Ajouter un compte comptable
 AccountAccounting=Compte comptable
 AccountAccountingShort=Compte
 AccountAccountingSuggest=Suggestion du compte
-Ventilation=Ventilation
+Ventilation=Liés aux comptes
+ProductsBinding=Liaison produits
 
 MenuAccountancy=Comptabilité
-CustomersVentilation=Ventilation clients
-SuppliersVentilation=Ventilation fournisseurs
+CustomersVentilation=Factures client liées
+SuppliersVentilation=Factures fournisseurs liées
 Reports=Rapports
 NewAccount=Nouveau compte comptable
 Create=Créer
-CreateMvts=Créer mouvement
-UpdateMvts=Modification de mouvements
-WriteBookKeeping=Enregistrer les écritures dans le grand livre
+CreateMvts=Créer nouvelle transaction
+UpdateMvts=Modification d'une transaction
+WriteBookKeeping=Enregistrer les opérations dans le Grand Livre
 Bookkeeping=Grand livre
 AccountBalance=Balance des comptes
 
 CAHTF=Total achat fournisseur HT
-InvoiceLines=Lignes de facture à ventiler
-InvoiceLinesDone=Lignes de factures ventilées
-IntoAccount=Ventiler dans le compte comptable
+InvoiceLines=Lignes de factures à ventiler
+InvoiceLinesDone=Lignes de factures liées
+IntoAccount=Lier ligne avec le compte comptable
 
-Ventilate=Ventiler
+Ventilate=Lier
 
 Processing=Traitement en cours
 EndProcessing=Fin du traitement
-AnyLineVentilate=Aucune ligne à ventiler
+AnyLineVentilate=Toutes lignes à lier
 SelectedLines=Lignes sélectionnées
 Lineofinvoice=Ligne de la facture
-VentilatedinAccount=Ventilé avec succès dans le compte comptable
-NotVentilatedinAccount=Non ventilé dans le compte comptable
+VentilatedinAccount=Liée avec succès sur compte comptable
+NotVentilatedinAccount=Non lié au compte comptable
+XLineSuccessfullyBinded=%s produits/services liés avec succès à un compte comptable
+XLineFailedToBeBinded=%s produits/services n'ont pu être liés à un compte comptable
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation "Ventilées" par les éléments les plus récents
+ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à lier représentés par page (maximum recommandé: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Trier de la page "Lien à réaliser" par les éléments les plus récents
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Trier la page "Liens réalisés" par les éléments les plus récents
 
 ACCOUNTING_LENGTH_DESCRIPTION=Longueur pour afficher la description des produits & services dans les listes (Idéalement = 50)
-ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longueur pour afficher la description du compte des produits & services dans les listes (Idéaliement = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Longueur pour afficher la description du compte des produits & services dans les listes (Idéalement = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux
 ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers
+ACCOUNTING_MANAGE_ZERO=Ajouter des 0  à la fin des codes comptable. Fonctionnalité nécessaire pour certains pays, désactivée par défaut. Attention à la fonction "longueur des comptes" de vos codes comptables.
+BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banque (Activé par défaut avec ce module).
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
@@ -81,31 +102,30 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Numéro de pièce
 AccountingCategory=Catégorie comptable
-
 NotMatch=Non défini
-
 DeleteMvt=Supprimer les lignes du grand livre
 DelYear=Année à supprimer
 DelJournal=Journal à supprimer
-ConfirmDeleteMvt=Cette action effacera toutes les lignes du grand livre pour l'année et/ou d'un journal 
-
+ConfirmDeleteMvt=Cela supprimera toutes les lignes du Grand Livre pour l'année et/ou un journal spécifique
+ConfirmDeleteMvtPartial=Ceci va supprimer la(les) ligne(s) sélectionnée(s) du Grand Livre
 DelBookKeeping=Supprimer les écritures du grand livre
-
 DescSellsJournal=Journal des ventes
 DescPurchasesJournal=Journal des achats
 FinanceJournal=Journal de trésorerie
 DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse
-
+DescJournalOnlyBindedVisible=Ceci est une vue de enregistrements qui sont liés à un compte comptable produits et qui peuvent être enregistrées dans le Grand Livre.
+VATAccountNotDefined=Compte de la TVA non défini
+ThirdpartyAccountNotDefined=Compte pour le tiers non défini
+ProductAccountNotDefined=Compte pour le produit non défini
+BankAccountNotDefined=Compte pour la banque non défini
 CustomerInvoicePayment=Paiement de facture client
-
 ThirdPartyAccount=Comptes de tiers
-
-NewAccountingMvt=Nouveau mouvement
-NumMvts=Numéro du mouvement
+NewAccountingMvt=Nouvelle transaction
+NumMvts=Numéro de transaction
 ListeMvts=Liste des mouvements
 ErrorDebitCredit=Débit et crédit ne peuvent pas avoir la même valeur en même temps.
 
-ReportThirdParty=Liste compte tiers
+ReportThirdParty=Liste des comptes tiers
 DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables
 
 ListAccounts=Liste des comptes comptables
@@ -114,22 +134,29 @@ Pcgtype=Classe de compte
 Pcgsubtype=Sous classe de compte
 Accountparent=Racine des comptes
 
-DescVentilCustomer=Consultez ici la ventilation comptable annuelle de vos factures clients
 TotalVente=Total chiffre affaires hors taxe
 TotalMarge=Total marge
-DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable
-DescVentilTodoCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable
-ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte :
+
+DescVentilCustomer=Consultez ici la liste des lignes de facture client lié (ou non) à un compte comptable produit
+DescVentilMore=Dans la plupart des cas, si vous utilisez des produits ou des services prédéfinis et vous définissez le numéro de compte comptable sur la fiche produit/service, l'application sera en mesure de faire toute les liaisons entre vos lignes de facture et le compte comptable de votre plan comptable, juste en un clic avec le bouton <strong>"%s"</strong>. Si le compte n'a pas été mis sur les fiches produits/services ou si vous avez encore quelques lignes non liées à un compte, vous devrez faire une liaison manuelle à partir du menu <strong>"%s"</strong>.
+DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable produits
+DescVentilTodoCustomer=Lier les lignes de facture non déjà liée à un compte comptable produit
+ChangeAccount=Modifier le compte comptable produit/service pour les lignes sélectionnées avec le compte comptable suivant:
 Vide=-
-DescVentilSupplier=Consultez ici la ventilation comptable annuelle de vos factures fournisseurs
+DescVentilSupplier=Consultez ici la liste des lignes de facture fournisseur liées ou pas encore liées à un compte comptable produit
 DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable
 
-ValidateHistory=Valider Automatiquement
+ValidateHistory=Lier automatiquement
+AutomaticBindingDone=Liaison automatique faite
 
 ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
 MvtNotCorrectlyBalanced=Le mouvement n'est pas équilibré. Crédit = %s. Débit = %s
-FicheVentilation=Fiche ventilation
+FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les opérations ont été inscrites dans le grand livre
+GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être enregistrées.
+NoNewRecordSaved=Aucun nouvel enregistrement sauvegardé
+ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
+ChangeBinding=Changer les liens
 
 ## Admin
 ApplyMassCategories=Application en masse des catégories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export vers Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initialisation comptabilité
-InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui n'ont pas de compte comptable défini pour les ventes et les achats. Vérifiez avant que l'installation du module comptabilité avancée est complète. 
+InitAccountancyDesc=Cette page peut être utilisée pour initialiser un compte comptable sur les produits et services qui ne disposent pas de compte comptable défini pour les ventes et les achats. Vérifiez avant que la définition du plan de compte est terminée.
 Options=Options
 OptionModeProductSell=Mode ventes
 OptionModeProductBuy=Modes achats
 OptionModeProductSellDesc=Afficher tous les produits/services n'ayant pas de compte comptable défini pour les ventes.
 OptionModeProductBuyDesc=Afficher tous les produits/services n'ayant pas de compte comptable défini pour les achats.
+CleanFixHistory=Effacer les données comptables des lignes qui n'existent pas dans le plan comptable
+CleanHistory=Réinitialiser tous lesliens pour l'année sélectionnée
 
 ## Dictionary
 Range=Plage de comptes
@@ -167,3 +196,9 @@ Formula=Formule
 ErrorNoAccountingCategoryForThisCountry=Pas de catégories comptable disponibles pour ce pays
 ExportNotSupported=Le format de l'export n'est pas supporté par cette page
 BookeppingLineAlreayExists=Lignes dejà existantes dans le grand livre
+
+Binded=Lignes liées
+ToBind=Lignes à lier
+
+WarningReportNotReliable=Attention, ce rapport ne se fonde pas sur le Grand Livre, donc n'est pas précis pour l'instant. Il sera remplacé par un rapport plus fiable dans une prochaine version.
+
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 5be0bbcd50c..a64dc3d5297 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -8,10 +8,15 @@ VersionExperimental=Expérimental
 VersionDevelopment=Développement
 VersionUnknown=Inconnue
 VersionRecommanded=Recommandé
-FileCheck=Intégrité des fichiers
+FileCheck=Vérification de l'intégrité des fichiers
+FileCheckDesc=Cet outil vous permet de vérifier l'intégrité des fichiers de votre application, en comparant chaque fichier avec les fichiers officiels. Vous pouvez utiliser cet outil pour détecter si certains fichiers ont été modifiés par un pirate informatique par exemple.
+MakeIntegrityAnalysisFrom=Faire l'analyse de l'intégrité des fichiers de l'application depuis
+LocalSignature=La signature locale intégrée (moins fiable)
+RemoteSignature=La signature sur le serveur distant (plus fiable)
 FilesMissing=Fichiers manquants
 FilesUpdated=Fichiers modifiés
 FileCheckDolibarr=Vérifier l'intégrité des fichiers
+AvailableOnlyOnPackagedVersions=Le fichier local pour vérification d'intégrité est disponible uniquement lorsque l'application est installé à partir d'un package certifié
 XmlNotFound=Fichier Xml d'intégrité de Dolibarr non trouvé
 SessionId=ID Session
 SessionSaveHandler=Modalité de sauvegarde des sessions
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s
 DictionarySetup=Dictionnaires
 Dictionary=Dictionnaires
 Chartofaccounts=Plan comptable
-Fiscalyear=Exercices fiscaux
+Fiscalyear=Exercice fiscal
 ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements
 ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
 DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Attendre que vous ayez appuyez sur une touche ava
 DelaiedFullListToSelectContact=Attendre que vous ayez appuyez sur une touche avant de charger le contenu de la liste des contacts (Cela peut augmenter les performances si vous avez un grand nombre de contacts)
 NumberOfKeyToSearch=Nb carac. déclenchant recherche : %s
 NotAvailableWhenAjaxDisabled=Non disponible quand Ajax est désactivé
-AllowToSelectProjectFromOtherCompany=Sur les documents d'un tiers, permet la sélection d'un projet lié à un autre tiers.
+AllowToSelectProjectFromOtherCompany=Sur les éléments d'un tiers, autorise la sélection d'un projet lié à un autre tiers
 JavascriptDisabled=Javascript désactivé
 UsePreviewTabs=Afficher les onglets "Aperçu"
 ShowPreview=Afficher aperçu
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encoder les champs binaires en hexadécimal
 IgnoreDuplicateRecords=Ignorer les erreurs de doublons (INSERT IGNORE)
 AutoDetectLang=Détection automatique (navigateur)
 FeatureDisabledInDemo=Fonction désactivée dans la démo
+FeatureAvailableOnlyOnStable=Fonction disponible uniquement sur les versions officielles stables
 Rights=Permissions
 BoxesDesc=Les widgets sont des composants montrant des informations que vous pouvez ajouter à vos pages pour les personnaliser. Vous pouvez choisir de les afficher ou non en sélectionnant la page cible et en cliquant sur "Activer" ou "Désactiver".
 OnlyActiveElementsAreShown=Seuls les éléments en rapport avec un <a href="%s">module actif</a> sont présentés.
-ModulesDesc=Les modules Dolibarr définissent les fonctionnalités disponibles dans l'application. Certains modules nécessitent des droits qu'il vous faudra affecter aux utilisateurs pour qu'ils puissent accéder à leurs fonctionnalités. Cliquez sur le bouton on/off de la colonne "État" pour activer un module/fonctionnalité.
+ModulesDesc=Les modules déterminent les fonctionnalités qui seront actives sur l'environnement. Certains modules nécessitent le paramétrage de permissions utilisateurs à définir suite à l'installation du module. Cliquez sur les boutons on/off pour activer/désactiver les modules.
 ModulesMarketPlaceDesc=D'autres modules/extensions sont disponibles en téléchargement sur des sites externes sur Internet...
 ModulesMarketPlaces=Plus de modules...
 DoliStoreDesc=DoliStore, la place de marché officielle des modules et extensions complémentaires pour Dolibarr ERP/CRM
@@ -240,7 +246,7 @@ MAIN_SMS_SENDMODE=Méthode d'envoi des SMS
 MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour l'envoi des SMS
 FeatureNotAvailableOnLinux=Fonctionnalité non disponible sous systèmes Unix. Tester votre sendmail localement.
 SubmitTranslation=Si la traduction de cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez corriger cela en éditant les fichiers dans le répertoire <b>langs/%s</b> et soumettre votre changement sur www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Si la traduction pour cette langue est incomplète ou si vous trouvez des erreurs, vous pouvez les corriger en éditant les fichiers dans le répertoire <b>langs/%s</b> et soumettre les modifications sur le forum dolibarr.org/forum ou pour les développeurs sur github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuration du module
 ModulesSetup=Configuration des modules
 ModuleFamilyBase=Système
@@ -273,6 +279,7 @@ YouCanSubmitFile=Pour cette étape, vous pouvez soumettre votre package en utili
 CurrentVersion=Version actuelle de Dolibarr
 CallUpdatePage=Aller à la page de mise à jour de la structure et des données de la base : %s.
 LastStableVersion=Dernière version stable disponible
+LastActivationDate=Dernière date d'activation
 UpdateServerOffline=Serveur de mise à jour hors ligne
 GenericMaskCodes=Vous pouvez saisir tout masque de numérotation. Dans ce masque, les balises suivantes peuvent être utilisées:<br><b>{000000}</b> correspond à un numéro qui sera incrémenté à chaque %s. Mettre autant de zéro que la longueur désirée du compteur. Le compteur sera complété par des 0 à gauche afin d'avoir autant de zéro que dans le masque.<br><b>{000000+000}</b> idem que précédemment mais un décalage correspondant au nombre à droite du + est appliqué dès la première %s.<br><b>{000000@x}</b> idem que précédemment mais le compteur est remis à zéro le xème mois de l'année (x entre 1 et 12, ou 0 pour utiliser le mois de début d'exercice fiscal défini dans votre configuration, ou 99 pour remise à zéro chaque mois). Si cette option est utilisée et x vaut 2 ou plus, alors la séquence {yy}{mm} ou {yyyy}{mm} est obligatoire. <br><b>{dd}</b> jour (01 à 31).<br><b>{mm}</b> mois (01 à 12).<br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> année sur 2, 4 ou 1 chiffres.<br>
 GenericMaskCodes2=<b>{cccc}</b> le code client sur n lettres<br><b>{cccc000}</b> le code client sur n lettres est suivi d'un compteur propre au client. Ce compteur propre au client est aussi remis à zéro en même temps que le compteur global.<br><b>{tttt}</b> Le code du type de tiers sur n caractères (voir dictionnaires-types de tiers).<br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Sécurisation des URLs
 SecurityTokenIsUnique=Utiliser un paramètre securekey unique pour chaque URL ?
 EnterRefToBuildUrl=Entrer la référence pour l'objet %s
 GetSecuredUrl=Obtenir l'URL calculée
-ButtonHideUnauthorized=Cacher les boutons non autorisés (au lieu de les voir grisés)
+ButtonHideUnauthorized=Cacher les boutons non autorisés au lieu de les voir grisés
 OldVATRates=Ancien taux de TVA
 NewVATRates=Nouveau taux de TVA
 PriceBaseTypeToChange=Modifier sur les prix dont la référence de base est le
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Liste de sélection
 ExtrafieldSelectList = Liste issue d'une table
 ExtrafieldSeparator=Séparateur de champ
+ExtrafieldPassword=Mot de passe
 ExtrafieldCheckBox=Case à cocher
 ExtrafieldRadio=Bouton radio
 ExtrafieldCheckBoxFromList= Liste à cocher issue d'une table
@@ -383,11 +391,14 @@ EnableFileCache=Utiliser des fichiers caches
 ShowDetailsInPDFPageFoot=Ajout de plus d'informations dans le pied de page de vos documents pdf, comme l'adresse de votre société, ou le nom du directeur (pour compléter les identifiants professionnels, le capital de la société et le numéro de TVA intra communautaire)
 NoDetails=Pas plus de détails dans le pied-de-page
 DisplayCompanyInfo=Afficher l'adresse de la société
-DisplayCompanyInfoAndManagers=Afficher les noms des sociétés et des supérieurs hiérarchiques
+DisplayCompanyManagers=Afficher le nom des responsables
+DisplayCompanyInfoAndManagers=Afficher l'adresse du tiers et le nom de son responsable
 EnableAndSetupModuleCron=Si vous voulez avoir cette facture récurrente générée automatiquement, le module *%s* doit être activé et correctement configuré. Dans le cas contraire, la génération des factures doit être effectuée manuellement à partir de ce modèle avec le bouton *Créer*. Notez que même si vous avez activé la génération automatique, vous pouvez toujours lancer en toute sécurité la génération manuelle. La génération en double sur une même période n'est pas possibles.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
+ModuleCompanyCodeAquarium=Renvoie un code comptable composé de :<br>%s suivi du code tiers fournisseur pour le code compta fournisseur,<br>%s suivi du code tiers client pour le code compta client.
 ModuleCompanyCodePanicum=Renvoie un code comptable vide.
-ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+ModuleCompanyCodeDigitaria=Renvoie un code comptable composé suivant le code tiers. Le code est composé du caractère 'C' en première position suivi des 5 premiers caractères du code tiers.
+Use3StepsApproval=Par défaut, les commandes fournisseurs nécessitent d'être créées et approuvées en deux étapes par deux utilisateurs distincts. Si un utilisateur à les deux permissions, ces deux actions sont effectuées en une seule fois. Cette option ajoute la nécessité d'une approbation par un troisième utilisateur si le montant de la commande est supérieur au montant d'une valeur définie soit étape 1 : Validation, étape 2 : Première approbation et étape 3 : seconde approbation selon le montant de la commande. <br>Si le champ est laissé vide, l'approbation se fera en deux étapes. Si le champ est saisi à une valeur faible (0.1) la double approbation sera toujours nécessaire.
+UseDoubleApproval=Activer l'approbation en trois étapes si le montant HT est supérieur à...
 
 # Modules
 Module0Name=Utilisateurs & groupes
@@ -466,17 +477,17 @@ Module410Name=Webcalendar
 Module410Desc=Interface avec le calendrier Webcalendar
 Module500Name=Dépenses spéciales
 Module500Desc=Dépenses spéciales (taxes, charges fiscales ou sociales, dividendes)
-Module510Name=Salaires
+Module510Name=Contrats et salaires des salariés
 Module510Desc=Gestion des paiements des salaires des employés
 Module520Name=Emprunt
 Module520Desc=Gestion des emprunts
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Envoi de notifications par e-mails (déclenchées par des évènements métiers) aux utilisateurs (configuration faite sur chaque fiche utilisateur), contacts de tiers (configuration faite sur chaque fiche tiers) ou à adresses e-mails spécifiques.
 Module700Name=Dons
 Module700Desc=Gestion des dons
 Module770Name=Notes de frais
 Module770Desc=Gestion et déclaration des notes de frais (transports, repas, ...)
-Module1120Name=Propositions commerciales founisseurs
+Module1120Name=Propositions commerciales fournisseurs
 Module1120Desc=Demander des devis et tarifs aux fournisseurs
 Module1200Name=Mantis
 Module1200Desc=Interface avec le bug tracker Mantis
@@ -747,6 +758,7 @@ Permission1236=Exporter les factures fournisseurs, attributs et règlements
 Permission1237=Exporter les commande fournisseurs, attributs
 Permission1251=Lancer des importations en masse dans la base (chargement de données)
 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é
@@ -780,6 +792,10 @@ Permission55002=Créer/modifier les sondages
 Permission59001=Consulter les propositions commerciales
 Permission59002=Saisir les marges commerciales
 Permission59003=Peut lire les marges de tout le monde
+Permission63001=Lire les ressources
+Permission63002=Créer/modifier les ressources
+Permission63003=Supprimer les ressources
+Permission63004=Lier les ressources aux événements de l'agenda
 DictionaryCompanyType=Type de Tiers
 DictionaryCompanyJuridicalType=Formes juridiques des Tiers
 DictionaryProspectLevel=Niveau de potentiel des prospects
@@ -853,6 +869,7 @@ LabelUsedByDefault=Libellé qui sera utilisé si aucune traduction n'est trouvé
 LabelOnDocuments=Libellé sur les documents
 NbOfDays=Nbre de jours
 AtEndOfMonth=En fin de mois
+CurrentNext=Current/Next
 Offset=Décalage
 AlwaysActive=Toujours actif
 Upgrade=Mise à jour
@@ -950,7 +967,7 @@ LogEventDesc=Vous pouvez activer ici, la journalisation des événements d'audit
 AreaForAdminOnly=Ces fonctions ne sont accessibles qu'aux administrateurs.
 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 sur la société ou association que vous devez gérer (pour cela cliquer sur le bouton "Modifier" en bas de page)
+CompanyFundationDesc=Éditez sur cette page toutes les informations connues de la société ou de l'association que vous souhaitez gérer (Pour cela, cliquez sur les boutons "Modifier" ou "Sauvegarder" en bas de page)
 DisplayDesc=Vous pouvez choisir ici tous les paramètres liés à l'apparence de Dolibarr
 AvailableModules=Modules disponibles
 ToActivateModule=Pour activer des modules, aller dans l'espace Configuration (Accueil->Configuration->Modules).
@@ -1030,8 +1047,16 @@ PathToDocuments=Chemin d'accès aux documents
 PathDirectory=Répertoire
 SendmailOptionMayHurtBuggedMTA=La fonction d'envoi de mails par la méthode "PHP mail directe" génère un message mail qui peut être mal interprété par certains serveurs mal configurés de réception de mail. Cela se traduit par des mails non lisibles chez les personnes hébergés par ces plateformes boguées. C'est le cas des clients de certains fournisseurs d'accès internet (Ex: Orange). Ce n'est pas un problème, ni dans Dolibarr ni dans PHP mais sur le serveur de réception. Vous pouvez toutefois ajouter l'option MAIN_FIX_FOR_BUGGED_MTA à 1 dans configuration - divers pour modifier Dolibarr afin de compenser le bug. Toutefois ce sont les serveurs respectueux du standard d'envoi de mail qui pourront avoir des problèmes. L'autre solution (recommandée) est d'utiliser la méthode d'envoi SMTP socket library qui n'a aucun de ces inconvénients.
 TranslationSetup=Configuration de la traduction
-TranslationDesc=Le choix de la langue affichée à l'écran se modifie:<br>* Soit de manière globale depuis le menu <strong>Accueil - Configuration - Affichage</strong><br>* Soit de manière spécifique à l'utilisateur depuis l'onglet <strong>Interface utilisateur</strong> de sa fiche utilisateur (cliquer sur l'identifiant en haut de l'écran).
-TranslationOverwriteDesc=Vous pouvez aussi écraser des valeurs en complétant/corrigeant le tableau suivant. Choisissez votre code de langue depmuis la liste déroulante "%s", choissez le code trouvé dans le fichier lang (langs/xx_XX/somefile.lang) dans le champ "%s", et dans "%s" la nouvelle valeur que vous souhaitez utiliser comme nouvelle traduction.
+TranslationKeySearch=Rechercher une traduction
+TranslationOverwriteKey=Ajouter une traduction
+TranslationDesc=Pour sélectionner la langue d'affichage de l'environnement : <br>* langue par défaut : menu <strong>Accueil - Configuration - Affichage</strong><br>* langue par utilisateur: Onglet <strong>Interface utilisateur</strong> de la fiche utilisateur (Accès a la fiche de l'utilisateur depuis l'identifiant dans l'angle supérieur droit de l'écran).
+TranslationOverwriteDesc=Vous pouvez aussi écraser des valeurs en complétant/corrigeant le tableau suivant. Choisissez votre code de langue depmuis la liste déroulante "%s", choissez le code trouvé dans le fichier lang dans le champ "%s", et dans "%s" la nouvelle valeur que vous souhaitez utiliser comme nouvelle traduction.
+TranslationOverwriteDesc2=Vous pouvez utiliser l'autre onglet pour vous aider à connaître la clé de traduction à utiliser
+TranslationString=Traduction
+CurrentTranslationString=Chaîne de traduction actuelle
+WarningAtLeastKeyOrTranslationRequired=Un critère de recherche est nécessaire au moins pour la clé ou la valeur de traduction
+NewTranslationStringToShow=Nouvelle traduction à afficher
+OriginalValueWas=La traduction d'origine est écrasée. La valeur initiale était: <br><br> %s
 TotalNumberOfActivatedModules=Nombre total de modules/fonctionnalités activés: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
@@ -1070,7 +1095,7 @@ HRMSetup=Configuration du module GRH
 CompanySetup=Configuration du module Tiers
 CompanyCodeChecker=Modèle de génération et contrôle des codes tiers (clients/fournisseurs)
 AccountCodeManager=Modèle de génération des codes comptable (clients/fournisseurs)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+NotificationsDesc=Les notifications activent l'envoi d'e-mails automatiques pour certains événements de Dolibarr. L'envoi de ces e-mails automatiques est défini selon :
 NotificationsDescUser=* par utilisateurs, utilisateur par utilisateur.
 NotificationsDescContact=* par tiers de contacts (clients ou fournisseur), contact par contact.
 NotificationsDescGlobal=* ou en définissant des emails cibles fixes sur la page de configuration du module.
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Utiliser TLS
 LDAPServerUseTLSExample=Votre serveur utilise le TLS
 LDAPServerDn=DN du serveur
 LDAPAdminDn=DN de l'administrateur
-LDAPAdminDnExample=DN complet (ex : cn=adminldap,dc=my-domain,dc=com)
+LDAPAdminDnExample=Direction complète (exemple : cn = admin, dc = exemple, dc = com ou cn = Adminitrateur, cn = utilisateurs, dc = exemple, dc = com pour active directory)
 LDAPPassword=Mot de passe de l'administrateur
 LDAPUserDn=DN des utilisateurs
 LDAPUserDnExample=DN complet (ex : ou=users,dc=my-domain,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Exemple : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Exemple : objectsid
 LDAPFieldEndLastSubscription=Date de fin de validité adhésion
-LDAPFieldTitle=Poste/Fonction
+LDAPFieldTitle=Poste/fonction
 LDAPFieldTitleExample=Exemple: title
 LDAPSetupNotComplete=Configuration LDAP incomplète (à compléter sur les autres onglets)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrateur ou mot de passe non renseigné. Les accès LDAP seront donc anonymes et en lecture seule.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Configuration des modules Produits et Services
 NumberOfProductShowInSelect=Nombre maximum de produits dans les listes déroulantes (0=aucune limite)
 ViewProductDescInFormAbility=Visualisation des descriptions produits dans les formulaires (sinon en tant que bulle d'aide)
 MergePropalProductCard=Ajoute dans l'onglet Fichiers joints des produits/services, une option pour fusionner le document PDF du produit au PDF des propositions Azur si le produit/services est inclut dans la proposition.
-ViewProductDescInThirdpartyLanguageAbility=Visualisation des descriptions produits dans la langue du tiers
+ViewProductDescInThirdpartyLanguageAbility=Visualisation des descriptions de produits dans la langue du tiers
 UseSearchToSelectProductTooltip=Si vous avez un nombre important de produits (>100 000), vous pourrez améliorer les performances en positionnant la constante PRODUCT_DONOTSEARCH_ANYWHERE à 1 dans Configuration->Divers. La recherche sera alors limité au début des chaines.
 UseSearchToSelectProduct=Utilisez un champ avec auto-complétion pour choisir les produits (plutôt qu'une liste déroulante).
 SetDefaultBarcodeTypeProducts=Type de code-barre utilisé par défaut pour les produits
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Exercice fiscal ouvert
 CloseFiscalYear=Exercice fiscal cloturé
 DeleteFiscalYear=Effacer exercice fiscal
 ConfirmDeleteFiscalYear=Êtes-vous sûr de vouloir supprimer cet exercice fiscal ?
+ShowFiscalYear=Voir l'exercice fiscal
 AlwaysEditable=Peut toujours être édité
 MAIN_APPLICATION_TITLE=Forcer la valeur visible du nom de l'application (attention : positionner ici son propre nom rendra inopérante la fonction de remplissage automatique de l'identifiant lorsque vous utilisez l'application mobile DoliDroid)
 NbMajMin=Nombre minimal de caractères majuscules
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=Liste des notifications par utilisateur*
 ListOfNotificationsPerUserOrContact=Liste des notifications par utilisateur* ou par contact**
 ListOfFixedNotifications=Liste des notifications emails fixes
 GoOntoUserCardToAddMore=Aller sur l'onglet "Notificiation" de l'utilisateur pour ajouter ou modifier une notification par utilisateurs
-GoOntoContactCardToAddMore=Allez sur l'onglet "Notifications" d'un contact de tiers pour ajouter ou supprimer des notifications pour les contacts/adresses
+GoOntoContactCardToAddMore=Rendez-vous sur l'onglet "Notifications" d'un tiers pour ajouter ou enlever les notifications pour les contacts/adresses
 Threshold=Seuil
 BackupDumpWizard=Assistant de génération d'un fichier de sauvegarde de la base de données
 SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Mettez en surbrillance les lignes de la table lorsque la sou
 TextTitleColor=Couleur du titre des pages
 LinkColor=Couleur des liens
 PressF5AfterChangingThis=Appuyez sur F5 sur le clavier après avoir modifié cette valeur pour que le changement soit effectif
-NotSupportedByAllThemes=Fonctionne avec le thème eldy mais n'est pas pris en charge par tous les thèmes
+NotSupportedByAllThemes=Fonctionne avec les thèmes natifs. Non garanti avec d'autres
 BackgroundColor=Couleur de fond
-TopMenuBackgroundColor=Couleur de fond pour le menu Gauche
+TopMenuBackgroundColor=Couleur de fond pour le menu horizontal
+TopMenuDisableImages=Cacher les images du menu principal
 LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
 BackgroundTableTitleColor=Couleur de fond pour les titres des lignes des tables
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
@@ -1569,13 +1596,13 @@ MailToSendIntervention=Pour l'envoi de fiche intervention
 MailToSendSupplierRequestForQuotation=Pour l'envoi de demande de prix fournisseur
 MailToSendSupplierOrder=Pour l'envoi de commande fournisseur
 MailToSendSupplierInvoice=Pour l'envoi de facture fournisseur
-MailToThirdparty=Pour l'envoi d'email depuis la fiche Tiers
+MailToThirdparty=Envoy email depuis la fiche Tiers
 ByDefaultInList=Afficher par défaut sur les vues listes
 YouUseLastStableVersion=Vous utilisez la dernière version stable
 TitleExampleForMajorRelease=Exemple de message que vous pouvez utiliser pour annonce une nouvelle version majeure (n'hésitez pas à l'utilisez pour vos propres news)
 TitleExampleForMaintenanceRelease=Exemple de message que vous pouvez utiliser pour annonce une nouvelle version de maintenance (n'hésitez pas à l'utilisez pour vos propres news)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version majeure avec de nouvelles fonctionnalités pour les utilisateurs et les développeurs. Vous pouvez la télécharger à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintanance, aussi elle ne contient que des correctifs de bugs. Nous recommandons tout personne utilisant une version plus ancienne de migrer sur celle-ci. En tant que version de maintenance, aucune nouvelle fonctionnalité n'est ajouté, ni modification de format de données. Vous pouvez télécharger cette version à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s est disponible. La version %s est une version de maintenance, aussi elle ne contient que des correctifs de bugs. Nous recommandons à toute personne utilisant une version plus ancienne de migrer vers celle-ci. En tant que version de maintenance, aucune nouvelle fonctionnalité n'est ajoutée, ni modification de format de données. Vous pouvez télécharger cette version à partir de la zone de téléchargement du portail http://www.dolibarr.org (sous-répertoire "Versions stables"). Vous pouvez lire le <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> pour la liste complète des changements.
 MultiPriceRuleDesc=Quand l'option « Plusieurs niveaux de prix par produit/service» est activée, vous pouvez définir différents prix (un par niveau de prix) pour chaque produits. Pour sauver du temps, vous pouvez entrer ici une règle pour avoir un prix pour chaque niveau calculé automatiquement. Cette page est ici pour sauver du temps et peut être utile si vos prix pour chaque niveaux sont relatif au premier niveau. Vous pouvez ignorer cette page dans la plupart des cas
 ModelModulesProduct=Modèles des documents de produits
 ToGenerateCodeDefineAutomaticRuleFirst=Pour pouvoir générer automatiquement des codes, vous devez d'abord définir un gestionnaire pour définir automatiquement le numéro du code-barre.
@@ -1599,4 +1626,9 @@ DetectionNotPossible=Détection impossible
 UrlToGetKeyToUseAPIs=Url pour obtenir le jeton pour utiliser l'API (une fois le jeton reçu, il est enregistré dans la table des utilisateurs de la base de données et sera vérifié à chaque accès)
 ListOfAvailableAPIs=Liste des APIs disponibles
 activateModuleDependNotSatisfied=Le module "%s" dépend du module "%s" qui est manquant, aussi le module "%1$s" peut ne pas fonctionner correctement. Merci d'installer le module "%2$s" ou désactiver le module "%1$s" si vous ne souhaitez pas avoir de mauvaise surprise
-CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+CommandIsNotInsideAllowedCommands=La commande demandée n'est pas autorisée par le paramètre <strong>$dolibarr_main_restrict_os_commands</strong> du fichier <strong>conf.php</strong>.
+LandingPage=Page cible
+SamePriceAlsoForSharedCompanies=Si vous utilisez un module multi-société, avec le choix «prix unique», le prix sera aussi le même pour toutes les sociétés si les produits sont partagés entre les environnements
+ModuleEnabledAdminMustCheckRights=Le module a été activé. Les permissions pour le(s) module(s) activé(s) ont été donnés aux utilisateurs admin uniquement. Vous devrez peut-être accorder des autorisations aux autres utilisateurs manuellement si nécessaire.
+UserHasNoPermissions=Cet utilisateur n'a pas de permission définie
+TypeCdr=Utilisez "Aucune" si la date du terme de paiement est la date de la facture plus un delta en jours (delta est le champ "Nb de jours") <br> Utilisez "À la fin du mois", si, après le delta, la date doit être augmentée pour atteindre la fin du mois (+ un «Offset» optionnel en jours) <br> Utilisez "Coutant/Suivant" pour que la date du terme de paiement soit la premier Nième jour du mois qui suit (N est stocké dans le champ "Nb de jours")
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 11f6caaf113..eaef5ec83be 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -27,11 +27,7 @@ AllTime=Depuis le début
 Reconciliation=Rapprochement
 RIB=Numéro de compte bancaire
 IBAN=Identifiant IBAN
-IbanValid=IBAN est valide
-IbanNotValid=IBAN n'est pas valide
 BIC=Identifiant BIC/SWIFT
-SwiftValid=BIC / SWIFT est valide
-SwiftNotValid=BIC / SWIFT n'est pas valide
 StandingOrders=Prélèvements
 StandingOrder=Prélèvement
 AccountStatement=Relevé
@@ -78,6 +74,7 @@ AccountToCredit=Compte à créditer
 AccountToDebit=Compte à débiter
 DisableConciliation=Désactiver la fonction de rapprochement pour ce compte
 ConciliationDisabled=Fonction rapprochement désactivée
+LinkedToAConciliatedTransaction=Lié à une écriture rapprochée
 StatusAccountOpened=Ouvert
 StatusAccountClosed=Fermé
 AccountIdShort=Numéro
@@ -87,6 +84,8 @@ AddBankRecordLong=Saisie d'une écriture manuelle hors facture
 ConciliatedBy=Rapproché par
 DateConciliating=Date rapprochement
 BankLineConciliated=Écriture rapprochée
+Reconciled=Rapproché
+NotReconciled=Non rapproché
 CustomerInvoicePayment=Règlement client
 SupplierInvoicePayment=Règlement fournisseur
 SubscriptionPayment=Paiement cotisation
@@ -94,7 +93,8 @@ WithdrawalPayment=Règlement bon de prélèvement
 SocialContributionPayment=Paiement de charge fiscale/sociale
 BankTransfer=Virement bancaire
 BankTransfers=Virements bancaire
-TransferDesc=En saisissant un virement d'un de vos comptes bancaires vers un autre, Dolibarr crée deux écritures comptables (une de débit dans un compte et l'autre de crédit, du même montant, dans l'autre compte. Le même libellé de transaction, et la même date, sont utilisés pour les 2 écritures)
+MenuBankInternalTransfer=Virement interne
+TransferDesc=Transférer d'un compte bancaire à un autre, Dolibarr ajoutera deux lignes d'écritures (une ligne de débit dans le compte source et une ligne de crédit dans le compte de destination. le même montant (excepté le signe), le libellé et la date seront repris.
 TransferFrom=De
 TransferTo=Vers
 TransferFromToDone=Le virement depuis <b>%s</b> vers <b>%s</b> de <b>%s</b> %s a été créé.
@@ -129,16 +129,19 @@ FutureTransaction=Transaction future. Pas moyen de concilier.
 SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise et cliquer sur "Créer".
 InputReceiptNumber=Choisissez le relevé bancaire liés au rapprochement. Utilisez une valeur numérique triable: AAAAMM ou AAAAMMJJ
 EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures
-ToConciliate=À rapprocher ?
+ToConciliate=A rapprocher ?
 ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur
-DefaultRIB=RIB par défaut
-AllRIB=Tous les RIB
-LabelRIB=Nom du RIB
-NoBANRecord=Aucun RIB enregistré
-DeleteARib=Supprimé RIB enregistré
-ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce RIB ?
+DefaultRIB=Compte bancaire par défaut
+AllRIB=Tous les comptes bancaires
+LabelRIB=Nom du compte bancaire
+NoBANRecord=Aucun compte bancaire enregistré
+DeleteARib=Supprimer compte bancaire
+ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce compte bancire ?
 RejectCheck=Chèque rejeté
 ConfirmRejectCheck=Êtes-vous sûr de vouloir marquer ce chèque comme rejeté ?
 RejectCheckDate=Date du rejet du chèque
 CheckRejected=Chèque rejeté
 CheckRejectedAndInvoicesReopened=Chèque rejeté et factures réouvertes
+BankAccountModelModule=Modèles de documents pour les comptes bancaires
+DocumentModelSepaMandate=Modèle de mandat SEPA. Utile pour les pays européens de la CEE seulement.
+DocumentModelBan=Modèle pour imprimer une page avec des informations du compte bancaire.
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index d9c0427649e..e2ab618fd30 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Erreur, il n'est pas possible d'
 BillFrom=Émetteur
 BillTo=Adressé à
 ActionsOnBill=Événements sur la facture
-RecurringInvoiceTemplate=Facture récurrente
+RecurringInvoiceTemplate=Factures récurrentes/modèles
 NoQualifiedRecurringInvoiceTemplateFound=Pas de facture récurrente qualifiée pour la génération
 FoundXQualifiedRecurringInvoiceTemplate=%s facture(s) récurrente(s) qualifiées pour la génération
 NotARecurringInvoiceTemplate=Pas une facture récurrente
@@ -312,7 +312,7 @@ LatestRelatedBill=Dernière facture en rapport
 WarningBillExist=Attention, une ou plusieurs factures existent déjà
 MergingPDFTool=Outil de fusion de PDF
 AmountPaymentDistributedOnInvoice=Montant paiement affecté à la facture
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Autoriser le règlement de différents tiers de la même maison-mère
 PaymentNote=Note du paiement
 ListOfPreviousSituationInvoices=Liste des factures de situation précédentes
 ListOfNextSituationInvoices=Liste des factures de situation suivantes
@@ -351,8 +351,8 @@ VarAmount=Montant variable (%% tot.)
 # PaymentType
 PaymentTypeVIR=Virement bancaire
 PaymentTypeShortVIR=Virement bancaire
-PaymentTypePRE=Prélèvement bancaire
-PaymentTypeShortPRE=Prélèvement
+PaymentTypePRE=Ordre de prélèvement
+PaymentTypeShortPRE=Ordre de prélèvement
 PaymentTypeLIQ=Espèce
 PaymentTypeShortLIQ=Espèce
 PaymentTypeCB=Carte bancaire
@@ -371,7 +371,7 @@ BankDetails=Coordonnées bancaires
 BankCode=Code banque
 DeskCode=Code guichet
 BankAccountNumber=Numéro de compte
-BankAccountNumberKey=Clé RIB
+BankAccountNumberKey=Clé
 Residence=Domiciliation
 IBANNumber=Code IBAN
 IBAN=IBAN
@@ -381,6 +381,7 @@ ExtraInfos=Informations complémentaires
 RegulatedOn=Réglé le
 ChequeNumber=Chèque N°
 ChequeOrTransferNumber=Chèque/Virement N°
+ChequeBordereau=Vérifier
 ChequeMaker=Chèque/Virement N°
 ChequeBank=Banque du chèque
 CheckBank=Chèque
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Suppression d'un paiement rapproché impossible
 PayedByThisPayment=Règlé par ce paiement
 ClosePaidInvoicesAutomatically=Classer "Payées" les factures standards ou de remplacements ayant un reste à payer nul 
 ClosePaidCreditNotesAutomatically=Classer automatiquement à "Payé" les factures avoirs entièrement remboursées.
+ClosePaidContributionsAutomatically=Classer "payée" toutes les dépenses spéciales réglées en totalité.
 AllCompletelyPayedInvoiceWillBeClosed=Toutes les factures avec un reste à payer nul seront automatiquement fermées au statut "Payé".
 ToMakePayment=Payer
 ToMakePaymentBack=Rembourser
 ListOfYourUnpaidInvoices=Liste des factures impayées
 NoteListOfYourUnpaidInvoices=Remarque: Cette liste ne contient que les factures des Tiers pour lesquels vous êtes le commercial affecté.
 RevenueStamp=Timbre fiscal
-YouMustCreateInvoiceFromThird=Cette option n'est disponible que lorsqu'on accède à la création de facture depuis l'onglet "Client" d'un Tiers.
+YouMustCreateInvoiceFromThird=Cette option est disponible uniquement lors de la création de la facture depuis l'onglet «client» du tiers
+YouMustCreateInvoiceFromSupplierThird=Cette option est disponible uniquement lors de la création d'une facture depuis l'onglet «fournisseur» d'un tiers
 YouMustCreateStandardInvoiceFirstDesc=Pour créer une facture modèle, vous devez d'abord créer une facture standard brouillon et la convertir en modèle.
 PDFCrabeDescription=Modèle de facture PDF complet (modèle recommandé par défaut)
 PDFCrevetteDescription=Modèle de facture PDF Crevette (modèle complet pour les factures de situation)
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Erreur: mise à jour du prix sur la ligne
 ToCreateARecurringInvoice=Pour créer une facture périodique à ce contrat, créez d'abord une facture brouillon puis convertissez la en facture modèle et définissez la fréquence de génération des futures factures.
 ToCreateARecurringInvoiceGene=Pour générer de futures factures régulièrement et manuellement, cliquer sur le menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Si vous devez utiliser de telles factures, demandez à votre administrateur d'activer le module <strong>%s</strong>. Notez que les deux méthodes de générations de factures (manuelles et automatiques) peuvent être utilisées simultanément sans risque de création de doublon.
+DeleteRepeatableInvoice=Supprimer facture modèle
+ConfirmDeleteRepeatableInvoice=Est-ce votre sûr de vouloir supprimer la facture modèle ?
 
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 30451d764b4..5011df18869 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Mes %s derniers marque-pages\n
 BoxOldestExpiredServices=Plus anciens services expirés
 BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés
 BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
-BoxTitleLastContracts=Les %s derniers contrats
+BoxTitleLastContracts=Les %s derniers contrats modifiés
 BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
 BoxTitleLastModifiedExpenses=Les %s dernières notes de frais modifiées
 BoxGlobalActivity=Activité globale (factures, propositions, commandes)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposition par mois
 NoTooLowStockProducts=Pas de produits sous le seuil de stock minimal
 BoxProductDistribution=Répartition des produis/services
 BoxProductDistributionFor=Répartition des %s pour les %s
+BoxTitleLastModifiedSupplierBills=Les %s dernières  factures fournisseurs modifiées
+BoxTitleLatestModifiedSupplierOrders=Les %s dernières commandes fournisseurs modifiées
+BoxTitleLastModifiedCustomerBills=Les %s dernières factures clients modifiées
+BoxTitleLastModifiedCustomerOrders=Les %s dernières commandes clients modifiées
+BoxTitleLastModifiedPropals=Les %s dernières propositions commerciales modifiées
 ForCustomersInvoices=Factures clients
 ForCustomersOrders=Commandes clients
 ForProposals=Propositions commerciales
 LastXMonthRolling=Les %s derniers mois tournant
-ChooseBoxToAdd=Ajouter des widgets au tableau de bord
+ChooseBoxToAdd=Ajouter le widget au tableau de bord
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 03e2b223cfa..a0dcd96a377 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=de
 CashDeskThirdParty=Tiers
 ShoppingCart=Panier
 NewSell=Nouvelle vente
-BackOffice=Back office
 AddThisArticle=Ajouter cet article
 RestartSelling=Reprendre la vente
-SellFinished=Vente terminée
+SellFinished=Vente complète
 PrintTicket=Imprimer ticket
 NoProductFound=Aucun article trouvé
 ProductFound=produit trouvé
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 02defa4cf98..256c8b40f68 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Espace tags/catégories de clients
 MembersCategoriesArea=Espace tags/catégories adhérents
 ContactsCategoriesArea=Espace tags/catégories de contacts
 AccountsCategoriesArea=Espace des tags/categories
+ProjectsCategoriesArea=Zone des tags/catégories des projets
 SubCats=Sous-catégories
 CatList=Liste des tags/catégories
 NewCategory=Nouveau tag/catégorie
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Ce tiers a les tags/catégories de fournisseurs s
 MemberIsInCategories=Ce membre a les tags/catégories suivant(e)s
 ContactIsInCategories=Ce contact a les tags/catégories suivant(e)s
 ProductHasNoCategory=Ce produit/service n'appartient à aucun(e) tag/catégorie
-CompanyHasNoCategory=Ce tiers n'a aucun tag/catégorie
+CompanyHasNoCategory=Ce tiers n'est classé dans aucune catégorie
 MemberHasNoCategory=Ce membre n'appartient à aucun(e) tag/catégorie
 ContactHasNoCategory=Ce contact n'appartient à aucun(e) tag/catégorie
+ProjectHasNoCategory=Ce projet n'est classé dans aucune catégorie
 ClassifyInCategory=Ajouter tag/catégorie
 NotCategorized=Sans tag/catégorie
 CategoryExistsAtSameLevel=Ce tag existe déjà avec cette référence
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Tags/catégories de produits
 MembersCategoriesShort=Tags/catégories de membres
 ContactCategoriesShort=Tags de contacts
 AccountsCategoriesShort=Tag/catégorie des comptes
+ProjectsCategoriesShort=Tags/catégories de projets
 ThisCategoryHasNoProduct=Ce tag/catégorie ne contient aucun produit.
 ThisCategoryHasNoSupplier=Ce tag/catégorie ne contient aucun fournisseur.
 ThisCategoryHasNoCustomer=Ce tag/catégorie ne contient aucun client.
 ThisCategoryHasNoMember=Ce tag/catégorie ne contient aucun adhérent.
 ThisCategoryHasNoContact=Ce tag/catégorie ne contient aucun contact.
 ThisCategoryHasNoAccount=Cette catégorie ne contient aucun compte
+ThisCategoryHasNoProject=Cette catégorie ne content aucun projet
 CategId=ID du(de la) tag/catégorie
 CatSupList=Liste des tags/catégories de fournisseurs
 CatCusList=Liste des tags/catégories de clients/prospects
@@ -71,6 +75,7 @@ CatContactList=Liste des tags/catégories de contact
 CatSupLinks=Liens entre fournisseurs et tags/catégories
 CatCusLinks=Liens entre clients/prospects et tags/catégories
 CatProdLinks=Liens entre produits/services et tags/catégories
+CatProJectLinks=Liens entre projets et tags/catégories
 DeleteFromCat=Enlever des tags/catégories
 ExtraFieldsCategories=Attributs supplémentaires
 CategoriesSetup=Configuration des tags/catégories
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index fdaa39b7d95..1f75b228f81 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nouveau particulier
 NewCompany=Nouvelle société (prospect, client, fournisseur)
 NewThirdParty=Nouveau tiers (prospect, client, fournisseur)
 CreateDolibarrThirdPartySupplier=Créer un Tiers (fournisseur)
+CreateThirdPartyOnly=Créer le tiers
+CreateThirdPartyAndContact=Créer un tiers + un contact/adresse fils
 ProspectionArea=Espace prospection
 IdThirdParty=Identifiant tiers
 IdCompany=Identifiant société
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Fournisseurs
 ThirdPartyType=Type du tiers
 Company/Fundation=Société/Association
 Individual=Individu privé
-ToCreateContactWithSameName=Créera automatiquement un contact physique avec les mêmes informations
+ToCreateContactWithSameName=Crée automatiquement un contact/adresse, sous le tiers, avec la même information que le tiers. Dans la plupart des cas, même si votre tiers est une personne physique, la création d'un tiers seul suffit.
 ParentCompany=Maison mère
 Subsidiaries=Filiales
 ReportByCustomers=Rapport par client
@@ -47,7 +49,7 @@ CivilityCode=Code civilité
 RegisteredOffice=Siège social
 Lastname=Nom
 Firstname=Prénom
-PostOrFunction=Poste/Fonction
+PostOrFunction=Poste/fonction
 UserTitle=Titre civilité
 Address=Adresse
 State=Département/Canton
@@ -64,7 +66,7 @@ Chat=Tchat
 PhonePro=Tél pro.
 PhonePerso=Tél perso.
 PhoneMobile=Tél portable
-No_Email=Désactiver l'envoi d'emailing de masse
+No_Email=Désabonnement demandé
 Fax=Fax
 Zip=Code postal
 Town=Ville
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Numéro de TVA
 VATIntraShort=Num. TVA
 VATIntraSyntaxIsValid=Syntaxe valide
-VATIntraValueIsValid=Valeur valide
 ProspectCustomer=Prospect / Client
 Prospect=Prospect
 CustomerCard=Fiche client
@@ -261,7 +262,9 @@ AddContactAddress=Créer contact/adresse
 EditContact=Éditer contact
 EditContactAddress=Éditer contact/adresse
 Contact=Contact
+ContactId=Id du contact
 ContactsAddresses=Contacts/Adresses
+FromContactName=Nom:
 NoContactDefinedForThirdParty=Aucun contact défini pour ce tiers
 NoContactDefined=Aucun contact défini
 DefaultContact=Contact par défaut
@@ -294,6 +297,7 @@ ContactForProposals=Contact de propositions
 ContactForContracts=Contact de contrats
 ContactForInvoices=Contact de factures
 NoContactForAnyOrder=Ce contact n'est contact d'aucune commande
+NoContactForAnyOrderOrShipments=Ce contact n'est contact d'aucune commande ou expédition
 NoContactForAnyProposal=Ce contact n'est contact d'aucune proposition commerciale
 NoContactForAnyContract=Ce contact n'est contact d'aucun contrat
 NoContactForAnyInvoice=Ce contact n'est contact d'aucune facture
@@ -369,8 +373,8 @@ AllocateCommercial=Affecter un commercial
 Organization=Organisme
 FiscalYearInformation=Information sur l'année fiscale
 FiscalMonthStart=Mois de début d'exercice
-YouMustAssignUserMailFirst=Vous devez créer une adresse email pour cet utilisateur avant de pouvoir lui définir des notifications par emails.
-YouMustCreateContactFirst=Vous devez créer un contact avec une adresse email sur le tiers avant de pouvoir lui définir des notifications par emails.
+YouMustAssignUserMailFirst=Une adresse e-mail est nécessaire pour l'envoi de notifications à cet utilisateur
+YouMustCreateContactFirst=Pour pouvoir ajouter une notifications par mail,vous devez déjà définir des contacts valides pour le tiers  
 ListSuppliersShort=Liste fournisseurs
 ListProspectsShort=Liste prospects
 ListCustomersShort=Liste clients
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Les tiers ont été fusionnés
 SaleRepresentativeLogin=Login du commercial
 SaleRepresentativeFirstname=Prénom du commercial
 SaleRepresentativeLastname=Nom du commercial
+ErrorThirdpartiesMerge=Une erreur est survenue lors de la suppression de ce tiers. La modification n'a pas pu être effectuée.
+NewCustomerSupplierCodeProposed=Nouveau code client ou fournisseur proposé en cas de doublon de code
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index b966dac9ca0..c0fac4f78b2 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Charge sociale ou fiscale
 SocialContributions=Charges fiscales ou sociales
 SocialContributionsDeductibles=Charge ou taxe déductible
 SocialContributionsNondeductibles=Charge ou taxe non déductible
+LabelContrib=Libellé de la dépense
+TypeContrib=Type de la charge
 MenuSpecialExpenses=Dépenses spéciales
 MenuTaxAndDividends=Taxes et charges
 MenuSocialContributions=Charges fiscales/sociales
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index cb01c9068e6..caeab63a7cb 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Supprimer une tâche planifiée
 Permission23104 = Exécuter une tâche planifiée
 # Admin
 CronSetup= Page de configuration du module - Gestion des travaux programmés
-URLToLaunchCronJobs=URL pour vérifier et lancer les travaux programmés actifs
+URLToLaunchCronJobs=Ou pour vérifier ou lancer les travaux planifiés qualifiés
 OrToLaunchASpecificJob=Ou pour vérifier et lancer un travail programmé spécifique
 KeyForCronAccess=Clé de sécurité pour l'URL de lancement des travaux programmés
 FileToLaunchCronJobs=Commande pour lancer les travaux programmés actifs
@@ -23,7 +23,7 @@ CronCommand=Commande
 CronList=Travaux planifiés
 CronDelete=Effacer les travaux planifiés
 CronConfirmDelete=Êtes-vous sûr de vouloir supprimer ces travaux planifiées?
-CronExecute=Lancer les travaux planifiés
+CronExecute=Lancer la tache planifiée
 CronConfirmExecute=Etes-vous sûr que vous voulez exécuter ces travaux planifiées maintenant?
 CronInfo=Le module des travaux planifiés permet d'exécuter des opérations qui ont été programmées
 CronTask=Travail planifié
@@ -39,7 +39,7 @@ CronMethod=Méthode
 CronModule=Module
 CronNoJobs=Aucun travail enregistré
 CronPriority=Priorité
-CronLabel=Description
+CronLabel=Libellé
 CronNbRun=Nb. exec.
 CronMaxRun=Nb max de lancement
 CronEach=Tous les
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Aller à la page "Accueil - Outils administratio
 JobDisabled=Travail désactivé
 MakeLocalDatabaseDumpShort=Sauvegarde locale de base
 MakeLocalDatabaseDump=Créer une sauvegarde locale de la base
+WarningCronDelayed=Attention, à des fins de performance, quelle que soit la prochaine date d'exécution des travaux actifs, vos travaux peuvent être retardée jusqu'à un maximum de %s heures avant d'être exécuter.
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index c09490c8184..18180ca1955 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Erreur, votre PHP doit avoir le module <b>%s</b> installé po
 ErrorOpenIDSetupNotComplete=Vous avez configuré Dolibarr pour accepter l'authentication OpenID, mais l'URL du service OpenID n'est pas défini dans la constante %s
 ErrorWarehouseMustDiffers=Les entrepôts source et destination doivent être différents
 ErrorBadFormat=Mauvais format
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'est lié à aucun tiers. Lier l'adhérent à un tiers existant ou créer un nouveau tiers pour le lier avant de créer l'adhésion avec facture.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erreur, cet adhérent n'ait pas encore lié à un tiers. Lier le tier à un tiers existant ou créer un nouveau tiers avant de créer une adhésion avec facture.
 ErrorThereIsSomeDeliveries=Erreur, il y a des bordereaux de réception liées à ces expéditions. La suppression est refusée.
 ErrorCantDeletePaymentReconciliated=Impossible d'effacer un paiement qui a généré une écriture bancaire qui a été rapprochée
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossible d'effacer un paiement qui porte sur au moins une facture qui est à l'état payée.
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Le stock du produit %s est insuffisant
 ErrorStockIsNotEnoughToAddProductOnInvoice=Le stock du produit %s est insuffisant pour permettre un ajout dans une nouvelle facture
 ErrorStockIsNotEnoughToAddProductOnShipment=Le stock du produit %s est insuffisant pour permettre un ajout dans une nouvelle expédition
 ErrorStockIsNotEnoughToAddProductOnProposal=Le stock du produit %s est insuffisant pour permettre un ajout dans une nouvelle proposition
+ErrorFailedToLoadLoginFileForMode=Impossible d'obtenir le fichier de connexion pour le mode '%s'.
+ErrorModuleNotFound=Fichier du module non trouvé.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
@@ -192,5 +194,5 @@ WarningClickToDialUserSetupNotComplete=La configuration ClickToDial pour votre c
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Fonction désactivé quand l'affichage est en mode optimisé pour les personnes aveugles ou les navigateurs textes.
 WarningPaymentDateLowerThanInvoiceDate=La date de paiement (%s) est inférieure à la date de facturation (%s) de la facture %s.
 WarningTooManyDataPleaseUseMoreFilters=Trop de données (plus de %s lignes). Utilisez davantage de filtres ou régler la constante %s pour augmenter la limite à une valeur plus élevée.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningSomeLinesWithNullHourlyRate=Certaines fois ont été enregistrés par quelques utilisateurs leur taux horaire alors qu'il n'est pas défini. Une valeur de 0 %s par heure a été utilisée mais ceci peut aboutir à la mauvaise estimation de temps passé.
 WarningYourLoginWasModifiedPleaseLogin=Votre identifiant a été modifié. Par sécurité, vous devrez vous identifiez avec votre nouvel identifiant avant l'action suivante.
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 8a1c7ddef6c..12623a6b410 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Les %s dernières demandes de congès modifiées
 HolidaysMonthlyUpdate=Mise à jour mensuelle
 ManualUpdate=Mise à jour manuelle
 HolidaysCancelation=Annulation de la demande de congés
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Nom du salarié
+EmployeeFirstname=Prénom du salarié
 
 ## Configuration du Module ##
 LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index 532c135e40b..0016389f193 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -10,7 +10,7 @@ OpenEtablishment=Etablissement ouvert
 CloseEtablishment=Etablissement fermé
 # Dictionary
 DictionaryDepartment=GRH - Liste des départements
-DictionaryFunction=GRH - List des fonctions
+DictionaryFunction=GRH - Liste des fonctions
 # Module
 Employees=Salariés
 Employee=Salarié
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 0c93f36e507..25a9592b7c1 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Ce PHP prend en charge les sessions.
 PHPSupportPOSTGETOk=Ce PHP prend bien en charge les variables POST et GET.
 PHPSupportPOSTGETKo=Il est possible que ce PHP ne prenne pas en charge les variables POST et/ou GET. Vérifier le paramètre <b>variables_order</b> du php.ini.
 PHPSupportGD=Ce PHP prend en charge les fonctions graphiques GD.
+PHPSupportCurl=PHP supporte l'extension Curl
 PHPSupportUTF8=Ce PHP prend en charge les fonctions UTF8.
 PHPMemoryOK=Votre mémoire maximum de session PHP est définie à <b>%s</b>. Ceci devrait être suffisant.
 PHPMemoryTooLow=Votre mémoire maximum de session PHP est définie à <b>%s</b> octets. Ceci est trop faible. Il est recommandé de modifier le paramètre <b>memory_limit</b> de votre fichier <b>php.ini</b> à au moins <b>%s</b> octets.
 Recheck=Cliquez ici pour un test plus probant
 ErrorPHPDoesNotSupportSessions=Votre installation PHP ne prend pas en charge les sessions. Cette fonctionnalité est requise pour faire fonctionner Dolibarr. Vérifiez votre configuration de PHP.
 ErrorPHPDoesNotSupportGD=Ce PHP ne prend pas en charge les fonctions graphiques GD. Aucun graphique ne sera disponible.
+ErrorPHPDoesNotSupportCurl=Votre version de PHP ne supporte pas l'extension Curl
 ErrorPHPDoesNotSupportUTF8=Ce PHP ne prend pas en charge les fonctions UTF8. Résolvez le problème avant d'installer Dolibarr car il ne pourra pas fonctionner correctement.
 ErrorDirDoesNotExists=Le répertoire <b>%s</b> n'existe pas ou n'est pas accessible.
 ErrorGoBackAndCorrectParameters=Revenez en arrière et corrigez les paramètres invalides.
@@ -133,6 +135,10 @@ ActivateModule=Activation du module %s
 ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert)
 WarningUpgrade=Attention :\nAvez-vous effectué une sauvegarde de votre base de données en premier ?\nC'est hautement recommandé : par exemple, à cause de nombreaux bugs dans le système de base de données (Par exemple mysql version 5.5.40/41/42/43), certaines données ou tables peuvent être perdues durant le processus, il est donc hautement recommandé d'avoir une sauvegarde complète de votre base de données avant de commencer la migration.\n\nCliquez Ok pour commencer la migration...
 ErrorDatabaseVersionForbiddenForMigration=La version de votre gestionnaire de base de données est %s. Celle-ci présente un défaut critique entraînant des pertes de données si vous changez la structure de votre base de données tel que requis par le processus de migration. C'est pourquoi la migration vous sera interdite tant que vous n'aurez pas mis à jour votre gestionnaire de base de données vers une version supérieure corrigée (Liste des versions affectées par le défaut : %s).
+KeepDefaultValuesWamp=Si vous utilisez l'installeur automatique DoliWamp, les données présentes ici sont pré-remplies. Ne les modifiez qu'en connaissance de cause.
+KeepDefaultValuesDeb=Vous utilisez l'assistant d'installation depuis un environnement Linux (Ubuntu, Debian, Fedor...). Les valeurs présentes ici sont pré-remplies. Seul le mot de passe d'accès du propriétaire de la base de données doit être renseigné. Les autres paramètres ne doivent être modifiés qu'en connaissance de cause.
+KeepDefaultValuesMamp=Vous utilisez l'assistant d'installation DoliMamp. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause.
+KeepDefaultValuesProxmox=Vous utilisez l'assistant d'installation depuis une application Proxmox. Les valeurs présentes ici sont pré-remplies. Leur modification ne doit être effectuée qu'en connaissance de cause.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Mise à jour des données des actions des éléments
 MigrationPaymentMode=Migration des modes de paiement
 MigrationCategorieAssociation=Migration des categories
 MigrationEvents=Migration des évènements pour ajouter les propriétaires dans la table des utilisateurs assignés
+MigrationRemiseEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise
+MigrationRemiseExceptEntity=Mettre à jour le champ "entity" de la table "llx_societe_remise_except"
 MigrationReloadModule=Rechargement du module %s
 ShowNotAvailableOptions=Afficher les choix non disponibles
 HideNotAvailableOptions=Cacher les choix non disponibles
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index 7d320e3cff2..011c7616efd 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Contact client suivi de l'intervention
 # Modele numérotation
 PrintProductsOnFichinter=Imprimer aussi les lignes de type "produit" (pas seulement de type service) sur les fiches d'intervention
 PrintProductsOnFichinterDetails=interventions générées à partir des commandes
+UseServicesDurationOnFichinter=Utiliser la durée des services dans les interventions créées depuis des commandes
 InterventionStatistics=Statistiques des interventions
 NbOfinterventions=Nb de fiches d'intervention
 NumberOfInterventionsByMonth=Nb de fiches d'intervention par mois (date de validation)
diff --git a/htdocs/langs/fr_FR/ldap.lang b/htdocs/langs/fr_FR/ldap.lang
index 0315416bacc..f3afca85ea0 100644
--- a/htdocs/langs/fr_FR/ldap.lang
+++ b/htdocs/langs/fr_FR/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Date de première adhésion
 LDAPFieldFirstSubscriptionAmount=Montant première adhésion
 LDAPFieldLastSubscriptionDate=Date de dernière adhésion
 LDAPFieldLastSubscriptionAmount=Montant dernière adhésion
+LDAPFieldSkype=Identifiant Skype
+LDAPFieldSkypeExample=Exemple : skypeName
 UserSynchronized=Utilisateur synchronisé
 GroupSynchronized=Groupe synchronisé
 MemberSynchronized=Adhérent synchronisé
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index 6fb63229485..c3114967ce0 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -29,7 +29,7 @@ MortgagePaymentInformation=Information de Paiement de l'Hypothèque
 DownPayment=Acompte
 DownPaymentDesc=L'<b>acompte</b> = Le prix de la maison multiplié par le pourcentage divisé par 100 (5% devient 5/100 ou 0,05)
 InterestRateDesc=Le  <b>taux d'intérêt</b> = Le pourcentage annuel d'intérêt divisé par 100.
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
+MonthlyFactorDesc=<b> facteur mensuel </b> = le résultat de la formule suivant
 MonthlyInterestRateDesc=Le  <b>taux d'intérêt mensuel</b> = Le taux annuel d'intérêt divisé par 12 (pour les 12 mois de l'année)
 MonthTermDesc=Le <b>terme en mois</b> du prêt en mois = Le nombre d'années que vous avez pris pour le prêt multiplié par 12
 MonthlyPaymentDesc=Le paiement mensuel est déterminé en utilisant la formule suivante
@@ -38,7 +38,7 @@ AmountFinanced=Montant financé
 AmortizationMonthlyPaymentOverYears=Amortissement pour paiement mensuel : <b>%s</b> sur %s ans
 Totalsforyear=Total pour l'année
 MonthlyPayment=Paiement mensuel
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
+LoanCalcDesc=Cette <b>simulation de prêt</b> peut être utilisée pour comprendre les paiements mensuels d'un emprunt, basé sur le montant emprunté, le terme du prêt désiré et l'intérêt.<br> Cette simulation inclut aussi PMI (l'Assurance Hypothécaire Privée) pour des prêts où moins de 20 %% est mis comme un acompte. Sont pris en considération les impôts fonciers de ville et leur effet sur le paiement total mensuel.<br>
 GoToInterest=%s remboursera les intérêts
 GoToPrincipal=%s remboursera le principal (capital)
 YouWillSpend=Vous allez dépenser %s pour l'année %s
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index cbdeaa04af2..eaee7b788e1 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Lu
 YourMailUnsubcribeOK=L'adresse email <b>%s</b> est bien désinscrite de la liste.
 ActivateCheckReadKey=Clé de sécurité permettant le chiffrement des URL utilisées dans les fonctions d'accusé de lecture et de désinscription
 EMailSentToNRecipients=Email envoyé à %s destinataires.
+EMailSentForNElements=%s e-mails envoyés
 XTargetsAdded=<b>%s</b> destinataires ajoutés dans la liste cible
-OnlyPDFattachmentSupported=Si le document PDF a déjà généré pour la facture, il sera attaché à l'email. Si non, aucun e-mail ne sera envoyé (aussi notez que seule les factures au format PDF sont prises en charge en tant que pièce jointe pour un envoi en masse dans cette version).
+OnlyPDFattachmentSupported=Si le document PDF a déjà été généré, il sera ajouté à l'e-mail en pièce jointe. Sinon, aucun e-mail ne sera envoyé. Notez que seuls des documents PDF peuvent être ajoutés en pièce jointe aux campagnes d'e-mailing
 AllRecipientSelected=Tous les tiers sélectionnés et si un email est défini
 ResultOfMailSending=Résultat de l'envoi d'EMail en masse
 NbSelected=Nb sélectionné
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index e4dca048a78..577654dd317 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -67,6 +67,7 @@ SelectDate=Sélectionnez une date
 SeeAlso=Voir aussi %s
 SeeHere=Regardez ici
 BackgroundColorByDefault=Couleur de fond
+FileRenamed=Le fichier a été renommé avec succès
 FileUploaded=Le fichier a été transféré avec succès
 FileWasNotUploaded=Un fichier a été sélectionné pour attachement mais n'a pas encore été uploadé. Cliquez sur "Joindre ce fichier" pour cela.
 NbOfEntries=Nb d'entrées
@@ -245,6 +246,10 @@ DateBuild=Date génération du rapport
 DatePayment=Date paiement
 DateApprove=Date approbation
 DateApprove2=Date approbation (deuxième approbation)
+UserCreation=Création de l'utilisateur
+UserModification=Modification de l'utilisateur
+UserCreationShort=Création de l'utilisateur
+UserModificationShort=Modification de l'utilisateur
 DurationYear=an
 DurationMonth=mois
 DurationWeek=semaine
@@ -256,6 +261,7 @@ DurationDays=jours
 Year=Année
 Month=Mois
 Week=Semaine
+WeekShort=Semaine
 Day=Jour
 Hour=Heure
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Mois du jour
 HourShort=H
 MinuteShort=mn
 Rate=Taux
+CurrencyRate=Taux de change de la devise
 UseLocalTax=Inclure taxe
 Bytes=Octets
 KiloBytes=Kilooctets
@@ -565,8 +572,11 @@ BackToList=Retour liste
 GoBack=Retour arrière
 CanBeModifiedIfOk=Peut être modifié si valide
 CanBeModifiedIfKo=Peut être modifié si invalide
+ValueIsValid=Valeur valide
+ValueIsNotValid=Valeur non valide
 RecordModifiedSuccessfully=Enregistrement modifié avec succès
 RecordsModified=%s enregistrements modifiés
+RecordsDeleted=Les %s dernières suppressions d'éléments
 AutomaticCode=Création automatique du code
 FeatureDisabled=Fonction désactivée
 MoveBox=Déplacer le widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Vous n'avez pas les permissions pour cette action
 SessionName=Nom session
 Method=Méthode
 Receive=Réceptionner
+CompleteOrNoMoreReceptionExpected=Complète ou plus de réception attendue
 PartialWoman=Partielle
 TotalWoman=Totale
 NeverReceived=Jamais reçu
@@ -598,6 +609,7 @@ DisabledModules=Modules désactivés
 For=Pour
 ForCustomer=Pour le client
 Signature=Signature
+DateOfSignature=Date de signature
 HidePassword=Afficher commande avec mot de passe masqué
 UnHidePassword=Afficher commande réelle avec mot de passe en clair
 Root=Racine
@@ -641,6 +653,15 @@ NewAttribute=Nouvel attribut
 AttributeCode=Code de l'attribut
 URLPhoto=URL de la photo/logo
 SetLinkToAnotherThirdParty=Lier vers un autre tiers
+LinkTo=Lier à
+LinkToProposal=Lier à une proposition commerciale
+LinkToOrder=Lier à une commande
+LinkToInvoice=Lier à une facture
+LinkToSupplierOrder=Lier à une commande fournisseur
+LinkToSupplierProposal=Lier à une proposition commerciale fournisseur
+LinkToSupplierInvoice=Lier à une facture fournisseur
+LinkToContract=Lier à un contrat
+LinkToIntervention=Lier à une intervention
 CreateDraft=Créer brouillon
 SetToDraft=Retour en brouillon
 ClickToEdit=Cliquer ici pour éditer
@@ -701,6 +722,9 @@ RelatedObjects=Objets liés
 ClassifyBilled=Classer facturé
 Progress=Progression
 ClickHere=Cliquer ici
+FrontOffice=Front office
+BackOffice=Back office
+View=Vue
 # Week day
 Monday=Lundi
 Tuesday=Mardi
@@ -751,7 +775,7 @@ SearchIntoSupplierInvoices=Factures fournisseurs
 SearchIntoCustomerOrders=Commandes clients
 SearchIntoSupplierOrders=Commandes fournisseurs
 SearchIntoCustomerProposals=Propositions/devis
-SearchIntoSupplierProposals=Propositions commerciales founisseurs
+SearchIntoSupplierProposals=Propositions commerciales fournisseurs
 SearchIntoInterventions=Interventions
 SearchIntoContracts=Contrats
 SearchIntoCustomerShipments=Expéditions clients
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index b7adbfdd4a6..96bf3d99d7a 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Le taux doit être une valeure numérique
 markRateShouldBeLesserThan100=Le taux de marque doit être inférieur à 100
 ShowMarginInfos=Afficher les infos de marges
 CheckMargins=Détails des marges
+MarginPerSaleRepresentativeWarning=Les données de marge par utilisateur sont calculées en fonction du lien entre les tiers et l'utilisateur affecté en tant que commercial. Les tiers peuvent ne pas avoir de commercial ou en avoir plusieurs. De ce fait, certaines lignes du rapport peuvent ne pas être affichées ou l'être plusieurs fois.
diff --git a/htdocs/langs/fr_FR/oauth.lang b/htdocs/langs/fr_FR/oauth.lang
index 24a654f21ac..4aba1a7cae3 100644
--- a/htdocs/langs/fr_FR/oauth.lang
+++ b/htdocs/langs/fr_FR/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configuration OAuth
+OAuthServices=Services OAuth
+ManualTokenGeneration=Génération manuelle du jeton
 NoAccessToken=Aucun jeton d'accès sauvegardé dans la base de donnée locale
 HasAccessToken=Un jeton a été généré et sauvegardé dans la base de donnée locale
 NewTokenStored=Jeton reçu et sauvegardé
@@ -9,7 +11,16 @@ RequestAccess=Cliquez ici pour demander/renouveler un accès et recevoir un nouv
 DeleteAccess=Cliquez ici pour effacer le jeton
 UseTheFollowingUrlAsRedirectURI=Utilisez l'URL suivante comme URI de redirection quand vous créez un crédit avec votre fournisseur OAuth :
 ListOfSupportedOauthProviders=Saisissez ici le crédit fourni par votre fournisseur OAuth2. Seuls les fournisseurs OAuth2 supportés sont visibles ici. Ce paramétrage est potentiellement utilisé par d'autres modules qui nécessitent une authentification OAuth2.
-OAUTH_GOOGLE_NAME=API Google
-OAUTH_GOOGLE_ID=ID API Google
-OAUTH_GOOGLE_SECRET=API Google Secrète
-OAUTH_GOOGLE_DESC=Allez sur <a href="https://console.developers.google.com/" target="_blank">cette page</a> puis Identitifaction pour créer des informations d'identification OAuth
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh présent
+TOKEN_EXPIRED=Token expiré
+TOKEN_EXPIRE_AT=Token expire le
+TOKEN_DELETE=Supprimer jeton enregistré
+OAUTH_GOOGLE_NAME=Service Oauth Google
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google secret
+OAUTH_GOOGLE_DESC=Allez sur <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">cette page</a> puis «Autorisation» pour créer les informations d'identification OAuth
+OAUTH_GITHUB_NAME=Service Oauth GitHub
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub secret
+OAUTH_GITHUB_DESC=Allez sur <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">cette page</a> , puis "Enregistrer une nouvelle application" pour créer les informations d'identification OAuth
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index ba303dce21d..71dfa596870 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Vos commandes ont été générées
 OrderFail=Une erreur s'est produite pendant la création de vos commandes
 CreateOrders=Créer commandes
 ToBillSeveralOrderSelectCustomer=Pour créer une facture pour plusieurs commandes, cliquez d'abord sur le client, puis choisir "%s".
+CloseReceivedSupplierOrdersAutomatically=Fermer la commande "%s" automatiquement si tous les produits ont été reçus.
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 9449e8b6961..d5676dda9fb 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -35,7 +35,7 @@ Notify_BILL_SENTBYMAIL=Envoi facture client par email
 Notify_BILL_SUPPLIER_VALIDATE=Validation facture fournisseur
 Notify_BILL_SUPPLIER_PAYED=Paiment facture fournisseur
 Notify_BILL_SUPPLIER_SENTBYMAIL=Envoi facture fournisseur par email
-Notify_BILL_SUPPLIER_CANCELED=Facture founisseur annulée
+Notify_BILL_SUPPLIER_CANCELED=Facture fournisseur annulée
 Notify_CONTRACT_VALIDATE=Validation contrat
 Notify_FICHEINTER_VALIDATE=Validation fiche d'intervention
 Notify_SHIPPING_VALIDATE=Validation expédition
diff --git a/htdocs/langs/fr_FR/printing.lang b/htdocs/langs/fr_FR/printing.lang
index d079e2cb569..734580af1cf 100644
--- a/htdocs/langs/fr_FR/printing.lang
+++ b/htdocs/langs/fr_FR/printing.lang
@@ -18,10 +18,6 @@ UserConf=Configuration par utilisateur
 PRINTGCP_INFO=Configuration Google OAuth API
 PRINTGCP_AUTHLINK=Authentification
 PRINTGCP_TOKEN_ACCESS=Token OAuth Google Cloud Impression
-PRINTGCP_TOKEN_REFRESH=Présence du jeton d'actualisation
-PRINTGCP_TOKEN_EXPIRED=Token expiré
-PRINTGCP_TOKEN_EXPIRE_AT=Token expirant le
-PRINTGCP_DELETE_TOKEN=Supprimer token sauvegardé
 PrintGCPDesc=Ce driver permet d'envoyer des documents directement à l'imprimante via Google Cloud Print
 GCP_Name=Nom
 GCP_displayName=Nom affiché
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 9aa4d25715d..a06cf463387 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Série
 atleast1batchfield=Date limite utilisation optimale, de consommation ou numéro de lot/série
 batch_number=Numéro de Lot/Série
 BatchNumberShort=Lot/Série
-l_eatby=Date limite de consommation
-l_sellby=Date de péremption
+EatByDate=DLC
+SellByDate=DLUO
 DetailBatchNumber=Détails Lot/Série
 DetailBatchFormat=Lot/Série: %s - DMD: %s - DLC: %s (Qté: %d)
 printBatch=Lot/Série: %s
@@ -17,6 +17,8 @@ printEatby=DMD/DLUO: %s
 printSellby=DLC: %s
 printQty=Qté: %d
 AddDispatchBatchLine=Ajouter une ligne pour la répartition par durée de conservation
-BatchDefaultNumber=Non défini
 WhenProductBatchModuleOnOptionAreForced=Quand le module Lot/Série est activé, le mode incrémentation/décrémentation des stocks est forcé sur le dernier choix et ne peut pas être édité. D'autres options peuvent être définies comme vous le voulez.
 ProductDoesNotUseBatchSerial=Ce produit n'utilise pas les numéros de lot/série
+ProductLotSetup=Configuration du module lot/série
+ShowCurrentStockOfLot=Afficher le stock actuel pour le couple produit / lot
+ShowLogOfMovementIfLot=Afficher l'historique des mouvements de couple produit / lot
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index eef4ac98480..fc1511020f0 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Changement TVA en masse
 ProductVatMassChangeDesc=Cette page permet de modifier les taux de TVA définis sur les produits ou services d'une valeur vers une autre. Attention, la modification est réalisée en masse sur toute la base de donnée.
 MassBarcodeInit=Initialisation codes-barre
 MassBarcodeInitDesc=Cette page peut être utilisée pour initialiser un code-barre sur des objets qui ne disposent pas de code-barre défini. Vérifiez avant que l'installation du module code-barres est complète.
-ProductAccountancyBuyCode=Code compta achat
-ProductAccountancySellCode=Code compta vente
+ProductAccountancyBuyCode=Code comptable (achat)
+ProductAccountancySellCode=Code comptable (vente)
 ProductOrService=Produit ou Service
 ProductsAndServices=Produits et Services
 ProductsOrServices=Produits ou Services
@@ -32,8 +32,8 @@ ServicesOnSellAndOnBuy=Services en vente et en achat
 LastModifiedProductsAndServices=Les %s derniers produits/services modifiés
 LastRecordedProducts=Les %s derniers produits enregistrés
 LastRecordedServices=Les %s derniers services enregistrés
-CardProduct0=Product card
-CardProduct1=Service card
+CardProduct0=Fiche produit
+CardProduct1=Fiche service
 Stock=Stock
 Stocks=Stocks
 Movements=Mouvements
@@ -57,8 +57,10 @@ AppliedPricesFrom=Prix de vente pratiqués à partir du
 SellingPrice=Prix de vente
 SellingPriceHT=Prix de vente HT
 SellingPriceTTC=Prix de vente TTC
-CostPriceDescription=Ce prix (net de taxe) peut être utilisée pour stocker le montant moyen de ce produit de coût pour votre entreprise. Il peut être tout prix vous vous calculer, par exemple à partir du prix d'achat moyen majoré des coûts de production et de la distribution moyenne.
+CostPriceDescription=Ce prix (net de taxe) peut être utilisé pour stocker le montant moyen du coût de ce produit pour votre entreprise. Il peut être calculé par exemple à partir du prix d'achat moyen majoré des coûts moyens de production et de distribution.
 CostPriceUsage=Dans une version future, cette valeur pourrait être utilisée pour le calcul de la marge.
+SoldAmount=Solde
+PurchasedAmount=Montant des achats
 NewPrice=Nouveau prix
 MinPrice=Prix de vente min.
 CantBeLessThanMinPrice=Le prix de vente ne doit pas être inférieur au minimum pour ce produit (%s HT). Ce message peut aussi être provoqué par une remise trop importante.
@@ -85,7 +87,7 @@ SetDefaultBarcodeType=Définissez le type de code-barres
 BarcodeValue=Valeur du code-barres
 NoteNotVisibleOnBill=Note (non visible sur les factures, propals...)
 ServiceLimitedDuration=Si produit de type service à durée limitée :
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Plusieurs niveaux de prix par produit/service (chaque client est dans un et un seul niveau)
 MultiPricesNumPrices=Nombre de prix
 AssociatedProductsAbility=Pris en charge des packages
 AssociatedProducts=Produit virtuel/package
@@ -197,14 +199,14 @@ PrintsheetForOneBarCode=Imprimer des étiquettes d'un code barre particulier
 BuildPageToPrint=Générer la page à imprimer
 FillBarCodeTypeAndValueManually=Remplir le type et la valeur du code barre manuellement.
 FillBarCodeTypeAndValueFromProduct=Remplir le type et la valeur du code barre par celui d'un produit.
-FillBarCodeTypeAndValueFromThirdParty=Remplir le type et la valeur du code barre par celui d'un tiers.
+FillBarCodeTypeAndValueFromThirdParty=Remplir le type et la valeur du code barre par celui du tiers.
 DefinitionOfBarCodeForProductNotComplete=Définition du type ou valeur du code barre incomplète sur le produit %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Définition du type ou valeure du code barre incomplète sur le tiers %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Définition du type ou valeur du code bar incomplète pour le tiers %s.
 BarCodeDataForProduct=Information de code barre du produit %s :
-BarCodeDataForThirdparty=Information de code barre du tiers %s :
+BarCodeDataForThirdparty=Information de code barre du produit %s :
 ResetBarcodeForAllRecords=Définir la valeur de code-barres pour tous les enregistrements (cela réinitialiser également les valeurs de code-barres déjà défini par des nouvelles)
 PriceByCustomer=Prix différents pour chaque client
-PriceCatalogue=A single sell price per product/service
+PriceCatalogue=Un seul prix de vente par produit/service
 PricingRule=Règles pour les prix clients
 AddCustomerPrice=Ajouter prix par client
 ForceUpdateChildPriceSoc=Définir le même prix sur les filiales des clients
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index a395bc7dd38..c0c9ee8a92c 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -14,7 +14,7 @@ ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes
 TasksOnProjectsPublicDesc=Cette vue affiche toutes les tâches de projets selon vos permissions utilisateur
 ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
 MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
 OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
 ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
@@ -72,7 +72,7 @@ GoToListOfTasks=Aller à la liste des tâches
 ListProposalsAssociatedProject=Liste des propositions commerciales associées au projet
 ListOrdersAssociatedProject=Liste des commandes clients associées au projet
 ListInvoicesAssociatedProject=Liste des factures clients associées au projet
-ListPredefinedInvoicesAssociatedProject=Liste des factures clients modèles associées au projet
+ListPredefinedInvoicesAssociatedProject=Liste des modèles de facture client associées au projet
 ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées au projet
 ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
 ListContractAssociatedProject=Liste des contrats associés au projet
@@ -123,6 +123,7 @@ ProjectReportDate=Reporter les dates des tâches en fonction de la date de dépa
 ErrorShiftTaskDate=Une erreur s'est produite dans le report des dates des tâches.
 ProjectsAndTasksLines=Projets et tâches
 ProjectCreatedInDolibarr=Projet %s créé
+ProjectModifiedInDolibarr=Projet %s modifié
 TaskCreatedInDolibarr=Tâche %s créée
 TaskModifiedInDolibarr=Tâche %s modifiée
 TaskDeletedInDolibarr=Tâche %s supprimée
@@ -153,7 +154,7 @@ PlannedWorkload=Charge de travail prévue
 PlannedWorkloadShort=Charge de travail
 ProjectReferers=Objets associés
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
-FirstAddRessourceToAllocateTime=Associer d'abord la ressource pour pouvoir saisir du temps
+FirstAddRessourceToAllocateTime=Affecter un utilisateur pour saisir des temps
 InputPerDay=Saisie par jour
 InputPerWeek=Saisie par semaine
 InputPerAction=Saisie par action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Opportunités/affaires ouvertes par statut
 ProjectsStatistics=Statistics sur les projets
 TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
 IdTaskTime=Id ligne de temps
-YouCanCompleteRef=Si vous souhaitez compléter la référence avec quelques informations (pour l'utiliser comme filtres de recherche), il est recommandé d'ajouter un caractère - pour la séparer, de sorte que la numérotation automatique fonctionne toujours correctement pour les projets à venir. Par exemple %s-ABC. Vous pouvez aussi préférer ajouter des clés de recherche dans le libellé.
+YouCanCompleteRef=SI vous souhaitez compléter la référence avec d'autres informations filtrables, il est recommandé d'ajouter le caractère - entre les données. La numérotation automatique sera alors fonctionnelle pour le prochain compteur. Par exemple %s-ABC. Il est également possible d'ajouter des mots-clés dans le libellé. Il est cependant recommandé d'utiliser un attribut supplémentaire ou extrafield.
 OpenedProjectsByThirdparties=Projets ouverts par tiers
 OnlyOpportunitiesShort=Opportunités uniquement
 OpenedOpportunitiesShort=Opportunités ouvertes
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 54253e4a6da..b12726dc90c 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nouveau règlement de salaire
 SalaryPayment=Règlement salaire
 SalariesPayments=Règlements des salaires
 ShowSalaryPayment=Afficher règlement de salaire
-THM=Tarif horaire moyen
-TJM=Tarif journalier moyen
+THM=Salaire horaire moyen
+TJM=Salaire journalier moyen
 CurrentSalary=Salaire courant
 THMDescription=Cette valeur peut être utilisé pour calculer le coût horaire consommé dans un projet suivi par utilisateurs si le module projet est utilisé
 TJMDescription=Cette valeur est actuellement seulement une information et n'est utilisé pour aucun calcul
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index f507c1503dc..9c8e6be412f 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Supprimer expédition
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks par lot/série
+LotSerial=Lots/séries
+LotSerialList=Liste des numéros de lots/séries
 Movements=Mouvements
 ErrorWarehouseRefRequired=Le nom de référence de l'entrepôt est obligatoire
 ListOfWarehouses=Liste des entrepôts
@@ -43,6 +45,7 @@ PMPValue=Valorisation (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valorisation des stocks
 UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
+AllowAddLimitStockByWarehouse=Autoriser l'ajout d'une limite et d'un stock désiré par produit et entrepôt
 IndependantSubProductStock=Le stock du produit et le stock des sous-produits sont indépendant
 QtyDispatched=Quantité ventilée
 QtyDispatchedShort=Qté ventilée
@@ -121,7 +124,7 @@ MovementLabel=Libellé du mouvement
 InventoryCode=Code mouvement ou inventaire
 IsInPackage=Inclus dans un package
 WarehouseAllowNegativeTransfer=Le stock peut être négatif
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
+qtyToTranferIsNotEnough=Vous n'avez pas assez de stock de votre entrepôt source
 ShowWarehouse=Afficher entrepôt
 MovementCorrectStock=Correction du stock pour le produit %s
 MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt
@@ -132,3 +135,9 @@ OpenAll=Accepte tous les mouvements
 OpenInternal=Accepte les mouvements internes
 OpenShipping=Accepte les expéditions
 OpenDispatch=Accepte les réceptions de commandes fournisseur
+UseDispatchStatus=Utiliser le statut de la commande (approuvée/refusée)
+OptionMULTIPRICESIsOn=L'option "plusieurs prix par tranches" est activée. Cela signifie qu'un produit à plusieurs prix de vente donc sa valeur de vente ne peut être calculée.
+ProductStockWarehouseCreated=Alerte de limite de stock et de stock désiré ajoutée
+ProductStockWarehouseUpdated=Alerte de limite de stock et de stock désiré actualisée
+ProductStockWarehouseDeleted=Alerte de limite de stock et de stock désiré supprimée
+AddNewProductStockWarehouse=Définir la limite d'alerte et de stock désiré optimal
diff --git a/htdocs/langs/fr_FR/supplier_proposal.lang b/htdocs/langs/fr_FR/supplier_proposal.lang
index 8ecdcf63d11..bea3ad4f31f 100644
--- a/htdocs/langs/fr_FR/supplier_proposal.lang
+++ b/htdocs/langs/fr_FR/supplier_proposal.lang
@@ -11,7 +11,7 @@ LastModifiedRequests=Les %s dernières demandes de prix modifiées
 RequestsOpened=Demandes de prix ouvertes
 SupplierProposalArea=Zone des propositions de fournisseurs
 SupplierProposalShort=Proposition commerciale fournisseur
-SupplierProposals=Propositions commerciales founisseurs
+SupplierProposals=Propositions commerciales fournisseurs
 SupplierProposalsShort=Propositions commerciale fournisseurs
 NewAskPrice=Nouvelle demande de prix
 ShowSupplierProposal=Afficher demande de prix
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Création d'un modèle par défaut
 DefaultModelSupplierProposalToBill=Modèle par défaut lors de la fermeture d'une demande de prix (accepté)
 DefaultModelSupplierProposalClosed=Modèle par défaut lors de la fermeture d'une demande de prix (refusé)
 ListOfSupplierProposal=Liste des demandes de propositions de fournisseur
+ListSupplierProposalsAssociatedProject=Liste des propositions commerciales fournisseurs liées à un projet
 SupplierProposalsToClose=Propositions commerciales fournisseurs à fermer
 SupplierProposalsToProcess=Propositions commerciales fournisseurs à traiter
 LastSupplierProposals=Dernières demande de prix
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 7c78f33bf3d..c7bc56acdbf 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -7,13 +7,13 @@ History=Historique
 ListOfSuppliers=Liste des fournisseurs
 ShowSupplier=Afficher fournisseur
 OrderDate=Date de commande
-BuyingPriceMin=Prix d'achat minimum
-BuyingPriceMinShort=Prix achat min.
+BuyingPriceMin=Meilleur prix d'achat
+BuyingPriceMinShort=Meilleur prix d'achat
 TotalBuyingPriceMinShort=Total des prix d'achat des sous-produits
 TotalSellingPriceMinShort=Total des prix de vente des sous-produits
 SomeSubProductHaveNoPrices=Certains sous-produits n'ont pas de prix définis
-AddSupplierPrice=Ajouter prix fournisseur
-ChangeSupplierPrice=Modifier prix fournisseur
+AddSupplierPrice=Ajouter un prix d'achat
+ChangeSupplierPrice=Modifier un prix d'achat
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cette référence fournisseur est déjà associée à la référence : %s
 NoRecordedSuppliers=Pas de fournisseur enregistré
 SupplierPayment=Paiement fournisseur
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Liste des commandes fournisseurs
 MenuOrdersSupplierToBill=Commandes fournisseurs en facture
 NbDaysToDelivery=Délai de livraison en jours
 DescNbDaysToDelivery=Le plus gros délai de livraison parmi les produits de cette commande
-UseDoubleApproval=Utilisez la double approbation lors que le montant (hors taxes) est supérieur à (La deuxième approbation pourra être fait par un utilisateur avec la permission dédiée. Réglez à 0 pour ne pas avoir de double approbation)
 SupplierReputation=Réputation du fournisseur
 DoNotOrderThisProductToThisSupplier=Ne pas commander
 NotTheGoodQualitySupplier=Mauvaise qualité
 ReputationForThisProduct=Réputation
+BuyerName=Nom de l'acheteur
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 1000fd233d4..7dc1b6e28b0 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -100,4 +100,6 @@ WeeklyHours=Heures de travail hebdomadaires
 ColorUser=Couleur de l'utilisateur
 DisabledInMonoUserMode=Désactivé en mode maintenance
 UserAccountancyCode=Code comptable utilisateur
+UserLogoff=Déconnexion de l'utilisateur
+UserLogged=Utilisateur connecté
 DateEmployment=Date d'embauche
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index 2769e144254..61a0b1e1e8d 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -12,6 +12,7 @@ EditMenu=Modifier menu
 EditPageMeta=Modifier métadonnées
 EditPageContent=Modifier contenu
 Website=Site web
+Webpage=Page web
 AddPage=Ajouter une page
 PreviewOfSiteNotYetAvailable=La prévisualisation de votre site web <strong>%s</strong> n'est pas disponible actuellement. Vous devez créer une première page.
 RequestedPageHasNoContentYet=La page demandée d'id %s est vide ou le fichier cache .tpl.php a été supprimé. Modifiez le contenu de la page pour résoudre ce problème.
@@ -22,4 +23,6 @@ ViewPageInNewTab=Pré-visualiser la page dans un nouvel onglet
 SetAsHomePage=Définir comme page d'accueil
 RealURL=URL réelle
 ViewWebsiteInProduction=Pré-visualiser le site web en utilisant l'URL de la page d'accueil
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=Si vous pouvez définir, sur votre serveur web, un serveur virtuel dédié avec un répertoire racine sur <strong>%s</strong>, définir ici le nom de cet hôte virtuel ainsi la prévisualisation peut être faite en utilisant l'accès direct par le serveur web et pas seulement en utilisant le serveur Dolibarr.
+PreviewSiteServedByWebServer=Preview %s in a new tab. Le %s sera servi par un serveur Web externe (comme Apache, Nginx, IIS). Vous devez installer et configurer ce serveur auparavant.<br>URL de %s desservie par le serveur externe: <br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Aperçu %s dans un nouvel onglet. Le %s sera servi par le serveur Dolibarr donc aucun serveur Web supplémentaire (comme Apache, Nginx, IIS) ne doit être installé.<br>L'inconvénient est que l'URL de pages utilisent un chemin de votre Dolibarr.<br>URL de %s servie par Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index b797e6312e2..4e758daa75e 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -1,7 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Espace prélèvements clients
-StandingOrders=Prélèvements
-StandingOrder=Prélèvement
+CustomersStandingOrdersArea=Espace Ordres de prélèvement
+SuppliersStandingOrdersArea=Espace ordre de virements
+StandingOrders=Ordres de prélèvement
+StandingOrder=Ordre de prélèvement
 NewStandingOrder=Nouveau prélèvement
 StandingOrderToProcess=À traiter
 WithdrawalsReceipts=Bons de prélèvements
@@ -11,7 +12,7 @@ WithdrawalsLines=Lignes de prélèvements
 RequestStandingOrderToTreat=Demandes de prélèvements à traiter
 RequestStandingOrderTreated=Demandes de prélèvements traitées
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Fonction non disponible. Le statut du bon de prélèvement doit être mis 'à créditer' avant d'effectuer un rejet sur des lignes spécifiques.
-NbOfInvoiceToWithdraw=Nombre de factures en attente de prélèvement
+NbOfInvoiceToWithdraw=Nb. de factures en attente de prélèvement
 NbOfInvoiceToWithdrawWithInfo=Nombre de factures en attente de prélèvement pour les clients ayant des informations bancaires définies
 InvoiceWaitingWithdraw=Factures en attente de prélèvement
 AmountToWithdraw=Somme à prélever
@@ -46,9 +47,9 @@ StatusRefused=Rejeté
 StatusMotif0=Non renseigné
 StatusMotif1=Provision insuffisante
 StatusMotif2=Prélèvement contesté
-StatusMotif3=Pas de bon à payer
+StatusMotif3=Pas d'ordres de prélèvements
 StatusMotif4=Opposition sur compte
-StatusMotif5=RIB inexploitable
+StatusMotif5=Numéro de compte inexploitable
 StatusMotif6=Compte solde
 StatusMotif7=Décision judiciaire
 StatusMotif8=Autre motif
@@ -61,28 +62,43 @@ NotifyCredit=Crédit du bon
 NumeroNationalEmetter=Numéro National Émetteur
 WithBankUsingRIB=Pour les comptes bancaires utilisant le RIB
 WithBankUsingBANBIC=Pour les comptes bancaires utilisant le code BAN/BIC/SWIFT
-BankToReceiveWithdraw=Compte bancaire recevant les prélèvements
+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.
-DoStandingOrdersBeforePayments=Cet onglet vous permet de demander à passer le paiement prélèvement. Une fois la demande faite, allez dans le menu par la Banque -> Virements pour générer l'ordre de prélèvement. Lorsque l'ordre de prélèvement est clos, le paiement sur la facture sera automatiquement enregistrée, et la facture fermée si le reste à payer est nul.
+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é"
 ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées
 StatisticsByLineStatus=Statistiques par statut des lignes
 RUM=RUM
+RUMLong=Référence Unique de Mandat
 RUMWillBeGenerated=Le numéro de RUM sera généré une fois les informations de compte bancaire sont enregistrées
 WithdrawMode=Mode de prélévement (FRST ou RECUR)
 WithdrawRequestAmount=Montant de la demande de prélèvement
 WithdrawRequestErrorNilAmount=Impossible de créer une demande de prélèvement pour un montant nul
+SepaMandate=Mandat prélèvement SEPA
+SepaMandateShort=Mandat SEPA
+PleaseReturnMandate=Merci de retourner ce formulaire mandat par email à %s ou par courrier à
+SEPALegalText=En signant ce formulaire mandat, vous autorisez (A) %s à envoyer des instructions à votre banque pour débiter votre compte et (B) votre banque à débiter votre compte conformément aux instructions de %s. Dans le cadre de vos droits, vous pouvez obtenir un remboursement de votre banque selon les termes et conditions de votre contrat avec votre banque. Un remboursement doit être demandé dans les 8 semaines à compter de la date à laquelle votre compte a été débité. Vos droits concernant le mandat ci-dessus sont expliqués dans une déclaration que vous pouvez obtenir auprès de votre banque.
+CreditorIdentifier=Identifiant créditeur
+CreditorName=Nom du créditeur
+SEPAFillForm=(B) Remplir tous les champs marqués *
+SEPAFormYourName=Votre nom
+SEPAFormYourBAN=Votre Numéro de compte bancaire (IBAN)
+SEPAFormYourBIC=Votre code identifiant de banque (BIC)
+SEPAFrstOrRecur=Type de paiement
+ModeRECUR=Payment récurrent
+ModeFRST=Paiement unitaire
+PleaseCheckOne=Cocher un choix uniquement
 
 ### Notifications
 InfoCreditSubject=Crédit prélèvement %s à la banque
-InfoCreditMessage=Le bon de prélèvement %s a été crédité par la banque.<br>Date crédit : %s
+InfoCreditMessage=Le bon de prélèvement %s a été crédité par la banque.<br>Info crédit : %s
 InfoTransSubject=Transmission du prélèvement %s à la banque
 InfoTransMessage=Le bon de prélèvement %s a été transmis à la banque par %s %s.<br><br>
 InfoTransData=Montant : %s<br>Méthode : %s<br>Date : %s
-InfoRejectSubject=Prélèvement rejeté
-InfoRejectMessage=Bonjour,<br><br>l'ordre de virement de la facture %s du tiers %s, pour un montant de %s a été refusé par la banque.<br><br>--<br>%s
+InfoRejectSubject=Ordre de prélèvement rejeté
+InfoRejectMessage=Bonjour, <br><br> l'ordre de prélèvement de la facture %s liée à la société %s, avec un montant de %s a été refusé par la banque.<br><br>--<br>%s
 ModeWarning=Option mode réel non établi, nous allons arrêter après cette simulation
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index c4257f26898..29b79621b7b 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuration du module workflow
 WorkflowDesc=Ce module est conçu pour modifier le comportement des actions automatiques dans l'application. Par défaut, le workflow est ouvert (vous pouvez faire les choses dans l'ordre que vous voulez). Vous pouvez toutefois activer des actions automatiques qui vous intéressent.
 ThereIsNoWorkflowToModify=Il n'y a pas de modifications de workflow disponibles avec les modules activés.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Créer une facture client automatiquement
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classer facturée la proposition commerciale source quand la commande client dérivée est classée payée
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source quand la facture client dérivée est classée payée
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classer facturée la ou les commandes clients source lorsque la facture client dérivée est validée
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=A la validation d'une commande, classer la proposition commerciale source "facturée"
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classez livré les commandes liées sur validation d'une expédition, si la quantité livrée est la même que celle de la commande
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index b541eb5535c..acdd6bb0134 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=נסיוני
 VersionDevelopment=התפתחות
 VersionUnknown=לא ידוע
 VersionRecommanded=מומלץ
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=מושב מזהה
 SessionSaveHandler=הנדלר להציל הפעלות
 SessionSavePath=הפגישה אחסון לוקליזציה
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=שגיאה, דיוק גבוה יותר <b>%s<
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=NBR של תווים כדי להפעיל חיפוש: %s
 NotAvailableWhenAjaxDisabled=לא זמין כאשר אייאקס נכים
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript מושבת
 UsePreviewTabs=השתמש בכרטיסיות תצוגה מקדימה
 ShowPreview=הצג תצוגה מקדימה
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=קידוד נתונים בינאריים ב הקסדצימ
 IgnoreDuplicateRecords=התעלם טעויות של רשומות כפולות (הכנס להתעלם)
 AutoDetectLang=Autodetect (שפת הדפדפן)
 FeatureDisabledInDemo=התכונה זמינה ב דמו
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=הרשאות
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=האלמנטים היחידים של <a href="%s">מודולים המאפשרים</a> מוצגים.
-ModulesDesc=מודולים Dolibarr להגדיר אילו פונקציונליות מופעלת התוכנה. מודולים מסוימים מחייבים הרשאות עליך להעניק למשתמשים, לאחר הפעלת המודול. לחץ על כפתור כיבוי / ב 'סטטוס' טור לאפשר מודול / תכונה.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=מודולים נוספים ...
 DoliStoreDesc=DoliStore, במקום השוק הרשמי של מודולים Dolibarr ERP / CRM חיצוניות
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr הגרסה הנוכחית
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=אתה רשאי להיכנס לכל מסכת מספור. במסכת זו, התגים הבאים יכול לשמש: <br> <b>{000000}</b> המתאים למספר אשר יהיה מוגדל על %s כל אחד. הזן כמו אפסים רבים ככל האורך הרצוי של הדלפק. נגד יושלם עד אפסים משמאל כדי שיהיה כמו אפסים רבים ככל המסכה. <br> <b>{000} 000000</b> זהה לקודם, אך קוזז המתאים למספר בצד ימין של סימן + מיושם החל מיום %s הראשונים. <br> <b>{000000 @ x}</b> זהה לקודם אבל הדלפק מתאפס לאפס כאשר x חודש הוא הגיע (x בין 1 ל 12 או 0 כדי להשתמש בחודשים הראשונים של שנת הכספים מוגדרת בהגדרות שלך). אם אפשרות זו בשימוש, x הוא 2 או יותר, אז רצף {yy} {מ&quot;מ} או {yyyy} {מ&quot;מ} נדרש גם. <br> <b>Dd {}</b> היום (01 עד 31). <br> <b>{מ&quot;מ}</b> החודש (01 עד 12). <br> <b>{Yy}, {yyyy}</b> או <b>{y}</b> השנה על 2, 4 או 1 מספרים. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=כל הדמויות האחרות מסכת יישאר ללא שינוי. <br> מקומות אסורים. <br>
 GenericMaskCodes4a=<u>למשל על %s 99 של צד שלישי TheCompany לעשות 2007/01/31:</u> <br>
 GenericMaskCodes4b=<u>למשל על צד שלישי נוצר 2007/03/01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=פרמטרים כדי להבטיח את כתובות ה
 SecurityTokenIsUnique=השתמש פרמטר ייחודי securekey עבור כל כתובת אתר
 EnterRefToBuildUrl=הזן התייחסות %s אובייקט
 GetSecuredUrl=לקבל את כתובת האתר מחושב
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=משתמשים להקות
@@ -428,8 +439,8 @@ Module55Name=ברקודים
 Module55Desc=ברקוד של ההנהלה
 Module56Name=טלפוניה
 Module56Desc=שילוב טלפוניה
-Module57Name=הוראות קבע
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=שילוב של מערכת ClickToDial (כוכבית, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=לוח השנה
 Module410Desc=שילוב לוח השנה
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=הודעות
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=תרומות
 Module700Desc=התרומה של ההנהלה
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=לקרוא ספקי
 Permission147=קרא את סטטיסטיקת
-Permission151=לקרוא הוראות קבע
-Permission152=צור / לשנות בקשה הוראות הקבע
-Permission153=עומדים שידור הזמנות קבלות
-Permission154=כרטיס אשראי / לסרב עומדים קבלות הזמנות
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=יצוא חשבוניות ספקים, תכונות ותשלומי
 Permission1237=Export supplier orders and their details
 Permission1251=הפעל יבוא המוני של נתונים חיצוניים לתוך מסד נתונים (עומס נתונים)
 Permission1321=יצוא חשבוניות הלקוח, תכונות ותשלומים
+Permission1322=Reopen a paid bill
 Permission1421=ייצוא הזמנות של לקוחות ותכונות
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=לייבל שימוש כברירת מחדל אם לא התר
 LabelOnDocuments=התווית על מסמכים
 NbOfDays=נ.ב. הימים
 AtEndOfMonth=בסוף החודש
+CurrentNext=Current/Next
 Offset=לקזז
 AlwaysActive=פעיל תמיד
 Upgrade=שדרוג
@@ -950,7 +967,7 @@ LogEventDesc=ניתן להפעיל כאן בכניסה לאירועים Dolibarr
 AreaForAdminOnly=תכונות אלה יכולים לשמש את <b>המשתמשים מנהל</b> בלבד.
 SystemInfoDesc=מערכת מידע הוא מידע טכני שונות נכנסת למצב קריאה בלבד ונראה לעין עבור מנהלי בלבד.
 SystemAreaForAdminOnly=אזור זה זמין עבור המשתמשים מנהל בלבד. אף אחד הרשאות Dolibarr יכול להפחית את המגבלה.
-CompanyFundationDesc=עריכת בדף זה כל המידע הידוע של החברה או הקרן עליך לנהל (עבור קליק זה, על כפתור &quot;ערוך&quot; בתחתית העמוד)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=אתה יכול לבחור בכל פרמטר הקשור מבט Dolibarr ולהרגיש כאן
 AvailableModules=הזמינות מודולים
 ToActivateModule=כדי להפעיל מודולים, ללכת על שטח ההתקנה (ראשי-> התקנה-> Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=אזהרה, על כמה מערכות לינוקס, ל
 PathToDocuments=הדרך מסמכים
 PathDirectory=מדריך
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=תצורת דה לה traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=השתמש ב-TLS
 LDAPServerUseTLSExample=השימוש שלך LDAP שרת TLS
 LDAPServerDn=שרת DN
 LDAPAdminDn=מנהל DN
-LDAPAdminDnExample=השלם DN (לשעבר: cn = adminldap, DC = החברה, DC = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=מנהל את הסיסמה
 LDAPUserDn=משתמשים של DN
 LDAPUserDnExample=השלם DN (לשעבר: ou = משתמשים, DC = החברה, DC = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=דוגמה: O
 LDAPFieldSid=SID
 LDAPFieldSidExample=דוגמה: objectsid
 LDAPFieldEndLastSubscription=תאריך סיום המנוי
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=ההתקנה LDAP אינה שלמה (ללכת על כרטיסיות ואחרים)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=אין מנהל או הסיסמה סיפק. גישה LDAP יהיה אנונימי ב למצב קריאה בלבד.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=מוצרים ושירותים ההתקנה מודולים
 NumberOfProductShowInSelect=מספר מקסימלי של מוצרים combos בחר רשימות (0 = ללא הגבלה)
 ViewProductDescInFormAbility=ויזואליזציה של תיאורי מוצרים בתחום הטפסים (גם בכינויו tooltip קופץ)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=ויזואליזציה של תיאורי מוצרים בשפה thirdparty
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=ברקוד מסוג ברירת מחדל עבור מוצרים
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=מודול הנסיגה ההתקנה
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=ההתקנה RSS חיצוני יבוא
 NewRSS=חדש באתר עדכוני RSS
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 9d03a31a309..d04f64eb153 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=הוראות קבע
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 9132ff84224..6ea572637b4 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=הוראות קבע
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/he_IL/boxes.lang b/htdocs/langs/he_IL/boxes.lang
index c036d45a8e0..5c510a2da5d 100644
--- a/htdocs/langs/he_IL/boxes.lang
+++ b/htdocs/langs/he_IL/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=הצעות
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/he_IL/cashdesk.lang b/htdocs/langs/he_IL/cashdesk.lang
index 6d160d5e522..d7319dc07d5 100644
--- a/htdocs/langs/he_IL/cashdesk.lang
+++ b/htdocs/langs/he_IL/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/he_IL/categories.lang b/htdocs/langs/he_IL/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/he_IL/categories.lang
+++ b/htdocs/langs/he_IL/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index afb6b95359e..0d4bfce0c8c 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=ספקים
 ThirdPartyType=Third party type
 Company/Fundation=החברה / קרן
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=שם פרטי
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=כתובת
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/he_IL/compta.lang b/htdocs/langs/he_IL/compta.lang
index 793491eb3ae..0243383a849 100644
--- a/htdocs/langs/he_IL/compta.lang
+++ b/htdocs/langs/he_IL/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index 417d9a824e1..cb68b31c80f 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=תאור
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index ba325ef87d8..f7bc8b8f968 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/he_IL/interventions.lang b/htdocs/langs/he_IL/interventions.lang
index 691eaeb2b6e..14efb117e65 100644
--- a/htdocs/langs/he_IL/interventions.lang
+++ b/htdocs/langs/he_IL/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/he_IL/ldap.lang b/htdocs/langs/he_IL/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/he_IL/ldap.lang
+++ b/htdocs/langs/he_IL/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/he_IL/mails.lang b/htdocs/langs/he_IL/mails.lang
index 4bd165d2015..0b8c98a247d 100644
--- a/htdocs/langs/he_IL/mails.lang
+++ b/htdocs/langs/he_IL/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 279b751bb9c..c688bd8257e 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/he_IL/margins.lang
+++ b/htdocs/langs/he_IL/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/he_IL/oauth.lang b/htdocs/langs/he_IL/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/he_IL/oauth.lang
+++ b/htdocs/langs/he_IL/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 9043d5a1d6b..5a166a6b988 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/he_IL/printing.lang b/htdocs/langs/he_IL/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/he_IL/printing.lang
+++ b/htdocs/langs/he_IL/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 29a366e5750..3fc8229de50 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 8cfdb2e4cbd..4da6d19cfb4 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 57f3a7c66c6..cc20b531545 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=מניות
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/he_IL/supplier_proposal.lang b/htdocs/langs/he_IL/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/he_IL/supplier_proposal.lang
+++ b/htdocs/langs/he_IL/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index f6743d3f516..dc8cf83599e 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/he_IL/users.lang b/htdocs/langs/he_IL/users.lang
index 2ab97c0cbab..05c878a2010 100644
--- a/htdocs/langs/he_IL/users.lang
+++ b/htdocs/langs/he_IL/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/he_IL/website.lang b/htdocs/langs/he_IL/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/he_IL/website.lang
+++ b/htdocs/langs/he_IL/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/he_IL/withdrawals.lang b/htdocs/langs/he_IL/withdrawals.lang
index 1e17d3d4ff9..68599cd3b91 100644
--- a/htdocs/langs/he_IL/withdrawals.lang
+++ b/htdocs/langs/he_IL/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=הוראות קבע
-StandingOrder=הוראות קבע
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/he_IL/workflow.lang b/htdocs/langs/he_IL/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/he_IL/workflow.lang
+++ b/htdocs/langs/he_IL/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index f9d91faa7ca..753cc56ff95 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -2,60 +2,81 @@
 ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Izvezi sa globalnim računom
+ACCOUNTING_EXPORT_LABEL=Izvezi oznaku
+ACCOUNTING_EXPORT_AMOUNT=Izvezi iznos
+ACCOUNTING_EXPORT_DEVISE=Izvezi valutu
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 
-ConfigAccountingExpert=Configuration of the module accounting expert
+ConfigAccountingExpert=Napredno podešavanje modula računovodstva
 Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
-Selectchartofaccounts=Select a chart of accounts
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-AccountAccountingShort=Account
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
+Selectchartofaccounts=Odaberi grafikon za račune
+Addanaccount=Dodaj obračunski račun
+AccountAccounting=Obračunski račun
+AccountAccountingShort=Račun
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
-MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+MenuAccountancy=Računovodstvo
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
-NewAccount=New accounting account
+NewAccount=Novi obračunski račun
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
-AccountBalance=Account balance
+AccountBalance=Stanje računa
 
-CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+CAHTF=Ukupna nabava dobavljača prije poreza
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -63,76 +84,82 @@ ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
 ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Račun prijenosa
 ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
-DONATION_ACCOUNTINGACCOUNT=Account to register donations
+DONATION_ACCOUNTINGACCOUNT=Račun za registraciju donacija
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Predefinirani obračunski račun za kupljene proizvode (ako nije postavljen na kartici proizvoda)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Predefinirani obračunski račun za prodane proizvode (ako nije postavljen na kartici proizvoda)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Predefinirani obračunski račun za kupljene usluge (ako nije postavljen na kartici usluga)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Predefinirani obračunski račun za prodane usluge (ako nije postavljen na kartici usluga)
 
 Doctype=Type of document
 Docdate=Date
 Docref=Reference
-Code_tiers=Thirdparty
-Labelcompte=Label account
+Code_tiers=Komitent
+Labelcompte=Oznaka računa
 Sens=Sens
 Codejournal=Journal
-NumPiece=Piece number
-AccountingCategory=Accounting category
-
-NotMatch=Not Set
-
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+NumPiece=Broj komada
+AccountingCategory=Obračunska kategorija
+NotMatch=Nije postavljeno
+DeleteMvt=Brisanje stavaka glavne knjige
+DelYear=Godina za obrisati
+DelJournal=Dnevnik za obrisati
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescFinanceJournal=Financijski izvještaj uključujući sve tipove plačanja po bankovnom računom
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
-ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+ThirdPartyAccount=Račun komitenta
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
-ListAccounts=List of the accounting accounts
+ListAccounts=Popis obračunskih računa
 
-Pcgtype=Class of account
-Pcgsubtype=Under class of account
-Accountparent=Root of the account
+Pcgtype=Klasa računa
+Pcgsubtype=Podklasa računa
+Accountparent=Korijen računa
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
-ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete obrisati obračunski račun jer je u upotrebi
+MvtNotCorrectlyBalanced=Kretanje nije točno balansirano. Potražno = %s. Dugovno = %s
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
-ApplyMassCategories=Apply mass categories
+ApplyMassCategories=Primjeni masovne kategorije
 
 ## Export
 Exports=Exports
@@ -150,20 +177,28 @@ Modelcsv_ebp=Export towards EBP
 Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Inicijalizacija računovodstva
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
+Options=Opcije
+OptionModeProductSell=Načini prodaje
+OptionModeProductBuy=Načini nabavke
+OptionModeProductSellDesc=Prikaži sve proizvode definirane za prodaju bez obračunskog računa 
+OptionModeProductBuyDesc=Prikaži sve proizvode definirane za nabavu bez obračunskog računa 
+CleanFixHistory=Obriši konto s stavaka koje ne postoje na grafikonu računa
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
+Range=Raspon obračunskog računa
+Calculated=Izračunato
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+ErrorNoAccountingCategoryForThisCountry=Nema dostupne obračunske kategorije za ovu zemlju
+ExportNotSupported=Podešeni format izvoza nije podržan
+BookeppingLineAlreayExists=Stavke već postoje u knjigovodstvu
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 23bcba937c3..dbfeeb08662 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -1,341 +1,348 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Foundation
-Version=Version
-VersionProgram=Version program
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
-VersionExperimental=Experimental
-VersionDevelopment=Development
-VersionUnknown=Unknown
-VersionRecommanded=Recommended
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
-SessionId=Session ID
-SessionSaveHandler=Handler to save sessions
-SessionSavePath=Storage session localization
-PurgeSessions=Purge of sessions
-ConfirmPurgeSessions=Do you really want to purge all sessions ? This will disconnect every user (except yourself).
+Foundation=Zaklada
+Version=Verzija
+VersionProgram=Programska verzija
+VersionLastInstall=Inicijalno instalirana verzija
+VersionLastUpgrade=Zadnja verzija nadogradnje
+VersionExperimental=Eksperimentalno
+VersionDevelopment=Razvoj
+VersionUnknown=Nepoznato
+VersionRecommanded=Preporučeno
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Nedostaju datoteke
+FilesUpdated=Nadograđene datoteke
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
+SessionId=ID Sesije
+SessionSaveHandler=Rukovatelj za spremanje sesije
+SessionSavePath=Lokalizacija pohrane sesije
+PurgeSessions=Brisanje sesija
+ConfirmPurgeSessions=Da li stvarno želite obrisati sve sesije ? Ovo će odjaviti sve korisnike (osim Vas) 
 NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow to list all running sessions.
-LockNewSessions=Lock new connections
-ConfirmLockNewSessions=Are you sure you want to restrict any new Dolibarr connection to yourself. Only user <b>%s</b> will be able to connect after that.
-UnlockNewSessions=Remove connection lock
-YourSession=Your session
-Sessions=Users session
-WebUserGroup=Web server user/group
+LockNewSessions=Zaključaj nova spajanja
+ConfirmLockNewSessions=Jeste li sigurni da želite ograničiti svako novo spajanje na Dolibarr za sebe. Samo korisnik <b>%s</b> će biti u mogučnosti da se nakon toga spoji.
+UnlockNewSessions=Otključaj spajanje
+YourSession=Vaša sesija
+Sessions=Korisničke sesije
+WebUserGroup=Web Server korisnik/grupa
 NoSessionFound=Your PHP seems to not allow to list active sessions. Directory used to save sessions (<b>%s</b>) might be protected (For example, by OS permissions or by PHP directive open_basedir).
 DBStoringCharset=Database charset to store data
-DBSortingCharset=Database charset to sort data
-WarningModuleNotActive=Module <b>%s</b> must be enabled
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr install or upgrade
-InternalUser=Internal user
-ExternalUser=External user
-InternalUsers=Internal users
-ExternalUsers=External users
-GUISetup=Display
-SetupArea=Setup area
-FormToTestFileUploadForm=Form to test file upload (according to setup)
-IfModuleEnabled=Note: yes is effective only if module <b>%s</b> is enabled
-RemoveLock=Remove file <b>%s</b> if it exists to allow usage of the update tool.
-RestoreLock=Restore file <b>%s</b>, with read permission only, to disable any usage of update tool.
-SecuritySetup=Security setup
-SecurityFilesDesc=Define here options related to security about uploading files.
-ErrorModuleRequirePHPVersion=Error, this module requires PHP version %s or higher
-ErrorModuleRequireDolibarrVersion=Error, this module requires Dolibarr version %s or higher
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
-ErrorCodeCantContainZero=Code can't contain value 0
-DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
+DBSortingCharset=Charset baze za sortiranje podataka
+WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
+WarningOnlyPermissionOfActivatedModules=Prikazane su samo dozvole vezane za aktivne module. Možete aktivirati druge module na stranici modula Naslovna -> Podešavanje -> Moduli.
+DolibarrSetup=Dolibarr instalacija ili nadogradnja
+InternalUser=Interni korisnik
+ExternalUser=Vanjski korisnik
+InternalUsers=Interni korisnici
+ExternalUsers=Vanjski korisnici
+GUISetup=Prikaz
+SetupArea=Sučelje postavki
+FormToTestFileUploadForm=Obrazac za testiranje uploada datoteka (sukladno postavkama)
+IfModuleEnabled=Napomena: DA je efektivno samo ako je modul <b>%s</b> omogućen
+RemoveLock=makni datoteku <b>%s</b> ako postoji da biste omogučili korištenje alata za nadogradnju.
+RestoreLock=Vratite datoteku <b>%s</b>, s dozvolom samo za čitanje, za onemogučavanje korištenja alata za nadogradnju.
+SecuritySetup=Postavke sigurnosti
+SecurityFilesDesc=Ovdje definirajte opcije vezane za sigurnost kod uploada datoteka.
+ErrorModuleRequirePHPVersion=Greška, ovaj modul zahtjeva PHP verziju %s ili višu
+ErrorModuleRequireDolibarrVersion=Greška, ovaj modul zahtjeva Dolibarr verzije %s ili više
+ErrorDecimalLargerThanAreForbidden=Greška, preciznost veća od <b>%s</b> nije podržana.
+DictionarySetup=Podešavanje definicija
+Dictionary=Definicije
+Chartofaccounts=Grafikon za račune
+Fiscalyear=Fiscal year
+ErrorReservedTypeSystemSystemAuto=Vrijednosti 'sistem' i 'sistemauto' za tipove je rezervirana. Možete koristiti 'korisnik' kao vrijednost za dodavanje vlastitog podatka
+ErrorCodeCantContainZero=Kod ne može sadržavati vrijednos 0
+DisableJavascript=Onemogući JavaScript i AJAX funkcije (Preporučljivo za slijepe osobe ili tekstualne web preglednike)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
-NumberOfKeyToSearch=Nbr of characters to trigger search: %s
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
-JavascriptDisabled=JavaScript isključena
-UsePreviewTabs=Use preview tabs
-ShowPreview=Show preview
-PreviewNotAvailable=Preview not available
+NumberOfKeyToSearch=Br. znakova za aktiviranje pretrage: %s
+NotAvailableWhenAjaxDisabled=Nije dostupno kada je Ajax onemogučen
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+JavascriptDisabled=JavaScript onemogučen
+UsePreviewTabs=Koristi karticu pregleda
+ShowPreview=Prikaži pregled
+PreviewNotAvailable=Pregled nije dostupan
 ThemeCurrentlyActive=Tema trenutno aktivna
-CurrentTimeZone=TimeZone PHP (server)
+CurrentTimeZone=Vremenska zona PHP (server)
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
-Space=Space
-Table=Tabla
+Space=Razmak
+Table=Tabela
 Fields=Polja
-Index=Index
-Mask=Mask
+Index=Indeks
+Mask=Maska
 NextValue=Sljedeća vrijednost
-NextValueForInvoices=Next value (invoices)
-NextValueForCreditNotes=Next value (credit notes)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
-MustBeLowerThanPHPLimit=Note: your PHP limits each file upload's size to <b>%s</b> %s, whatever this parameter's value is
-NoMaxSizeByPHPLimit=Note: No limit is set in your PHP configuration
-MaxSizeForUploadedFiles=Maximum size for uploaded files (0 to disallow any upload)
-UseCaptchaCode=Use graphical code (CAPTCHA) on login page
-AntiVirusCommand= Full path to antivirus command
+NextValueForInvoices=Sljedeća vrijednost (računi)
+NextValueForCreditNotes=Sljedeća vrijednost (kreditne bilješke)
+NextValueForDeposit=Sljedeća vrijednost (polog)
+NextValueForReplacements=Sljedeća vrijednost (zamjene)
+MustBeLowerThanPHPLimit=Napomena: vaš PHP limitira svaki upload datoteka većih od <b>%s</b> %s, bez obzira koja je vrijednost parametra
+NoMaxSizeByPHPLimit=Napomena: Limit nije podešen u vašoj PHP konfiguraciji
+MaxSizeForUploadedFiles=Maksimalna veličina datoteka za upload (0 onemogučuje bilokakav upload)
+UseCaptchaCode=Koristi grafički kod (CAPTCHA) na stranici za prijavu
+AntiVirusCommand= Puna putanja do antivirusne komande
 AntiVirusCommandExample= Example for ClamWin: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe<br>Example for ClamAv: /usr/bin/clamscan
-AntiVirusParam= More parameters on command line
+AntiVirusParam= Dodatni parametri za komandnu liniju
 AntiVirusParamExample= Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
-ComptaSetup=Accounting module setup
-UserSetup=User management setup
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
-DetailPosition=Sort number to define menu position
+ComptaSetup=Podešavanje modula računovodstva
+UserSetup=Podešavanje upravljanja korisnicima
+MultiCurrencySetup=Podešavanje više valuta
+MenuLimits=Limiti i točnost
+MenuIdParent=Matični izbornik ID
+DetailMenuIdParent=ID matičnog izbornika (prazno za top izbornik)
+DetailPosition=Redni broj za definiranje pozicije izbornika
 AllMenus=Svi
-NotConfigured=Module not configured
+NotConfigured=Modul nije konfiguriran
 Active=Aktivan
 SetupShort=Postavke
 OtherOptions=Ostale opcije
 OtherSetup=Ostale postavke
-CurrentValueSeparatorDecimal=Decimal separator
-CurrentValueSeparatorThousand=Thousand separator
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+CurrentValueSeparatorDecimal=Decimalni separator
+CurrentValueSeparatorThousand=Separator tisučica
+Destination=Odredište
+IdModule=ID Modula
+IdPermissions=ID Dozvole
 Modules=Moduli
-LanguageBrowserParameter=Parametri %s
+LanguageBrowserParameter=Parametar %s
 LocalisationDolibarrParameters=Parametri prijevoda
-ClientTZ=Client Time Zone (user)
-ClientHour=Client time (user)
-OSTZ=Server OS Time Zone
-PHPTZ=PHP server Time Zone
-DaylingSavingTime=Daylight saving time
-CurrentHour=PHP Time (server)
-CurrentSessionTimeOut=Current session timeout
+ClientTZ=Vremenska zona klijenta (korisnik)
+ClientHour=Vrijeme klijent (korisnik)
+OSTZ=Server OS vremenska zona
+PHPTZ=PHP server vremenska zona
+DaylingSavingTime=Ljetno računanje vremena
+CurrentHour=PHP Vrijem (server)
+CurrentSessionTimeOut=Trenutni istek sesije
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
-PositionByDefault=Default order
-Position=Position
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
+Box=Dodatak
+Boxes=Dodaci
+MaxNbOfLinesForBoxes=Maksimalni broj linija u dodatku
+PositionByDefault=Predefiniran redosljed
+Position=Pozicija
+MenusDesc=Upravitelji izbornicima postavljaju sadržaj za dva izbornika ( horizontalni i vertikalni).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menu for users
-LangFile=.lang file
+MenuForUsers=Izbornik za korisnike
+LangFile=.lang datoteka
 System=Sistem
-SystemInfo=System information
-SystemToolsArea=System tools area
+SystemInfo=Informacije o sistemu
+SystemToolsArea=Sučelje sistemskih alata
 SystemToolsAreaDesc=This area provides administration features. Use the menu to choose the feature you're looking for.
-Purge=Purge
+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 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 file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeDeleteLogFile=Obriši dnevnik datoteka <b>%s</b> definiran za Syslog modul ( nema rizika od gubitka podataka)
+PurgeDeleteTemporaryFiles=Obriši sve privremene datotek ( bez rizika od gubitka podataka)
+PurgeDeleteTemporaryFilesShort=Obriši privremene datoteke
 PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory <b>%s</b>. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
-PurgeRunNow=Purge now
-PurgeNothingToDelete=No directory or files to delete.
-PurgeNDirectoriesDeleted=<b>%s</b> files or directories deleted.
-PurgeAuditEvents=Purge all security events
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events ? All security logs will be deleted, no other data will be removed.
-GenerateBackup=Generate backup
+PurgeRunNow=Izbriši sada
+PurgeNothingToDelete=Nema mapa i datoteka za brisanje.
+PurgeNDirectoriesDeleted=<b>%s</b> datoteka ili mapa obrisano.
+PurgeAuditEvents=Trajno izbriši sve sigurnosne događaje
+ConfirmPurgeAuditEvents=Jeste li sigurni da želite izbrisati sve sigurnosne događaje ? Svi sigurnosni dnevnici će biti obrisani, ostali podaci će ostati netaknuti.
+GenerateBackup=Generiraj backup
 Backup=Sigurnosna kopija
-Restore=Restore
-RunCommandSummary=Backup has been launched with the following command
-BackupResult=Backup result
-BackupFileSuccessfullyCreated=Backup file successfully generated
-YouCanDownloadBackupFile=Generated files can now be downloaded
-NoBackupFileAvailable=No backup files available.
-ExportMethod=Export method
-ImportMethod=Import method
-ToBuildBackupFileClickHere=To build a backup file, click <a href="%s">here</a>.
-ImportMySqlDesc=To import a backup file, you must use mysql command from command line:
-ImportPostgreSqlDesc=To import a backup file, you must use pg_restore command from command line:
+Restore=Vrati
+RunCommandSummary=Backup je pokrenut s sljedećom komandom
+BackupResult=Rezultat backupa
+BackupFileSuccessfullyCreated=Datoteka backupa uspješno generirana
+YouCanDownloadBackupFile=Generirane datoteke se mogu sada skinuti
+NoBackupFileAvailable=Nema dostupnih backup datoteka
+ExportMethod=Način izvoza
+ImportMethod=Način uvoza
+ToBuildBackupFileClickHere=Za kreiranje backup datoteke kliknite <a href="%s">ovdje</a>.
+ImportMySqlDesc=Za uvoz backup datoteke, morate koristiti mysql komande sa komandne linije:
+ImportPostgreSqlDesc=Za uvoz backup datoteke, morate koristiti pg_restore komandu sa komandne linije:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=File name to generate
-Compression=Compression
-CommandsToDisableForeignKeysForImport=Command to disable foreign keys on import
-CommandsToDisableForeignKeysForImportWarning=Mandatory if you want to be able to restore your sql dump later
-ExportCompatibility=Compatibility of generated export file
-MySqlExportParameters=MySQL export parameters
-PostgreSqlExportParameters= PostgreSQL export parameters
-UseTransactionnalMode=Use transactional mode
-FullPathToMysqldumpCommand=Full path to mysqldump command
-FullPathToPostgreSQLdumpCommand=Full path to pg_dump command
-ExportOptions=Export Options
-AddDropDatabase=Add DROP DATABASE command
-AddDropTable=Add DROP TABLE command
-ExportStructure=Structure
-NameColumn=Name columns
-ExtendedInsert=Extended INSERT
-NoLockBeforeInsert=No lock commands around INSERT
-DelayedInsert=Delayed insert
-EncodeBinariesInHexa=Encode binary data in hexadecimal
-IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
-AutoDetectLang=Autodetect (browser language)
-FeatureDisabledInDemo=Feature disabled in demo
-Rights=Permissions
+FileNameToGenerate=Naziv datoteke za generiranje
+Compression=Kompresija
+CommandsToDisableForeignKeysForImport=Komanda za onemogučivanje vanjskih ključeva na uvozu
+CommandsToDisableForeignKeysForImportWarning=Obavezno ako želite biti u mogučnosti kasnije povratiti vaš sql backup
+ExportCompatibility=Kompatibilnost generirane izvozne datoteke
+MySqlExportParameters=MySQL parametri izvoza
+PostgreSqlExportParameters= PostgreSQL parametri izvoza
+UseTransactionnalMode=Koristi transakcijski način
+FullPathToMysqldumpCommand=Kompletna putanja do mysaldump komande
+FullPathToPostgreSQLdumpCommand=Kompletna putanja do pg_dump komande
+ExportOptions=Opcije izvoza
+AddDropDatabase=Dodaj DROP_DATABASE komandu
+AddDropTable=Dodaj DROP TABLE komandu
+ExportStructure=Struktura
+NameColumn=Nazivi kolona
+ExtendedInsert=Prošireni INSERT
+NoLockBeforeInsert=Nemoj zaključavati komande oko INSERT-a
+DelayedInsert=INSERT s kašnjenjem
+EncodeBinariesInHexa=Kodiraj binarne podatke u heksadecimalne
+IgnoreDuplicateRecords=Ignoriraj greške duplih podataka (INSERT IGNORE)
+AutoDetectLang=Automatski detektiraj (jezik web preglednika)
+FeatureDisabledInDemo=Mogučnost onemogućena u demo verziji
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+Rights=Prava pristupa
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
-ModulesMarketPlaces=More modules...
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
+ModulesMarketPlaces=Više modula...
+DoliStoreDesc=DoliStorel, ovlaštena trgovina za Dolibarr ERP/CRM dodatne module
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
-URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
-UsedOnlyWithTypeOption=Used by some agenda option only
-Security=Security
-Passwords=Passwords
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
+WebSiteDesc=Referentne web lokacije za pronalazak više modula
+URL=Poveznica
+BoxesAvailable=Dostupni dodaci
+BoxesActivated=Aktivirani dodaci
+ActivateOn=Aktiviraj na
+ActiveOn=Aktivirano
+SourceFile=Izvorna datoteka
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupno samo ako JavaScript nije onemogućena
+Required=Obavezno
+UsedOnlyWithTypeOption=Koristi se samo kod nekih opcija agende
+Security=Sigurnost
+Passwords=Lozinke
+DoNotStoreClearPassword=Nemojte pohranjivat čitljive lozinke u bazu pohranite samo enkriptane vrijednosti (Preporučeno aktivirano)
+MainDbPasswordFileConfEncrypted=Lozinka baze enkriptirana u conf.php (Preporučeno aktivirano)
+InstrucToEncodePass=Da biste imali kodiranu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="...";</b><br>sa<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Da biste imali čitljivu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>sa<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Zaštita generiranih PDF datoteka (NIJE preporučeno aktiviranje, kvari masovno generiranje PDF-ova)
 ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
-Feature=Feature
-DolibarrLicense=License
-Developpers=Developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteLocal=Local web site (%s)
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
-OtherResources=Autres ressources
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),<br>take a look at the Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:<br><b><a href="%s" target="_blank">%s</a></b>
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in <b>english only</b>.
-CurrentMenuHandler=Current menu handler
-MeasuringUnit=Measuring unit
-Emails=E-mails
-EMailsSetup=E-mails setup
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: <b>%s</b>)
-MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
-MAIN_MAIL_SENDMODE=Method to use to send EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Disable all SMS sendings (for test purposes or demos)
-MAIN_SMS_SENDMODE=Method to use to send SMS
-MAIN_MAIL_SMS_FROM=Default sender phone number for Sms sending
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+Feature=Mogučnost
+DolibarrLicense=Licenca
+Developpers=Kreatori/suradnici
+OfficialWebSite=Internacionalna oficijalna Dolibarr web lokacija
+OfficialWebSiteLocal=Lokalna web lokacija (%s)
+OfficialWiki=Dolibarr dokumentacija na Wiki-u
+OfficialDemo=Dolibarr Online demo 
+OfficialMarketPlace=Ovlaštena trgovina za vanjske module/dodatke
+OfficialWebHostingService=Preporučeni web hosting servisi (Cloud hosting)
+ReferencedPreferredPartners=Preferirani partneri
+OtherResources=Drugi resursi
+ForDocumentationSeeWiki=Za korisničku ili razvojnu dokumentciju ( DOC, FAQ...)<br> pogledajte na Dolibarr Wiki-u:<br><b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=Za sva ostala pitanja/pomoć, obratite se na Dolibarr forumu:<br><b><a href="%s" target="_blank">%s</a></b>
+HelpCenterDesc1=Ovo sučelje vam može pomoći da dobijete pomoć Dolibarr servisa podrške
+HelpCenterDesc2=Neki dijelovi ovog servisa su dostupni samo na <b>engleskom</b>.
+CurrentMenuHandler=Trenutačni nositelj izbornika
+MeasuringUnit=Mjerna jedinica
+Emails=E-pošta
+EMailsSetup=Podešavanje e-pošte
+EMailsDesc=Ova stranica dozvoljava vam ispravak PHP parametara za slanje e-pošte. U većini slučajeva na Unix/Linux operativnim sustavima, vaša PHP konfiguracija je u redu i ovi parametri su nepotrebni.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (predefiniran u php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (predefiniran u php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Nije definiran u PHP-u niti na Unix-u)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Nije definiran u PHP-u niti na Unix-u)
+MAIN_MAIL_EMAIL_FROM=E-pošta pošiljatelja za automatsku e-poštu (predefinirano u php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=E-pošta pošiljatelja korištena za poruke o greškama
+MAIN_MAIL_AUTOCOPY_TO= Sustavno pošalji skriveno CC sve poslane poruke e-pošte
+MAIN_DISABLE_ALL_MAILS=Onemogući slanje svih poruka e-poštom (samo za testiranje i demo)
+MAIN_MAIL_SENDMODE=Način slanja e-pošte
+MAIN_MAIL_SMTPS_ID=SMTP ID potrebna prijava
+MAIN_MAIL_SMTPS_PW=SMTP Lozinka ako je potrebna prijava
+MAIN_MAIL_EMAIL_TLS= Koristi TLS (SSL) enkripciju
+MAIN_MAIL_EMAIL_STARTTLS= Koristi TLS (STARTTLS) enkripciju
+MAIN_DISABLE_ALL_SMS=Onemogući sva SMS slanja (za testiranje ili demo)
+MAIN_SMS_SENDMODE=Način slanja SMS-a
+MAIN_MAIL_SMS_FROM=Zadani broj pošiljatelja za slanje SMS-ova
+FeatureNotAvailableOnLinux=Mogučnost nije dostupna na UNIX-u. Testirajte sendmail program lokalno.
 SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-ModuleSetup=Module setup
-ModulesSetup=Modules setup
-ModuleFamilyBase=System
-ModuleFamilyCrm=Customer Relation Management (CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleSetup=Podešavanje modula
+ModulesSetup=Podešavanje modula
+ModuleFamilyBase=Sistem
+ModuleFamilyCrm=Upravljanje odnosima sa kupcima (CRM)
+ModuleFamilySrm=Upravljanje odnosima dobavljača (SRM)
+ModuleFamilyProducts=Upravljanje proizvodima (PM)
+ModuleFamilyHr=Upravljanje ljudskim resursima (HR)
+ModuleFamilyProjects=Projekti/zajednički rad
+ModuleFamilyOther=Ostalo
+ModuleFamilyTechnic=Alati multi modula
+ModuleFamilyExperimental=Experimentalni moduli
+ModuleFamilyFinancial=Financijski moduli (Računovodstvo/Financije)
+ModuleFamilyECM=Elektronski upravitelj sadržajem (ECM)
 ModuleFamilyPortal=Web sites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
-StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.<br>
+MenuHandlers=Nosioci izbornka
+MenuAdmin=Uređivač izbornika
+DoNotUseInProduction=Nemojte koristiti u stvarnom okruženju
+ThisIsProcessToFollow=Ovo je podešavanje za proces:
+ThisIsAlternativeProcessToFollow=Ovo je alternativno podešavanje za obradu:
+StepNb=Korak %s
+FindPackageFromWebSite=Pronađite paket koji pruža željenu mogučnost ( npr. ovlaštena web lokacija %s).
+DownloadPackageFromWebSite=Download paketa (npr. sa ovlaštene web lokacije %s)
+UnpackPackageInDolibarrRoot=Raspakirajte paket u Dolibarr serversku mapu za vanjske module:
+SetupIsReadyForUse=Instalacija je završena i Dolibarr je spreman za korištenje nove komponente.
+NotExistsDirect=Alternativna root mapa nije definirana. <br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-UpdateServerOffline=Update server offline
+YouCanSubmitFile=Ovo je prvi korak, možete poslati paket koristeći ovaj alat: Odaberite datoteke modula
+CurrentVersion=Trenutna verzija Dolibarr-a
+CallUpdatePage=Idite na stranicu koja nadograđuje strukturu baze i podatke: %s
+LastStableVersion=Zadnja stabilna verzija
+LastActivationDate=Last activation date
+UpdateServerOffline=Nadogradi server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
-GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
-GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Example on product created on 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> will give <b>0199-ZZZ/31/XXX</b>
-GenericNumRefModelDesc=Returns a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address <b>%s</b> on port <b>%s</b>
-ServerNotAvailableOnIPOrPort=Server is not available at address <b>%s</b> on port <b>%s</b>
-DoTestServerAvailability=Test server connectivity
-DoTestSend=Test sending
-DoTestSendHTML=Test sending HTML
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes3=Svi preostali znakovi u predlošku će ostati nepromjenjeni.<br>Razmak nije dozvoljen.<br>
+GenericMaskCodes4a=<u>Primjer na 99th %s Tvrtka komitenta je uradila 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Primjer na komitentu kreiranog 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Primjer na proizvodu kreiranog 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> dati će <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> dati će <b>0199-ZZZ/31/XXX</b>
+GenericNumRefModelDesc=Vraća prilagodljiv broj sukladno s definiranim predloškom.
+ServerAvailableOnIPOrPort=Server je dostupan na adresi <b>%s</b> na portu <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server nije dostupan na adresi <b>%s</b> s portom <b>%s</b>
+DoTestServerAvailability=Provjera veze s serverom
+DoTestSend=Slanje testa
+DoTestSendHTML=Slanje HTML testa
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Greška, ne možete koristiti opciju @ ako sekvence {yy}{mm} ili {yyyy}{mm} nisu u predlošku.
+UMask=Umask parametar za nove datoteke na Unix/Linux/BSD/Mac sistemu.
 UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).<br>It must be the octal value (for example, 0666 means read and write for everyone).<br>This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
+SeeWikiForAllTeam=Pogledajte wiki stranicu za kompletan popis svih sudionika i njihovih organizacija
 UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelpCenter=Sakrij poveznicu "<b>Trebate li pomoć ili podršku</b>" na stranici prijave
+DisableLinkToHelp=Sakrij poveznicu na online pomoć "<b>%s</b>"
 AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
-ConfirmPurge=Are you sure you want to execute this purge ?<br>This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
-MinLength=Minimum length
+ConfirmPurge=Jeste li sigurni da želite izvršiti brisanje ?<br>Ovom akcijom ćete stvarno obrisati sve vaše datoteke bez mogučnosti povratka ( ECM datoteke, priložene datoteke...).
+MinLength=Minimalna dužina
 LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
+ExamplesWithCurrentSetup=Primjeri s trenutno pokrenutim postavkama
+ListOfDirectories=Popis mapa sa OpenDocument predlošcima
 ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+NumberOfModelFilesFound=Broj ODT/ODS predložaka pronađenih u mapama
+ExampleOfDirectoriesForModelGen=Primjer:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>Da bi ste saznali kako kreirati ODT predloške dokumenata, prije pohranjivanja istih u navedene mape, pročitajte wiki dokumentaciju na:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Position of Name/Lastname
-DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
-KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
-TestSubmitForm=Input test form
+FirstnameNamePosition=Pozicija Imena/Prezimena
+DescWeather=Sljedeće slike biti će prikazane na kontrolnoj ploči kada broj zakašnjelih akcija dosegne sljedeće vrijednosti:
+KeyForWebServicesAccess=Ključ za korištenje web servisa (parametar "dolibarrkey" u web servisima)
+TestSubmitForm=Unesite obrazac testiranja
 ThisForceAlsoTheme=Using this menu manager will also use its own theme whatever is user choice. Also this menu manager specialized for smartphones does not works on all smartphone. Use another menu manager if you experience problems on yours.
-ThemeDir=Skins directory
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
-SmsTestMessage=Test message from __PHONEFROM__ to __PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ThemeDir=Mapa stilova
+ConnectionTimeout=Prekid veze
+ResponseTimeout=Odgovor 
+SmsTestMessage=Test poruka od __PHONEFROM__ za __PHONETO__
+ModuleMustBeEnabledFirst=Modul <b>%s</b> mora biti omogućen ako želite koristiti ovu mogučnost.
 SecurityToken=Key to secure URLs
 NoSmsEngine=No SMS sender manager available. SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
 PDF=PDF
 PDFDesc=You can set each global options related to the PDF generation
-PDFAddressForging=Rules to forge address boxes
-HideAnyVATInformationOnPDF=Hide all information related to VAT on generated PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
+PDFAddressForging=Pravila za kopiranje adresnih blokova
+HideAnyVATInformationOnPDF=Sakrij sve informacije vezane za PDV na generiranim PDF
+HideDescOnPDF=Sakrij opis proizvoda na generiranim PDF
+HideRefOnPDF=Sakrij ref. proizvoda na generiranim PDF
+HideDetailsOnPDF=Sakrij stavke detalja proizvoda na generiranim PDF
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
-Library=Library
-UrlGenerationParameters=Parameters to secure URLs
-SecurityTokenIsUnique=Use a unique securekey parameter for each URL
-EnterRefToBuildUrl=Enter reference for object %s
-GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
+Library=Biblioteka
+UrlGenerationParameters=Parametri za osiguranje URL-a
+SecurityTokenIsUnique=Koristi jedinstven securekey parametar za svaki URL
+EnterRefToBuildUrl=Unesite referencu za objekt %s
+GetSecuredUrl=Traži izračunan URL
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
+OldVATRates=Stara PDV stopa
+NewVATRates=Nova PDV stopa
+PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definiranoj na
+MassConvert=Pokreni masovnu konverziju
 String=String
 TextLong=Long text
 Int=Integer
@@ -343,618 +350,628 @@ Float=Float
 DateAndTime=Date and hour
 Unique=Unique
 Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
-ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
+ExtrafieldPhone = Telefon
+ExtrafieldPrice = Cijena
+ExtrafieldMail = E-pošta
+ExtrafieldSelect = Odaberi popis
+ExtrafieldSelectList = Odaberi iz tabele
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Lozinka
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
+ExtrafieldLink=Poveži s objektom
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
+LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
 LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
 RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user <strong>%s</strong> (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
+LinkToTest=Generirana veza za korisnika <strong>%s</strong> (kliknite na telefonski broj za test)
+KeepEmptyToUseDefault=Ostavite prazno za zadane vrijednosti
 DefaultLink=Default link
-SetAsDefault=Set as default
+SetAsDefault=Postavi kao zadano
 ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
+ExternalModule=Vanjski modul - Instaliran u mapi %s
+BarcodeInitForThirdparties=Masovno postavljanje barkodova za komitente
+BarcodeInitForProductsOrServices=Masovno postavljanje ili promjena barkodova usluga i proizvoda
+CurrentlyNWithoutBarCode=Trenutno, imate <strong>%s</strong> podataka na <strong>%s</strong> %s bez definiranog barkoda.
+InitEmptyBarCode=Inicijalna vrijednost za sljedećih %s praznih podataka
+EraseAllCurrentBarCode=Obriše sve trenutne vrijednosti barkoda
+ConfirmEraseAllCurrentBarCode=Jeste li sigurni da želite obrisati sve trenutne barkod vrijednosti ?
+AllBarcodeReset=Sve barkod vrijednosti su obrisane
+NoBarcodeNumberingTemplateDefined=Nema predloška označavanja barkodom omogučenog u podešavanju modula.
 EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
-NoDetails=No more details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+NoDetails=Nema više detalja u podnožju dokumenta
+DisplayCompanyInfo=Prikaži adresu tvrtke
+DisplayCompanyManagers=Prikaz upravitelja imenima
+DisplayCompanyInfoAndManagers=Prikaži adresu tvrtke i ime menadžera
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
+ModuleCompanyCodePanicum=Povratak praznog konta.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Koristi 3 koraka odobravanja kada je iznos (bez poreza) veći od...
 
 # Modules
-Module0Name=Users & groups
-Module0Desc=Users and groups management
-Module1Name=Third parties
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
+Module0Name=Korisnici i grupe
+Module0Desc=Upravljanje korisnicima i grupama
+Module1Name=Komitenti
+Module1Desc=Upravljanje tvrtkama i kontaktima (kupci, potencijalni kupci, ...)
+Module2Name=Komercijala
+Module2Desc=Upravljanje komercijalom
+Module10Name=Računovodstvo
 Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
-Module20Name=Proposals
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name=Energy
-Module23Desc=Monitoring the consumption of energies
-Module25Name=Customer Orders
-Module25Desc=Customer order management
-Module30Name=Invoices
+Module20Name=Ponude
+Module20Desc=Upravljanje ponudama
+Module22Name=Masovno slanje e-pošte
+Module22Desc=Upravljanje masovnim slanjem e-pošte
+Module23Name=Energija
+Module23Desc=Pračenje potrošnje energije
+Module25Name=Narudžbe kupaca
+Module25Desc=Upravljanje narudžbama kupaca
+Module30Name=Računi
 Module30Desc=Invoice and credit note management for customers. Invoice management for suppliers
-Module40Name=Suppliers
-Module40Desc=Supplier management and buying (orders and invoices)
-Module42Name=Logs
-Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Editors
-Module49Desc=Editor management
-Module50Name=Products
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Stocks
-Module52Desc=Stock management (products)
-Module53Name=Services
-Module53Desc=Service management
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
-Module55Name=Barcodes
-Module55Desc=Barcode management
-Module56Name=Telephony
-Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module40Name=Dobavljači
+Module40Desc=Upravljanje dobavljačima i nabava (narudžbe i računi)
+Module42Name=Dnevnici
+Module42Desc=Sadržaji dnevnika (datoteke, syslog, ...)
+Module49Name=Urednici
+Module49Desc=Upravljanje urednicima
+Module50Name=Proizvodi
+Module50Desc=Upravljanje proizvodima
+Module51Name=Masovno slanje pošte
+Module51Desc=Upravljanje masovnim slanje papirne pošte
+Module52Name=Zalihe
+Module52Desc=Upravljanje zalihama
+Module53Name=Usluge
+Module53Desc=Upravljanje uslugama
+Module54Name=Ugovori/pretplate
+Module54Desc=Upravljanje ugovorima (usluge ili pretplate)
+Module55Name=Barkodovi
+Module55Desc=Upravljanje barkodovima
+Module56Name=Telefonija
+Module56Desc=Integracija telefonije
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module58Desc=Integracija ClickToDial sistema (Asterisk, ...)
 Module59Name=Bookmark4u
 Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
-Module70Name=Interventions
-Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
+Module70Name=Intervencije
+Module70Desc=Upravljanje intervencijama
+Module75Name=Trošak i putne napomene
+Module75Desc=Upravljanje putnim troškovima i napomenama
+Module80Name=Isporuke
+Module80Desc=Upravljanje isporukama i dostavama narudžbi
+Module85Name=Banke i gotovina
+Module85Desc=Upravljanje bankovnim i gotovinskim računima
+Module100Name=Vanjska lokacija
 Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
-Module105Name=Mailman and SPIP
-Module105Desc=Mailman or SPIP interface for member module
+Module105Name=Mailman i SPIP
+Module105Desc=Mailman ili SPIP sučelje za modul članova
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
+Module200Desc=LDAP sinhronizacija mape
 Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr data (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
-Module310Name=Members
-Module310Desc=Foundation members management
+Module210Desc=PostNuke integracija
+Module240Name=Izvozi podataka
+Module240Desc=Alat za izvoz Dolibarr podataka (sa asistentom)
+Module250Name=Uvoz podataka
+Module250Desc=Alat za uvoz podataka u Dolibarr (sa asistentom)
+Module310Name=Članovi
+Module310Desc=Upravljanje članovima zaklade
 Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
-Module330Name=Bookmarks
-Module330Desc=Bookmarks management
-Module400Name=Projects/Opportunities/Leads
+Module320Desc=Dodaj RSS feed unutar Dolibar stranica
+Module330Name=Oznake
+Module330Desc=Upravljanje oznakama
+Module400Name=Projekti/Mogućnosti/Vodiči
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
-Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
-Module700Name=Donations
-Module700Desc=Donation management
-Module770Name=Expense reports
+Module410Name=Web kalendar
+Module410Desc=Integracija web kalendara
+Module500Name=Specijalni troškovi
+Module500Desc=Upravljanje specijalnim troškovima (porezi, društveni ili fiskalni porezi, dividende)
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
+Module520Name=Kredit
+Module520Desc=Upravljanje kreditima
+Module600Name=Obavijesti
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
+Module700Name=Donacije
+Module700Desc=Upravljanje donacijama
+Module770Name=Izvještaji troška
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Ponuda dobavljača
+Module1120Desc=Zahtjev za ponudom dobavljača s cijenama
 Module1200Name=Mantis
-Module1200Desc=Mantis integration
-Module1400Name=Accounting
-Module1400Desc=Accounting management (double parties)
-Module1520Name=Document Generation
+Module1200Desc=Integracija Mantisa
+Module1400Name=Računovodstvo
+Module1400Desc=Upravljanje računovodstvom ( dvostruke stranke ) 
+Module1520Name=Generiranje dokumenta
 Module1520Desc=Mass mail document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Name=Kategorije
+Module1780Desc=Kreiraj kategoriju (proizvodi, kupci, dobavljači, kontakti ili članovi)
 Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
-Module2300Name=Cron
-Module2300Desc=Scheduled job management
-Module2400Name=Agenda/Events
+Module2000Desc=Dozvoljava uređivanje nekog tekstualnog područja u naprednom editoru (bazirano na CKEditor-u)
+Module2200Name=Dinamičke cijene
+Module2200Desc=Omogući korištenje matematičkih izraza za cijene
+Module2300Name=CRON
+Module2300Desc=Upravljanje planiranim poslovima
+Module2400Name=Planer/Događaji
 Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
-Module2500Name=Electronic Content Management
-Module2500Desc=Save and share documents
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2500Name=Elektronski upravitelj sadržajem
+Module2500Desc=Spremanje i dijeljenje dokumenata
+Module2600Name=API/Web servisi (SOAP server)
+Module2600Desc=Omogući Dolibarr SOAP server pružatelja API servisa
+Module2610Name=API/Webservis (REST server)
+Module2610Desc=Omogući Dolibarr REST server pružajući API servise
 Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Need an internet access
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
+Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=Dodaj Skype gumb na kartice korisnika / komitenta / kontakata / članova
 Module4000Name=HRM
-Module4000Desc=Human resources management
-Module5000Name=Multi-company
-Module5000Desc=Allows you to manage multiple companies
-Module6000Name=Workflow
-Module6000Desc=Workflow management
-Module10000Name=Websites
+Module4000Desc=Upravljanje ljudskim resursima
+Module5000Name=Multi tvrtka
+Module5000Desc=Dozvoljava upravljanje multi tvrtkama
+Module6000Name=Tijek rada
+Module6000Desc=Upravljanje tijekom rada
+Module10000Name=Web lokacije
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
-Module20000Desc=Declare and follow employees leaves requests
-Module39000Name=Product lot
+Module20000Name=Upravljanje zahtjevima odlazaka
+Module20000Desc=Objavi i prati zahtjeve odsutnosti zaposlenika
+Module39000Name=Lot proizvoda
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=PayBox
-Module50000Desc=Module to offer an online payment page by credit card with PayBox
-Module50100Name=Point of sales
-Module50100Desc=Point of sales module (POS).
+Module50000Desc=Modul za mogućnost online plaćanja kreditnom karticom putem PayBox-a
+Module50100Name=Prodajno mjesto 
+Module50100Desc=Modul prodajnog mjesta (POS)
 Module50200Name=Paypal
-Module50200Desc=Module to offer an online payment page by credit card with Paypal
-Module50400Name=Accounting (advanced)
-Module50400Desc=Accounting management (double parties)
+Module50200Desc=Modul za mogućnost online plaćanja kreditnom karticom putem PayPal-a
+Module50400Name=Računovodstvo (napredno)
+Module50400Desc=Upravljanje računovodstvom ( dvostruke stranke ) 
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
-Module59000Name=Margins
-Module59000Desc=Module to manage margins
-Module60000Name=Commissions
-Module60000Desc=Module to manage commissions
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
-Permission11=Read customer invoices
-Permission12=Create/modify customer invoices
-Permission13=Unvalidate customer invoices
-Permission14=Validate customer invoices
-Permission15=Send customer invoices by email
-Permission16=Create payments for customer invoices
-Permission19=Delete customer invoices
-Permission21=Read commercial proposals
-Permission22=Create/modify commercial proposals
-Permission24=Validate commercial proposals
-Permission25=Send commercial proposals
-Permission26=Close commercial proposals
-Permission27=Delete commercial proposals
-Permission28=Export commercial proposals
-Permission31=Read products
-Permission32=Create/modify products
-Permission34=Delete products
-Permission36=See/manage hidden products
-Permission38=Export products
+Module55000Name=Anketa, Upitnik ili Glasanje
+Module55000Desc=Modul za izradu online anketa, upitnika ili glasovanja (slično kao Doodle, Studs, Rdvz, ...)
+Module59000Name=Marže
+Module59000Desc=Modul za upravljanje maržama
+Module60000Name=Provizije
+Module60000Desc=Modul za upravljanje provizijama
+Module63000Name=Sredstva
+Module63000Desc=Upravljanje sredstvima (pisači, vozila, prostorije, ...) koje možete djeliti s događajima
+Permission11=Čitaj račune kupca
+Permission12=Kreiraj/promjeni račune kupca
+Permission13=Ne ovjeravaj račun kupca
+Permission14=Ovjeri račun kupca
+Permission15=Pošalji račun kupca e-poštom
+Permission16=Kreiraj plačanje za račune kupca
+Permission19=Obriši račun kupca
+Permission21=Pročitaj ponude
+Permission22=Kreiraj/izmjeni ponudu
+Permission24=Ovjeri ponudu
+Permission25=Pošalji ponudu
+Permission26=Zatvori ponudu
+Permission27=Obriši ponudu
+Permission28=Izvezi ponude
+Permission31=Čitaj proizvode
+Permission32=Kreiraj/izmjeni proizvod
+Permission34=Obriši proizvod
+Permission36=Pregled/upravljanje skrivenim proizvodima
+Permission38=izvoz proizvoda
 Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
-Permission42=Create/modify projects (shared project and projects i'm contact for)
-Permission44=Delete projects (shared project and projects i'm contact for)
-Permission45=Export projects
-Permission61=Read interventions
-Permission62=Create/modify interventions
-Permission64=Delete interventions
-Permission67=Export interventions
-Permission71=Read members
-Permission72=Create/modify members
-Permission74=Delete members
-Permission75=Setup types of membership
-Permission76=Export data
-Permission78=Read subscriptions
-Permission79=Create/modify subscriptions
-Permission81=Read customers orders
-Permission82=Create/modify customers orders
-Permission84=Validate customers orders
-Permission86=Send customers orders
-Permission87=Close customers orders
-Permission88=Cancel customers orders
-Permission89=Delete customers orders
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
-Permission95=Read reports
-Permission101=Read sendings
-Permission102=Create/modify sendings
-Permission104=Validate sendings
-Permission106=Export sendings
-Permission109=Delete sendings
-Permission111=Read financial accounts
-Permission112=Create/modify/delete and compare transactions
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
-Permission115=Export transactions and account statements
-Permission116=Transfers between accounts
-Permission117=Manage cheques dispatching
-Permission121=Read third parties linked to user
-Permission122=Create/modify third parties linked to user
-Permission125=Delete third parties linked to user
-Permission126=Export third parties
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
-Permission146=Read providers
-Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
-Permission161=Read contracts/subscriptions
-Permission162=Create/modify contracts/subscriptions
-Permission163=Activate a service/subscription of a contract
-Permission164=Disable a service/subscription of a contract
-Permission165=Delete contracts/subscriptions
-Permission167=Export contracts
-Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
-Permission174=Read all trips and expenses
-Permission178=Export trips and expenses
-Permission180=Read suppliers
-Permission181=Read supplier orders
-Permission182=Create/modify supplier orders
-Permission183=Validate supplier orders
-Permission184=Approve supplier orders
-Permission185=Order or cancel supplier orders
-Permission186=Receive supplier orders
-Permission187=Close supplier orders
-Permission188=Cancel supplier orders
-Permission192=Create lines
-Permission193=Cancel lines
-Permission194=Read the bandwith lines
-Permission202=Create ADSL connections
-Permission203=Order connections orders
-Permission204=Order connections
-Permission205=Manage connections
-Permission206=Read connections
-Permission211=Read Telephony
-Permission212=Order lines
-Permission213=Activate line
-Permission214=Setup Telephony
-Permission215=Setup providers
-Permission221=Read emailings
-Permission222=Create/modify emailings (topic, recipients...)
-Permission223=Validate emailings (allows sending)
-Permission229=Delete emailings
-Permission237=View recipients and info
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
-Permission241=Read categories
-Permission242=Create/modify categories
-Permission243=Delete categories
-Permission244=See the contents of the hidden categories
-Permission251=Read other users and groups
-PermissionAdvanced251=Read other users
-Permission252=Read permissions of other users
-Permission253=Create/modify other users, groups and permisssions
-PermissionAdvanced253=Create/modify internal/external users and permissions
-Permission254=Create/modify external users only
-Permission255=Modify other users password
-Permission256=Delete or disable other users
+Permission42=Kreiraj/izmjeni projekte (zajednički projekti i moji projekti)
+Permission44=Obriši projekte (zajednički projekti i moji projekti)
+Permission45=Izvezi projekte
+Permission61=Čitaj intervencije
+Permission62=Kreiraj/promjeni intervencije
+Permission64=Obriši intervencije
+Permission67=Izvezi intervencije
+Permission71=Čitaj članove
+Permission72=Kreiraj/izmjeni članove
+Permission74=Obriši članove
+Permission75=Podešavanje tipova članarine
+Permission76=Izvoz podataka
+Permission78=Čitaj pretplate
+Permission79=Kreiraj/izmjeni pretplate
+Permission81=Čitaj narudžbe kupca
+Permission82=Kreiraj/izmjeni narudžbe kupaca
+Permission84=Ovjeri narudžbe kupaca
+Permission86=Pošalji narudžbe kupaca
+Permission87=Zatvori narudžbe kupaca
+Permission88=Otkaži narudžbe kupaca
+Permission89=Obriši narudžbe kupaca
+Permission91=Čitaj društvene ili fiskalne poreze i PDV
+Permission92=Kreiraj/izmjeni društvene ili fiskalne poreze i PDV
+Permission93=Obriši društvene ili fiskalne poreze i PDV
+Permission94=Izvezi društvene ili fiskalne poreze
+Permission95=Čitaj izvještaje
+Permission101=Čitaj slanja
+Permission102=Kreiraj/izmjeni slanja
+Permission104=Ovjeri slanja
+Permission106=Izvezi slanja
+Permission109=Obriši slanja
+Permission111=Čitanje financijskih računa
+Permission112=Kreiraj/izmjeni/obriši i usporedi transakcije
+Permission113=Podešavanje financijskih računa (kreiranje, upravljanje kategorijama)
+Permission114=Uskladi transakcije
+Permission115=Izvoz transakcija i izvodi
+Permission116=Prijenos između računa
+Permission117=Upravljanje otpremom čekova
+Permission121=Čitaj veze komitenata s korisnicima
+Permission122=Kreiraj/izmjeni komitente povezane s korisnicima
+Permission125=Obriši komitente povezane s korisnicima
+Permission126=Izvezi komitente
+Permission141=Čitaj sve projekte i zadatke (također privatne koji nisu moji)
+Permission142=Kreiraj/izmjeni sve projekte i zadatke (također privatne koji nisu moji)
+Permission144=Obriši sve projekte i zadatke (također privatne koji nisu moji)
+Permission146=Čitaj pružatelje
+Permission147=Čitaj statistiku
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
+Permission161=Čitaj ugovore/pretplate
+Permission162=Kreiraj/izmjeni ugovore/pretplate
+Permission163=Aktiviraj uslugu/pretplatu ugovora
+Permission164=Deaktiviraj uslugu/pretplatu ugovora
+Permission165=Obriši ugovore/pretplate
+Permission167=Izvezi ugovore
+Permission171=Čitaj putne naloge i troškove (vaši i vaših podređenih)
+Permission172=Kreiraj/izmjeni putne naloge i troškove
+Permission173=Obriši putne naloge i troškove
+Permission174=Čitaj sve putne naloge i troškove
+Permission178=Izvezi putne naloge i troškove
+Permission180=Čitaj dobavljače
+Permission181=Čitaj narudžbe dobavljača
+Permission182=Kreiraj/izmjeni narudžbe dobavljača
+Permission183=Ovjeri narudžbe dobavljača
+Permission184=Odobri narudžbe dobavljača
+Permission185=Narući ili otkaži narudžbu dobavljača
+Permission186=Zaprimi narudžbu dobavljača
+Permission187=Zatvori narudžbu dobavljača
+Permission188=Otkaži narudžbu dobavljača
+Permission192=Kreiraj stavke
+Permission193=Otkaži stavke
+Permission194=Čitaj protočnost stavaka
+Permission202=Kreiraj ADSL sapajanje
+Permission203=Narući narudžbe spajanja
+Permission204=Narudžba spajanja
+Permission205=Upravljanje spajanjima
+Permission206=Čitaj spajanja
+Permission211=Čitaj telefoniju
+Permission212=Narudžbe linija
+Permission213=Aktiviraj liniju
+Permission214=Postavke telefonije
+Permission215=Postavke pružatelja
+Permission221=Čitaj korespodenciju
+Permission222=Kreiraj/izmjeni korespodenciju (teme, primatelji...)
+Permission223=Ovjeri korespodenciju (omogućuje slanje)
+Permission229=Obriši korespodenciju
+Permission237=Pregled primatelja i informacije
+Permission238=Ručno slanje korespodencije
+Permission239=Obriši korespodenciju nakon ovjere ili slanja
+Permission241=Čitaj kategorije
+Permission242=Kreiraj/izmjeni kategorije
+Permission243=Obriši kategorije
+Permission244=Vidi sadržaj skrivenih kategorija
+Permission251=Čitaj ostale korisnike i grupe
+PermissionAdvanced251=Čitaj ostale korisnike
+Permission252=Čitaj dozvole ostalih korisnika
+Permission253=Kreiraj/izmjeni druge korisnike, grupe i dozvole
+PermissionAdvanced253=Kreiraj/izmjeni interne/vanjske korisnike i dozvole
+Permission254=Kreiraj/izmjeni samo vanjske korisnike
+Permission255=Izmjeni lozinku ostalih korisnika
+Permission256=Obriši ili isključi ostale korisnike
 Permission262=Extend access to all third parties (not only those linked to user). Not effective for external users (always limited to themselves).
-Permission271=Read CA
-Permission272=Read invoices
-Permission273=Issue invoices
-Permission281=Read contacts
-Permission282=Create/modify contacts
-Permission283=Delete contacts
-Permission286=Export contacts
-Permission291=Read tariffs
-Permission292=Set permissions on the tariffs
-Permission293=Modify costumers tariffs
-Permission300=Read bar codes
-Permission301=Create/modify bar codes
-Permission302=Delete bar codes
-Permission311=Read services
-Permission312=Assign service/subscription to contract
-Permission331=Read bookmarks
-Permission332=Create/modify bookmarks
-Permission333=Delete bookmarks
-Permission341=Read its own permissions
-Permission342=Create/modify his own user information
-Permission343=Modify his own password
-Permission344=Modify its own permissions
-Permission351=Read groups
-Permission352=Read groups permissions
-Permission353=Create/modify groups
-Permission354=Delete or disable groups
-Permission358=Export users
-Permission401=Read discounts
-Permission402=Create/modify discounts
-Permission403=Validate discounts
-Permission404=Delete discounts
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
-Permission531=Read services
-Permission532=Create/modify services
-Permission534=Delete services
-Permission536=See/manage hidden services
-Permission538=Export services
-Permission701=Read donations
-Permission702=Create/modify donations
-Permission703=Delete donations
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
-Permission1001=Read stocks
-Permission1002=Create/modify warehouses
-Permission1003=Delete warehouses
-Permission1004=Read stock movements
-Permission1005=Create/modify stock movements
-Permission1101=Read delivery orders
-Permission1102=Create/modify delivery orders
-Permission1104=Validate delivery orders
-Permission1109=Delete delivery orders
-Permission1181=Read suppliers
-Permission1182=Read supplier orders
-Permission1183=Create/modify supplier orders
-Permission1184=Validate supplier orders
-Permission1185=Approve supplier orders
-Permission1186=Order supplier orders
-Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Delete supplier orders
-Permission1190=Approve (second approval) supplier orders
-Permission1201=Get result of an export
-Permission1202=Create/Modify an export
-Permission1231=Read supplier invoices
-Permission1232=Create/modify supplier invoices
-Permission1233=Validate supplier invoices
-Permission1234=Delete supplier invoices
-Permission1235=Send supplier invoices by email
-Permission1236=Export supplier invoices, attributes and payments
-Permission1237=Export supplier orders and their details
-Permission1251=Run mass imports of external data into database (data load)
-Permission1321=Export customer invoices, attributes and payments
-Permission1421=Export customer orders and attributes
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-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
-Permission2411=Read actions (events or tasks) of others
-Permission2412=Create/modify actions (events or tasks) of others
-Permission2413=Delete actions (events or tasks) of others
-Permission2414=Export actions/tasks of others
-Permission2501=Read/Download documents
-Permission2502=Download documents
-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)
-Permission50101=Use Point of sales
-Permission50201=Read transactions
-Permission50202=Import transactions
-Permission54001=Print
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
-Permission59003=Read every user margin
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
+Permission271=Čitaj CA
+Permission272=Čitaj račune
+Permission273=Izdaj račun
+Permission281=Čitaj kontakte
+Permission282=Kreira/izmjeni kontakte
+Permission283=Obriši kontakte
+Permission286=Izvezi kontakte
+Permission291=Čitaj tarife
+Permission292=Postavi dozvole na tarifama
+Permission293=Izmjeni tarife kupaca
+Permission300=Čitaj barkodove
+Permission301=Kreiraj/izmjeni barkodove
+Permission302=Obriši barkodove
+Permission311=Čitaj usluge
+Permission312=Dodavanje usluge/pretplate ugovoru
+Permission331=Čitaj zabilješke
+Permission332=Kreiraj/izmjeni zabilješke
+Permission333=Obriši zabilješke
+Permission341=Čitaj svoje dozvole
+Permission342=Kreiraj/izmjeni svoje korisničke informacije
+Permission343=Izmjeni svoju lozinku
+Permission344=Izmjeni svoje dozvole
+Permission351=Čitaj grupe
+Permission352=Čitaj dozvole grupa
+Permission353=Kreiraj/izmjeni grupe
+Permission354=Obriši ili iskljući grupe
+Permission358=Izvezi korisnike
+Permission401=Čitaj popuste
+Permission402=Kreiraj/izmjeni popuste
+Permission403=Ovjeri popuste
+Permission404=Obriši popuste
+Permission510=Čitaj plaće
+Permission512=Kreiraj/izmjeni plaće
+Permission514=Obriši plaće
+Permission517=Izvoz plaća
+Permission520=Čitaj kredite
+Permission522=Kreiraj/izmjeni kredite
+Permission524=Obriši kredite
+Permission525=Pristup kreditnom kalkulatoru
+Permission527=Izvoz kredita
+Permission531=Čitaj usluge
+Permission532=Kreiraj/izmjeni usluge
+Permission534=Obriši usluge
+Permission536=Vidi/upravljaj skrivenim uslugama
+Permission538=Izvezi usluge
+Permission701=Čitaj donacije
+Permission702=Kreiraj/izmjeni donacije
+Permission703=Obriši donacije
+Permission771=Čitaj izvještaje troška (vaši i vaših podređenih)
+Permission772=Kreiraj/izmjeni izvještaje troška
+Permission773=Obriši izvještaje troška
+Permission774=Čitaj sve izvještaje troška (čak i svoje i podređenih)
+Permission775=Odobri izvještaje trška
+Permission776=Isplati izvještaje troška
+Permission779=Izvezi izvještaje troška
+Permission1001=Čitaj zalihe
+Permission1002=Kreiraj/izmjeni skladišta
+Permission1003=Obriši skladišta
+Permission1004=Čitaj kretanja zaliha
+Permission1005=Kreiraj/izmjeni kretanja zaliha
+Permission1101=Čitaj naloge isporuka
+Permission1102=Kreiraj/izmjeni naloge isporuka
+Permission1104=Ovjeri naloge isporuka
+Permission1109=Obriši naloge isporuka
+Permission1181=Čitaj dobavljače
+Permission1182=Čitaj narudžbe dobavljača
+Permission1183=Kreiraj/izmjeni narudžbe dobavljača
+Permission1184=Ovjeri narudžbe dobavljača
+Permission1185=Odobri narudžbe dobavljača
+Permission1186=Narući narudžbe dobavljača
+Permission1187=Potvrđivanje primke narudžbe dobavljača
+Permission1188=Obriši narudžbe dobavljača
+Permission1190=Odobri (drogo odobrenje) narudžba dobavljača
+Permission1201=Primi rezultat izvoza
+Permission1202=Kreiraj/izmjeni izvoz
+Permission1231=Čitaj račune dobavljača
+Permission1232=Kreiraj/izmjeni račune dobavljača
+Permission1233=Ovjeri račune dobavljača
+Permission1234=Obriši račune dobavljača
+Permission1235=Pošalji račune dobavljača e-poštom
+Permission1236=Izvezi račune dobavljača, atribute i plačanja
+Permission1237=Izvezi narudžbe dobavljača i njihovi detalji
+Permission1251=Pokreni masovni uvoz vanjskih podataka u bazu (učitavanje podataka)
+Permission1321=Izvezi račune kupaca, atribute i plačanja
+Permission1322=Reopen a paid bill
+Permission1421=Izvezi narudžbe kupaca i atribute
+Permission20001=Čitaj zahtjeve odsutnosti (vaš i vaših podređenih)
+Permission20002=Kreiraj/izmjeni vaše zahtjeve odsutnosti
+Permission20003=Obriši zahtjeve odsutnosti
+Permission20004=Čitaj zahtjeve odsutnosti (svih korisnika)
+Permission20005=Kreiraj/izmjeni zahtjeve odsutnosti za sve 
+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
+Permission2411=Čitaj akcije (događaje ili zadatke) ostalih
+Permission2412=Kreiraj/izmjeni akcije (događaje ili zadatke) ostalih
+Permission2413=Obriši akcije (događaje ili zadatke) ostalih
+Permission2414=Izvezi ostale akcije/zadatke
+Permission2501=Čitaj/Skini dokumente
+Permission2502=Skidanje dokumenata
+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)
+Permission50101=Koristi POS
+Permission50201=Čitaj transakcije
+Permission50202=Uvezi transakcije
+Permission54001=Ispis
+Permission55001=Čitaj ankete
+Permission55002=Kreiraj/izmjeni ankete
+Permission59001=Pročitaj komercijalne marže
+Permission59002=Postavi komercijalne marže
+Permission59003=Čitaj marže svakog korisnika
+Permission63001=Čitaj sredstva
+Permission63002=Kreiraj/izmjeni sredstva
+Permission63003=Obriši sredstva
+Permission63004=Poveži sredstava sa događajima agende
+DictionaryCompanyType=Tipovi komitenata
+DictionaryCompanyJuridicalType=Zakonski okviri za komitente
+DictionaryProspectLevel=Razina potencijalnog kupca
+DictionaryCanton=Država/provincija
+DictionaryRegion=Regije
+DictionaryCountry=Zemlje
+DictionaryCurrency=Valute
+DictionaryCivility=Osobni i profesionalni naslovi
+DictionaryActions=Tipovi događaja agende
+DictionarySocialContributions=Tipovi Društveni ili fiskalnih poreza
+DictionaryVAT=Stope PDV-a ili stope prodajnih poreza
+DictionaryRevenueStamp=Iznosi biljega
+DictionaryPaymentConditions=Uvjeti plaćanja
+DictionaryPaymentModes=Naćini plaćanja
+DictionaryTypeContact=Tipovi Kontakata/adresa
 DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
-DictionaryAccountancyCategory=Accounting categories
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
-SetupSaved=Setup saved
-BackToModuleList=Back to modules list
-BackToDictionaryList=Back to dictionaries list
-VATManagement=VAT Management
+DictionaryPaperFormat=Formati papira
+DictionaryFees=Tipovi pristojbi
+DictionarySendingMethods=Metode isporuke
+DictionaryStaff=Zaposlenici
+DictionaryAvailability=Kašnjenje isporuke
+DictionaryOrderMethods=Metode naručivanja
+DictionarySource=Porjeklo ponuda/narudžbi
+DictionaryAccountancyCategory=Obračunske kategorije
+DictionaryAccountancysystem=Modeli za grafikone računa
+DictionaryEMailTemplates=Predlošci e-pošte
+DictionaryUnits=Jedinice
+DictionaryProspectStatus=Status prospekcije
+DictionaryHolidayTypes=Tipovi odsustva
+DictionaryOpportunityStatus=Status šanse za projekt/prednost
+SetupSaved=Postavi spremljeno
+BackToModuleList=Povratak na popis modula
+BackToDictionaryList=Povratak na popis definicija
+VATManagement=Upravljanje PDV
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
 VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real).  A system in which VAT is declared.
 VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration.  This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
 ##### Local Taxes #####
-LTRate=Rate
-LocalTax1IsNotUsed=Do not use second tax
-LocalTax1IsUsedDesc=Use a second type of tax (other than VAT)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax1Management=Second type of tax
+LTRate=Stopa
+LocalTax1IsNotUsed=Nemoj koristit drugi porez
+LocalTax1IsUsedDesc=Koristi drugi porez (osim PDV)
+LocalTax1IsNotUsedDesc=Nemoj koristiti drugi tip poreza (osim PDV)
+LocalTax1Management=Tip drugog poreza
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Do not use third tax
-LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2IsNotUsed=Nemoj koristiti treći porez
+LocalTax2IsUsedDesc=Koristi treći porez (osim PDV)
+LocalTax2IsNotUsedDesc=Nemoj koristiti treći tip poreza (osim PDV)
+LocalTax2Management=Tip trećeg poreza
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
-LocalTax1ManagementES= RE Management
+LocalTax1ManagementES= Upravljenje RE
 LocalTax1IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If te buyer is not subjected to RE, RE by default=0. End of rule.<br>If the buyer is subjected to RE then the RE by default. End of rule.<br>
-LocalTax1IsNotUsedDescES= By default the proposed RE is 0. End of rule.
+LocalTax1IsNotUsedDescES= Kao zadano preporučeni RE je 0. Kraj prvila.
 LocalTax1IsUsedExampleES= In Spain they are professionals subject to some specific sections of the Spanish IAE.
 LocalTax1IsNotUsedExampleES= In Spain they are professional and societies and subject to certain sections of the Spanish IAE.
-LocalTax2ManagementES= IRPF Management
+LocalTax2ManagementES= Upravljanje IRPF
 LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices, orders etc follow the active standard rule:<br>If the seller is not subjected to IRPF, then IRPF by default=0. End of rule.<br>If the seller is subjected to IRPF then the IRPF by default. End of rule.<br>
-LocalTax2IsNotUsedDescES= By default the proposed IRPF is 0. End of rule.
+LocalTax2IsNotUsedDescES= Kao zadano preporučeni IRPF je 0. Kraj prvila.
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
+CalcLocaltax=Izvještaji o lokalnim porezima
+CalcLocaltax1=Prodaja - Nabava
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
+CalcLocaltax2=Nabava
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
+CalcLocaltax3=Prodaja
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
-LabelUsedByDefault=Label used by default if no translation can be found for code
-LabelOnDocuments=Label on documents
-NbOfDays=Nb of days
-AtEndOfMonth=At end of month
+LabelUsedByDefault=Oznake korištene kao zadane ako ne postoji prijevoda za kod
+LabelOnDocuments=Oznake na dokumentima
+NbOfDays=Br. dana
+AtEndOfMonth=Na kraju mjeseca
+CurrentNext=Current/Next
 Offset=Offset
-AlwaysActive=Always active
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Extend
-AddExtensionThemeModuleOrOther=Add extension (theme, module, ...)
+AlwaysActive=Uvjek aktivno
+Upgrade=Nadogradnja
+MenuUpgrade=Nadogradnja / Proširivanje
+AddExtensionThemeModuleOrOther=Dodaj proširenje (tema, modul, ...)
 WebServer=Web server
-DocumentRootServer=Web server's root directory
-DataRootServer=Data files directory
+DocumentRootServer=Web server korjenska mapa
+DataRootServer=Mapa datoteka
 IP=IP
 Port=Port
-VirtualServerName=Virtual server name
+VirtualServerName=Naziv virtualnog servera
 OS=OS
-PhpWebLink=Web-Php link
-Browser=Browser
+PhpWebLink=Web-PHP veza
+Browser=Preglednik
 Server=Server
-Database=Database
-DatabaseServer=Database host
-DatabaseName=Database name
-DatabasePort=Database port
-DatabaseUser=Database user
-DatabasePassword=Database password
-Tables=Tables
-TableName=Table name
-NbOfRecord=Nb of records
+Database=Baza podataka
+DatabaseServer=Host baze podataka
+DatabaseName=Naziv baze podataka
+DatabasePort=Port baze podataka
+DatabaseUser=Korisnik baze podataka
+DatabasePassword=Lozinka baze podataka
+Tables=Tabele
+TableName=Naziv tabele
+NbOfRecord=Br. zapisa
 Host=Server
-DriverType=Driver type
-SummarySystem=System information summary
-SummaryConst=List of all Dolibarr setup parameters
-MenuCompanySetup=Company/Foundation
-DefaultMenuManager= Standard menu manager
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Skin theme
-DefaultSkin=Default skin theme
-MaxSizeList=Max length for list
-DefaultMaxSizeList=Default max length for lists
-DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
-MessageOfDay=Message of the day
-MessageLogin=Login page message
-PermanentLeftSearchForm=Permanent search form on left menu
-DefaultLanguage=Default language to use (language code)
-EnableMultilangInterface=Enable multilingual interface
-EnableShowLogo=Show logo on left menu
-CompanyInfo=Company/foundation information
-CompanyIds=Company/foundation identities
-CompanyName=Name
-CompanyAddress=Address
-CompanyZip=Zip
-CompanyTown=Town
-CompanyCountry=Country
-CompanyCurrency=Main currency
+DriverType=Tip upr. programa
+SummarySystem=Sažetak informacija o sistemu
+SummaryConst=Popis svih Dolibarr parametara podešavanja
+MenuCompanySetup=Tvrtka/Zaklada
+DefaultMenuManager= Upravitelj standardnog izbornika
+DefaultMenuSmartphoneManager=Upravitelj mobilnog izbornika
+Skin=Skin teme
+DefaultSkin=Zadani skin teme
+MaxSizeList=Maks. dužina za popis
+DefaultMaxSizeList=Zadana maks. dužina popisa
+DefaultMaxSizeShortList=Zadana maks. dužina za kratke popise ( npr. na kartici kupca)
+MessageOfDay=Poruka dana
+MessageLogin=Poruka na stranici za prijavu
+PermanentLeftSearchForm=Stalni obrazac za pretraživanje na ljevom izborniku
+DefaultLanguage=Zadani jezik za korištenje (kod jezika)
+EnableMultilangInterface=Omogući višejezično sučelje
+EnableShowLogo=Prikaži logo na ljevom izborniku
+CompanyInfo=Informacije o tvrtci/zakladi
+CompanyIds=Identitet tvrtke/zaklade
+CompanyName=Naziv
+CompanyAddress=Adresa
+CompanyZip=PBR
+CompanyTown=Grad
+CompanyCountry=Zemlja
+CompanyCurrency=Glavna valuta
 CompanyObject=Object of the company
 Logo=Logo
-DoNotSuggestPaymentMode=Do not suggest
-NoActiveBankAccountDefined=No active bank account defined
-OwnerOfBankAccount=Owner of bank account %s
-BankModuleNotActive=Bank accounts module not enabled
-ShowBugTrackLink=Show link "<strong>%s</strong>"
-Alerts=Alerts
-DelaysOfToleranceBeforeWarning=Tolerance delays before warning
+DoNotSuggestPaymentMode=Ne preporuči
+NoActiveBankAccountDefined=Nije postavljen aktivni bankovni račun
+OwnerOfBankAccount=Vlasnik bankovnog računa %s
+BankModuleNotActive=Modul bankovnih računa nije omogučen
+ShowBugTrackLink=Prikaži poveznicu "<strong>%s</strong>"
+Alerts=Obavijesti
+DelaysOfToleranceBeforeWarning=Tolerancija kašnjenja prije upozorenja
 DelaysOfToleranceDesc=This screen allows you to define the tolerated delays before an alert is reported on screen with picto %s for each late element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Delay tolerance (in days) before alert on planned events (agenda events) not completed yet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Delay tolerance (in days) before alert on project not closed in time
-Delays_MAIN_DELAY_TASKS_TODO=Delay tolerance (in days) before alert on planned tasks (project tasks) not completed yet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on orders not processed yet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Delay tolerance (in days) before alert on suppliers orders not processed yet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Delay tolerance (in days) before alert on proposals to close
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Delay tolerance (in days) before alert on proposals not billed
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerance delay (in days) before alert on services to activate
-Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerance delay (in days) before alert on expired services
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerance delay (in days) before alert on unpaid supplier invoices
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerence delay (in days) before alert on unpaid client invoices
-Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerance delay (in days) before alert on pending bank reconciliation
-Delays_MAIN_DELAY_MEMBERS=Tolerance delay (in days) before alert on delayed membership fee
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerance delay (in days) before alert for cheques deposit to do
-Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
+Delays_MAIN_DELAY_ACTIONS_TODO=Tolerancija kašnjenja (u danima) prije obavijesti o planiranim događajima (događaji agende) koji nisu još završeni
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Tolerancija kašnjenja (u danima) prije obavijesti o projektima koji nisu zatvoreni na vrijeme
+Delays_MAIN_DELAY_TASKS_TODO=Tolerancija kašnjenja (u danima) prije obavijesti o planiranim događajima (projektni zadaci) koji nisu još završeni
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Tolerancija kašnjenja (u danima) prije obavijesti o narudžbama koje nisu još obrađene
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Tolerancija kašnjenja (u danima) prije obavijesti o narudžbama dobavljača koje nisu još obrađene
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Tolerancija kašnjenja (u danima) prije obavijesti o ponudama za zatvaranje
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Tolerancija kašnjenja (u danima) prije obavijesti o ponudama koje nisu naplačene
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tolerancija kašnjenja (u danima) prije obavijesti o uslugama za aktivaciju
+Delays_MAIN_DELAY_RUNNING_SERVICES=Tolerancija kašnjenja (u danima) prije obavijesti o isteklim uslugama
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Tolerancija kašnjenja (u danima) prije obavijesti o neplaćenim računima dobavljača
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Tolerancija kašnjenja (u danima) prije obavijesti o neplaćenim računima kupaca
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancija kašnjenja (u danima) prije obavijesti o usklađivanju s bankom u tijeku
+Delays_MAIN_DELAY_MEMBERS=Tolerancija kašnjenja (u danima) prije obavijesti o zakašnjelim članarinama
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancija kašnjenja (u danima) prije obavijesti za napraviti čekovne pologe
+Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerancija kašnjenja (u danima) prije obavijesti za odobravanje izvještaja troška
+SetupDescription1=Sučelje postavki je za inicijalnu podešavanje parametara prije korištenja Dolibarr-a.
 SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
 SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
 SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=Other menu entries manage optional parameters.
-LogEvents=Security audit events
-Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
-ListOfSecurityEvents=List of Dolibarr security events
-SecurityEventsPurged=Security events purged
+SetupDescription5=Ostale stavke izbornika upravljaju dodatnim parametrima.
+LogEvents=Pregled sigurnosnih događaja
+Audit=Revizija
+InfoDolibarr=O Dolibarr instalaciji
+InfoBrowser=O pregledniku
+InfoOS=O OS-u
+InfoWebServer=O Web serveru
+InfoDatabase=O bazi podataka
+InfoPHP=O PHP
+InfoPerf=O izvođenju
+BrowserName=Naziv preglednika
+BrowserOS=OS preglednika
+ListOfSecurityEvents=Popis Dolibarr sigurnosnih događaja
+SecurityEventsPurged=Sigurnosni događaji trajno obrisani
 LogEventDesc=You can enable here the logging for Dolibarr security events. Administrators can then see its content via menu <b>System tools - Audit</b>. Warning, this feature can consume a large amount of data in database.
-AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
+AreaForAdminOnly=Ove mogućnosti mogu se koristit samo od strane <b>administratora</b>.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
-AvailableModules=Available modules
-ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
-SessionTimeOut=Time out for session
+AvailableModules=Dostupni moduli
+ToActivateModule=Za aktivaciju modula, idite na podešavanja (Naslovna->Podešavanje->Moduli).
+SessionTimeOut=Istek za sesije
 SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here.
 TriggersAvailable=Available triggers
 TriggersDesc=Triggers are files that will modify the behaviour of Dolibarr workflow once copied into the directory <b>htdocs/core/triggers</b>. They realised new actions, activated on Dolibarr events (new company creation, invoice validation, ...).
@@ -963,227 +980,235 @@ TriggerDisabledAsModuleDisabled=Triggers in this file are disabled as module <b>
 TriggerAlwaysActive=Triggers in this file are always active, whatever are the activated Dolibarr modules.
 TriggerActiveAsModuleActive=Triggers in this file are active as module <b>%s</b> is enabled.
 GeneratedPasswordDesc=Define here which rule you want to use to generate new password if you ask to have auto generated password
-DictionaryDesc=Insert all reference data. You can add your values to the default.
+DictionaryDesc=Unesite sve referentne podatke. Možete postaviti svoje vrijednosti kao zadane.
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=Limits/Precision setup
-LimitsDesc=You can define limits, precisions and optimisations used by Dolibarr here
-MAIN_MAX_DECIMALS_UNIT=Max decimals for unit prices
-MAIN_MAX_DECIMALS_TOT=Max decimals for total prices
+MiscellaneousDesc=Svi ostali sigurnosni parametri su definirani ovdje.
+LimitsSetup=Podešavanje limita/preciznosti
+LimitsDesc=Ovdje možete podesiti limite, preciznost i optimizaciju korištenu u Dolibarr-u
+MAIN_MAX_DECIMALS_UNIT=Maks. decimala za jediničnu cijenu
+MAIN_MAX_DECIMALS_TOT=Maks. decimala za ukupnu cijenu
 MAIN_MAX_DECIMALS_SHOWN=Max decimals for prices shown on screen (Add <b>...</b> after this number if you want to see <b>...</b> when number is truncated when shown on screen)
 MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
-UnitPriceOfProduct=Net unit price of a product
-TotalPriceAfterRounding=Total price (net/vat/incl tax) after rounding
+UnitPriceOfProduct=Neto jedinična cijena proizvoda
+TotalPriceAfterRounding=Ukupna cijena (neto/PDV/uklj. porez) nakon zaokruživanja
 ParameterActiveForNextInputOnly=Parameter effective for next input only
 NoEventOrNoAuditSetup=No security event has been recorded yet. This can be normal if audit has not been enabled on "setup - security - audit" page.
 NoEventFoundWithCriteria=No security event has been found for such search criterias.
-SeeLocalSendMailSetup=See your local sendmail setup
-BackupDesc=To make a complete backup of Dolibarr, you must:
+SeeLocalSendMailSetup=Provjerite vaše postavke lokalnog sendmail-a
+BackupDesc=Za kreiranje kompletnog backupa, morate:
 BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
 BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
 BackupDescX=Archived directory should be stored in a secure place.
 BackupDescY=The generated dump file should be stored in a secure place.
 BackupPHPWarning=Backup can't be guaranted with this method. Prefer previous one
-RestoreDesc=To restore a Dolibarr backup, you must:
+RestoreDesc=Za vračanje backupa, morate:
 RestoreDesc2=Restore archive file (zip file for example) of documents directory to extract tree of files in documents directory of a new Dolibarr installation or into this current documents directoy (<b>%s</b>).
 RestoreDesc3=Restore the data, from a backup dump file, into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once restore is finished, you must use a login/password, that existed when backup was made, to connect again. To restore a backup database into this current installation, you can follow this assistant.
-RestoreMySQL=MySQL import
-ForcedToByAModule= This rule is forced to <b>%s</b> by an activated module
-PreviousDumpFiles=Available database backup dump files
-WeekStartOnDay=First day of week
+RestoreMySQL=MySQL uvoz
+ForcedToByAModule= Ovo pravilo je forsirano na <b>%s</b> od aktiviranog modula
+PreviousDumpFiles=Dostupne datoteke backupa baze podataka
+WeekStartOnDay=Prvi dan tjedna
 RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be required (Programs version %s differs from database version %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user <b>%s</b> or you must add -W option at end of command line to provide <b>%s</b> password.
-YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
-DownloadMoreSkins=More skins to download
+YourPHPDoesNotHaveSSLSupport=SSL funkcije nisu dostupne u vašem PHP
+DownloadMoreSkins=Više skinova za skinuti
 SimpleNumRefModelDesc=Returns the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
-ShowProfIdInAddress=Show professionnal id with addresses on documents
+ShowProfIdInAddress=Prikaži profesionalni ID s adresama na dokumentima
 ShowVATIntaInAddress=Hide VAT Intra num with addresses on documents
-TranslationUncomplete=Partial translation
+TranslationUncomplete=Parcijalni prijevod
 SomeTranslationAreUncomplete=Some languages may be partially translated or may contains errors. If you detect some, you can fix language files registering to <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.
-MAIN_DISABLE_METEO=Disable meteo view
-TestLoginToAPI=Test login to API
+MAIN_DISABLE_METEO=Onemogući meteo pregled
+TestLoginToAPI=Testiraj prijavu na API
 ProxyDesc=Some features of Dolibarr need to have an Internet access to work. Define here parameters for this. If the Dolibarr server is behind a Proxy server, those parameters tells Dolibarr how to access Internet through it.
-ExternalAccess=External access
+ExternalAccess=Vanjski pristup
 MAIN_PROXY_USE=Use a proxy server (otherwise direct access to internet)
 MAIN_PROXY_HOST=Name/Address of proxy server
 MAIN_PROXY_PORT=Port of proxy server
 MAIN_PROXY_USER=Login to use the proxy server
 MAIN_PROXY_PASS=Password to use the proxy server
 DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
-ExtraFields=Complementary attributes
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=Complementary attributes (thirdparty)
-ExtraFieldsContacts=Complementary attributes (contact/address)
-ExtraFieldsMember=Complementary attributes (member)
-ExtraFieldsMemberType=Complementary attributes (member type)
-ExtraFieldsCustomerInvoices=Complementary attributes (invoices)
-ExtraFieldsSupplierOrders=Complementary attributes (orders)
-ExtraFieldsSupplierInvoices=Complementary attributes (invoices)
-ExtraFieldsProject=Complementary attributes (projects)
-ExtraFieldsProjectTask=Complementary attributes (tasks)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+ExtraFields=Dodatni atributi
+ExtraFieldsLines=Dodatni atributi (stavke)
+ExtraFieldsSupplierOrdersLines=Dodatni atributi (stavke narudžbe)
+ExtraFieldsSupplierInvoicesLines=Dodatni atributi (stavke računa)
+ExtraFieldsThirdParties=Komplementarni atributi (komitenti)
+ExtraFieldsContacts=Dodatni atributi (kontakt/adresa)
+ExtraFieldsMember=Dodatni atributi (član)
+ExtraFieldsMemberType=Dodatni atributi (tip člana)
+ExtraFieldsCustomerInvoices=Dodatni atributi (računi)
+ExtraFieldsSupplierOrders=Dodatni atributi (narudžbe)
+ExtraFieldsSupplierInvoices=Dodatni atributi (računi)
+ExtraFieldsProject=Dodatni atributi (projekti)
+ExtraFieldsProjectTask=Dodatni atributi (zadaci)
+ExtraFieldHasWrongValue=Atribut %s ima krivu vrijednost.
+AlphaNumOnlyLowerCharsAndNoSpace=samo alfanumerički i mala slova bez razmaka
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
-PathToDocuments=Path to documents
-PathDirectory=Directory
+PathToDocuments=Putanja do dokumenata
+PathDirectory=Mapa
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
-YesInSummer=Yes in summer
+TranslationSetup=Postavke prijevoda
+TranslationKeySearch=Pretraži prijevod po ključi ili tekstu
+TranslationOverwriteKey=Prepiši prevedeni tekst
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Prevedeni tekst
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=Novi prevedeni tekst za prikaz
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TotalNumberOfActivatedModules=Ukupan broj aktiviranih modula : <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=Morate omogućiti barem 1 modul
+ClassNotFoundIntoPathWarning=Klasa %s nije pronađena u PHP putanji
+YesInSummer=Da u ljeto
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
 SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
+ConditionIsCurrently=Stanje je trenutno %s
 YouUseBestDriver=You use driver %s that is best driver available currently.
 YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
 NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
-SearchOptim=Search optimization
+SearchOptim=Optimizacija pretrage
 YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
 BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
 BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
 XDebugInstalled=XDebug is loaded.
 XCacheInstalled=XCache is loaded.
 AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
-FieldEdition=Edition of field %s
+AskForPreferredShippingMethod=Zatraži za preferiranu metodu slanja za komitente.
+FieldEdition=Izdanje polja %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+GetBarCode=Uzmi barkod
 ##### Module password generation
 PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
 PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
-SetupPerso=According to your configuration
-PasswordPatternDesc=Password pattern description
+PasswordGenerationPerso=Vrati lozinku prema vašoj osobno postavljenoj konfiguraciji.
+SetupPerso=Sukladno vašoj konfiguraciji
+PasswordPatternDesc=Opis uzorka lozinke
 ##### Users setup #####
 RuleForGeneratedPasswords=Rule to generate suggested passwords or validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the link "Forget password" on login page
-UsersSetup=Users module setup
-UserMailRequired=EMail required to create a new user
+DisableForgetPasswordLinkOnLogonPage=Ne prikazuj poveznicu "Zaboravili ste lozinku" na stranici prijave
+UsersSetup=Podešavanje modula korisnka
+UserMailRequired=E-pošta je obavezna za kreiranje novog korisnika
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=Podešavanje modula HRM
 ##### Company setup #####
-CompanySetup=Companies module setup
-CompanyCodeChecker=Module for third parties code generation and checking (customer or supplier)
-AccountCodeManager=Module for accountancy code generation (customer or supplier)
+CompanySetup=Podešavanje modula tvrtke
+CompanyCodeChecker=Modul za generiranje koda komitenata i provhera (kupac ili dobavljač)
+AccountCodeManager=Modul za generiranje konta (kupac ili dobavljač)
 NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
-ModelModules=Documents templates
+NotificationsDescUser=* po korisniku, jedan po jedan.
+NotificationsDescContact=* po kontaktu komitenta (kupci ili dobavljači), jedan po jedan.
+NotificationsDescGlobal=* ili podešavanjem globalnih ciljanih adresa e-pošte u postavkama modula.
+ModelModules=Predlošci dokumenata
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
-WatermarkOnDraft=Watermark on draft document
+WatermarkOnDraft=Vodeni žig na skici dokumenta
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules on Professional Ids
-MustBeUnique=Must be unique ?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
-Miscellaneous=Miscellaneous
+CompanyIdProfChecker=Pravila za profesionalne ID
+MustBeUnique=Mora biti jedinstven ?
+MustBeMandatory=Obavezan za kreiranje komitenta ?
+MustBeInvoiceMandatory=Obavezno za ovjeru računa ?
+Miscellaneous=Ostalo
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=Izvoz poveznice u <b>%s</b> formatu je dostupno na sljedećoj poveznici: %s
 ##### Invoices #####
-BillsSetup=Invoices module setup
-BillsNumberingModule=Invoices and credit notes numbering model
-BillsPDFModules=Invoice documents models
-CreditNote=Credit note
-CreditNotes=Credit notes
-ForceInvoiceDate=Force invoice date to validation date
-SuggestedPaymentModesIfNotDefinedInInvoice=Suggested payments mode on invoice by default if not defined for invoice
-SuggestPaymentByRIBOnAccount=Suggest payment by withdraw on account
-SuggestPaymentByChequeToAddress=Suggest payment by cheque to
-FreeLegalTextOnInvoices=Free text on invoices
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
+BillsSetup=Podešavanje modula računa
+BillsNumberingModule=Način označavanja računa i odobrenja
+BillsPDFModules=Model dokumenata računa
+CreditNote=Odobrenje
+CreditNotes=Odobrenja
+ForceInvoiceDate=Forsiraj datum računa kao datum ovjere
+SuggestedPaymentModesIfNotDefinedInInvoice=Predloženi način plačanja na računu kao zadano ako nije definirano za račun
+SuggestPaymentByRIBOnAccount=Predloži plačanje isplatom na račun
+SuggestPaymentByChequeToAddress=Predloži plačanje čekom na 
+FreeLegalTextOnInvoices=Slobodan unos teksta na računu
+WatermarkOnDraftInvoices=Vodeni žig na skici računa (ništa ako se ostavi prazno)
+PaymentsNumberingModule=Način označavanja plačanja
+SuppliersPayment=Plaćanja dobavljačima
+SupplierPaymentSetup=Podešavanje plaćanja dobavljačima
 ##### Proposals #####
-PropalSetup=Commercial proposals module setup
-ProposalsNumberingModules=Commercial proposal numbering models
-ProposalsPDFModules=Commercial proposal documents models
-FreeLegalTextOnProposal=Free text on commercial proposals
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+PropalSetup=Podešavanje modula ponuda
+ProposalsNumberingModules=Modeli brojeva ponuda
+ProposalsPDFModules=Modeli dokumenta ponuda
+FreeLegalTextOnProposal=Slobodan unos teksta na ponudi
+WatermarkOnDraftProposal=Vodeni žig na skici ponude (ako nije prazno)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Traži odredišni bankovni račun ponude
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
+SupplierProposalSetup=Podešavanje modula cijenovnih upita dobavljačima
+SupplierProposalNumberingModules=Način označavanja cijenovnih upita dobavljačima
+SupplierProposalPDFModules=Model dokumenata cijenovnih upita dobavljaču
+FreeLegalTextOnSupplierProposal=Slobodan unos teksta na upitima prema dobavljaču
+WatermarkOnDraftSupplierProposal=Vodeni žig na skici upita dobavljaču (ništa ako se ostavi prazno)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Traži odredišni bankovni račun zahtjeva za cijenom
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Upitaj za izvorno skladište za narudžbe
 ##### Orders #####
-OrdersSetup=Order management setup
-OrdersNumberingModules=Orders numbering models
-OrdersModelModule=Order documents models
-FreeLegalTextOnOrders=Free text on orders
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+OrdersSetup=Podešavanje upravljanjem narudžbama
+OrdersNumberingModules=Način označavanja narudžba
+OrdersModelModule=Model dokumenata narudžba
+FreeLegalTextOnOrders=Slobodan unos teksta na narudžbama
+WatermarkOnDraftOrders=Vodeni žig na narudžbama (ništa ako se ostavi prazno)
 ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Traži odredišni bankovni račun narudžbe
 ##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
+ClickToDialSetup=Podešavanje modula ClickToDial
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with your clicktodial login (defined on your user card)<br><b>__PASS__</b> that will be replaced with your clicktodial password (defined on your user card).
 ##### Bookmark4u #####
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
-FreeLegalTextOnInterventions=Free text on intervention documents
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+InterventionsSetup=Podešavanje modula intervencija
+FreeLegalTextOnInterventions=Slobodan unos teksta na dokumentima intervencija
+FicheinterNumberingModules=Način označavanja intervencija
+TemplatePDFInterventions=Model dokumenata intervncijskih kartica
+WatermarkOnDraftInterventionCards=Vodeni žig na dokumenitma intervencijskih kartica (ništa ako se ostavi prazno)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
-ContractsNumberingModules=Contracts numbering modules
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+ContractsSetup=Podešavanje modula ugovora/pretplata
+ContractsNumberingModules=Način označavanja ugovora
+TemplatePDFContracts=Modeli dokumenata ugovora
+FreeLegalTextOnContracts=Slobodan unos teksta na ugovorima
+WatermarkOnDraftContractCards=Vodeni žig na skicama ugovora (ništa ako se ostavi prazno)
 ##### Members #####
-MembersSetup=Members module setup
-MemberMainOptions=Main options
-AdherentLoginRequired= Manage a Login for each member
-AdherentMailRequired=EMail required to create a new member
+MembersSetup=Podešavanje modula članova
+MemberMainOptions=Glavne opcije
+AdherentLoginRequired= Upravljanje prijavom svakog korisnika
+AdherentMailRequired=E-pošta je potrebna za kreiranje novog člana
 MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
-LDAPUsersSynchro=Users
-LDAPGroupsSynchro=Groups
-LDAPContactsSynchro=Contacts
-LDAPMembersSynchro=Members
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSetup=Podešavanje LDAP
+LDAPGlobalParameters=Globalni parametri
+LDAPUsersSynchro=Korisnici
+LDAPGroupsSynchro=Grupe
+LDAPContactsSynchro=Kontakti
+LDAPMembersSynchro=Članovi
+LDAPSynchronization=LDAP sinhronizacija
+LDAPFunctionsNotAvailableOnPHP=LDAP funkcije nisu dostupne u vašem PHP-u
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
-LDAPSynchronizeUsers=Organization of users in LDAP
-LDAPSynchronizeGroups=Organization of groups in LDAP
-LDAPSynchronizeContacts=Organization of contacts in LDAP
-LDAPSynchronizeMembers=Organization of foundation's members in LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
-LDAPServerPortExample=Default port : 389
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
-LDAPServerUseTLSExample=Your LDAP server use TLS
+LDAPNamingAttribute=Ključ u LDAP
+LDAPSynchronizeUsers=Organizacija korisnika u LDAP
+LDAPSynchronizeGroups=Organizacija grupa u LDAP
+LDAPSynchronizeContacts=Organizacija kontakta u LDAP
+LDAPSynchronizeMembers=Organizacija članova zaklade u LDAP
+LDAPPrimaryServer=Primarni server
+LDAPSecondaryServer=Sekundarni server
+LDAPServerPort=Server Port
+LDAPServerPortExample=Zadani port: 389
+LDAPServerProtocolVersion=Verzija protokola
+LDAPServerUseTLS=Koristi TLS
+LDAPServerUseTLSExample=Vaš LDAP server koristi TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
-LDAPPassword=Administrator password
-LDAPUserDn=Users' DN
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPPassword=Administratorska lozinka
+LDAPUserDn=Korisnici DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
+LDAPGroupDn=Grupe DN
 LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
 LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
 LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
-LDAPDnSynchroActive=Users and groups synchronization
-LDAPDnSynchroActiveExample=LDAP to Dolibarr or Dolibarr to LDAP synchronization
-LDAPDnContactActive=Contacts' synchronization
-LDAPDnContactActiveExample=Activated/Unactivated synchronization
-LDAPDnMemberActive=Members' synchronization
-LDAPDnMemberActiveExample=Activated/Unactivated synchronization
+LDAPDnSynchroActive=Sinhronizacija korisnika i grupa
+LDAPDnSynchroActiveExample=LDAP u Dolibarr ili Dolibarr u LDAP sinhronizacija
+LDAPDnContactActive=Sinhronizacija kontakata
+LDAPDnContactActiveExample=Aktivirana/Neaktivirana sinhronizacija
+LDAPDnMemberActive=Sinhronizacija članova
+LDAPDnMemberActiveExample=Aktivirana/Neaktivirana sinhronizacija
 LDAPContactDn=Dolibarr contacts' DN
 LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
 LDAPMemberDn=Dolibarr members DN
@@ -1196,71 +1221,71 @@ LDAPGroupObjectClassList=List of objectClass
 LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
 LDAPContactObjectClassList=List of objectClass
 LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
-LDAPTestConnect=Test LDAP connection
-LDAPTestSynchroContact=Test contacts synchronization
-LDAPTestSynchroUser=Test user synchronization
-LDAPTestSynchroGroup=Test group synchronization
-LDAPTestSynchroMember=Test member synchronization
-LDAPTestSearch= Test a LDAP search
-LDAPSynchroOK=Synchronization test successful
-LDAPSynchroKO=Failed synchronization test
+LDAPTestConnect=Testiranje LDAP veze
+LDAPTestSynchroContact=Testiranje sinhronizacije kontakata
+LDAPTestSynchroUser=Testiranje sinhronizacije korisnika
+LDAPTestSynchroGroup=Testiranje sinhronizacije grupa
+LDAPTestSynchroMember=Testiranje sinhronizacije članova
+LDAPTestSearch= Testiranje LDAP pretraživanja
+LDAPSynchroOK=Testiranje sinhronizacije je uspješno
+LDAPSynchroKO=Neuspješno testiranje sinhronizacije
 LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that connexion to server is correctly configured and allows LDAP udpates
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=%s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=%s)
+LDAPTCPConnectOK=TCP veza na LDAP server uspješna (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP veza na LDAP server neuspješna (Server=%s, Port=%s)
 LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
 LDAPBindKO=Connect/Authentificate to LDAP server failed (Server=%s, Port=%s, Admin=%s, Password=%s)
-LDAPSetupForVersion3=LDAP server configured for version 3
-LDAPSetupForVersion2=LDAP server configured for version 2
-LDAPDolibarrMapping=Dolibarr Mapping
-LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
-LDAPFieldLoginExample=Example : uid
-LDAPFilterConnection=Search filter
-LDAPFilterConnectionExample=Example : &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example : samaccountname
-LDAPFieldFullname=Full name
-LDAPFieldFullnameExample=Example : cn
-LDAPFieldPasswordNotCrypted=Password not crypted
-LDAPFieldPasswordCrypted=Password crypted
-LDAPFieldPasswordExample=Example : userPassword
-LDAPFieldCommonNameExample=Example : cn
-LDAPFieldName=Name
-LDAPFieldNameExample=Example : sn
-LDAPFieldFirstName=First name
-LDAPFieldFirstNameExample=Example : givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Example : mail
-LDAPFieldPhone=Professional phone number
-LDAPFieldPhoneExample=Example : telephonenumber
-LDAPFieldHomePhone=Personal phone number
-LDAPFieldHomePhoneExample=Example : homephone
-LDAPFieldMobile=Cellular phone
-LDAPFieldMobileExample=Example : mobile
-LDAPFieldFax=Fax number
-LDAPFieldFaxExample=Example : facsimiletelephonenumber
-LDAPFieldAddress=Street
-LDAPFieldAddressExample=Example : street
-LDAPFieldZip=Zip
-LDAPFieldZipExample=Example : postalcode
-LDAPFieldTown=Town
-LDAPFieldTownExample=Example : l
-LDAPFieldCountry=Country
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example : description
-LDAPFieldNotePublic=Public Note
+LDAPSetupForVersion3=LDAP server podešen za verziju 3
+LDAPSetupForVersion2=LDAP server podešen za verziju 2
+LDAPDolibarrMapping=Dolibarr mapiranje
+LDAPLdapMapping=LDAP mapiranje
+LDAPFieldLoginUnix=Prijava (unix)
+LDAPFieldLoginExample=Primjer : uid
+LDAPFilterConnection=Filter pretraživanja
+LDAPFilterConnectionExample=Primjer : &(objectClass=inetOrgPerson)
+LDAPFieldLoginSamba=Prijava (samba, activedirectory)
+LDAPFieldLoginSambaExample=Primjer : samaccountname
+LDAPFieldFullname=Puno ime
+LDAPFieldFullnameExample=Primjer : cn
+LDAPFieldPasswordNotCrypted=Lozinka nije kriptirana
+LDAPFieldPasswordCrypted=Lozinka kriptirana
+LDAPFieldPasswordExample=Primjer : userPassword
+LDAPFieldCommonNameExample=Primjer : cn
+LDAPFieldName=Naziv
+LDAPFieldNameExample=Primjer : sn
+LDAPFieldFirstName=Ime
+LDAPFieldFirstNameExample=Primjer : givenName
+LDAPFieldMail=Adresa e-pošte
+LDAPFieldMailExample=Primjer : mail
+LDAPFieldPhone=Broj telefona ured
+LDAPFieldPhoneExample=Primjer : telephonenumber
+LDAPFieldHomePhone=Broj telefona privatni
+LDAPFieldHomePhoneExample=Primjer : homePhone
+LDAPFieldMobile=Broj mobitela
+LDAPFieldMobileExample=Primjer : mobitel
+LDAPFieldFax=Broj Faxa
+LDAPFieldFaxExample=Primjer : facsimiletelephonenumber
+LDAPFieldAddress=Ulica
+LDAPFieldAddressExample=Primjer : street
+LDAPFieldZip=PBR
+LDAPFieldZipExample=Primjer : postalcode
+LDAPFieldTown=Grad
+LDAPFieldTownExample=Primjer : I
+LDAPFieldCountry=Zemlja
+LDAPFieldDescription=Opis
+LDAPFieldDescriptionExample=Primjer : description
+LDAPFieldNotePublic=Javna napomena
 LDAPFieldNotePublicExample=Example : publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example : uniqueMember
-LDAPFieldBirthdate=Birthdate
-LDAPFieldCompany=Company
-LDAPFieldCompanyExample=Example : o
+LDAPFieldGroupMembers= Članovi grupe
+LDAPFieldGroupMembersExample= Primjer : uniqueMember
+LDAPFieldBirthdate=Datum rođenja
+LDAPFieldCompany=Tvrtka
+LDAPFieldCompanyExample=Primjer : o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example : objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
-LDAPFieldTitleExample=Example: title
-LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
+LDAPFieldSidExample=Primjer : objectsid
+LDAPFieldEndLastSubscription=Datum kraja pretplate
+LDAPFieldTitle=Mjesto zaposlenja
+LDAPFieldTitleExample=Primjer : title
+LDAPSetupNotComplete=Postavljanje LDAP nije kompletno (idite na ostale tabove)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
 LDAPDescContact=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr contacts.
 LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr users.
@@ -1287,82 +1312,82 @@ CacheByClient=Cache by browser
 CompressionOfResources=Compression of HTTP responses
 TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Services module setup
-ProductServiceSetup=Products and Services modules setup
-NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
+ProductSetup=Podešavanje modula proizvoda
+ServiceSetup=Podešavanje modula usluga
+ProductServiceSetup=Podešavanje modula Proizvoda i usluga
+NumberOfProductShowInSelect=Maks. broj proizvoda u odabiru ( 0= bez limita)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
-SetDefaultBarcodeTypeProducts=Default barcode type to use for products
-SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
+SetDefaultBarcodeTypeProducts=Zadani tip barkoda za korištenje kod proizvoda
+SetDefaultBarcodeTypeThirdParties=Zadani tip barkoda za korištenje kod komitenta
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
 ProductCodeChecker= Module for product code generation and checking (product or service)
-ProductOtherConf= Product / Service configuration
-IsNotADir=is not a directory!
+ProductOtherConf= Konfiguracija Proizvoda / Usluga
+IsNotADir=nije mapa!
 ##### Syslog #####
-SyslogSetup=Logs module setup
-SyslogOutput=Logs outputs
-SyslogFacility=Facility
-SyslogLevel=Level
-SyslogFilename=File name and path
+SyslogSetup=Podešavanje modula dnevnika
+SyslogOutput=Izlazi dnevnika
+SyslogFacility=Postrojenje
+SyslogLevel=Nivo
+SyslogFilename=Naziv datoteke i putanja
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
 ##### Donations #####
-DonationsSetup=Donation module setup
-DonationsReceiptModel=Template of donation receipt
+DonationsSetup=Podešavanje modula donacija
+DonationsReceiptModel=Predložak za donacijsku primku
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
-BarcodeDescEAN8=Barcode of type EAN8
-BarcodeDescEAN13=Barcode of type EAN13
-BarcodeDescUPC=Barcode of type UPC
-BarcodeDescISBN=Barcode of type ISBN
-BarcodeDescC39=Barcode of type C39
-BarcodeDescC128=Barcode of type C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
+BarcodeSetup=Podešavanje barkoda
+PaperFormatModule=Modul formata ispisa
+BarcodeEncodeModule=Tip dekodiranja barkoda
+CodeBarGenerator=Generator barkoda
+ChooseABarCode=Generator nije definiran
+FormatNotSupportedByGenerator=Format nije podržan ovim generatora
+BarcodeDescEAN8=Barkod tipa EAN8
+BarcodeDescEAN13=Barkod tipa EAN13
+BarcodeDescUPC=Barkod tipa UPC
+BarcodeDescISBN=Barkod tipa ISBN
+BarcodeDescC39=Barkod tipa C39
+BarcodeDescC128=Barkod tipa C128
+BarcodeDescDATAMATRIX=Barkod tipa Datamatrix
+BarcodeDescQRCODE=Barkod tipa QR
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
-BarcodeInternalEngine=Internal engine
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarcodeInternalEngine=Interni uređaj
+BarCodeNumberManager=Upravitelj za automatsko definiranje barkoda
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
+ExternalRSSSetup=Podešavanje uvoza vanjskog RSS
+NewRSS=Novi RSS Feed
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Zanimljiv RSS Feed
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Sender EMail (From) for emails sent by emailing module
-MailingEMailError=Return EMail (Errors-to) for emails with errors
-MailingDelay=Seconds to wait after sending next message
+MailingSetup=Podešavanje modula slanja e-pošte
+MailingEMailFrom=E-pošta pošiljatelja (Od) za e-poštu poslanu modulom
+MailingEMailError=Povratna e-pošta (Za) za e-poštu s greškom
+MailingDelay=Čekanje u sekundama kod slanja sljedeće poruke
 ##### Notification #####
-NotificationSetup=EMail notification module setup
-NotificationEMailFrom=Sender EMail (From) for emails sent for notifications
+NotificationSetup=Podešavanje modula obavjesti putem e-pošte
+NotificationEMailFrom=E-pošta pošiljatelja (Od) za e-poštu obavijesti
 FixedEmailTarget=Fixed email target
 ##### Sendings #####
-SendingsSetup=Sending module setup
-SendingsReceiptModel=Sending receipt model
-SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipping sheets for customer deliveries
+SendingsSetup=Podešavanje modula slanja
+SendingsReceiptModel=Model primke slanja
+SendingsNumberingModules=Način označavanja slanja
+SendingsAbility=Podrži liste isporuke za dostave kupcima
 NoNeedForDeliveryReceipts=In most cases, sendings receipts are used both as sheets for customer deliveries (list of products to send) and sheets that is recevied and signed by customer. So product deliveries receipts is a duplicated feature and is rarely activated.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Slobodan unos teksta kod isporuka
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
-DeliveryOrderModel=Products deliveries receipt model
+DeliveryOrderNumberingModules=Način označavanja primke proizvoda
+DeliveryOrderModel=Model primke proizvoda
 DeliveriesOrderAbility=Support products deliveries receipts
-FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+FreeLegalTextOnDeliveryReceipts=Slobodan unos teksta na primkama
 ##### FCKeditor #####
-AdvancedEditor=Advanced editor
-ActivateFCKeditor=Activate advanced editor for:
+AdvancedEditor=Napredni uređivač
+ActivateFCKeditor=Aktiviraj napredni uređivač za: 
 FCKeditorForCompany=WYSIWIG creation/edition of elements description and note (except products/services)
 FCKeditorForProduct=WYSIWIG creation/edition of products/services description and note
 FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). <font class="warning">Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.</font>
@@ -1375,192 +1400,194 @@ OSCommerceTestOk=Connection to server '%s' on database '%s' with user '%s' succe
 OSCommerceTestKo1=Connection to server '%s' succeed but database '%s' could not be reached.
 OSCommerceTestKo2=Connection to server '%s' with user '%s' failed.
 ##### Stock #####
-StockSetup=Warehouse module setup
+StockSetup=Podešavanje modula skladišta
 IfYouUsePointOfSaleCheckModule=If you use a Point of Sale module (POS module provided by default or another external module), this setup may be ignored by your Point Of Sale module. Most point of sales modules are designed to create immediatly an invoice and decrease stock by default whatever are options here. So, if you need or not to have a stock decrease when registering a sell from your Point Of Sale, check also your POS module set up.
 ##### Menu #####
-MenuDeleted=Menu deleted
-Menus=Menus
-TreeMenuPersonalized=Personalized menus
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
-NewMenu=New menu
-Menu=Selection of menu
-MenuHandler=Menu handler
-MenuModule=Source module
-HideUnauthorizedMenu= Hide unauthorized menus (gray)
-DetailId=Id menu
-DetailMenuHandler=Menu handler where to show new menu
-DetailMenuModule=Module name if menu entry come from a module
-DetailType=Type of menu (top or left)
-DetailTitre=Menu label or label code for translation
+MenuDeleted=Izbornik obrisan
+Menus=Izbornici
+TreeMenuPersonalized=Personizirani izbornik
+NotTopTreeMenuPersonalized=Osobni izbornici nisu povezani na gornji izbornik
+NewMenu=Novi izbornik
+Menu=Odabir za izbornik
+MenuHandler=Nosioc izbornika
+MenuModule=Izvorni modul
+HideUnauthorizedMenu= Sakrij neautorizirane izbornike (sivo)
+DetailId=ID Izbornika
+DetailMenuHandler=Nosioc izbornika gdje da se prikaže novi izbornik
+DetailMenuModule=Naziv modula ako stavka izbornika dolazi iz modula
+DetailType=Tip izbornika (gore ili lijevi)
+DetailTitre=Oznaka izbornika ili oznaka koda za prijevod
 DetailUrl=URL where menu send you (Absolute URL link or external link with http://)
-DetailEnabled=Condition to show or not entry
-DetailRight=Condition to display unauthorized grey menus
-DetailLangs=Lang file name for label code translation
-DetailUser=Intern / Extern / All
-Target=Target
-DetailTarget=Target for links (_blank top open a new window)
+DetailEnabled=Uvjet za prikaz stavke ili ne
+DetailRight=Uvjet za prikaz neautoroziranih sivih izbornika
+DetailLangs=Jezična datoteka za oznakz koda prijevoda
+DetailUser=Interni / Vanjski / Svi
+Target=Cilj
+DetailTarget=Cilj za poveznice (_blank otvara u novom prozoru)
 DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Delete menu entry
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?
-FailedToInitializeMenu=Failed to initialize menu
+ModifMenu=Promjena izbornika
+DeleteMenu=Obriši stavku izbornika
+ConfirmDeleteMenu=Jeste li sigurni da želite obrisati stavku izbornika <b>%s</b>?
+FailedToInitializeMenu=Neuspješna inicijalizacija izbornika
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
-OptionVatMode=VAT due
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
-OptionVatDefaultDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on payments for services
-OptionVatDebitOptionDesc=VAT is due:<br>- on delivery for goods (we use invoice date)<br>- on invoice (debit) for services
-SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
-OnDelivery=On delivery
-OnPayment=On payment
-OnInvoice=On invoice
-SupposedToBePaymentDate=Payment date used
-SupposedToBeInvoiceDate=Invoice date used
-Buy=Buy
-Sell=Sell
-InvoiceDateUsed=Invoice date used
+TaxSetup=Podešavanje modula poreza, društvenih ili fiskalnih poreza i dividendi
+OptionVatMode=PDV koji dospjeva
+OptionVATDefault=Gotovinska osnova
+OptionVATDebitOption=Obračunska osnova
+OptionVatDefaultDesc=PDV koji dospjeva: <br>- kod isporuke dobara (koristimo datum računa)<br>-kod plaćanja za usluge
+OptionVatDebitOptionDesc=PDV koji dospjeva: <br>- kod isporuke dobara (koristimo datum računa)<br>-kod računa (zaduženja) za usluge
+SummaryOfVatExigibilityUsedByDefault=Vrijeme PDV obaveze zadano ovisno o odabranim opcijama:
+OnDelivery=Po isporuci
+OnPayment=Po uplati
+OnInvoice=Po računu
+SupposedToBePaymentDate=Korišten datum plaćanja
+SupposedToBeInvoiceDate=Korišten datum računa
+Buy=Kupi
+Sell=Prodaj
+InvoiceDateUsed=Korišten datum računa
 YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Setup - Company/Foundation), so there is no VAT options to setup.
-AccountancyCode=Accountancy Code
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCode=Konto
+AccountancyCodeSell=Konto prodaje
+AccountancyCodeBuy=Konto nabave
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
+AgendaSetup=Podešavanje modula događaja i agende
 PasswordTogetVCalExport=Key to authorize export link
-PastDelayVCalExport=Do not export event older than
+PastDelayVCalExport=Nemoj izvoziti događaj stariji od
 AGENDA_USE_EVENT_TYPE=Use events types (managed into menu Setup -> Dictionary -> Type of agenda events)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
-AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
-AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into search filter of agenda view
-AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
+AGENDA_DEFAULT_FILTER_TYPE=Postavi automatski ovaj tip događaja u filter pretraživanja na prikazu agende.
+AGENDA_DEFAULT_FILTER_STATUS=Postavi automatski ovaj status u filter pretraživanja na prikazu agende.
+AGENDA_DEFAULT_VIEW=Koji tab želite da se otvori kod odabira izbornika Agenda
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sales (CashDesk) #####
-CashDesk=Point of sales
-CashDeskSetup=Point of sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sells
-CashDeskBankAccountForSell=Default account to use to receive cash payments
-CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
-CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
+CashDesk=POS
+CashDeskSetup=Podešavanja modula POS
+CashDeskThirdPartyForSell=Predefinirani generčki komitent za prodaju
+CashDeskBankAccountForSell=Zadani račun za prijem gotovinskih uplata
+CashDeskBankAccountForCheque= Zadani račun za prijem čekovnih uplata
+CashDeskBankAccountForCB= Zadani račun za prijem plačanja kreditnim karticama
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
-CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
+CashDeskIdWareHouse=Forsiraj i ograniči skladište za skidanje zaliha
+StockDecreaseForPointOfSaleDisabled=Skidanje zaliha iz POS-a je onemogućeno
+StockDecreaseForPointOfSaleDisabledbyBatch=Skidanje zaliha na POS-u nije kompatibilno s upravljanjem lota
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
+BookmarkSetup=Podešavanje modula zabilješki
 BookmarkDesc=This module allows you to manage bookmarks. You can also add shortcuts to any Dolibarr pages or externale web sites on your left menu.
 NbOfBoomarkToShow=Maximum number of bookmarks to show in left menu
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
+WebServicesSetup=Podešavanje modula webservisa
 WebServicesDesc=By enabling this module, Dolibarr become a web service server to provide miscellaneous web services.
 WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
 EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at Url
 ##### API ####
-ApiSetup=API module setup
+ApiSetup=Podešavanje API modula
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=Možete istražiti API na URL
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
+ApiKey=API Key
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Free text on cheque receipts
+BankSetupModule=Podešavanje modula banka
+FreeLegalTextOnChequeReceipts=Slobodan unos teksta na čekovnim primkama
 BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display order
-BankOrderES=Spanish
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
+BankOrderGlobal=Generalno
+BankOrderGlobalDesc=Glavni red prikaza
+BankOrderES=Španjolski
+BankOrderESDesc=Španjolski red prikaza
+ChequeReceiptsNumberingModule=Način označavanja čekovnih primki
 
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=Više poduzeća module podešavanje
 ##### Suppliers #####
-SuppliersSetup=Supplier module setup
-SuppliersCommandModel=Complete template of supplier order (logo...)
-SuppliersInvoiceModel=Complete template of supplier invoice (logo...)
-SuppliersInvoiceNumberingModel=Supplier invoices numbering models
+SuppliersSetup=Podešavanje modula dobavljača
+SuppliersCommandModel=Kompletan predložak narudžbe dobavljača (logo...)
+SuppliersInvoiceModel=Kompletan predložak računa dobavljača (logo...)
+SuppliersInvoiceNumberingModel=Način označavanja računa dobavljača
 IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
+GeoIPMaxmindSetup=Podešavanje modula GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
-TestGeoIPResult=Test of a conversion IP -> country
+TestGeoIPResult=Testiranje konverzije IP -> zemlja
 ##### Projects #####
-ProjectsNumberingModules=Projects numbering module
-ProjectsSetup=Project module setup
-ProjectsModelModule=Project reports document model
-TasksNumberingModules=Tasks numbering module
-TaskModelModule=Tasks reports document model
+ProjectsNumberingModules=Način označavanja projekata
+ProjectsSetup=Podešavanje modula projekata
+ProjectsModelModule=Model dokumenata projektnih izvještaja
+TasksNumberingModules=Način označavanja zadataka
+TaskModelModule=Model dokumenata izvještaja zadataka
 UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-AlwaysEditable=Can always be edited
+FiscalYears=Fisklane godine
+FiscalYearCard=Kartica fiskalne godine
+NewFiscalYear=Nova fiskalna godina
+OpenFiscalYear=Otvori fiskalnu godinu
+CloseFiscalYear=Zatvori fiskalnu godinu
+DeleteFiscalYear=Obriši fiskalnu godinu
+ConfirmDeleteFiscalYear=Jeste li sigurni da želite obrisati fiskalnu godinu ?
+ShowFiscalYear=Show fiscal year
+AlwaysEditable=Uvijek može biti izmjenjen
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
 NbNumMin=Minimum number of numeric characters
 NbSpeMin=Minimum number of special characters
 NbIteConsecutive=Maximum number of repeating same characters
 NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
+SalariesSetup=Podešavanje modula plaća
+SortOrder=Redosljed sortiranja
 Format=Format
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
 IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
+ExpenseReportsSetup=Podešavanje modula Izvještaji troška
+TemplatePDFExpenseReports=Predlošci dokumenta za generiranje izvještaja troška
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=List of fixed notifications
-GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build database backup dump file
+ListOfNotificationsPerUser=Popis obavijesti po korisniku *
+ListOfNotificationsPerUserOrContact=Popis obavijesti po korisniku* ili po kontaktu **
+ListOfFixedNotifications=Popis stalnih obavijesti
+GoOntoUserCardToAddMore=Idite na tab "Obavijesti" korisnika za dodavanje ili micanje obavijesti za korisnike
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Najviše dopušteno
+BackupDumpWizard=Čarobnjak za izradu backup-a baze podataka
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
-LinkColor=Color of links
+TextTitleColor=Boja naslova stranice
+LinkColor=Boja poveznica
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
+BackgroundColor=Boja pozadine
+TopMenuBackgroundColor=Boja pozadine za gornji izbornik
+TopMenuDisableImages=Sakrij slike u gornjem izborniku
+LeftMenuBackgroundColor=Boja pozadine lijevog izbornika
+BackgroundTableTitleColor=Boja pozadine za zaglavlje tablica
+BackgroundTableLineOddColor=Boja pozadine za neparne redove u tablici
+BackgroundTableLineEvenColor=Boja pozadine za parne redove u tablici
 MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
 NbAddedAutomatically=Number of days added to counters of users (automatically) each month
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
+SellTaxRate=Stopa prodajnog poreza
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-FixTZ=TimeZone fix
+TypeOfTemplate=Tip predloška
+TemplateIsVisibleByOwnerOnly=Predložak je vidljiv samo vlasniku
+FixTZ=Ispravak vremenske zone
 FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
-ExpectedChecksum=Expected Checksum
-CurrentChecksum=Current Checksum
+ExpectedChecksum=Očekivani checksum
+CurrentChecksum=Trenutni checksum
 MailToSendProposal=To send customer proposal
 MailToSendOrder=To send customer order
 MailToSendInvoice=To send customer invoice
@@ -1569,34 +1596,39 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+MailToThirdparty=To send email from third party page
+ByDefaultInList=Prikaži kao zadano na popisu
+YouUseLastStableVersion=Koristite zadnju stabilnu verziju
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
+ModelModulesProduct=Predlošci za dokumente proizvoda
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
-SeeSubstitutionVars=See * note for list of possible substitution variables
-AllPublishers=All publishers
-UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
+SeeSubstitutionVars=Vidi * napomenu za popis mogućih zamjenskih varijabli
+AllPublishers=Svi izdavači
+UnknownPublishers=Nepoznati izdavači
+AddRemoveTabs=Dodaj ili makni tabove
+AddDictionaries=Dodaj definicije
+AddBoxes=Dodaj dodatke
+AddSheduledJobs=Dodaj planirani posao
+AddHooks=Dodaj hooks
+AddTriggers=Dodaj triggers
+AddMenus=Dodaj izbornike
+AddPermissions=Dodaj dozvole
+AddExportProfiles=Dodaj izvozne profile
+AddImportProfiles=Dodaj uvozne profile
+AddOtherPagesOrServices=Dodaj ostale stranice ili usluge
+AddModels=Dodaj predloške dokumenta ili brojanja
 AddSubstitutions=Add keys substitutions
-DetectionNotPossible=Detection not possible
+DetectionNotPossible=Detekcija nije moguća
 UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and will be checked on each future access)
-ListOfAvailableAPIs=List of available APIs
+ListOfAvailableAPIs=Popis dostupnih APIa
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Odredišna stranica
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index cf3959094ce..71623736487 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -4,92 +4,92 @@ Actions=Događaji
 Agenda=Podsjetnik
 Agendas=Podsjetnici
 Calendar=Kalendar
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
+LocalAgenda=Interni kalendar
+ActionsOwnedBy=Događaj u vlasništvu
+ActionsOwnedByShort=Vlasnik
 AffectedTo=Dodjeljeno korisniku
-Event=Event
+Event=Događaj
 Events=Događaj
 EventsNb=Broj događaja
 ListOfActions=Lista događaja
 Location=Lokacija
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Bilo kojem korisniku u grupi
 EventOnFullDay=Događaji za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Svi prekinuti događaji
 MenuToDoMyActions=Svi nedovršeni događaji
 MenuDoneMyActions=Moji prekinuti događaji
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=Popis događaja (Interni kalendar)
 ActionsAskedBy=Događaje izvijestio/la
 ActionsToDoBy=Događaj dodjeljen
 ActionsDoneBy=Događaji završeni od strane korisnika
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Događaj dodjeljen
 ViewCal=Mjesečni pregled
 ViewDay=Dnevni pregled
 ViewWeek=Tjedni pregled
-ViewPerUser=Per user view
-ViewPerType=Per type view
+ViewPerUser=Pregled po korisniku
+ViewPerType=Pregled po tipu
 AutoActions= Automasko filtriranje
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaAutoActionDesc= Ovdje definirajte događaje koje želite da Dolibarr kreira automatski u podsjetnik. Ako ništa nije označeno, samo manualne akcije će biti uključene u log i vidljive u podsjetniku. Automatsko pračenje poslovnih akcija napravljene na objektima ( provjera, promjena statusa) neće biti spremljena.
 AgendaSetupOtherDesc= Ova stranica omogućava opcije za izvoz događaja u vanjski kalendar (thunderbird, google calendar, ...)
 AgendaExtSitesDesc=Ova stranica omogućuje postavu vanjskih izvora kalendara kako bi se mogli viditi svoje događaje u Dolibarr podsjetnicima
 ActionsEvents=Događaji za koje Dolibarr će kreirat akcije u podsjetnicima automatski
 PropalValidatedInDolibarr=Ponuda %s ovjerena
 InvoiceValidatedInDolibarr=Račun %s ovjeren
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Račun %s ovjeren na POS-u
 InvoiceBackToDraftInDolibarr=Račun %s  vraćen u status skice
 InvoiceDeleteDolibarr=Račun %s obrisan
 OrderValidatedInDolibarr=Narudžba %s ovjerena
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Narudžba %s označena kao isporučena
 OrderCanceledInDolibarr=Narudžba %s otkazana
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Narudžba %s označena kao naplaćena
 OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Narudžba %s je odbijena
 OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice
-ProposalSentByEMail=Komercijalni prijedlog %s poslan putem Emaila
-OrderSentByEMail=Narudžba kupca %s poslana putem Emaila
-InvoiceSentByEMail=Račun kupca %s poslan Emailom
-SupplierOrderSentByEMail=Narudžba dobavljača %s poslana Emailom
-SupplierInvoiceSentByEMail=Račun dobavljača %s poslan Emailom
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
-NewCompanyToDolibarr= Treća stranka stvorena
+ProposalSentByEMail=Ponuda %s poslana putem e-pošte
+OrderSentByEMail=Narudžba kupca %s poslana putem e-pošte
+InvoiceSentByEMail=Račun kupca %s poslan putem e-pošte
+SupplierOrderSentByEMail=Narudžba dobavljača %s poslana putem e-pošte
+SupplierInvoiceSentByEMail=Račun dobavljača %s poslan putem e-pošte
+ShippingSentByEMail=Pošiljka %s poslana e-poštom
+ShippingValidated= Pošiljka %s je ovjerena
+InterventionSentByEMail=Intervencija %s poslana putem e-pošte
+ProposalDeleted=Ponuda obrisana
+OrderDeleted=Narudžba obrisana
+InvoiceDeleted=Račun obrisan
+NewCompanyToDolibarr= Komitent kreiran
 DateActionStart= Datum početka
 DateActionEnd= Datum završetka
 AgendaUrlOptions1=Možete isto dodati sljedeće paramete za filtriranje prikazanog: 
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptions4=<b>Prijava=%s</b>da se ograniči prikaz na akcije dodijeljene korisniku  <b>%s</b>.
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
+AgendaUrlOptions2=<b>login=%s</b> da se ograniči prikaz na akcije kreirane od ili dodjeljene korisniku  <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> da se ograniči prikaz na akcije u vlasništvu korisnika <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> da se ograniči prikaz na akcije dodijeljene korisniku  <b>%s</b>.
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> da se ograniči prikaz na akcije dodjeljene projektu <b>PROJECT_ID</b>.
+AgendaShowBirthdayEvents=Prikaži rođendane kontakata
+AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista podsjetnika događaja
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Već utvrđeni raspon radnih dana u tjednu (npr. 1-5, 1-6)
+DefaultWorkingHours=Već utvrđeno dnevno radno vrijeme (npr. 9-18)
 # External Sites ical
 ExportCal=Izvezi kalendar
 ExtSites=Uvezi vanjski kalendar
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Prikaz vanjskih kalendara ( postavljenih u globalnim postavkama) u podsjetniku. Ne utječe na vanjske kalendare definirane od strane korisnika.
 ExtSitesNbOfAgenda=Broj kalendara
 AgendaExtNb=Calendar broj %s
 ExtSiteUrlAgenda=URL za pristup .ical datoteki
 ExtSiteNoLabel=Bez opisa
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
-CloneAction=Clone event
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
-RepeatEvent=Repeat event
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+VisibleTimeRange=Vidljivi vremenski raspon
+VisibleDaysRange=Vidljivi dnevni raspon
+AddEvent=Kreiraj događaj
+MyAvailability=Moja dostupnost
+ActionType=Tip događaja
+DateActionBegin=Datum početka događaja
+CloneAction=Kloniraj događaj
+ConfirmCloneEvent=Jeste li sigurni da želite klonirati događaj <b>%s</b>
+RepeatEvent=Ponovi događaj
+EveryWeek=Svaki tjedan
+EveryMonth=Svaki mjesec
+DayOfMonth=Dan u mjesecu
+DayOfWeek=Dan u tjednu
+DateStartPlusOne=Datum početka + 1 sat
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 6b9914856bd..0e79b6b6451 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -5,140 +5,143 @@ BankName=Ime banke
 FinancialAccount=Račun
 BankAccount=Bankovni račun
 BankAccounts=Bankovni računi
-ShowAccount=Show Account
-AccountRef=Financial account ref
-AccountLabel=Financial account label
-CashAccount=Cash account
-CashAccounts=Cash accounts
-CurrentAccounts=Current accounts
+ShowAccount=Prikaži račun
+AccountRef=Financijski račun ref.
+AccountLabel=Oznaka financijskog računa
+CashAccount=Gotovinski račun
+CashAccounts=Gotovinski računi
+CurrentAccounts=Trenutni računi
 SavingAccounts=Štedni računi
-ErrorBankLabelAlreadyExists=Financial account label already exists
-BankBalance=Balance
-BankBalanceBefore=Balance before
-BankBalanceAfter=Balance after
-BalanceMinimalAllowed=Minimum allowed balance
-BalanceMinimalDesired=Minimum desired balance
-InitialBankBalance=Initial balance
-EndBankBalance=End balance
-CurrentBalance=Current balance
-FutureBalance=Future balance
-ShowAllTimeBalance=Show balance from start
-AllTime=From start
-Reconciliation=Reconciliation
-RIB=Bank Account Number
+ErrorBankLabelAlreadyExists=Oznaka financijskog računa već postoji
+BankBalance=Stanje računa
+BankBalanceBefore=Stanje prije
+BankBalanceAfter=Stanje nakon
+BalanceMinimalAllowed=Minimalno dozvoljeno stanje
+BalanceMinimalDesired=Minimalno željeno stanje
+InitialBankBalance=Početno stanje
+EndBankBalance=Završno stanje
+CurrentBalance=Trenutno stanje
+FutureBalance=Buduće stanje
+ShowAllTimeBalance=Prikaži stanje od početka
+AllTime=Od početka
+Reconciliation=Usklađivanje
+RIB=Broj bankovnog računa
 IBAN=IBAN broj
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
-BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Otvorene narudžbe
-StandingOrder=Otvorena narudžba
-AccountStatement=Account statement
-AccountStatementShort=Statement
-AccountStatements=Account statements
-LastAccountStatements=Last account statements
-IOMonthlyReporting=Monthly reporting
-BankAccountDomiciliation=Account address
-BankAccountCountry=Account country
-BankAccountOwner=Account owner name
-BankAccountOwnerAddress=Account owner address
-RIBControlError=Integrity check of values fails. This means information for this account number are not complete or wrong (check country, numbers and IBAN).
+BIC=BIC/SWIFT broj
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
+AccountStatement=Izvod računa
+AccountStatementShort=Izvod
+AccountStatements=Izvodi računa
+LastAccountStatements=Posljednji izvod računa
+IOMonthlyReporting=Mjesećni izvještaj
+BankAccountDomiciliation=Adresa računa
+BankAccountCountry=Država računa
+BankAccountOwner=Naziv vlasnika računa
+BankAccountOwnerAddress=Adresa vlasinka računa
+RIBControlError=Neispravne vrijednosti. Ovo znači da informacije za ovaj račun nisu potpune ili su krive ( provjerite državu, brojeve i IBAN).
 CreateAccount=Kreiraj račun
 NewAccount=Novi račun
-NewFinancialAccount=New financial account
-MenuNewFinancialAccount=New financial account
+NewFinancialAccount=Novi financijski račun
+MenuNewFinancialAccount=Novi financijski račun
 EditFinancialAccount=Uredi račun
-LabelBankCashAccount=Bank or cash label
+LabelBankCashAccount=Oznaka za banku ili gotovinu
 AccountType=Tip računa
-BankType0=Savings account
-BankType1=Current or credit card account
-BankType2=Cash account
-AccountsArea=Accounts area
-AccountCard=Account card
-DeleteAccount=Delete account
-ConfirmDeleteAccount=Are you sure you want to delete this account ?
+BankType0=Štedni račun
+BankType1=Trenutni ili račun kreditne kartice
+BankType2=Gotovinski račun
+AccountsArea=Sučelje računa
+AccountCard=Kartica računa
+DeleteAccount=Brisanje računa
+ConfirmDeleteAccount=Jeste li sigurni da želite obrisati ovaj račun ?
 Account=Račun
-BankTransactionByCategories=Bank transactions by categories
-BankTransactionForCategory=Bank transactions for category <b>%s</b>
-RemoveFromRubrique=Remove link with category
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the transaction and the category ?
-ListBankTransactions=List of bank transactions
-IdTransaction=Transaction ID
-BankTransactions=Bank transactions
-ListTransactions=List transactions
-ListTransactionsByCategory=List transaction/category
-TransactionsToConciliate=Transactions to reconcile
-Conciliable=Can be reconciled
-Conciliate=Reconcile
-Conciliation=Reconciliation
-IncludeClosedAccount=Include closed accounts
-OnlyOpenedAccount=Only open accounts
-AccountToCredit=Account to credit
-AccountToDebit=Account to debit
-DisableConciliation=Disable reconciliation feature for this account
-ConciliationDisabled=Reconciliation feature disabled
-StatusAccountOpened=Open
+BankTransactionByCategories=Bankovne transakcije po kategorijama
+BankTransactionForCategory=Bankovne transakcije za kategoriju <b>%s</b>
+RemoveFromRubrique=Maknite vezu s kategorijom
+RemoveFromRubriqueConfirm=Jeste li sigurni da želite maknuti vezu između transakcije i kategorije ?
+ListBankTransactions=Popis bankovnih transakcija
+IdTransaction=ID Transakcije
+BankTransactions=Bankovne transakcije
+ListTransactions=Popis transakcija
+ListTransactionsByCategory=Popis transakcija/kategorija
+TransactionsToConciliate=Transakcije za usklađenje
+Conciliable=Može se uskladiti
+Conciliate=Uskladi
+Conciliation=Usklađivanje
+IncludeClosedAccount=Uključujući i zatvorene račune
+OnlyOpenedAccount=Samo otvoreni računi
+AccountToCredit=Račun za kreditiranje
+AccountToDebit=Račun za terećenje
+DisableConciliation=Onemogući usklađivanje za ovaj račun
+ConciliationDisabled=Mogučnost usklađivanja je onemogućena
+LinkedToAConciliatedTransaction=Povezano s usklađenom transakcijom
+StatusAccountOpened=Otvoren
 StatusAccountClosed=Zatvoren
 AccountIdShort=Broj
 LineRecord=Transakcija
 AddBankRecord=Dodaj transakciju
 AddBankRecordLong=Dodaj transakciju ručno
-ConciliatedBy=Reconciled by
-DateConciliating=Reconcile date
-BankLineConciliated=Transaction reconciled
-CustomerInvoicePayment=Customer payment
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
-WithdrawalPayment=Withdrawal payment
-SocialContributionPayment=Social/fiscal tax payment
+ConciliatedBy=Uskladio
+DateConciliating=Datum usklađenja
+BankLineConciliated=Transakcija usklađena
+Reconciled=Reconciled
+NotReconciled=Not reconciled
+CustomerInvoicePayment=Plaćanje kupca
+SupplierInvoicePayment=Plaćanje dobavljaču
+SubscriptionPayment=Plaćanje pretplate
+WithdrawalPayment=Isplata
+SocialContributionPayment=Plaćanje društveni/fiskalni porez
 BankTransfer=Bankovni transfer
 BankTransfers=Bankovni transferi
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Interni prijenos
+TransferDesc=Prebacivanje s jednog na drugi račun, Dolibarr će zapisati dva podatka (isplatu u izvornom računu i uplatu na odredišnom računu. Isti iznos (osim znaka), oznaka, datum će biti korišteno za ovu transakciju)
 TransferFrom=Od
 TransferTo=Za
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
-CheckTransmitter=Transmitter
-ValidateCheckReceipt=Validate this check receipt ?
-ConfirmValidateCheckReceipt=Are you sure you want to validate this check receipt, no change will be possible once this is done ?
-DeleteCheckReceipt=Delete this check receipt ?
-ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt ?
-BankChecks=Bank checks
-BankChecksToReceipt=Checks awaiting deposit
-ShowCheckReceipt=Show check deposit receipt
-NumberOfCheques=Nb of check
+TransferFromToDone=Prijenos sa <b>%s</b> na <b>%s</b> od <b>%s</b> %s je pohranjen.
+CheckTransmitter=Pošiljatelj
+ValidateCheckReceipt=Ovjera ove čekovne potvrde ?
+ConfirmValidateCheckReceipt=Jeste li sigurni da želite potvrditi ovu čekovnu potvrdu, nakon toga ne možete napraviti nikakvu promjenu ?
+DeleteCheckReceipt=Obriši ovu čekovnu potvrdu ?
+ConfirmDeleteCheckReceipt=Jeste li sigurni da želite izbrisati ovu čekovnu potvrdu?
+BankChecks=Bankovni čekovi
+BankChecksToReceipt=Čekovi koji čekaju depozit
+ShowCheckReceipt=Prikaži potvrdu depozita čeka
+NumberOfCheques=Br čekova
 DeleteTransaction=Obriši transakciju
-ConfirmDeleteTransaction=Are you sure you want to delete this transaction ?
-ThisWillAlsoDeleteBankRecord=This will also delete generated bank transactions
-BankMovements=Movements
-PlannedTransactions=Planned transactions
-Graph=Graphics
-ExportDataset_banque_1=Bank transactions and account statement
-ExportDataset_banque_2=Deposit slip
-TransactionOnTheOtherAccount=Transaction on the other account
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Payment number could not be updated
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Payment date could not be updated
-Transactions=Transactions
-BankTransactionLine=Bank transaction
-AllAccounts=All bank/cash accounts
-BackToAccount=Back to account
-ShowAllAccounts=Show for all accounts
-FutureTransaction=Transaction in futur. No way to conciliate.
-SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
-EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
-ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+ConfirmDeleteTransaction=Jeste li sigurni da želite obrisati ovu transakciju ?
+ThisWillAlsoDeleteBankRecord=Ovo će isto obrisati generirane bankovne transakcije
+BankMovements=Promjene
+PlannedTransactions=Planirane transakcije
+Graph=Grafovi
+ExportDataset_banque_1=Bankovne transakcije i izvodi
+ExportDataset_banque_2=Potvrda pologa
+TransactionOnTheOtherAccount=Transakcije na drugom računu
+PaymentNumberUpdateSucceeded=Broj uplate je uspješno promjenjen
+PaymentNumberUpdateFailed=Broj uplate ne može se promjeniti
+PaymentDateUpdateSucceeded=Datum uplate je uspješno promjenjen
+PaymentDateUpdateFailed=Datum uplate se ne može promjeniti
+Transactions=Transakcije
+BankTransactionLine=Bankovne transakcije
+AllAccounts=Svi bankovni/gotovinski računi
+BackToAccount=Povratak na račun
+ShowAllAccounts=Prikaži za sve račune
+FutureTransaction=Transakcija je u budućnosti. Ne može se uskladiti.
+SelectChequeTransactionAndGenerate=Odaberite/filtrirajte čekove koje želite uključiti, odaberite potvrdu depozita i kliknite "Kreiraj"
+InputReceiptNumber=Odaberite bankovni izvod povezan s usklađenjem. Koristite numeričke vrijednosti: YYYYMM ili YYYYMMDD radi sortiranja
+EventualyAddCategory=Konačno, odredite kategoriju u koju želite svrstati podatke
+ToConciliate=To reconcile ?
+ThenCheckLinesAndConciliate=Tada, označite stavke na izvodu i kliknite
+DefaultRIB=Predefinirani BAN
+AllRIB=Svi BAN-ovi
+LabelRIB=Oznaka BAN-a
+NoBANRecord=Nema podataka o BAN-u
+DeleteARib=Obrišite BAN podatak
+ConfirmDeleteRib=Jeste li sigurni da želite obrisati ovaj BAN podatak ?
+RejectCheck=Ček vračen
+ConfirmRejectCheck=Jeste li sigurni da želite ovaj ček označiti kao odbijen ?
+RejectCheckDate=Datum povratka čeka
+CheckRejected=Ček vračen
+CheckRejectedAndInvoicesReopened=Ček je vračen i računi su ponovo otvoreni
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 5f3ec178a0e..c5f442729c2 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Račun
 Bills=Računi
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Računi za kupce
+BillsCustomer=Računi kupaca
+BillsSuppliers=Računi dobavljača
+BillsCustomersUnpaid=Neplaćeni računi za kupce
 BillsCustomersUnpaidForCompany=Neplaćeni računi kupca za %s
 BillsSuppliersUnpaid=Neplaćeni računi dobavljača
 BillsSuppliersUnpaidForCompany=Neplaćeni računi dobavljača za %s
 BillsLate=Zakašnjela plaćanja
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatistics=Statistika računa kupaca
+BillsStatisticsSuppliers=Statistika računa dobavljača
+DisabledBecauseNotErasable=Onemogućeno jer ne može biti obrisano
 InvoiceStandard=Običan račun
 InvoiceStandardAsk=Običan račun
 InvoiceStandardDesc=Ovo je uobičajeni tip računa.
@@ -24,12 +24,12 @@ InvoiceProFormaDesc=<b> Predračun </ b> je kopija pravog računa, ali nema knji
 InvoiceReplacement=Zamjenski račun
 InvoiceReplacementAsk=Zamjenski račun za račun
 InvoiceReplacementDesc=<b>Zamjenski račun</b>koristi se za opozivanje i zamjenu postojećeg računa koji još nije plaćen. <br><br>Bilješka: Mogu biti zamijenjeni samo računi uz koje nije vezano nikakvo plaćanje. Ako račun kojeg mijenjate nije još zatvoren, bit će samostalno zatvoren kao "napušten".
-InvoiceAvoir=Bonifikacija
-InvoiceAvoirAsk=Bonifikacija za ispravan račun
+InvoiceAvoir=Odobrenje
+InvoiceAvoirAsk=Odobrenje za ispravak računa
 InvoiceAvoirDesc=<b>kredit<b> je negativan račun koji se koristi prilikom riješavanja problema koji nastaje kada je na računu drugačiji iznos od plaćenog (npr. kada je kupac uplatio više greškom ili neće platiti sve jer je jedan dio proizvoda vratio).
-invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
-invoiceAvoirWithPaymentRestAmount=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithLines=Kreiranje odobrenja  sa stavkama po izvornom računu
+invoiceAvoirWithPaymentRestAmount=Kreiranje odobrenja s neplačenim iznosom po izvornom računu
+invoiceAvoirLineWithPaymentRestAmount=Financijsko odobrenje za neplaćeni iznos
 ReplaceInvoice=Zamjeni račun %s
 ReplacementInvoice=Zamjenski račun
 ReplacedByInvoice=Zamijenjen s računom %s
@@ -56,14 +56,14 @@ SupplierBill=Račun dobavljača
 SupplierBills=Računi dobavljača
 Payment=Plaćanja
 PaymentBack=Povratno plaćanje
-CustomerInvoicePaymentBack=Payment back
+CustomerInvoicePaymentBack=Povrat plaćanja
 Payments=Plaćanja
 PaymentsBack=Povratna plaćanja
-paymentInInvoiceCurrency=in invoices currency
+paymentInInvoiceCurrency=po valuti računa
 PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
 ConfirmDeletePayment=Jeste li sigurni da želite izbrisati ovo plaćanje?
-ConfirmConvertToReduc=Do you want to convert this credit note or deposit into an absolute discount ?<br>The amount will so be saved among all discounts and could be used as a discount for a current or a future invoice for this customer.
+ConfirmConvertToReduc=Da li želite pretvoriti ovo odobrenje ili depozit u apsolutni rabat? <br> Iznos će biti pohranjen zajedno s svim rabatima i može se koristit kao rabat za sve tekuće i buduće račune kupca.
 SupplierPayments=Plaćanja dobavljačima
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
@@ -75,16 +75,16 @@ PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Izvršeni povrati plaćanja
 PaymentRule=Pravilo plaćanja
 PaymentMode=Oblik plaćanja
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
-PaymentModeShort=Payment type
-PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+IdPaymentMode=Oblik plaćanja (ID)
+LabelPaymentMode=Oblik plaćanja (oznaka)
+PaymentModeShort=Oblik plaćanja
+PaymentTerm=Uvjeti plaćanja
+PaymentConditions=Uvjeti plaćanja
+PaymentConditionsShort=Uvjeti plaćanja
 PaymentAmount=Iznos plaćanja
 ValidatePayment=Ovjeri plaćanje
 PaymentHigherThanReminderToPay=Plaćanje je veće nego podsjetnik za plaćanje
-HelpPaymentHigherThanReminderToPay=Attention, the payment amount of one or more bills is higher than the rest to pay. <br> Edit your entry, otherwise confirm and think about creating a credit note of the excess received for each overpaid invoices.
+HelpPaymentHigherThanReminderToPay=Pažnja, iznos plaćanja jednog ili više računa je veći nego ostatak plaćanja. <br> Promjenite Vaš unos, u suprotnom potvrdite i razmislite o kreiranju odborenja za primljeni višak za svaki pretplaćeni račun.
 HelpPaymentHigherThanReminderToPaySupplier=Upozorenje! Iznos uplate za jedan ili više računa viši je od iznosa preostalog za plaćanje. <br>izmjenite unos ili potvrdite.
 ClassifyPaid=Označi kao plaćeno
 ClassifyPaidPartially=Označi kao djelomično plaćeno
@@ -92,8 +92,8 @@ ClassifyCanceled=Označi kao napušteno
 ClassifyClosed=Označi kao zatvoreno
 ClassifyUnBilled=Klasificirati 'nefakturirano'
 CreateBill=Izradi račun
-CreateCreditNote=Create credit note
-AddBill=Create invoice or credit note
+CreateCreditNote=Izradi zadužnicu
+AddBill=Izradi račun ili kreditnu bilješku
 AddToDraftInvoices=Dodati u skice računa
 DeleteBill=Izbriši račun
 SearchACustomerInvoice=Traži račun za kupca
@@ -105,10 +105,10 @@ DoPaymentBack=Izvrši povrat plaćanja
 ConvertToReduc=Pretvori u budući popust
 EnterPaymentReceivedFromCustomer=Upiši zaprimljeno plaćanje kupca
 EnterPaymentDueToCustomer=Napravi 
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
 PriceBase=Osnovica
 BillStatus=Stanje računa
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Status generiranih računa
 BillStatusDraft=Skica (potrebno potvrditi)
 BillStatusPaid=Plaćeno
 BillStatusPaidBackOrConverted=Plaćeno ili pretvoreno u popust
@@ -142,10 +142,10 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne može se poništiti
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Radnje na računu
-RecurringInvoiceTemplate=Recurring invoice
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Not a recurring template invoice
+RecurringInvoiceTemplate=Predložak/ponavljajući račun
+NoQualifiedRecurringInvoiceTemplateFound=Ne postoji predložak pretplatničkog računa za genereiranje.
+FoundXQualifiedRecurringInvoiceTemplate=Pronađeno %s predložaka pretplatničkih računa za generiranje.
+NotARecurringInvoiceTemplate=Ne postoji predložak za pretplatnički račun
 NewBill=Novi račun
 LastBills=Zadnjih %s računa
 LastCustomersBills=Zadnjih %s računa kupaca
@@ -160,40 +160,40 @@ ConfirmDeleteBill=Jeste li sigurni da želite obrisati ovo plaćanje?
 ConfirmValidateBill=Jeste li sigurni da želite ovjeriti ovaj račun s brojem <b>%s</b>?
 ConfirmUnvalidateBill=Jeste li sigurni da želite račun <b>%s</b> promijeniti u skicu?
 ConfirmClassifyPaidBill=Jeste li sigurni da želite račun <b>%s</b> označiti kao plaćen?
-ConfirmCancelBill=Jeste li sigurni da poništiti račun <b>%s</b>?
+ConfirmCancelBill=Jeste li sigurni da želite poništiti račun <b>%s</b>?
 ConfirmCancelBillQuestion=Zašto želite ovaj račun označiti kao napušten?
 ConfirmClassifyPaidPartially=Jeste li sigurni da želite račun <b>%s</b> označiti kao plaćen?
 ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u cijelosti. Iz kojeg razloga ga želite zatvortiti?
-ConfirmClassifyPaidPartiallyReasonAvoir=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I regularise the VAT with a credit note.
-ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
-ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is a discount granted because payment was made before term. I recover the VAT on this discount without a credit note.
+ConfirmClassifyPaidPartiallyReasonAvoir=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Reguliramo PDV putem odobrenja.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Prihvaćam gubitak iznos PDV-a na ovom popustu.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Potražujem povrat poreza na popustu bez odobrenja.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ovaj izbor je moguć ako vaš račun je izdan s prikladnom napomenom. (Primjer «Samo porez koji odgovara cijeni koja je plaćena daje pravo na odbitak poreza»)
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen.
-ConfirmClassifyPaidPartiallyReasonOtherDesc=Use this choice if all other does not suit, for example in following situation:<br>- payment not complete because some products were shipped back<br>- amount claimed too important because a discount was forgotten<br>In all cases, amount over-claimed must be corrected in accountancy system by creating a credit note.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristi ovaj izbor ako ostali nisu prikladni, npr. u sljedećoj situaciji: <br> - uplata nije kompletna jer neki od proizvoda s vraćeni nazad <br> - iznos potraživanja je prevažan jer je izostavljen popust <br> U svim slučajevima, iznos prekoračenja mora biti ispravljen u računovodstvu kreiranjem odobrenja.
 ConfirmClassifyAbandonReasonOther=Drugo
-ConfirmClassifyAbandonReasonOtherDesc=This choice will be used in all other cases. For example because you plan to create a replacing invoice.
+ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor će biti korišten u svim ostalim slućajevima. Na primjer zato jer planirate kreirati zamjenski račun.
 ConfirmCustomerPayment=Potvrđujete li ovo plaćanje za <b>%s</b> %s ?
-ConfirmSupplierPayment=Imate li potvrdu ove unušene uplata <b>%s</b> %s ?
-ConfirmValidatePayment=Are you sure you want to validate this payment ? No change can be made once payment is validated.
+ConfirmSupplierPayment=Imate li potvrdu ove unesene uplate <b>%s</b> %s ?
+ConfirmValidatePayment=Jeste li sigurni da želite potvrditi plaćanje ? Nakon toga ne možete napraviti nikakvu promjenu.
 ValidateBill=Ovjeri račun
 UnvalidateBill=Neovjeren račun
 NumberOfBills=Broj računa
 NumberOfBillsByMonth=Broj računa po mjesecu
-AmountOfBills=Iznos računa
-AmountOfBillsByMonthHT=Iznos računa po mjesecu (bez PDV-a)
-ShowSocialContribution=Show social/fiscal tax
+AmountOfBills=Broj računa
+AmountOfBillsByMonthHT=Broj računa po mjesecu (bez PDV-a)
+ShowSocialContribution=Prikaži društveni/fiskalni porez
 ShowBill=Prikaži račun
 ShowInvoice=Prikaži račun
 ShowInvoiceReplace=Prikaži zamjenski računa
 ShowInvoiceAvoir=Prikaži bonifikaciju
 ShowInvoiceDeposit=Prikaži račun za polog
-ShowInvoiceSituation=Show situation invoice
+ShowInvoiceSituation=Prikaži račun etape
 ShowPayment=Prikaži plaćanje
 AlreadyPaid=Plaćeno do sada
 AlreadyPaidBack=Povrati do sada
@@ -206,11 +206,11 @@ Rest=U toku
 AmountExpected=Utvrđen iznos
 ExcessReceived=Previše primljeno
 EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
-EscompteOfferedShort=Discount
+EscompteOfferedShort=Rabat
 SendBillRef=Podnošenje računa %s
 SendReminderBillRef=Podnošenje Računa %s (podsjetnik)
-StandingOrders=Otvorene narudžbe
-StandingOrder=Otvorene narudžbe
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nema skica računa
 NoOtherDraftBills=Nema ostalih skica računa
 NoDraftInvoices=Nema skica računa
@@ -218,23 +218,23 @@ RefBill=Broj računa
 ToBill=Za naplatu
 RemainderToBill=Podsjetnik za naplatu
 SendBillByMail=Pošalji račun e-poštom
-SendReminderBillByMail=Pošalji odsjetnik e-poštom
-RelatedCommercialProposals=Povezane ponude
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+SendReminderBillByMail=Pošalji podsjetnik e-poštom
+RelatedCommercialProposals=Vezane ponude
+RelatedRecurringCustomerInvoices=Vezani pretplatnički računi za kupca
 MenuToValid=Za ovjeru
-DateMaxPayment=Plaćanje do
+DateMaxPayment=Dospijeće plaćanja
 DateInvoice=Datum računa
-DatePointOfTax=Point of tax
+DatePointOfTax=Porezna stavka
 NoInvoice=Nema računa
 ClassifyBill=Svrstavanje računa
-SupplierBillsToPay=Unpaid supplier invoices
-CustomerBillsUnpaid=Unpaid customer invoices
+SupplierBillsToPay=Neplaćeni računi dobavljača
+CustomerBillsUnpaid=Neplaćeni računi kupca
 NonPercuRecuperable=Nepovratno
 SetConditions=Odredi rok plaćanja
 SetMode=Odredi oblik plaćanja
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=Postavi prihodovnu markicu
 Billed=Nplaćeno
-RecurringInvoices=Recurring invoices
+RecurringInvoices=Pretplatnički računi
 RepeatableInvoice=Predložak računa
 RepeatableInvoices=Predlošci računa
 Repeatable=Predložak
@@ -268,8 +268,8 @@ Deposit=Polog
 Deposits=Polozi
 DiscountFromCreditNote=Popust iz bonifikacije %s
 DiscountFromDeposit=Plaćanja s računa za predujam %s
-AbsoluteDiscountUse=This kind of credit can be used on invoice before its validation
-CreditNoteDepositUse=Invoice must be validated to use this king of credits
+AbsoluteDiscountUse=Ovaj kredit se može koristit na računu prije ovjere
+CreditNoteDepositUse=Račun mora biti ovjeren prije korištenja ovog kredita
 NewGlobalDiscount=Novi apsolutni popust
 NewRelativeDiscount=Novi relativni popust
 NoteReason=Bilješka/Razlog
@@ -279,11 +279,11 @@ DiscountStillRemaining=Preostali popusti
 DiscountAlreadyCounted=Uračunati popusti
 BillAddress=Adresa za naplatu
 HelpEscompte=Ovaj popust zajamčen je jer je kupac izvršio plaćanje prije roka.
-HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
-HelpAbandonOther=This amount has been abandoned since it was an error (wrong customer or invoice replaced by an other for example)
-IdSocialContribution=Social/fiscal tax payment id
+HelpAbandonBadCustomer=Ovaj iznos neće biti plaćen (kupac je loš kupac) i smatra se kao gubitak.
+HelpAbandonOther=Ovaj iznos neće biti plaćen zbog greške (na primjer odabran je krivi kupac ili je račun zamjenjen drugim računom)
+IdSocialContribution=ID plaćanja društvenog/fiskalnog poreza
 PaymentId=Oznaka plaćanja
-PaymentRef=Payment ref.
+PaymentRef=Ref. plaćanja
 InvoiceId=Oznaka računa
 InvoiceRef=Broj računa
 InvoiceDateCreation=Datum izrade računa
@@ -297,82 +297,82 @@ InvoiceNotChecked=Račun nije izabran
 CloneInvoice=Kloniraj račun
 ConfirmCloneInvoice=Jeste li sigurni da želite klonirati ovaj račun <b>%s</b>?
 DisabledBecauseReplacedInvoice=Radnja obustavljena jer je račun zamjenjen.
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
+DescTaxAndDividendsArea=Ovo sučelje predstavlja sažetak svih plaćanja za specijalne troškove. Uključeni su samo podaci s plaćanjem u tekućoj godini.
 NbOfPayments=Broj plaćanja
 SplitDiscount=Podijeli popust u dva
 ConfirmSplitDiscount=Jeste li sigurni da želite podijeliti ovaj popust od <b>%s</b> %s u 2 manja popusta?
-TypeAmountOfEachNewDiscount=Input amount for each of two parts :
-TotalOfTwoDiscountMustEqualsOriginal=Total of two new discount must be equal to original discount amount.
+TypeAmountOfEachNewDiscount=Unesite iznos za svaku od oba dijela:
+TotalOfTwoDiscountMustEqualsOriginal=Ukupan zbroj dva nova rabata mora biti jednak kao originalni iznos rabata.
 ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
-RelatedCustomerInvoices=Related customer invoices
-RelatedSupplierInvoices=Related supplier invoices
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
-PaymentNote=Payment note
-ListOfPreviousSituationInvoices=List of previous situation invoices
-ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of latest generation
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
-GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
-DateIsNotEnough=Date not reached yet
-InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
+RelatedCustomerInvoices=Povezani računi kupca
+RelatedSupplierInvoices=Povezani računi dobavljača
+LatestRelatedBill=Posljednju vezani računi
+WarningBillExist=Upozorenje, jedan ili više računa već postoje
+MergingPDFTool=Alat za spajanje PDF dokumenta
+AmountPaymentDistributedOnInvoice=Plaćeni iznos je prosljeđen po računu
+PaymentOnDifferentThirdBills=Dopusti plaćanja za različite račune, ali od iste matične tvrtke
+PaymentNote=Obavijest plaćanja
+ListOfPreviousSituationInvoices=Popis prijašnjih računa etape
+ListOfNextSituationInvoices=Popis narednih računa etapa
+FrequencyPer_d=Svakih %s dana
+FrequencyPer_m=Svakih %s mjeseci
+FrequencyPer_y=Svakih %s godina
+toolTipFrequency=Primjeri:<br /><b>Postavite 7 / dan</b>: izdaje novi račun svakih 7 dana<br /><b>Postavite 3 / mjesec</b>: izdaje novi račun svaka 3 mjeseca
+NextDateToExecution=Datum generiranja sljedećeg računa
+DateLastGeneration=Datum zadnjeg generiranja
+MaxPeriodNumber=Maksimalni br. generiranja računa
+NbOfGenerationDone=Br. već generiranih računa
+MaxGenerationReached=Dosegnut maksimalan br. generiranih računa
+InvoiceAutoValidate=Automatska ovjera računa
+GeneratedFromRecurringInvoice=Pretplatnički račun generiran iz predloška %s
+DateIsNotEnough=Datum nije još dosegnut
+InvoiceGeneratedFromTemplate=Račun %s generiran iz predloška pretplatničkog računa %s
 # PaymentConditions
 PaymentConditionShortRECEP=Odmah
 PaymentConditionRECEP=Odmah
 PaymentConditionShort30D=30 dana
 PaymentCondition30D=30 dana
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30 dana na kraju mjeseca
+PaymentCondition30DENDMONTH=Unutar 30 dana od kraja mjeseca
 PaymentConditionShort60D=60 dana
 PaymentCondition60D=60 dana
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60 dana na kraju mjeseca
+PaymentCondition60DENDMONTH=Unutar 60 dana od kraja mjeseca
 PaymentConditionShortPT_DELIVERY=Isporuka
 PaymentConditionPT_DELIVERY=Po primitku
-PaymentConditionShortPT_ORDER=Order
+PaymentConditionShortPT_ORDER=Narudžba
 PaymentConditionPT_ORDER=Po nalogu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% nakon isporuke
 FixAmount=Utvrđeni iznos
-VarAmount=Variable amount (%% tot.)
+VarAmount=Promjenjivi iznos (%% tot.)
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Narudžbenica banke
-PaymentTypeShortPRE=Narudžbenica banke
+PaymentTypeVIR=Bankovni prijenos
+PaymentTypeShortVIR=Bankovni prijenos
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Gotovina
 PaymentTypeShortLIQ=Gotovina
 PaymentTypeCB=Kreditna kartica
 PaymentTypeShortCB=Kreditna kartica
 PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=TIP (Dokumenti uz plaćanje) 
+PaymentTypeShortTIP=TIP Plaćanje
 PaymentTypeVAD=Internet plaćanje
 PaymentTypeShortVAD=Internet plaćanje
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeTRA=Skica banke
+PaymentTypeShortTRA=Skica
+PaymentTypeFAC=Faktor
+PaymentTypeShortFAC=Faktor
 BankDetails=Bankovni podaci
 BankCode=Oznaka Banke
 DeskCode=Desk code
 BankAccountNumber=Broj računa
 BankAccountNumberKey=Ključ
-Residence=Direct debit
+Residence=Izravno zaduženje
 IBANNumber=IBAN broj
 IBAN=IBAN
 BIC=BIC/SWIFT
@@ -381,41 +381,42 @@ ExtraInfos=Dodatni podaci
 RegulatedOn=Regulirano od
 ChequeNumber=Ček broj
 ChequeOrTransferNumber=broj čeka/prijenosa
-ChequeMaker=Check/Transfer transmitter
+ChequeBordereau=Provjera zadanog
+ChequeMaker=Čekovni/transakcijski pošiljatelj
 ChequeBank=Banka
-CheckBank=Check
+CheckBank=Ček
 NetToBePaid=Netto za platiti
 PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Fax
-PrettyLittleSentence=Accept the amount of payments due by checks issued in my name as a Member of an accounting association approved by the Fiscal Administration.
-IntracommunityVATNumber=Intracommunity number of VAT
-PaymentByChequeOrderedTo=Check payment (including tax) are payable to %s send to
-PaymentByChequeOrderedToShort=Check payment (including tax) are payable to
+PrettyLittleSentence=Prihvati iznos dospjelih plačanja čekovima izdanih u moje ime kao Član računovodstvene udruge odobrenih od Porezne uprave
+IntracommunityVATNumber=Porezni broj
+PaymentByChequeOrderedTo=Plačanja čekom (uključujući porez) su naplativi prema %s poslani 
+PaymentByChequeOrderedToShort=Plačanja čekom (uključujući porez) su naplativi prema 
 SendTo=Pošalji
 PaymentByTransferOnThisBankAccount=Bezgotovinsko plaćanje na slijedeći bankovni račun
-VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
-LawApplicationPart1=By application of the law 80.335 of 12/05/80
+VATIsNotUsedForInvoice=Ne primjenjivo VAT čl.-293B CGI-a
+LawApplicationPart1=Po primjeni zakona 80.335 od 12.05.80
 LawApplicationPart2=Roba ostaje vlasništvo
 LawApplicationPart3=prodavača sve do izvršenja cjelokupnog plaćanja
 LawApplicationPart4=njihove cijene.
-LimitedLiabilityCompanyCapital=SARL with Capital of
+LimitedLiabilityCompanyCapital=SARL s kapitalom od
 UseLine=Primjeni
 UseDiscount=Iskoriti popust
 UseCredit=Koristite kredit
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Checks deposits
+UseCreditNoteInInvoicePayment=Smanji iznos za plaćanje s ovim kreditom
+MenuChequeDeposits=Depozit čekova
 MenuCheques=Čekovi
 MenuChequesReceipts=Potvrde čekova
 NewChequeDeposit=Novi polog
 ChequesReceipts=Potvrde čekova
-ChequesArea=Checks deposits area
-ChequeDeposits=Checks deposits
+ChequesArea=Sučelje depozita čekova
+ChequeDeposits=Depoziti čekova
 Cheques=Čekovi
-DepositId=Id deposit
-NbCheque=Number of checks
+DepositId=ID depozita
+NbCheque=Broj čekova
 CreditNoteConvertedIntoDiscount=Ova bonifikacija ili račun za predujam su pretvoreni u %s
-UsBillingContactAsIncoiveRecipientIfExist=Use customer billing contact address instead of third party address as recipient for invoices
+UsBillingContactAsIncoiveRecipientIfExist=Koristi adresu naplate kupca umjesto adrese komitenta kao primatelja računa
 ShowUnpaidAll=Prikaži sve neplaćene račune
 ShowUnpaidLateOnly=Prikaži samo račune kojima kasni plaćanje
 PaymentInvoiceRef=Plaćanje računa %s
@@ -425,25 +426,27 @@ Reported=Odgođeno
 DisabledBecausePayments=Nije moguće obzirom da postoje neka plaćanja
 CantRemovePaymentWithOneInvoicePaid=Plaćanje se ne može izbrisati obzirom da postoji barem jedan račun koji je označen kao plaćen
 ExpectedToPay=Očekivano plaćanje
-CantRemoveConciliatedPayment=Can't remove conciliated payment
+CantRemoveConciliatedPayment=Nije moguče uklanjanje usaglašenog plaćanja
 PayedByThisPayment=Plaćeno s ovom uplatom
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Obilježi kao "Plaćeno" kao standardno, etape ili zamjenski račun kompletno plaćen.
 ClosePaidCreditNotesAutomatically=Klasificiraj "plaćene" bonifikacije kao plaćene u cjelosti.
-AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
+ClosePaidContributionsAutomatically=Označi "Plaćeno" sve društvene ili fiskalne kompletno plaćene doprinose.
+AllCompletelyPayedInvoiceWillBeClosed=Svi računi za plačanje bez ostatka biti će automatski zatvoreni s statusom "Plaćeno"
 ToMakePayment=Plati
-ToMakePaymentBack=Pay back
+ToMakePaymentBack=Povrat
 ListOfYourUnpaidInvoices=Popis neplaćenih računa
-NoteListOfYourUnpaidInvoices=Napomena: Ovaj popis sadrži samo račune za treće osobe kojima ste vi prodajni predstavnik
-RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
-YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
+NoteListOfYourUnpaidInvoices=Napomena: Ovaj popis sadrži samo račune za komitente kojima ste vi prodajni predstavnik
+RevenueStamp=Prihodovna markica
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
+YouMustCreateStandardInvoiceFirstDesc=Kako biste izradili novi predložak računa morate prvo izraditi običan račun i onda ga promijeniti u "predložak"
 PDFCrabeDescription="Crabe" predložak PDF računa. Potpuni predložak računa (preporučeni)
-PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
+PDFCrevetteDescription=PDF račun prema Crevette predlošku. Kompletan predložak računa za etape
+TerreNumRefModelDesc1=Vraća broj u formatu %syymm-nnnn za standardne račune i %syymm-nnnn za odobrenja gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
+MarsNumRefModelDesc1=Vraća broj u formatu %syymm-nnnn za standardne račune, %syymm-nnnn za zamjenske račune,  %syymm-nnnn za račune depozita, i %syymm-nnnn za odobrenja,  gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
+TerreNumRefModelError=Račun koji počinje s $syymm već postoji i nije kompatibilan s ovim modelom označivanja. Maknite ili promjenite kako biste aktivirali ovaj modul.
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
+TypeContact_facture_internal_SALESREPFOLL=Predstavnik praćenja računa kupca
 TypeContact_facture_external_BILLING=Kontakt osoba za račun
 TypeContact_facture_external_SHIPPING=Kontakt osoba za isporuku
 TypeContact_facture_external_SERVICE=Kontakt osoba za usluge kupcima
@@ -452,29 +455,31 @@ TypeContact_invoice_supplier_external_BILLING=Osoba za račune pri dobavljaču
 TypeContact_invoice_supplier_external_SHIPPING=Osoba za pošiljke pri dobavljaču
 TypeContact_invoice_supplier_external_SERVICE=Osoba za usluge pri dobavljaču
 # Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The <b>situation invoices</b> are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
-InvoiceSituationLast=Final and general invoice
-PDFCrevetteSituationNumber=Situation N°%s
-PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
-PDFCrevetteSituationInvoiceTitle=Situation invoice
-PDFCrevetteSituationInvoiceLine=Situation N°%s : Inv. N°%s on %s
-TotalSituationInvoice=Total situation
-invoiceLineProgressError=Invoice line progress can't be greater than or equal to the next invoice line
-updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
-ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
-ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
-ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+InvoiceFirstSituationAsk=Račun prve etape
+InvoiceFirstSituationDesc=<b>Račun etape</b> je vezan za etape vezane za napredovanje, npr. napredovanje gradnje. Svaka etapa je vezana za račun.
+InvoiceSituation=Račun etape
+InvoiceSituationAsk=Račun slijedi etapu
+InvoiceSituationDesc=Kreiranje nove etapu koja prati postojeću
+SituationAmount=Iznos računa etape (net)
+SituationDeduction=Oduzimanje po etapama
+ModifyAllLines=Izmjeni sve stavke
+CreateNextSituationInvoice=Kreiraj sljedeću etapu
+NotLastInCycle=Ovaj račun nije posljednji u ciklusu i ne smije se mijenjati
+DisabledBecauseNotLastInCycle=Sljedeća etapa već postoji
+DisabledBecauseFinal=Ova etapa je konačna
+CantBeLessThanMinPercent=Napredak ne može biti manje nego što je vrijednost u prijašnjoj etapi.
+NoSituations=Nema otvorenih etapa
+InvoiceSituationLast=Konačni i glavni račun
+PDFCrevetteSituationNumber=Etapa N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Račun etapa - IZRAČUN
+PDFCrevetteSituationInvoiceTitle=Račun etape
+PDFCrevetteSituationInvoiceLine=Etapa N°%s : Rč. N°%s na %s
+TotalSituationInvoice=Ukupno etapa
+invoiceLineProgressError=Napredak stavke računa ne može biti veći od ili  jednak kao sljedećoj stavci
+updatePriceNextInvoiceErrorUpdateline=Greška: promjena cijene na stavki računa: %s
+ToCreateARecurringInvoice=Za kreiranje ponavljajućih računa za ovaj ugovor, prvo kreirajte skicu računa, onda konvertirajte istu u predložak računa i definirajte učestalost generiranja budućih računa.
+ToCreateARecurringInvoiceGene=Za generiranje budućih računa normalno ili ručno, idite na izbornik <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=Ako trebate imati takve račune automatski generirane, zatražite od vašeg administratora da uključi modul <strong>%s</strong>. Napomena: oba načina (ručni i automatski) mogu se koristit zajedno bez rizika od dupliciranja. 
+DeleteRepeatableInvoice=Izbriši predložak računa
+ConfirmDeleteRepeatableInvoice=Jeste li sigorni da želite izbrisati predložak računa?
 
diff --git a/htdocs/langs/hr_HR/bookmarks.lang b/htdocs/langs/hr_HR/bookmarks.lang
index b0c627f70f9..a83d4bdf110 100644
--- a/htdocs/langs/hr_HR/bookmarks.lang
+++ b/htdocs/langs/hr_HR/bookmarks.lang
@@ -13,6 +13,6 @@ UrlOrLink=URL
 BehaviourOnClick=Ponašanje kad se klikne na URL
 CreateBookmark=Kreiraj zabilješku
 SetHereATitleForLink=Postavi naslov za zabilješku
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Koristi eksterni http URL ili relativni Bolibarr URL
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Koristi eksterni http URL ili relativni Dolibarr URL
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Odaberite ako se povezana stranica mora/ne mora otvoriti u novom prozoru 
 BookmarksManagement=Upravljanje zabilješkama
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 0773482be16..52cba7e67dd 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -1,79 +1,84 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=RSS Informacije
-BoxLastProducts=Latest %s products/services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest supplier invoices
-BoxLastCustomerBills=Latest customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest customer orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Latest %s modified products/services
-BoxTitleProductsAlertStock=Proizvodi u skladištu - uzbuna
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
-BoxTitleLastModifiedCustomers=Latest %s modified customers
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
-BoxTitleLastModifiedProspects=Latest %s modified prospects
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Open accounts balances
-BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
-BoxMyLastBookmarks=My latest %s bookmarks
-BoxOldestExpiredServices=Najstariji aktivni istekli usluge
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxLastProducts=Zadnjih %s proizvoda/usluga
+BoxProductsAlertStock=Upozorenja stanja zaliha za proizvode
+BoxLastProductsInContract=Zadnjih %s ugovorenih proizvoda/usluga
+BoxLastSupplierBills=Zadnji račun dobavljača
+BoxLastCustomerBills=Zadnji račun kupca
+BoxOldestUnpaidCustomerBills=Najstariji neplačeni račun kupca
+BoxOldestUnpaidSupplierBills=Najstariji neplačeni račun dobavljača
+BoxLastProposals=Zadnja ponuda
+BoxLastProspects=Zadnji izmjenjeni potencijalni kupci
+BoxLastCustomers=Zadnji promjenjei kupci
+BoxLastSuppliers=Zadnji promjenjeni dobavljači
+BoxLastCustomerOrders=Zadnje narudžbe kupca
+BoxLastActions=Zadnje akcije
+BoxLastContracts=Zadnji ugovori
+BoxLastContacts=Zadnji kontakti/adrese
+BoxLastMembers=Zadnji članovi
+BoxFicheInter=Zadnje intervencije
+BoxCurrentAccounts=Stanje otvorenog računa
+BoxTitleLastRssInfos=Zadnjih %s novosti od %s
+BoxTitleLastProducts=Zadnjih %s izmjenjenih proizvoda/usluga
+BoxTitleProductsAlertStock=Proizvodi u skladištu upozorenje
+BoxTitleLastSuppliers=Zadnjih %s zabilježenih dobavljača
+BoxTitleLastModifiedSuppliers=Zadnjih %s izmjenjenih dobavljača
+BoxTitleLastModifiedCustomers=Zadnjih %s izmjenjenih kupaca
+BoxTitleLastCustomersOrProspects=Zadnjih %s kupaca ili potencijalnih kupaca
+BoxTitleLastCustomerBills=Zadnjih %s računa kupaca
+BoxTitleLastSupplierBills=Zadnjih %s računa dobavljača
+BoxTitleLastModifiedProspects=Zadnjih %s izmjenjenih potencijalnih kupaca
+BoxTitleLastModifiedMembers=Zadnjih %s članova
+BoxTitleLastFicheInter=Zadnjih %s izmjenjenih intervencija
+BoxTitleOldestUnpaidCustomerBills=Najstarijih %s neplačenih računa kupaca
+BoxTitleOldestUnpaidSupplierBills=Najstarijih %s neplačenih računa dobavljača
+BoxTitleCurrentAccounts=Stanja otvorenih računa
+BoxTitleLastModifiedContacts=Zadnjih %s izmjenjenih kontakta/adresa
+BoxMyLastBookmarks=Mojih zadnjih %s oznaka
+BoxOldestExpiredServices=Najstarije aktivne istekle usluge
+BoxLastExpiredServices=Zadnjih %s najstarijih kontakta s aktivnim isteklim uslugama
+BoxTitleLastActionsToDo=Zadnjih %s akcija za napraviti
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=Zadnjih %s izmjenjenih donacija
+BoxTitleLastModifiedExpenses=Zadnjih %s izmjenjenih izvještaja troškova
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
-LastRefreshDate=Latest refresh date
-NoRecordedBookmarks=Nema oznaka definirana.
+BoxGoodCustomers=Dobar kupac
+BoxTitleGoodCustomers=%s dobrih kupaca
+FailedToRefreshDataInfoNotUpToDate=Neuspješno osvježavanje RSS kanala. Zadnje uspješno osvježivanje: %s
+LastRefreshDate=Datum zadnjeg osvježavanja
+NoRecordedBookmarks=Nema definiranih oznaka.
 ClickToAdd=Kliknite ovdje za dodavanje.
-NoRecordedCustomers=Nema snimljene kupci
-NoRecordedContacts=Nema snimljene kontakti
-NoActionsToDo=Nema akcije učiniti
-NoRecordedOrders=Nema zabilježenih kupca narudžbe
-NoRecordedProposals=Nema snimljene prijedlozi
-NoRecordedInvoices=Nema zabilježenih kupca račune
-NoUnpaidCustomerBills=Ne neplaćene račune kupca
-NoUnpaidSupplierBills=Ne neplaćene račune dobavljača
-NoModifiedSupplierBills=Nema zabilježenih dobavljača računi
-NoRecordedProducts=Nema zabilježenih proizvodi / usluge
-NoRecordedProspects=Nema snimljene perspektive
-NoContractedProducts=Nema proizvoda / usluge ugovorene
-NoRecordedContracts=Nema snimljene ugovori
-NoRecordedInterventions=Nema zabilježenih intervencija
-BoxLatestSupplierOrders=Najnoviji dobavljač narudžbe
-NoSupplierOrder=Ne bilježi dobavljač bi
-BoxCustomersInvoicesPerMonth=Korisnički računi mjesečno
-BoxSuppliersInvoicesPerMonth=Dobavljač računi mjesečno
-BoxCustomersOrdersPerMonth=Korisnički nalozi mjesečno
-BoxSuppliersOrdersPerMonth=Dobavljač naloga mjesečno
-BoxProposalsPerMonth=Prijedlozi mjesečno
-NoTooLowStockProducts=Nema proizvoda pod niskim granice dionica
-BoxProductDistribution=Proizvodi / usluge distribucije
-BoxProductDistributionFor=Raspodjela% s za% s
-ForCustomersInvoices=Kupci računi
-ForCustomersOrders=Kupci narudžbe
+NoRecordedCustomers=Nema pohranjenih kupaca
+NoRecordedContacts=Nema pohranjenih kontakata
+NoActionsToDo=Nema akcija za napraviti
+NoRecordedOrders=Nema pohranjene narudžbe kupca
+NoRecordedProposals=Nema pohranjenih prijedloga
+NoRecordedInvoices=Nema pohranjenih računa kupca
+NoUnpaidCustomerBills=Nema neplačenih računa kupca
+NoUnpaidSupplierBills=Nema neplačenih računa dobavljača
+NoModifiedSupplierBills=Nema pohranjenih računa dobavljača
+NoRecordedProducts=Nema pohranjenih proizvoda/usluga
+NoRecordedProspects=Nema pohranjenih potencijalnih kupaca
+NoContractedProducts=Nema ugovorenih proizvoda/usluga
+NoRecordedContracts=Nema pohranjenih ugovora
+NoRecordedInterventions=Nema pohranjenih intervencija
+BoxLatestSupplierOrders=Zadnje narudžbe dobavljaču
+NoSupplierOrder=Nema pohranjene narudžbe dobavljača
+BoxCustomersInvoicesPerMonth=Računi kupca po mjesecu
+BoxSuppliersInvoicesPerMonth=Računi dobavljača po mjesecu
+BoxCustomersOrdersPerMonth=Narudžbe kupca po mjesecu
+BoxSuppliersOrdersPerMonth=Narudžbe dobavljača po mjesecu
+BoxProposalsPerMonth=Prijedloga po mjesecu
+NoTooLowStockProducts=Nema proizvoda ispod razine zalihe
+BoxProductDistribution=Raspodjela proivoda/usluga
+BoxProductDistributionFor=Raspodjela %s za %s
+BoxTitleLastModifiedSupplierBills=Zadnjih %s izmjenjenih računa dobavljača
+BoxTitleLatestModifiedSupplierOrders=Zadnjih %s izmjenjenih narudžbi dobavljača
+BoxTitleLastModifiedCustomerBills=Zadnjih %s izmjenjenih računa kupca
+BoxTitleLastModifiedCustomerOrders=Zadnjih %s izmjenjenih narudžbi kupca
+BoxTitleLastModifiedPropals=Zadnjih %s izmjenjenih prijedloga
+ForCustomersInvoices=Računi kupaca
+ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+LastXMonthRolling=Zadnjih %s tekučih mjeseci
+ChooseBoxToAdd=Dodaj dodatak na kontrolnu ploču
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index 7b80d1a6f47..85ef3138280 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -1,35 +1,34 @@
 # Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDeskBankCash=Bank account (cash)
-CashDeskBankCB=Bank account (card)
-CashDeskBankCheque=Bank account (cheque)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selling services
-CashDeskProducts=Products
-CashDeskStock=Stock
-CashDeskOn=on
-CashDeskThirdParty=Third party
-ShoppingCart=Shopping cart
-NewSell=New sell
-BackOffice=Back office
-AddThisArticle=Add this article
-RestartSelling=Go back on sell
-SellFinished=Sell finished
-PrintTicket=Print ticket
-NoProductFound=No article found
-ProductFound=product found
-NoArticle=No article
-Identification=Identification
-Article=Article
-Difference=Difference
-TotalTicket=Total ticket
-NoVAT=No VAT for this sale
-Change=Excess received
-BankToPay=Charge Account
-ShowCompany=Show company
-ShowStock=Show warehouse
-DeleteArticle=Click to remove this article
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+CashDeskMenu=Prodajno mjesto
+CashDesk=Prodajno mjesto
+CashDeskBankCash=Bankovni račun (gotovina)
+CashDeskBankCB=Bankovni račun (kartice)
+CashDeskBankCheque=Bankovni račun (čekovi)
+CashDeskWarehouse=Skladište
+CashdeskShowServices=Prodaja usluga
+CashDeskProducts=Proizvodi
+CashDeskStock=Zaliha
+CashDeskOn=na
+CashDeskThirdParty=Komitent
+ShoppingCart=Košarica
+NewSell=Nova prodaja
+AddThisArticle=Dodaj ovu stavku
+RestartSelling=Povratak na prodaju
+SellFinished=Sale complete
+PrintTicket=Ispis računa
+NoProductFound=Stavka nije pronađena
+ProductFound=Proizvod pronađen
+NoArticle=Nema stavke
+Identification=Indetifikacija
+Article=Stavka
+Difference=Razlika
+TotalTicket=Ukupno računa
+NoVAT=Bez poreza za ovu prodaju
+Change=Previše primljeno
+BankToPay=Tereti račun
+ShowCompany=Prikaži tvrtku
+ShowStock=Prikaži skladište
+DeleteArticle=Kliknite za brisanje stavke
+FilterRefOrLabelOrBC=Pretraživanje (Ref/Oznaka)
+UserNeedPermissionToEditStockToUsePos=Možete zatražiti da smanjite zalihe po kreiranju računa, tako da korisnik koji koristi POS ima dozvolu za uređivanje zaliha.
+DolibarrReceiptPrinter=Pisač za ispis računa
diff --git a/htdocs/langs/hr_HR/categories.lang b/htdocs/langs/hr_HR/categories.lang
index 976c8a50d93..2dc8967c819 100644
--- a/htdocs/langs/hr_HR/categories.lang
+++ b/htdocs/langs/hr_HR/categories.lang
@@ -1,81 +1,86 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
-In=In
-AddIn=Add in
-modify=modify
-Classify=Classify
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
-SubCats=Subcategories
-CatList=List of tags/categories
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
-NoSubCat=No subcategory.
-SubCatOf=Subcategory
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
-WasAddedSuccessfully=<b>%s</b> was added successfully.
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
-CategoryExistsAtSameLevel=This category already exists with this ref
-ContentsVisibleByAllShort=Contents visible by all
-ContentsNotVisibleByAllShort=Contents not visible by all
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Custo./Prosp. categories
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
-ThisCategoryHasNoProduct=This category does not contain any product.
-ThisCategoryHasNoSupplier=This category does not contain any supplier.
-ThisCategoryHasNoCustomer=This category does not contain any customer.
-ThisCategoryHasNoMember=This category does not contain any member.
-ThisCategoryHasNoContact=This category does not contain any contact.
-ThisCategoryHasNoAccount=This category does not contain any account.
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-DeleteFromCat=Remove from tags/category
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
+Rubrique=Kategorija
+Rubriques=Kategorije
+categories=kategorije
+NoCategoryYet=Nije kreirana kategorija ovog tipa
+In=U
+AddIn=Dodaj u
+modify=promjeni
+Classify=Označi
+CategoriesArea=Sučelje Kategorija
+ProductsCategoriesArea=Sučelje kategorije Proizvoda/Usluga
+SuppliersCategoriesArea=Sučelje kategorija dobavljača
+CustomersCategoriesArea=Sučelje kategorija kupaca
+MembersCategoriesArea=Sučelje kategorija članova
+ContactsCategoriesArea=Sučelje kategorija kontakta
+AccountsCategoriesArea=Sučelje tagova/kategorija računa
+ProjectsCategoriesArea=Sučelje kategorija projekata
+SubCats=Podkategorije
+CatList=Popis kategorija
+NewCategory=Nova kategorija
+ModifCat=Promjeni kategoriju
+CatCreated=Kategorija kreirana
+CreateCat=Kreiraj kategoriju
+CreateThisCat=Kreiraj ovu kategoriju
+NoSubCat=Nema podkategorije.
+SubCatOf=Podkategorija
+FoundCats=Pronađene kategorije
+ImpossibleAddCat=Nemoguće je dodati kategoriju %s
+WasAddedSuccessfully=<b>%s</b> je uspješno dodana.
+ObjectAlreadyLinkedToCategory=Element je več povezan s ovom kategorijom.
+ProductIsInCategories=Proizvod/usluga je povezana s sljedećim kategorijama
+CompanyIsInCustomersCategories=Ovaj komitent je povezan sa sljedećim kategorijama kupaca/potencijalnim kupaca
+CompanyIsInSuppliersCategories=Ovaj komitent je povezan sa sljedećim kategorijama dobavljača
+MemberIsInCategories=Ovaj član je povezan s sljedećim kategorijama članova
+ContactIsInCategories=Ovaj kontakt je povezan sa sljedećim kategorijama kontakta
+ProductHasNoCategory=Ovaj proizvod/usluga se ne nalazi niti u jednoj kategoriji
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=Ovaj član se ne nalazi niti u jednoj kategoriji
+ContactHasNoCategory=Ovaj kontakt se ne nalazi niti u jednoj kategoriji
+ProjectHasNoCategory=Ovaj projekt se ne nalazi niti u jednoj kategoriji
+ClassifyInCategory=Dodaj u kategoriju
+NotCategorized=Bez kategorije
+CategoryExistsAtSameLevel=Kategorija s ovom ref. već postoji
+ContentsVisibleByAllShort=Sadržaj vidljiv svima
+ContentsNotVisibleByAllShort=Sadržaj nije vidljiv svima
+DeleteCategory=Obriši kategoriju
+ConfirmDeleteCategory=Jeste li sigurni da želite obrisati ovu kategoriju ?
+NoCategoriesDefined=Kategorija nije definirana
+SuppliersCategoryShort=Kategorija dobavljača
+CustomersCategoryShort=Kategorija kupaca
+ProductsCategoryShort=Kategorija proizvoda
+MembersCategoryShort=Kategorija članova
+SuppliersCategoriesShort=Kategorije dobavljača
+CustomersCategoriesShort=Kategorije kupaca
+ProspectsCategoriesShort=Kategorije potencijalnih kupaca
+CustomersProspectsCategoriesShort=Kategorije kupaca/pot. kupaca
+ProductsCategoriesShort=Kategorije proizvoda
+MembersCategoriesShort=Kategorije članova
+ContactCategoriesShort=Kategorije kontakata
+AccountsCategoriesShort=Tagovi/kategorije računa
+ProjectsCategoriesShort=Kategorije projekata
+ThisCategoryHasNoProduct=Ova kategorija ne sadrži niti jedan proizvod.
+ThisCategoryHasNoSupplier=Ova kategorija ne sadrži niti jednog dobavljača.
+ThisCategoryHasNoCustomer=Ova kategorija ne sadrži niti jednog kupca.
+ThisCategoryHasNoMember=Ova kategorija ne sadrži niti jednog člana.
+ThisCategoryHasNoContact=Ova kategorija ne sadrži niti jedan kontakt.
+ThisCategoryHasNoAccount=Ova kategorija ne sadrži niti jedan račun
+ThisCategoryHasNoProject=Ova kategorija ne sadrži niti jedan projekt.
+CategId=ID Kategorije
+CatSupList=Popis kategorija dobavljača
+CatCusList=Popis kategorija kupaca/potencijalnih kupaca
+CatProdList=Popis kategorija proizvoda
+CatMemberList=Popis kategorija članova
+CatContactList=Popis kategorija kontakta
+CatSupLinks=Veze između dobavljača i kategorija
+CatCusLinks=Veze između kupaca/potencijalnih kupaca i kategorija
+CatProdLinks=Veze izmeđi proizvoda/usluga i kategorija
+CatProJectLinks=Veze između projekata i kategorija
+DeleteFromCat=Makni iz kategorije
+ExtraFieldsCategories=Dodatni atributi
+CategoriesSetup=Podešavanje kategorija
+CategorieRecursiv=Poveži automatski sa matičnom kategorijom
+CategorieRecursivHelp=Ako je aktivirano, proizvod će isto biti povezan s matičnom kategorijom kada se dodaje u podkategoriju
+AddProductServiceIntoCategory=Dodaj sljedeće proizvode/usluge
+ShowCategory=Prikaži kategoriju
+ByDefaultInList=Po predefiniranom na listi
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index e27be29b568..831bec1ef35 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -1,71 +1,71 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commercial
-CommercialArea=Commercial area
+Commercial=Komercijala
+CommercialArea=Sučelje komercijale
 Customer=Kupac
 Customers=Kupci
 Prospect=Potencijalni kupac
 Prospects=Potencijalni kupci
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event ?
-CardAction=Event card
-ActionOnCompany=Related company
-ActionOnContact=Related contact
-TaskRDVWith=Meeting with %s
+DeleteAction=Obriši događaj
+NewAction=Novi događaj
+AddAction=Kreiraj događaj
+AddAnAction=Kreiraj događaj
+AddActionRendezVous=Kreirajte sastanak
+ConfirmDeleteAction=Jeste li sigurni da želite izbrisati ovaj događaj ?
+CardAction=Kartica događaja
+ActionOnCompany=Povezana tvrtka
+ActionOnContact=Vezani kontakt
+TaskRDVWith=Sastanak sa %s
 ShowTask=Prikaži zadatak
 ShowAction=Prikaži događaj
 ActionsReport=Izvješće događaja
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
-SalesRepresentative=Trgovački predstavnik
-SalesRepresentatives=Trgovački predstavnici
-SalesRepresentativeFollowUp=Sales representative (follow-up)
-SalesRepresentativeSignature=Sales representative (signature)
-NoSalesRepresentativeAffected=No particular sales representative assigned
+ThirdPartiesOfSaleRepresentative=Komitenti s prodajnim predstavnikom
+SalesRepresentative=Prodajni predstavnik
+SalesRepresentatives=Prodajni predstavnici
+SalesRepresentativeFollowUp=Prodajni predstavnik (pratitelj)
+SalesRepresentativeSignature=Prodajni predstavnik (potpis)
+NoSalesRepresentativeAffected=Nije dodjeljen prodajni predstavnik
 ShowCustomer=Prikaži kupca
 ShowProspect=Prikaži potencijalnog kupca
 ListOfProspects=Lista potencijalnih kupaca
 ListOfCustomers=Lista kupaca
-LastDoneTasks=Latest %s completed tasks
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=Completed and To do events
+LastDoneTasks=Zadnjih %s završenih zadataka
+LastActionsToDo=Najstarijih %s nezavršenih akcija
+DoneAndToDoActions=Završeni i za odraditi 
 DoneActions=Završeni događaji
 ToDoActions=Nedovršeni događaji
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
-StatusNotApplicable=Not applicable
-StatusActionToDo=To do
+SendPropalRef=Predaja ponude %s
+SendOrderRef=Predaja narudžbe %s
+StatusNotApplicable=Nije primjenjivo
+StatusActionToDo=Napraviti
 StatusActionDone=Završeno
 StatusActionInProcess=U procesu
-TasksHistoryForThisContact=Events for this contact
-LastProspectDoNotContact=Do not contact
-LastProspectNeverContacted=Never contacted
-LastProspectToContact=To contact
-LastProspectContactInProcess=Contact in process
-LastProspectContactDone=Contact done
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Event done by
+TasksHistoryForThisContact=Događaji za ovaj kontakt
+LastProspectDoNotContact=Ne kontaktiraj
+LastProspectNeverContacted=Nikad kontaktiraj
+LastProspectToContact=Kontaktiraj
+LastProspectContactInProcess=Kontakti u obradi
+LastProspectContactDone=Kontak završen
+ActionAffectedTo=Događaj dodjeljen
+ActionDoneBy=Događaj odradio
 ActionAC_TEL=Telefonski poziv
 ActionAC_FAX=Pošalji faks
 ActionAC_PROP=Pošalji ponudu poštom
-ActionAC_EMAIL=Pošalji email
-ActionAC_RDV=Meetings
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Send customer invoice by mail
-ActionAC_REL=Send customer invoice by mail (reminder)
+ActionAC_EMAIL=Pošalji e-poštu
+ActionAC_RDV=Sastanci
+ActionAC_INT=Intervencija na lokaciji
+ActionAC_FAC=Pošalji račun kupca poštom
+ActionAC_REL=Pošalji narudđbu kupca putem pošte (podsjetnik)
 ActionAC_CLO=Zatvoren
-ActionAC_EMAILING=Pošalji masovni email
-ActionAC_COM=Pošalji narudđbu kupca putem pošte
+ActionAC_EMAILING=Masovno slanje e-pošte
+ActionAC_COM=Pošalji narudžbu kupca putem pošte
 ActionAC_SHIP=Pošalji dostavu putem pošte
-ActionAC_SUP_ORD=Send supplier order by mail
-ActionAC_SUP_INV=Send supplier invoice by mail
+ActionAC_SUP_ORD=Pošalji narudžbu dobavljača poštom
+ActionAC_SUP_INV=Pošalji račun dobavljača poštom
 ActionAC_OTH=Ostalo
-ActionAC_OTH_AUTO=Other (automatically inserted events)
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTO=Ostalo (automatsko uneseni događaji)
+ActionAC_MANUAL=Ručno uneseni događaji
+ActionAC_AUTO=Automatski uneseni događaji
 Stats=Statistike prodaje
-StatusProsp=Prospect status
-DraftPropals=Draft commercial proposals
-NoLimit=No limit
+StatusProsp=Status potencijalnog kupca
+DraftPropals=Skica ponude
+NoLimit=Bez ograničenja
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index acb706d6bac..bbaf240e343 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -1,70 +1,72 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Ime poduzeća %s već postoji. Odaberite drugo.
 ErrorSetACountryFirst=Odaberite prvo državu
-SelectThirdParty=Odaberite treću osobu
-ConfirmDeleteCompany=Jeste li sigurni da želite izbrisati ovu poduzeće i sve njezine nasljeđene podatke?
+SelectThirdParty=Odaberi komitenta
+ConfirmDeleteCompany=Jeste li sigurni da želite izbrisati ovo poduzeće i sve pripadajuće podatke?
 DeleteContact=Izbriši kontakt/adresu.
 ConfirmDeleteContact=Jeste li sigurni da želite izbrisati ovaj kontakt i sve nasljeđene informacije?
-MenuNewThirdParty=Nova treća strana
+MenuNewThirdParty=Novi komitent
 MenuNewCustomer=Novi kupac
 MenuNewProspect=Novi potencijalni kupac
 MenuNewSupplier=Novi dobavljač
 MenuNewPrivateIndividual=Nova privatna osoba
-NewCompany=Nova kompanija(potencijalni kupac, kupac, dobavljač)
-NewThirdParty=Nova stranka(potencijalni kupac, kupac, dobavljač)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
-ProspectionArea=Prospection area
-IdThirdParty=Id treće strane
-IdCompany=Id kompanije
+NewCompany=Nova tvrtka (potencijalni kupac, kupac, dobavljač)
+NewThirdParty=Novi komitent (potencijalni kupac, kupac, dobavljač)
+CreateDolibarrThirdPartySupplier=Kreiraj komitenta (dobavljač)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=Sučelje Potencijalnih kupaca
+IdThirdParty=Komitent ID
+IdCompany=ID Tvrtke
 IdContact=Id kontakta
 Contacts=Kontakti/Adrese
-ThirdPartyContacts=Kontakti treće stranke
-ThirdPartyContact=Stranka kontakt / adresa
-Company=Kompanija
-CompanyName=Ime kompanije 
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+ThirdPartyContacts=Kontakti komitenta
+ThirdPartyContact=Komitent kontakt/adresa
+Company=Tvrtka
+CompanyName=Naziv tvrtke
+AliasNames=Alias (komercijala, zaštitni znak, ...)
+AliasNameShort=Naziv aliasa
 Companies=Kompanije
-CountryIsInEEC=Country is inside European Economic Community
-ThirdPartyName=Ime treće stranke
-ThirdParty=Third party
-ThirdParties=Third parties
+CountryIsInEEC=Zemlja je unutar EU
+ThirdPartyName=Naziv komitenta
+ThirdParty=Komitent
+ThirdParties=Komitenti
 ThirdPartyProspects=Potencijalni kupac
 ThirdPartyProspectsStats=Potencijalni kupci
 ThirdPartyCustomers=Kupci
 ThirdPartyCustomersStats=Kupci
-ThirdPartyCustomersWithIdProf12=Kupci sa %s i %s
+ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
 ThirdPartySuppliers=Dobavljači
-ThirdPartyType=Tip treće stane
-Company/Fundation=Kompanija/fundacija
+ThirdPartyType=Tip komitenta
+Company/Fundation=Tvrtka/zaklada
 Individual=Privatna osoba
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
-ParentCompany=Kompanija vlasnik
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
+ParentCompany=Matična tvrtka
 Subsidiaries=Podružnice
 ReportByCustomers=Izvještaj od kupaca
-ReportByQuarter=Report by rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
+ReportByQuarter=Izvještaj po stopi
+CivilityCode=Kod uljudnosti
+RegisteredOffice=Registriran ured
 Lastname=Prezime
 Firstname=Ime
-PostOrFunction=Pozicija/Funkcija
+PostOrFunction=Radno mjesto
 UserTitle=Titula
 Address=Adresa
 State=Država/provincija
-StateShort=State
+StateShort=Država
 Region=Regija
 Country=Država
 CountryCode=Šifra države
 CountryId=ID države
 Phone=Telefon:
-PhoneShort=Phone
+PhoneShort=Telefon
 Skype=Skype
 Call=Poziv
 Chat=Chat
 PhonePro=Prof. telefon
 PhonePerso=Osob. telefon
 PhoneMobile=Mobitel
-No_Email=Ne šalji promotivne emailove
+No_Email=Odbija masovno slanje e-pošte
 Fax=Faks
 Zip=Poštanski broj
 Town=Grad
@@ -73,24 +75,24 @@ Poste= Pozicija
 DefaultLang=Primarni jezik
 VATIsUsed=Porez se koristi
 VATIsNotUsed=Porez se ne korisit
-CopyAddressFromSoc=Fill address with thirdparty address
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+CopyAddressFromSoc=Fill address with third party address
+ThirdpartyNotCustomerNotSupplierSoNoRef=Komitent nije kupac niti dobavljač, nema raspoloživih upućenih objekata
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
-LocalTax2IsUsed=Use third tax
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
+LocalTax1IsUsed=Koristi drugi dodatni porez
+LocalTax1IsUsedES= RE je korišten
+LocalTax1IsNotUsedES= RE nije korišten
+LocalTax2IsUsed=Koristi treći dodatni porez
+LocalTax2IsUsedES= IRPF je korišten
+LocalTax2IsNotUsedES= IRPF nije korišten
 LocalTax1ES=RE
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-WrongCustomerCode=Customer code invalid
-WrongSupplierCode=Supplier code invalid
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Supplier code model
-Gencod=Bar code
+TypeLocaltax1ES=RE tip
+TypeLocaltax2ES=IRPF tip
+WrongCustomerCode=Neispravan kod kupca
+WrongSupplierCode=Neispravan kod dobavljača
+CustomerCodeModel=Način koda kupca 
+SupplierCodeModel=Način koda dobavljača
+Gencod=Barkod
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -137,7 +139,7 @@ ProfId4BR=CPF
 ProfId1CH=-
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
-ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId4CH=Dokaz ID 2 (broj komercijalnog podatka)
 ProfId5CH=-
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
@@ -170,7 +172,7 @@ ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=-
 ProfId6FR=-
-ProfId1GB=Registration Number
+ProfId1GB=Registracijski broj
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
@@ -214,7 +216,7 @@ ProfId5NL=-
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
-ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId3PT=Dokaz ID 3 (broj komercijalnog podatka)
 ProfId4PT=Prof Id 4 (Conservatory)
 ProfId5PT=-
 ProfId6PT=-
@@ -238,158 +240,162 @@ ProfId5RU=-
 ProfId6RU=-
 VATIntra=Porezni broj
 VATIntraShort=Porezni broj
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
-CustomerCard=Customer Card
+VATIntraSyntaxIsValid=Sintaksa je u redu
+ProspectCustomer=Potencijalni / Kupac
+Prospect=Potencijalni kupac
+CustomerCard=Kartica kupca
 Customer=Kupac
-CustomerRelativeDiscount=Relative customer discount
-CustomerRelativeDiscountShort=Relative discount
-CustomerAbsoluteDiscountShort=Absolute discount
-CompanyHasRelativeDiscount=This customer has a default discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
-CompanyHasAbsoluteDiscount=This customer still has discount credits or deposits for <b>%s</b> %s
-CompanyHasCreditNote=This customer still has credit notes for <b>%s</b> %s
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
-CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
-CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
-DiscountNone=None
+CustomerRelativeDiscount=Relativni popust kupcu
+CustomerRelativeDiscountShort=Relativni popust
+CustomerAbsoluteDiscountShort=Apsolutni popust
+CompanyHasRelativeDiscount=Ovaj kupac ima predefiniran popust od <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Ovaj kupac nema predefiniran relativni popust
+CompanyHasAbsoluteDiscount=Ovaj kupac još uvijek ima kreditni popust ili depozit za <b>%s</b> %s
+CompanyHasCreditNote=Ovaj kupac još uvijek ima odobrenje za <b>%s</b> %s
+CompanyHasNoAbsoluteDiscount=Ovaj kupac nema dostupan kreditni popust
+CustomerAbsoluteDiscountAllUsers=Apsolutni popusti (odobreni svim korisnicima)
+CustomerAbsoluteDiscountMy=Apsolutni popust (Vaše odobrenje)
+DiscountNone=Ništa
 Supplier=Dobavljač
-AddContact=Create contact
-AddContactAddress=Create contact/address
+AddContact=Kreiraj kontakt
+AddContactAddress=Kreiraj kontakt/adresu
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
 Contact=Kontakt
+ContactId=ID kontakta
 ContactsAddresses=Kontakt/adrese
-NoContactDefinedForThirdParty=Nema kontakta za ovo stranku
-NoContactDefined=No contact defined
-DefaultContact=Default contact/address
-AddThirdParty=Create third party
-DeleteACompany=Izbriši firmu
-PersonalInformations=Personal data
-AccountancyCode=Accountancy code
-CustomerCode=Customer code
-SupplierCode=Supplier code
-CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
-CustomerCodeDesc=Customer code, unique for all customers
-SupplierCodeDesc=Supplier code, unique for all suppliers
-RequiredIfCustomer=Required if third party is a customer or prospect
-RequiredIfSupplier=Required if third party is a supplier
-ValidityControledByModule=Validity controled by module
-ThisIsModuleRules=This is rules for this module
-ProspectToContact=Prospect to contact
-CompanyDeleted=Company "%s" deleted from database.
-ListOfContacts=List of contacts/addresses
-ListOfContactsAddresses=List of contacts/adresses
-ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+FromContactName=Name:
+NoContactDefinedForThirdParty=Nema kontakta za ovog komitenta
+NoContactDefined=Nije definiran kontakt
+DefaultContact=Predefinirani kontakt/adresa
+AddThirdParty=Kreiraj komitenta
+DeleteACompany=Izbriši tvrtku
+PersonalInformations=Osobni podaci
+AccountancyCode=Konto
+CustomerCode=Kod kupca
+SupplierCode=Kod dobavljača
+CustomerCodeShort=Kod kupca
+SupplierCodeShort=Kod dobavljača
+CustomerCodeDesc=Kod kupca, jedinstven za sve kupce
+SupplierCodeDesc=Kod dobavljača, jedinstven za sve dobavljače
+RequiredIfCustomer=Obavezno ako je komitent kupac ili potencijalni kupac
+RequiredIfSupplier=Obavezno ako je komitent dobavljač
+ValidityControledByModule=Odobravanje kontrolirano modulom
+ThisIsModuleRules=Ovo su pravila za ovaj modul
+ProspectToContact=Potencijalni kupac u kontakt
+CompanyDeleted=Tvrtka "%s" izbrisana iz baze.
+ListOfContacts=Popis kontakata/adresa
+ListOfContactsAddresses=Popis kontakata/adresa
+ListOfThirdParties=Popis komitenata
+ShowCompany=Show third party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Sve(bez filtera)
 ContactType=Tip kontakta
-ContactForOrders=Order's contact
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Proposal's contact
-ContactForContracts=Contract's contact
-ContactForInvoices=Invoice's contact
-NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyProposal=This contact is not a contact for any commercial proposal
-NoContactForAnyContract=This contact is not a contact for any contract
-NoContactForAnyInvoice=This contact is not a contact for any invoice
-NewContact=New contact
-NewContactAddress=New contact/address
+ContactForOrders=Kontakt narudžbe
+ContactForOrdersOrShipments=Kontakt narudžbe ili pošiljke
+ContactForProposals=Kontakt ponude
+ContactForContracts=Kontakt ugovora
+ContactForInvoices=Kontakt računa
+NoContactForAnyOrder=Ovaj kontakt nije kontakt za nikakvu narudžbu
+NoContactForAnyOrderOrShipments=Ovaj kontakt nije kontakt za nikakvu narudžbu ili pošiljku
+NoContactForAnyProposal=Ovaj kontakt nije kontakt za bilo koju ponudu
+NoContactForAnyContract=Ovaj kontakt nije kontakt za nikakav ugovor
+NoContactForAnyInvoice=Ovaj kontakt nije kontakt za nikakav račun
+NewContact=Novi kontakt
+NewContactAddress=Novi kontakt/adresa
 MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Kapital od %s
-EditCompany=Uredi firmu
+EditCompany=Uredi tvrtku
 ThisUserIsNot=Ovaj korisnik nije ni potencijalni kupac, kupac ni dobavljač
 VATIntraCheck=Ček
-VATIntraCheckDesc=The link <b>%s</b> allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
+VATIntraCheckDesc=Poveznica <b>%s</b> dozvoljava upit servis za provjeru poreznog broja u EU VIES. Potreban je pristup internetu kako bi ovaj servis radio.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Check Intracomunnautary VAT on European commision site
-VATIntraManualCheck=You can also check manually from european web site <a href="%s" target="_blank">%s</a>
-ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
-NorProspectNorCustomer=Nor prospect, nor customer
-JuridicalStatus=Legal form
-Staff=Staff
-ProspectLevelShort=Potential
-ProspectLevel=Prospect potential
-ContactPrivate=Private
-ContactPublic=Shared
-ContactVisibility=Visibility
-ContactOthers=Other
-OthersNotLinkedToThirdParty=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
-PL_UNKNOWN=Unknown
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+VATIntraCheckableOnEUSite=Provjeri OIB na EU VIES
+VATIntraManualCheck=Također možete provjeriti ručno na stranici <a href="%s" target="_blank">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije pružena od strane države članice (%s).
+NorProspectNorCustomer=Niti potencijalni, niti kupac
+JuridicalStatus=Zakonski okvir
+Staff=Zaposlenih
+ProspectLevelShort=Potencijal
+ProspectLevel=Potencijalni kupac
+ContactPrivate=Privatno
+ContactPublic=Zajedničko
+ContactVisibility=Vidljivost
+ContactOthers=Ostalo
+OthersNotLinkedToThirdParty=Ostali, nisu povezani s komitentom
+ProspectStatus=Status potencijalnog kupca
+PL_NONE=Ništa
+PL_UNKNOWN=Nepoznat
+PL_LOW=Nisko
+PL_MEDIUM=Srednje
+PL_HIGH=Visoko
 TE_UNKNOWN=-
-TE_STARTUP=Startup
-TE_GROUP=Velika kompanija
-TE_MEDIUM=Srednja kompanija
+TE_STARTUP=Start up
+TE_GROUP=Velika tvrtka
+TE_MEDIUM=Srednja tvrtka
 TE_ADMIN=Državna firma
-TE_SMALL=Mala komanija
+TE_SMALL=Mala tvrtka
 TE_RETAIL=Preprodavač
 TE_WHOLE=Wholetailer
 TE_PRIVATE=Privatna osoba
 TE_OTHER=Drugo
 StatusProspect-1=Nemoj kontaktirati
 StatusProspect0=Nikad kontaktirana
-StatusProspect1=To be contacted
+StatusProspect1=Za kontaktiranje
 StatusProspect2=Trenutno se kontaktira
 StatusProspect3=Završen kontakt
 ChangeDoNotContact=Promjeni u status "nemoj kontaktirat"
 ChangeNeverContacted=Promjeni status u 'nikad kontaktiran'
-ChangeToContact=Change status to 'To be contacted'
-ChangeContactInProcess=Change status to 'Contact in process'
-ChangeContactDone=Change status to 'Contact done'
-ProspectsByStatus=Prospects by status
-NoParentCompany=None
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Contact not linked to any third party
-DolibarrLogin=Dolibarr login
-NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
-ImportDataset_company_3=Bank details
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
-PriceLevel=Price level
+ChangeToContact=Promjeni status u 'Za kontaktiranje'
+ChangeContactInProcess=Promjeni status u 'kontakt u tijeku'
+ChangeContactDone=Promjeni status u 'kontaktiran'
+ProspectsByStatus=Potencijalni kupci po statusu
+NoParentCompany=Ništa
+ExportCardToFormat=Izvezi karticu u formatu
+ContactNotLinkedToCompany=Kontakt nije povezan ni sa jednim komitentom
+DolibarrLogin=Dolibarr korisničko ime
+NoDolibarrAccess=Nema pristup Dolibarr-u
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_2=Kontakti i svojstva
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ImportDataset_company_2=Kontakti/adrese (komitenti ili ne) i atributi
+ImportDataset_company_3=Bankovni podaci
+ImportDataset_company_4=Komitenti/Prodajni predstavnici (Odnosi se na korisnike prodajne predstavnike prema tvrtkama)
+PriceLevel=Razina cijene
 DeliveryAddress=Adresa dostave
-AddAddress=Add address
+AddAddress=Dodaj adresu
 SupplierCategory=Kategorija dobavljača
-JuridicalStatus200=Independent
+JuridicalStatus200=Nezavisni
 DeleteFile=Izbriši datoteku
-ConfirmDeleteFile=Are you sure you want to delete this file?
-AllocateCommercial=Assigned to sales representative
+ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovu datoteku?
+AllocateCommercial=Dodjeljeno prodajnom predstavniku
 Organization=Organizacija
 FiscalYearInformation=Informacije za fiskalnu godinu
 FiscalMonthStart=Početni mjesec fiskalne godine
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Morate prvo kreirati e-poštu za ovog korisnika kako biste mogli dodati njegove obavijesti putem e-pošte.
+YouMustCreateContactFirst=Kako biste bili u mogućnosti dodavanja obavijesti e-poštom, prvo morate definirati kontakt s valjanom adresom e-pošte za komitenta
 ListSuppliersShort=Lista dobavljača
 ListProspectsShort=Lista potencijalnih kupaca
 ListCustomersShort=Lista kupaca
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Latest %s modified third parties
-UniqueThirdParties=Total of unique third parties
+ThirdPartiesArea=Sučelje komitenata i kontakata
+LastModifiedThirdParties=Zadnjih %s izmjenjenih komitenata
+UniqueThirdParties=Ukupno jedinstvenih komitenata
 InActivity=Otvoren
 ActivityCeased=Zatvoren
-ProductsIntoElements=List of products/services into %s
+ProductsIntoElements=Popis proizvoda/usluga u %s
 CurrentOutstandingBill=Trenutno otvoreni računi
 OutstandingBill=Maksimalno za otvorene račune
-OutstandingBillReached=Max. for outstanding bill reached
-MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
+OutstandingBillReached=Dosegnut maksimum neplačenih računa
+MonkeyNumRefModelDesc=Vraća broj u formatu %syymm-nnnn za kod kupca i %syymm-nnnn za kod dobavljača gdje je yy godina, mm je mjesec i nnnn je sljedni broj bez prekida i bez mogučnosti povratka na 0
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
+MergeOriginThirdparty=Dupliciran komitent (komitent koji želite obrisati)
+MergeThirdparties=Spoji komitente
+ConfirmMergeThirdparties=Jeste li sigurni da želite spojiti ovog komitenta s trenutnim komitentom ? Svi povezani objekti (računi, narudžbe, ...) biti će pripojeni s trenutnim komitentom te ćete biti u mogučnosti brisanja duplih.
+ThirdpartiesMergeSuccess=Komitenti su spojeni
+SaleRepresentativeLogin=Korisničko ime predstavnika
+SaleRepresentativeFirstname=Ime predstavnika
+SaleRepresentativeLastname=Prezime predstavnika
+ErrorThirdpartiesMerge=Dogodila se greška kod brisanja komitenta. Provjerite zapise. Promjene su poništene.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index ce2ef616ab4..a75f3bc21a0 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -1,202 +1,204 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Financial
-TaxModuleSetupToModifyRules=Go to <a href="%s">Taxes module setup</a> to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=Option for accountancy
-OptionModeTrue=Option Incomes-Expenses
-OptionModeVirtual=Option Claims-Debts
-OptionModeTrueDesc=In this context, the turnover is calculated over payments (date of payments). The validity of the figures is assured only if the book-keeping is scrutinized through the input/output on the accounts via invoices.
-OptionModeVirtualDesc=In this context, the turnover is calculated over invoices (date of validation). When these invoices are due, whether they have been paid or not, they are listed in the turnover output.
-FeatureIsSupportedInInOutModeOnly=Feature only available in CREDITS-DEBTS accountancy mode (See Accountancy module configuration)
-VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Tax module setup.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
-Param=Setup
-RemainingAmountPayment=Amount payment remaining :
-Account=Account
-Accountparent=Account parent
-Accountsparent=Accounts parent
-Income=Income
-Outcome=Expense
-ReportInOut=Income / Expense
-ReportTurnover=Turnover
-PaymentsNotLinkedToInvoice=Payments not linked to any invoice, so not linked to any third party
-PaymentsNotLinkedToUser=Payments not linked to any user
+MenuFinancial=Financijski
+TaxModuleSetupToModifyRules=Idite na <a href="%s">Podešavanje modula poreza</a> za promjenu pravila izračuna
+TaxModuleSetupToModifyRulesLT=Idite na <a href="%s">Postavke tvrtke</a> za promjenu pravila za kalkulacije
+OptionMode=Opcija za računovodstvo
+OptionModeTrue=Opcija Prihodi-Troškovi
+OptionModeVirtual=Opcija Potraživanja-Dugovanja
+OptionModeTrueDesc=U ovom kontekstu, promet je izračunat kroz plaćanja ( datum plaćanja ). Valjanost brojki je osigurano samo ako je pomno vođenje knjiga po računu kroz ulazne/izlazne račune.
+OptionModeVirtualDesc=U ovom kontekstu, promet je izračunat putem računa (datum ovjere). Kada su ti računi u dospijeću, bez obzira da li su plaćeni ili ne, oni su prikazani na prikazu prometa.
+FeatureIsSupportedInInOutModeOnly=Mogučnost je dostupna samo u KREDITIRANJA-DUGOVANJA načinu računovodstva ( Pogledajte podešavanje Računovodstvenog modula ) 
+VATReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korištenjem pravila definiranih u postavkama Poreznog modula
+LTReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korištenjem pravila definiranih u postavkama tvrtke.
+Param=Podešavanje
+RemainingAmountPayment=Preostali iznos za naplatu:
+Account=Račun
+Accountparent=Matični račun
+Accountsparent=Matični računi
+Income=Prihod
+Outcome=Trošak
+ReportInOut=Prihod / Trošak
+ReportTurnover=Promet
+PaymentsNotLinkedToInvoice=Plaćanja nisu povezana s niti jednim računom, također nisu povezane s nijednim komitentom
+PaymentsNotLinkedToUser=Plaćanja nisu povezana s niti jednim korisnikom
 Profit=Profit
-AccountingResult=Accounting result
-Balance=Balance
-Debit=Debit
-Credit=Credit
-Piece=Accounting Doc.
-AmountHTVATRealReceived=Net collected
-AmountHTVATRealPaid=Net paid
-VATToPay=VAT sells
-VATReceived=VAT received
-VATToCollect=VAT purchases
-VATSummary=VAT Balance
-LT2SummaryES=IRPF Balance
-LT1SummaryES=RE Balance
-VATPaid=VAT paid
-LT2PaidES=IRPF Paid
-LT1PaidES=RE Paid
-LT2CustomerES=IRPF sales
-LT2SupplierES=IRPF purchases
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
-VATCollected=VAT collected
-ToPay=To pay
-SpecialExpensesArea=Area for all special payments
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-MenuSpecialExpenses=Special expenses
-MenuTaxAndDividends=Taxes and dividends
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Accountancy/Treasury area
-NewPayment=New payment
-Payments=Payments
-PaymentCustomerInvoice=Customer invoice payment
-PaymentSocialContribution=Social/fiscal tax payment
-PaymentVat=VAT payment
-ListPayment=List of payments
-ListOfCustomerPayments=List of customer payments
-DateStartPeriod=Date start period
-DateEndPeriod=Date end period
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
-LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
-newLT2PaymentES=New IRPF payment
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=IRPF Payment
-LT2PaymentsES=IRPF Payments
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
-Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=Show VAT payment
-TotalToPay=Total to pay
-CustomerAccountancyCode=Customer accountancy code
-SupplierAccountancyCode=Supplier accountancy code
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
-AccountNumber=Account number
-NewAccount=New account
-SalesTurnover=Sales turnover
-SalesTurnoverMinimum=Minimum sales turnover
-ByExpenseIncome=By expenses & incomes
-ByThirdParties=By third parties
-ByUserAuthorOfInvoice=By invoice author
-CheckReceipt=Check deposit
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Latest %s check receipts
-NewCheckReceipt=New discount
-NewCheckDeposit=New check deposit
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check reception date
-NbOfCheques=Nb of checks
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
-CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
-AnnualByCompaniesDueDebtMode=Balance of income and expenses, detail by third parties, mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-AnnualByCompaniesInputOutputMode=Balance of income and expenses, detail by third parties, mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>.
-SeeReportInInputOutputMode=See report <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b> for a calculation on actual payments made
-SeeReportInDueDebtMode=See report <b>%sClaims-Debts%s</b> said <b>commitment accounting</b> for a calculation on issued invoices
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
-RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
-RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
-RulesCADue=- It includes the client's due invoices whether they are paid or not. <br>- It is based on the validation date of these invoices.<br>
-RulesCAIn=- It includes all the effective payments of invoices received from clients.<br>- It is based on the payment date of these invoices<br>
-DepositsAreNotIncluded=- Deposit invoices are nor included
-DepositsAreIncluded=- Deposit invoices are included
-LT2ReportByCustomersInInputOutputModeES=Report by third party IRPF
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
-VATReportByCustomersInInputOutputMode=Report by the customer VAT collected and paid
-VATReportByCustomersInDueDebtMode=Report by the customer VAT collected and paid
-VATReportByQuartersInInputOutputMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
-VATReportByQuartersInDueDebtMode=Report by rate of the VAT collected and paid
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
-SeeVATReportInInputOutputMode=See report <b>%sVAT encasement%s</b> for a standard calculation
-SeeVATReportInDueDebtMode=See report <b>%sVAT on flow%s</b> for a calculation with an option on the flow
-RulesVATInServices=- For services, the report includes the VAT regulations actually received or issued on the basis of the date of payment.
-RulesVATInProducts=- For material assets, it includes the VAT invoices on the basis of the invoice date.
-RulesVATDueServices=- For services, the report includes VAT invoices due, paid or not, based on the invoice date.
-RulesVATDueProducts=- For material assets, it includes the VAT invoices, based on the invoice date.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-PercentOfInvoice=%%/invoice
-NotUsedForGoods=Not used on goods
-ProposalStats=Statistics on proposals
-OrderStats=Statistics on orders
-InvoiceStats=Statistics on bills
-Dispatch=Dispatching
-Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Third party must be defined as a customer
-SellsJournal=Sales Journal
-PurchasesJournal=Purchases Journal
-DescSellsJournal=Sales Journal
-DescPurchasesJournal=Purchases Journal
-InvoiceRef=Invoice ref.
-CodeNotDef=Not defined
-WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
-Pcg_version=Pcg version
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
-ByProductsAndServices=By products and services
-RefExt=External ref
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=To calculate total VAT, there is two methods:<br>Method 1 is rounding vat on each line, then summing them.<br>Method 2 is summing all vat on each line, then rounding result.<br>Final result may differs from few cents. Default mode is mode <b>%s</b>.
-CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
-TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
-CalculationMode=Calculation mode
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT (VAT on sales)
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT (VAT on purchases)
-ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social/fiscal tax
-ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports
-OtherCountriesCustomersReport=Foreign customers report
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=National customers report
-BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
-LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Import social/fiscal taxes
-ImportDataset_tax_vat=Import vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+AccountingResult=Rezultati računovodstvo
+Balance=Stanje
+Debit=Zaduženje
+Credit=Kredit
+Piece=Računovodstveni dok.
+AmountHTVATRealReceived=Nije naplaćeno
+AmountHTVATRealPaid=Neto plaćeno
+VATToPay=PDV prodaje
+VATReceived=PDV primljen
+VATToCollect=PDV kupvine
+VATSummary=PDV stanje
+LT2SummaryES=IRPF stanje
+LT1SummaryES=RE Stanje
+VATPaid=PDV plaćeno
+LT2PaidES=IRPF plaćeno
+LT1PaidES=RE Plaćeno
+LT2CustomerES=IRPF prodaje
+LT2SupplierES=IRPF kupovine
+LT1CustomerES=RE prodaja
+LT1SupplierES=RE kupovina
+VATCollected=PDV prikupljen
+ToPay=Za platiti
+SpecialExpensesArea=Sučelji svih specijalnih plaćanja
+SocialContribution=Društveni ili fisklani porez
+SocialContributions=Društveni ili fiskanlni porezi
+SocialContributionsDeductibles=Odbitak društveni ili fiskalni porezi
+SocialContributionsNondeductibles=Neodbijajući društveni ili fiskalni porezi
+LabelContrib=Oznaka doprinosa
+TypeContrib=Tip doprinosa
+MenuSpecialExpenses=Specijalni troškovi
+MenuTaxAndDividends=Porezi i dividende
+MenuSocialContributions=Društveni/fiskalni porezi
+MenuNewSocialContribution=Novi druš/fis porez
+NewSocialContribution=Novi društveni/fiskalni porez
+ContributionsToPay=Društvni/fiskalni porez za platiti
+AccountancyTreasuryArea=Sučelje Računovodstva/Financija
+NewPayment=Novo plaćanje
+Payments=Plaćanja
+PaymentCustomerInvoice=Uplata računa kupca
+PaymentSocialContribution=Plaćanje društveni/fiskalni porez
+PaymentVat=PDV plaćanje
+ListPayment=Popis plaćanja
+ListOfCustomerPayments=Popis uplata kupca
+DateStartPeriod=Datum početka perioda
+DateEndPeriod=Datum završetka perioda
+newLT1Payment=Novo plaćanje poreza 2
+newLT2Payment=Novo plaćanje poreza 3
+LT1Payment=Plaćanje poreza 2
+LT1Payments=Plaćanja poreza 2
+LT2Payment=Plaćanje poreza 3
+LT2Payments=Plaćanja poreza 3
+newLT1PaymentES=Novo RE plaćanje
+newLT2PaymentES=Novo IRPF plaćanje
+LT1PaymentES=RE Plaćanje
+LT1PaymentsES=RE Plaćanja
+LT2PaymentES=IRPF plaćanje
+LT2PaymentsES=IRPF plaćanja
+VATPayment=Plaćanje poreza prodaje
+VATPayments=Plaćanja poreza kod prodaje
+VATRefund=Povrat povrata poreza
+Refund=Povrat
+SocialContributionsPayments=Plaćanja društveni/fiskalni porez
+ShowVatPayment=Prikaži PDV plaćanja
+TotalToPay=Ukupno za platiti
+CustomerAccountancyCode=Konto kupca
+SupplierAccountancyCode=Konto dobavljača
+CustomerAccountancyCodeShort=Konto kupca
+SupplierAccountancyCodeShort=Konto dobavljača
+AccountNumber=Broj računa
+NewAccount=Novi račun
+SalesTurnover=Promet prodaje
+SalesTurnoverMinimum=Minimalni promet prodaje
+ByExpenseIncome=Po troškovima i prihodima
+ByThirdParties=Po komitentima
+ByUserAuthorOfInvoice=Po autoru računa
+CheckReceipt=Depozit čeka
+CheckReceiptShort=Depozit čeka
+LastCheckReceiptShort=Zadnjih %s potvrda čekova
+NewCheckReceipt=Novi rabat
+NewCheckDeposit=Novi depozit čeka
+NewCheckDepositOn=Izradi račun za depozit na računu: %s
+NoWaitingChecks=Nema čekova koji čekaju depozit.
+DateChequeReceived=Datum zaprimanja čeka
+NbOfCheques=Br. čekova
+PaySocialContribution=Plati društveni/fiskalni porez
+ConfirmPaySocialContribution=Jeste li sigurni da želite svrstati ovaj društveni/fiskalni porez kao plaćeno ?
+DeleteSocialContribution=Obriši plaćanje društvenog ili fiskalnog poreza
+ConfirmDeleteSocialContribution=Jeste li sigurni da želite obrisati ovu uplatu društveni/fiskalni poreza
+ExportDataset_tax_1=Društveni i fiskalni porezi i plaćanja
+CalcModeVATDebt=Način <b>%sPDV na računovodstvene usluge%s</b>
+CalcModeVATEngagement=Način <b>%sPDV na prihode-troškove%s</b>
+CalcModeDebt=Način <b>%sPotraživanje-Dugovanje%s</b> zvano <b>Predano računovodstvo</b>.
+CalcModeEngagement=Način <b>%sPrihodi-Troškovi%s</b> zvano <b>Gotovinsko računovodstvo</b>
+CalcModeLT1= Način <b>%sRE na računima kupaca - računima dobavljača%s</b>
+CalcModeLT1Debt=Način  <b>%sRE na računu kupca%s</b>
+CalcModeLT1Rec= Način  <b>%sRE na računu dobavljača%s</b>
+CalcModeLT2= Način <b>%sIRPF na računima kupaca - računima dobavljača%s</b>
+CalcModeLT2Debt=Način  <b>%sIRPF na računu kupca%s</b>
+CalcModeLT2Rec= Način  <b>%sIRPF na računu dobavljača%s</b>
+AnnualSummaryDueDebtMode=Stanje prihoda i troškova, godišnji sažetak
+AnnualSummaryInputOutputMode=Stanje prihoda i troškova, godišnji sažetak
+AnnualByCompaniesDueDebtMode=Bilanca prihoda i rashoda, detaljno po komitentima, način <b>%sPotražno-Dugovno%s</b> zovemo  <b>Predano računovodstvo</b>.
+AnnualByCompaniesInputOutputMode=Bilanca prihoda i rashoda, detaljno po komitentima, način <b>%sPrihodi-Rashodi%s</b> zovemo <b>Gotovinsko računovodstvo</b>.
+SeeReportInInputOutputMode=Vidi izvještaj <b>%sPrihoda-Troškova%s</b> zvani <b>Gotovinsko računovodstvo</b> za izračun po stvarno uplatama
+SeeReportInDueDebtMode=Vidi izvještaj <b>%sPotražno-Dugovno%s</b> zvano <b>Predano računovodstvo</b> za izračun po izdatim računima 
+RulesAmountWithTaxIncluded=Prikazani iznosi su sa uključenim svim porezima
+RulesResultDue=- Uključuje neplačene račune, troškove, PDV, donacije bez obzira da li su plaćene ili ne. Također uključuje isplačene plaće.<br>- Baziran je na datumu ovjere računa i PDV i po datumu dospjeća troškova. Za plaće definirane sa modulom Plaća, koristi se vrijednost datuma isplate.
+RulesResultInOut=- Uključuje stvarne uplate po računima, troškove, PDV i plaće. <br>- Baziran je po datumu plaćanja računa, troškova, PDV-a i plaćama. Datum donacje za donacije.
+RulesCADue=- Uključuje dospjeće računa kupca bez obzira da li je plaćena ili ne.<br>- Baziran je po datumu ovjere tih računa.<br> 
+RulesCAIn=- Uključuje sva efektivna plaćanja računa zaprimljena od klijenata.<br>- Baziran je po datumu plaćanja tih računa<br>
+DepositsAreNotIncluded=- Računi pologa nisu uključeni
+DepositsAreIncluded=- Računi pologa su uključeni
+LT2ReportByCustomersInInputOutputModeES=Izvještaj po IRPF komitenta
+LT1ReportByCustomersInInputOutputModeES=Izvještaj po RE komitenta
+VATReport=PDV izvještaj 
+VATReportByCustomersInInputOutputMode=Izvještaj prikupljenog i plaćenog PDV-a kupaca
+VATReportByCustomersInDueDebtMode=Izvještaj prikupljenog i plaćenog PDV-a kupaca
+VATReportByQuartersInInputOutputMode=Izvještaj po prikupljenog i plaćenog stopi PDV-a
+LT1ReportByQuartersInInputOutputMode=Izvještaj po RE stopi
+LT2ReportByQuartersInInputOutputMode=Izvještaj po IRPF stopi
+VATReportByQuartersInDueDebtMode=Izvještaj po prikupljenog i plaćenog stopi PDV-a
+LT1ReportByQuartersInDueDebtMode=Izvještaj po RE stopi
+LT2ReportByQuartersInDueDebtMode=Izvještaj po IRPF stopi
+SeeVATReportInInputOutputMode=Vidi izvještaj <b>%sPDV pokrivanje%s</b> za standardni izračun
+SeeVATReportInDueDebtMode=Vidi izvještaj <b>%sProtoka PDV%s</b> za izračun sa opcijom protoka
+RulesVATInServices=- Za usluge, izvještaj uključuje propisani PDV stvarno primljen ili izdan baziran po datumu plaćanja. 
+RulesVATInProducts=- Za materjalna dobra, uključuje PDV računa bazirano po datumu računa.
+RulesVATDueServices=- Za usluge, izvještaj uključuje PDV dospjelih računa, plaćene ili neplaćene, bazirano po datumu računa.
+RulesVATDueProducts=- Za materjalna dobra, uključuje PDV računa, bazirano po datumu računa.
+OptionVatInfoModuleComptabilite=Napomena: Za materijalna dobra, koristite datum isporuke kako bi bilo točnije.
+PercentOfInvoice=%%/račun
+NotUsedForGoods=Nije korišteno na robi
+ProposalStats=Statistike na ponudama
+OrderStats=Statistike na narudžbama
+InvoiceStats=Statistike na računima
+Dispatch=Otpremiti
+Dispatched=Otpremljeno
+ToDispatch=Za otpremu
+ThirdPartyMustBeEditAsCustomer=Komitent mora biti definirana kao kupac
+SellsJournal=Izvještaj prodaje
+PurchasesJournal=Izvještaj kupovine
+DescSellsJournal=Izvještaj prodaje
+DescPurchasesJournal=Izvještaj kupovine
+InvoiceRef=Ref. računa
+CodeNotDef=Nije definirano
+WarningDepositsNotIncluded=Računi depozita nisu uključeni u ovoj verziji s ovim računovodstvenim modulom
+DatePaymentTermCantBeLowerThanObjectDate=Datum valute plaćanja ne može biti manji od datuma objekta.
+Pcg_version=Pcg verzija
+Pcg_type=Pcg tip
+Pcg_subtype=Pcg podtip
+InvoiceLinesToDispatch=Stavke računa za otpremu
+ByProductsAndServices=Po proizvodima i uslugama
+RefExt=Vanjska ref.
+ToCreateAPredefinedInvoice=Za kreiranje predloška računa, kreirajte stadardni račun, onda, bez ovjeravanja, kliknite na gumb "%s"
+LinkedOrder=Poveži s narudžbom
+Mode1=Metoda 1
+Mode2=Metoda 2
+CalculationRuleDesc=Za izračunavanje poreza, postoje dvije metode:<br> Metoda 1 je zaokruživanje PDV za svaku  stavku te njihov zbroj.<br>Metoda 2 je zbrajanje PDV za svaku stavku te zaokruživanje rezultata.<br>Konačni rezultat se može razlikovati za par lipa. Zadani način je način <b>%s</b>.
+CalculationRuleDescSupplier=Sukladno dobavljaču, odaberite prikladnu metodu za primjenu istog pravila računanja i dobivanju istog rezultata očekivanog od vašeg dobavljača.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Izvještaj prometa po proizvodu, kada koristite <b>gotovinsko računovodstvo</b> način nije točno. Ovaj izvještaj je dostupan samo kada koristite <b>Predano računovodstvo</b> (vidi podešavanjke modula računovodstva).
+CalculationMode=Način izračuna
+AccountancyJournal=Kontni plan
+ACCOUNTING_VAT_SOLD_ACCOUNT=Predefinirani konto za prikupljanje PDV ( PDV kod prodaje)
+ACCOUNTING_VAT_BUY_ACCOUNT=Predefinirani konto za povrat poreza ( porez kod nabave)
+ACCOUNTING_VAT_PAY_ACCOUNT=Predefinirani konto za plačanje PDV
+ACCOUNTING_ACCOUNT_CUSTOMER=Konto za predefiniran za komitente kupaca
+ACCOUNTING_ACCOUNT_SUPPLIER=Konto za predefiniran za komitente dobavljače
+CloneTax=Kloniraj društveni/fiskalni porez
+ConfirmCloneTax=Potvrdi kloniranje plaćanja društvenog/fiskalnog poreza
+CloneTaxForNextMonth=Kloniraj za sljedeći mjesec
+SimpleReport=Jednostavan izvještaj
+AddExtraReport=Dodatni izvještaji
+OtherCountriesCustomersReport=Izvještaj stranih kupaca
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Bazirano prema prva dva slova PDV je različit od zemlje vaše tvrtke
+SameCountryCustomersWithVAT=Izvještaj domaćih kupaca
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Bazirano prema prva dva slova PDV je isti od zemlje vaše tvrtke
+LinkedFichinter=Poveži sa intervencijom
+ImportDataset_tax_contrib=Uvoz društvenih/fiskalnih poreza
+ImportDataset_tax_vat=Uvoz plaćanja PDV-a
+ErrorBankAccountNotFound=Greška: Nije pronađen bankovni račun
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index 33c6d0407bb..9c3525cba6d 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -14,13 +14,13 @@ ServiceStatusNotLateShort=Nedovršen
 ServiceStatusLate=Završen
 ServiceStatusLateShort=Završen
 ServiceStatusClosed=Zatvoren
-ShowContractOfService=Show contract of service
+ShowContractOfService=Prikaži ugovor za usluge
 Contracts=Ugovori
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
+ContractsSubscriptions=Ugovori/Pretplate
+ContractsAndLine=Ugovori i stavke ugovora
 Contract=Ugovor
-ContractLine=Contract line
-Closing=Closing
+ContractLine=Stavka ugovora
+Closing=Zatvaranje
 NoContracts=Nema ugovora
 MenuServices=Usluge
 MenuInactiveServices=Usluga nije aktivna
@@ -28,7 +28,7 @@ MenuRunningServices=Pokrenute usluge
 MenuExpiredServices=Usluge koje su istekle
 MenuClosedServices=Završene usluge
 NewContract=Novi ugovor
-NewContractSubscription=New contract/subscription
+NewContractSubscription=Novi ugovor/pretplata
 AddContract=Izradi ugovor
 DeleteAContract=Izbriši ugovor
 CloseAContract=Zatvori ugovor
@@ -50,8 +50,8 @@ ListOfClosedServices=Lista završenih usluga
 ListOfRunningServices=Lista usluga koje se odvijaju
 NotActivatedServices=Neaktivne usluge(među ovjerenim ugovorima)
 BoardNotActivatedServices=Usluge za aktivaciju među ovjerenim ugovorima
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+LastContracts=Zadnjih %s ugovora
+LastModifiedServices=Zadnjih %s promjenjenih usluga
 ContractStartDate=Datum početka
 ContractEndDate=Datum završetka
 DateStartPlanned=Planirani početni datum
@@ -72,17 +72,17 @@ DeleteContractLine=Izbriši linije ugovora
 ConfirmDeleteContractLine=Jeste li sigurni da želite izbrisati ovu liniju ugovora?
 MoveToAnotherContract=Premjesti usluge u drugi ugovor
 ConfirmMoveToAnotherContract=Prihvaćam novi prikazani ugovor i potvrđujem da želim premjestit usluge u taj ugovor.
-ConfirmMoveToAnotherContractQuestion=Odaberi u koji postojeći ugovor(od same treće strane), vi želite preselite usluge?
+ConfirmMoveToAnotherContractQuestion=Odaberi u koji postojeći ugovor (od istog komitenta), želite preseliti usluge?
 PaymentRenewContractId=Obnovi liniju ugovora(broj %s)
 ExpiredSince=Datum isteka
 NoExpiredServices=Nema isteklih aktivnih usluga
 ListOfServicesToExpireWithDuration=Lista usluga koja ističe za %s dana
 ListOfServicesToExpireWithDurationNeg=Lista usluga koji ističe za više od %s dana
 ListOfServicesToExpire=Lista usluga koja ističe
-NoteListOfYourExpiredServices=Ova lista sadrži samo usluge kontakata treće strane sa kojima ste linkani kao prodajni predstavnik
+NoteListOfYourExpiredServices=Ova lista sadrži samo usluge kontakata komitenata sa kojima ste povezani kao prodajni predstavnik
 StandardContractsTemplate=Predložak uobičajenog ugovora
 ContactNameAndSignature=Za %s, ime i potpis
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+OnlyLinesWithTypeServiceAreUsed=Samo stavke tipa "Usluga" biti će klonirane.
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Predstavnik trgovca potpisuje ugovor
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index eb0811a2e38..09fbbbe19c6 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -1,78 +1,79 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = Pročitaj planirani posao
+Permission23102 = Kreiraj/promjeni planirani posao
+Permission23103 = Obriši planirani posao
+Permission23104 = Pokreni planirani posao
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronSetup= Postavljanje upravljanja planiranih poslova
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=Ili za provjeru i pokretanje specifičnog posla
+KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron zadataka
+FileToLaunchCronJobs=Komanda za pokretanje cron poslova
+CronExplainHowToRunUnix=U Unix okolini potrebno je korisititi sljedeći crontab unos za pokretanje komande svakih 5 minuta
+CronExplainHowToRunWin=Na Microsoft(tm) Windows okolini možete koristiti Scheduled task alate za pokretanje komandi svakih 5 minuta
+CronMethodDoesNotExists=Klasa %s ne sadrži niti jednu %s metodu
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=Omogući i onemogući
 # Page list
-CronLastOutput=Last run output
-CronLastResult=Last result code
-CronCommand=Command
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
-CronInfo=Scheduled job module allow to execute job that have been planned
-CronTask=Job
-CronNone=None
-CronDtStart=Not before
-CronDtEnd=Not after
-CronDtNextLaunch=Next execution
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
-CronClass=Class
-CronMethod=Method
-CronModule=Module
-CronNoJobs=No jobs registered
-CronPriority=Priority
-CronLabel=Description
-CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronLastOutput=Zadnji put pokrenuti izlaz
+CronLastResult=Zadnji kod rezultata
+CronCommand=Komanda
+CronList=Planirani poslovi
+CronDelete=Obriši planirane zadatke
+CronConfirmDelete=Jeste li sigurni da želite izbrisati ove planirane poslove?
+CronExecute=Pokreni planirani posao
+CronConfirmExecute=Jeste li sigurni da želite pokrenuti ove planirane poslove sada ?
+CronInfo=Modul planiranih poslova omogućuje izvrsavanje poslova koji su planirani
+CronTask=Posao
+CronNone=Nijedan
+CronDtStart=Ne prije
+CronDtEnd=Ne nakon
+CronDtNextLaunch=Slijedeće pokretanje
+CronDtLastLaunch=Početni datum zadnjeg pokretanja
+CronDtLastResult=Datum završetka zadnjeg pokretanja
+CronFrequency=Učestalost
+CronClass=Klasa
+CronMethod=Metoda
+CronModule=Modul
+CronNoJobs=Nema registriranih poslova
+CronPriority=Prioritet
+CronLabel=Oznaka
+CronNbRun=Br. pokretanja
+CronMaxRun=Max br. pokretanja
+CronEach=Svakih
+JobFinished=Posao pokrenut i završen
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
-CronArgs=Parameters
-CronSaveSucess=Save successfully
-CronNote=Comment
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=Enable
-CronStatusInactiveBtn=Disable
-CronTaskInactive=This job is disabled
-CronId=Id
-CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
-CronFrom=From
+CronAdd= Dodaj poslove
+CronEvery=Izvrši posao svaki
+CronObject=Instanca/Objekt za kreiranje
+CronArgs=Parametri
+CronSaveSucess=Uspješno spremljeno
+CronNote=Komentar
+CronFieldMandatory=Polja %s su obavezna
+CronErrEndDateStartDt=Datum kraja ne može biti prije datuma početka
+CronStatusActiveBtn=Omogući
+CronStatusInactiveBtn=Onemogući
+CronTaskInactive=Ovaj posao je onemogućen
+CronId=ID
+CronClassFile=Klase (filename.class.php)
+CronModuleHelp=Naziv mape Dolibarr modula ( radi isto i s vanjskim Dolibarr modulom ). <BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/<u>product</u>/class/product.class.php, vrijednost modula je <i>product</i>
+CronClassFileHelp=Naziv datoteke za učitavanje.<BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/product/class/<u>product.class.php</u>, vrijednost naziva datoteke klase je <i>product.class.php</i>
+CronObjectHelp=Naziv objekta za učitavanje.<BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/product/class/product.class.php, vrijednost naziva datoteke klase je <i>Product</i>
+CronMethodHelp=Metoda objekta za pokretanje.<BR> Na primjer za dohvat metode od Dolibarr Product objekta /htdocs/product/class/product.class.php, vrijednost metode je <i>fetch</i>
+CronArgsHelp=Argumenti metode.<BR> Na primjer za dohvat metodu od Dolibarr Product objekta /htdocs/product/class/product.class.php, vrijednost parametara može biti <i>0, ProductRef</i>
+CronCommandHelp=Sistemska komanda za pokretanje
+CronCreateJob=Kreiraj novi planirani posao
+CronFrom=Od
 # Info
 # Common
-CronType=Job type
+CronType=Tip posla
 CronType_method=Call method of a Dolibarr Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
+CronCannotLoadClass=Nemoguće učitati klasu %s ili objekt %s
+UseMenuModuleToolsToAddCronJobs=Idite na izbornik "Home - Admin tools - Scheduled jobs" za prikaz i uređivanje planiranih poslova.
+JobDisabled=Posao onemogućen
+MakeLocalDatabaseDumpShort=Lakalni backup baze
+MakeLocalDatabaseDump=Kreiraj lokalni backup baze
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/hr_HR/deliveries.lang b/htdocs/langs/hr_HR/deliveries.lang
index afeaf5b2ea3..8792cf441ce 100644
--- a/htdocs/langs/hr_HR/deliveries.lang
+++ b/htdocs/langs/hr_HR/deliveries.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Dostava
-DeliveryRef=Ref Delivery
+DeliveryRef=Ref. dostave
 DeliveryCard=Dostavna kartica
 DeliveryOrder=Narudžba za isporuku
 DeliveryDate=Datum dostave
 CreateDeliveryOrder=Generiraj narudžbu dostave
-DeliveryStateSaved=Delivery state saved
+DeliveryStateSaved=Status dostave pohranjen
 SetDeliveryDate=Postavi dan za slanje
 ValidateDeliveryReceipt=Ovjeriti otpremnicu
 ValidateDeliveryReceiptConfirm=Jeste li sigurni da želite ovjeriti otpremnicu?
@@ -14,9 +14,9 @@ DeleteDeliveryReceiptConfirm=Jeste li sigurni da želite ovjeriti otpremnicu <b>
 DeliveryMethod=Metoda dostave
 TrackingNumber=Broj za praćenje
 DeliveryNotValidated=Dostava nije potvrđena
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=Otkazano
+StatusDeliveryDraft=Skica
+StatusDeliveryValidated=Primljeno
 # merou PDF model
 NameAndSignature=Ime i potpis:
 ToAndDate=Za___________________________________ dana ____/_____/__________
@@ -27,4 +27,4 @@ Recipient=Primatelj
 ErrorStockIsNotEnough=Nema dovoljno robe na skladištu
 Shippable=Dostava je moguća
 NonShippable=Dostava nije moguća
-ShowReceiving=Show delivery receipt
+ShowReceiving=Prikaži dostavnu primku
diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
index 2022600a381..fabe3be0a9b 100644
--- a/htdocs/langs/hr_HR/dict.lang
+++ b/htdocs/langs/hr_HR/dict.lang
@@ -30,12 +30,12 @@ CountryMC=Monako
 CountryAU=Australija
 CountrySG=Singapur
 CountryAF=Afganistan
-CountryAX=Åland Islands
+CountryAX=Alandski otoci
 CountryAL=Albanija
 CountryAS=Američka Samoa
 CountryAD=Andora
 CountryAO=Angola
-CountryAI=Anguilla
+CountryAI=Angvila
 CountryAQ=Antartik
 CountryAG=Antigua and Barbuda
 CountryAM=Armenija
@@ -295,13 +295,13 @@ CurrencyCentSingINR=paise
 CurrencyThousandthSingTND=tisućuti
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Mailing campaign
-DemandReasonTypeSRC_CAMP_EMAIL=EMailing campaign
-DemandReasonTypeSRC_CAMP_PHO=Phone campaign
-DemandReasonTypeSRC_CAMP_FAX=Fax campaign
-DemandReasonTypeSRC_COMM=Commercial contact
-DemandReasonTypeSRC_SHOP=Shop contact
-DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_CAMP_MAIL=Kampanja poštom
+DemandReasonTypeSRC_CAMP_EMAIL=Kampanja e-poštom
+DemandReasonTypeSRC_CAMP_PHO=Kampanja telefonom
+DemandReasonTypeSRC_CAMP_FAX=Kampanja faksom
+DemandReasonTypeSRC_COMM=Kontakt komercijale
+DemandReasonTypeSRC_SHOP=Kontakt u dućanu
+DemandReasonTypeSRC_WOM=Usmeno
 DemandReasonTypeSRC_PARTNER=Suradnik
 DemandReasonTypeSRC_EMPLOYEE=Zaposlenik
 DemandReasonTypeSRC_SPONSORING=Sponzorstvo
diff --git a/htdocs/langs/hr_HR/donations.lang b/htdocs/langs/hr_HR/donations.lang
index be959a80805..20767ce61a9 100644
--- a/htdocs/langs/hr_HR/donations.lang
+++ b/htdocs/langs/hr_HR/donations.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - donations
-Donation=Donation
-Donations=Donations
-DonationRef=Donation ref.
-Donor=Donor
-AddDonation=Create a donation
-NewDonation=New donation
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation ?
-ShowDonation=Show donation
-PublicDonation=Public donation
-DonationsArea=Donations area
-DonationStatusPromiseNotValidated=Draft promise
-DonationStatusPromiseValidated=Validated promise
-DonationStatusPaid=Donation received
-DonationStatusPromiseNotValidatedShort=Draft
-DonationStatusPromiseValidatedShort=Validated
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
-DonationDatePayment=Payment date
-ValidPromess=Validate promise
-DonationReceipt=Donation receipt
-DonationsModels=Documents models for donation receipts
-LastModifiedDonations=Latest %s modified donations
-DonationRecipient=Donation recipient
-IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
+Donation=Donacija
+Donations=Donacije
+DonationRef=Ref. donacije
+Donor=Donator
+AddDonation=Kreiraj donaciju
+NewDonation=Nova donacija
+DeleteADonation=Obriši donaciju
+ConfirmDeleteADonation=Jeste li sigurni da želite obrisati ovu donaciju ?
+ShowDonation=Prikaži donaciju
+PublicDonation=Javna donacija
+DonationsArea=Sučelje donacija
+DonationStatusPromiseNotValidated=Skica obečanja
+DonationStatusPromiseValidated=Ovjeri obečanje
+DonationStatusPaid=Primljene donacije
+DonationStatusPromiseNotValidatedShort=Skica
+DonationStatusPromiseValidatedShort=Ovjereno
+DonationStatusPaidShort=Primljeno
+DonationTitle=Račun za donaciju
+DonationDatePayment=Datum plačanja
+ValidPromess=Ovjeri obečanje
+DonationReceipt=Račun za donaciju
+DonationsModels=Modeli dokumenata za račune donacija
+LastModifiedDonations=Zadnjih %s promjenjenih donacija
+DonationRecipient=Primatelj donacije
+IConfirmDonationReception=Primatelj objavljuje primitak, kao donaciju, sljedećeg iznosa
+MinimumAmount=Minimalni iznos je %s
+FreeTextOnDonations=Slobodan tekst za prikaz u podnožju
+FrenchOptions=Opcije za Francusku
+DONATION_ART200=Prikaži članak 200 iz CGI ako ste zabrinuti
+DONATION_ART238=Prikaži članak 238 iz CGI ako ste zabrinuti
+DONATION_ART885=Prikaži članak 885 iz CGI ako ste zabrinuti
+DonationPayment=Isplata donacije
diff --git a/htdocs/langs/hr_HR/ecm.lang b/htdocs/langs/hr_HR/ecm.lang
index b3d0cfc6482..126a3c545cd 100644
--- a/htdocs/langs/hr_HR/ecm.lang
+++ b/htdocs/langs/hr_HR/ecm.lang
@@ -1,44 +1,44 @@
 # Dolibarr language file - Source file is en_US - ecm
-ECMNbOfDocs=Nb of documents in directory
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
-ECMSections=Directories
+ECMNbOfDocs=Br. dokumenata u mapi
+ECMSection=Mapa
+ECMSectionManual=Ručna mapa
+ECMSectionAuto=Automatska mapa
+ECMSectionsManual=Ručno stablo
+ECMSectionsAuto=Automatsko stablo
+ECMSections=Mape
 ECMRoot=Root
-ECMNewSection=New directory
-ECMAddSection=Add directory
-ECMCreationDate=Creation date
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
-ECMNbOfFilesInSubDir=Number of files in sub-directories
-ECMCreationUser=Creator
-ECMArea=EDM area
-ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
-ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.<br>* Manual directories can be used to save documents not linked to a particular element.
-ECMSectionWasRemoved=Directory <b>%s</b> has been deleted.
-ECMSearchByKeywords=Search by keywords
-ECMSearchByEntity=Search by object
-ECMSectionOfDocuments=Directories of documents
-ECMTypeAuto=Automatic
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=Documents linked to third parties
-ECMDocsByProposals=Documents linked to proposals
-ECMDocsByOrders=Documents linked to customers orders
-ECMDocsByContracts=Documents linked to contracts
-ECMDocsByInvoices=Documents linked to customers invoices
-ECMDocsByProducts=Documents linked to products
-ECMDocsByProjects=Documents linked to projects
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
-ECMNoDirectoryYet=No directory created
-ShowECMSection=Show directory
-DeleteSection=Remove directory
-ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
-ECMDirectoryForFiles=Relative directory for files
-CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
-ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
-DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Refresh" button first to synchronize disk and database to get content of this directory.
+ECMNewSection=Nova mapa
+ECMAddSection=Dodaj mapu
+ECMCreationDate=Datum kreiranja
+ECMNbOfFilesInDir=Broj datoteka u mapi
+ECMNbOfSubDir=Broj podmapa
+ECMNbOfFilesInSubDir=Broj datoteka u podmapama
+ECMCreationUser=Kreirao
+ECMArea=Sučelje EDM 
+ECMAreaDesc=EDM (Upravljanje elektronskim dokumentima) sučelje dozvoljava vam spremanje, dijeljenje i brzo pretraživanje svih tipova dokumenata u Dolibarr-u.
+ECMAreaDesc2=* Automatske mape se popunjavaju automatski kada dodajete dokumente s kartice elemenata.<br>* Ručne mape mogu se koristiti za spremanje dokumenata koji nisu povezani s određenim elementom.
+ECMSectionWasRemoved=Mapa <b>%s</b> je obrisana.
+ECMSearchByKeywords=Pretraživanje po ključnim riječima
+ECMSearchByEntity=Pretraživanje po objektu
+ECMSectionOfDocuments=Mape dokumenata
+ECMTypeAuto=Automatsko
+ECMDocsBySocialContributions=Dokumenti povezani za društvene ili fiskalne poreze
+ECMDocsByThirdParties=Dokumenti povezani za komitente
+ECMDocsByProposals=Dokumenti povezani za ponude
+ECMDocsByOrders=Dokumenti povezani za narudžbe kupaca
+ECMDocsByContracts=Dokumenti povezani za ugovore
+ECMDocsByInvoices=Dokumenti povezani za račune kupaca
+ECMDocsByProducts=Dokumenti povezani za proizvode
+ECMDocsByProjects=Dokumenti vezani za projekte
+ECMDocsByUsers=Dokumenti povezani za korisnike
+ECMDocsByInterventions=Dokumenti povezani za intervencije
+ECMNoDirectoryYet=Mapa nije kreirana
+ShowECMSection=Prikaži mapu
+DeleteSection=Obriši mapu
+ConfirmDeleteSection=Možete li potvrditi da želite obrisati mapu <b>%s</b> ?
+ECMDirectoryForFiles=Relativna mapa za datoteke
+CannotRemoveDirectoryContainsFiles=Brisanje nije moguće jer sadrži neke datoteke
+ECMFileManager=Upravitelj datotekama
+ECMSelectASection=Odaberite mapu na lijevom stablu
+DirNotSynchronizedSyncFirst=Izgleda da ova mapa je kreirana ili mjenjana izvan ECM modula. Morate prvo kliknuti na gumb "Osvježenje" kako biste sinhronizirali disk i bazu da dobijete sadržaj ove mape.
 
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 364d60bf6b8..49af0fbc8b0 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -18,9 +18,9 @@ ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'.
 ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'.
 ErrorFailToDeleteDir=Failed to delete directory '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
-ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
-ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
-ErrorBadThirdPartyName=Bad value for third party name
+ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni račun je gotovinski račun, te kao takav prihvača samo gotovinske uplate.
+ErrorFromToAccountsMustDiffers=Izvorni i odredišni bankovni računi moraju biti različiti.
+ErrorBadThirdPartyName=Neispravan unos za naziv komitenta
 ErrorProdIdIsMandatory=The %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntax for customer code
 ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
@@ -63,7 +63,7 @@ ErrorNoValueForRadioType=Please fill value for radio list
 ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
 ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorNoAccountancyModuleLoaded=No accountancy module activated
+ErrorNoAccountancyModuleLoaded=Računovodstveni modul nije aktiviran
 ErrorExportDuplicateProfil=This profile name already exists for this export set.
 ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
 ErrorLDAPMakeManualTest=A .ldif file has been generated in directory %s. Try to load it manually from command line to have more information on errors.
@@ -91,7 +91,7 @@ ErrorMaxNumberReachForThisMask=Max number reach for this mask
 ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
 ErrorSelectAtLeastOne=Error. Select at least one entry.
 ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
-ErrorProdIdAlreadyExist=%s is assigned to another third
+ErrorProdIdAlreadyExist=%s je dodjeljen to drugom 
 ErrorFailedToSendPassword=Failed to send password
 ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
 ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
@@ -102,7 +102,7 @@ ErrorRecordAlreadyExists=Record already exists
 ErrorCantReadFile=Failed to read file '%s'
 ErrorCantReadDir=Failed to read directory '%s'
 ErrorBadLoginPassword=Bad value for login or password
-ErrorLoginDisabled=Your account has been disabled
+ErrorLoginDisabled=Vaš račun je onemogučen
 ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.
 ErrorFailedToChangePassword=Failed to change password
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
@@ -110,7 +110,7 @@ ErrorLoginHasNoEmail=This user has no email address. Process aborted.
 ErrorBadValueForCode=Bad value for security code. Try again with new value...
 ErrorBothFieldCantBeNegative=Fields %s and %s can't be both negative
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
-ErrorWebServerUserHasNotPermission=User account <b>%s</b> used to execute web server has no permission for that
+ErrorWebServerUserHasNotPermission=Korisnički račun <b>%s</b> koji pokreće web server nema dozvolu za pokretanje
 ErrorNoActivatedBarcode=No barcode type activated
 ErrUnzipFails=Failed to unzip %s with ZipArchive
 ErrNoZipEngine=No engine to unzip %s file in this PHP
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hr_HR/externalsite.lang b/htdocs/langs/hr_HR/externalsite.lang
index facf3bbea2f..e938e493903 100644
--- a/htdocs/langs/hr_HR/externalsite.lang
+++ b/htdocs/langs/hr_HR/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=Postavljanje linkova na vanjske web stranice
 ExternalSiteURL=URL vanjske stranice
 ExternalSiteModuleNotComplete=Modul ExternalSite nije ispravno podešen.
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=Moj izbornik unos
diff --git a/htdocs/langs/hr_HR/ftp.lang b/htdocs/langs/hr_HR/ftp.lang
index 8ecb0c55cad..8b752c8df69 100644
--- a/htdocs/langs/hr_HR/ftp.lang
+++ b/htdocs/langs/hr_HR/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+FTPClientSetup=Podešavanje FTP Klijent modula
+NewFTPClient=Podešavanje novog FTP spajanja
+FTPArea=FTP sučelje
+FTPAreaDesc=Ovaj ekran vam prikazuje sadržaj FTP servera
+SetupOfFTPClientModuleNotComplete=Postavke modula FTP klijenta nije potpun
+FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP funkcije
+FailedToConnectToFTPServer=Neuspješno povezivanje s FTP serverom (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Neuspješna prijava na FTP server s pristupnim podacima
+FTPFailedToRemoveFile=Neuspješno brisanje datoteke <b>%s</b>.
+FTPFailedToRemoveDir=Neuspješno brisanje mape <b>%s</b> (Provjerite prava pristupa i da li je mapa prazna).
+FTPPassiveMode=Pasivni mod
+ChooseAFTPEntryIntoMenu=Odaberite FTP na izborniku
+FailedToGetFile=Neuspješno preuzimanje datoteka %s
diff --git a/htdocs/langs/hr_HR/help.lang b/htdocs/langs/hr_HR/help.lang
index 22da1f5c45e..03aa3fc4f27 100644
--- a/htdocs/langs/hr_HR/help.lang
+++ b/htdocs/langs/hr_HR/help.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Forum/Wiki support
-EMailSupport=Emails support
-RemoteControlSupport=Online real time / remote support
-OtherSupport=Other support
-ToSeeListOfAvailableRessources=To contact/see available resources:
-HelpCenter=Help center
-DolibarrHelpCenter=Dolibarr help and support center
-ToGoBackToDolibarr=Otherwise, click <a href="%s">here to use Dolibarr</a>
-TypeOfSupport=Source of support
-TypeSupportCommunauty=Community (free)
-TypeSupportCommercial=Commercial
-TypeOfHelp=Type
-NeedHelpCenter=Need help or support ?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Formation
-ToGetHelpGoOnSparkAngels1=Some companies can provide a fast (sometime immediate) and more efficient online support by taking control of your computer. Such helpers can be found on <b>%s</b> web site:
-ToGetHelpGoOnSparkAngels3=You can also go to the list of all available coaches for Dolibarr, for this click on button
-ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment you make your search, so think to change the filter to look for "all availability". You will be able to send more requests.
-BackToHelpCenter=Otherwise, click here to go <a href="%s">back to help center home page</a>.
-LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+CommunitySupport=Forum/Wiki podrška
+EMailSupport=Podrška e-poštom
+RemoteControlSupport=Online real time / remote podrška
+OtherSupport=Ostala podrška
+ToSeeListOfAvailableRessources=Da biste kontaktirali/vidjeli raspoložive resurse:
+HelpCenter=Help centar
+DolibarrHelpCenter=Dolibarr centar pomoći i podrške
+ToGoBackToDolibarr=U suprotnom, kliknite <a href="%s">ovdje za korištenje Dolibarr-a</a>
+TypeOfSupport=Izvor podrške
+TypeSupportCommunauty=Zajednica (besplatno)
+TypeSupportCommercial=Komercijalno
+TypeOfHelp=Tip
+NeedHelpCenter=Trebate li pomoć ili podršku ?
+Efficiency=Efikasnost
+TypeHelpOnly=Samo pomoć
+TypeHelpDev=Pomoć + Razvoj
+TypeHelpDevForm=Pomoć + Razvoj + Osnivanje
+ToGetHelpGoOnSparkAngels1=Neke tvrtke mogu pružiti brzu (ponekad neposrednu) i efikasniju online podršku uzimajući kontrolu nad vašim računalom. Takvi pomoćnici mogu se pronaći na <b>%s</b> web stranicama:
+ToGetHelpGoOnSparkAngels3=Također možete pogledati popis svih dostupnih trenera za Dolibarr, za to kliknite na gumb 
+ToGetHelpGoOnSparkAngels2=Ponekad, nema dostupne tvrtke u trenutku vašeg pretraživanja, probajte promjeniti filter za pretraživanje na "sva dostupnost". Biti ćete u mogućnosti poslati više zahtjeva.
+BackToHelpCenter=U suprotnim, kliknite ovdje za povratak na <a href="%s">naslovnu stranicu centra pomoći</a>.
+LinkToGoldMember=Možete nazvati jednog od trenera predodabrane od Dolibarr-a za vaš jezik (%s) kliknuvši na dodatak(status i maksimalna cijena je automatski ažurirana):
+PossibleLanguages=Podržani jezici
+SubscribeToFoundation=Pomognite Dolibarr projektu, prijavite se u zakladu
+SeeOfficalSupport=Za oficijalnu Dolibarr podršku na vašem jeziku: <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index a95da81eaaa..3bf65ea9247 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -1,103 +1,103 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
-AddCP=Make a leave request
-DateDebCP=Start date
-DateFinCP=End date
-DateCreateCP=Creation date
-DraftCP=Draft
-ToReviewCP=Awaiting approval
-ApprovedCP=Approved
-CancelCP=Canceled
-RefuseCP=Refused
-ValidatorCP=Approbator
-ListeCP=List of leaves
-ReviewedByCP=Will be reviewed by
-DescCP=Description
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
-ErrorEndDateCP=You must select an end date greater than the start date.
-ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the leave request does not exist.
-ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this leave request.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-NbUseDaysCP=Number of days of vacation consumed
-EditCP=Edit
-DeleteCP=Delete
-ActionRefuseCP=Refuse
-ActionCancelCP=Cancel
+Holidays=Odsustva
+CPTitreMenu=Odsustva
+MenuReportMonth=Mjesečna izjava
+MenuAddCP=Novi zahtjev odsustva
+NotActiveModCP=Morate omogućiti modul Odsustva za pregled ove stranice.
+AddCP=Izradi zahtjev odsustva
+DateDebCP=Datum početka
+DateFinCP=Datum završetka
+DateCreateCP=Datum kreiranja
+DraftCP=Skica
+ToReviewCP=Čeka odobrenje
+ApprovedCP=Odobreno
+CancelCP=Poništeno
+RefuseCP=Odbijeno
+ValidatorCP=Odobrio
+ListeCP=Popis odsustva
+ReviewedByCP=Biti će pregledano od
+DescCP=Opis
+SendRequestCP=Kreiraj zahtjev odsustva
+DelayToRequestCP=Zahtjev odsustva mora biti kreiran najmanje <b>%s dan(a)</b> prije.
+MenuConfCP=Stanje odsustva
+SoldeCPUser=Stanje odsustva je <b>%s</b> dana.
+ErrorEndDateCP=Datum završetka mora biti veći od datuma početka.
+ErrorSQLCreateCP=Dogodila se SQL greška kod kreiranja:
+ErrorIDFicheCP=Dogosila se greška, zahtjev ne postoji.
+ReturnCP=Povratak na prijašnju stranu
+ErrorUserViewCP=Niste ovlašteni za čitanje zahtjeva.
+InfosWorkflowCP=Procedura Informacija
+RequestByCP=Zahtjeva
+TitreRequestCP=Zahtjev za odsustvom
+NbUseDaysCP=Broj potrošenih dana godišnjeg 
+EditCP=Uredi
+DeleteCP=Obriši
+ActionRefuseCP=Odbij
+ActionCancelCP=Otkaži
 StatutCP=Status
-TitleDeleteCP=Delete the leave request
-ConfirmDeleteCP=Confirm the deletion of this leave request?
-ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
-CantCreateCP=You don't have the right to make leave requests.
-InvalidValidatorCP=You must choose an approbator to your leave request.
-NoDateDebut=You must select a start date.
-NoDateFin=You must select an end date.
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
-DetailRefusCP=Reason for refusal
-DateRefusCP=Date of refusal
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Assign an exceptional leave for a user
-addEventToUserCP=Assign leave
-MotifCP=Reason
-UserCP=User
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
-FirstDayOfHoliday=First day of vacation
-LastDayOfHoliday=Last day of vacation
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
-HolidaysMonthlyUpdate=Monthly update
-ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+TitleDeleteCP=Obriši zahtjev odsutnosti
+ConfirmDeleteCP=Potvrdite brisanje ovog zahtjeva ?
+ErrorCantDeleteCP=Greška nemate pravo za brisanje zahtjeva.
+CantCreateCP=Nemate pravo za kreiranje zahtjeva.
+InvalidValidatorCP=Morate izabrati osobu odobravanja vašeg zahtjeva.
+NoDateDebut=Morate odabrati datum početka.
+NoDateFin=Morate odabrati datum završetka.
+ErrorDureeCP=Vaš zahtjev ne sadrži radni dan.
+TitleValidCP=Odobri zahtjev
+ConfirmValidCP=Jeste li sigurni da želite odobriti zahtjev za odlaskom ?
+DateValidCP=Datum odobrenja
+TitleToValidCP=Pošalji zahtjev
+ConfirmToValidCP=Jeste li sigurni da želite poslati zahtjev za odlaskom ?
+TitleRefuseCP=Odbij zahtjev
+ConfirmRefuseCP=Jeste li sigurni da želite odbiti zajtjev za odlaskom ?
+NoMotifRefuseCP=Morate odabrati razlog odbijanja zahtjeva.
+TitleCancelCP=Otkaži zahtjev.
+ConfirmCancelCP=Jeste li sigurni da želite poništite zahtjev za odlaskom ?
+DetailRefusCP=Razlog odbijanja
+DateRefusCP=Datum odbijanja
+DateCancelCP=Datom otkazivanja
+DefineEventUserCP=Dodjeli specijalno odsustvo za korisnika
+addEventToUserCP=Dodjeli odsustvo
+MotifCP=Razlog
+UserCP=Korisnik
+ErrorAddEventToUserCP=Dogodila se greška kod dodavanja specijalnog odsustva.
+AddEventToUserOkCP=Dodatak specijalnog odsustva je završen.
+MenuLogCP=Pregled dnevnika promjena
+LogCP=Dnevnik promjena za dostupne slobodne dane
+ActionByCP=Izvršio
+UserUpdateCP=Za korisnika
+PrevSoldeCP=Prijašnje stanje
+NewSoldeCP=Novo stanje
+alreadyCPexist=Zahtjev je već napravljen za ovaj period.
+FirstDayOfHoliday=Prvi dan godišnjeg
+LastDayOfHoliday=Zadnji dan godišnjeg
+BoxTitleLastLeaveRequests=Zadnjih %s izmjenjenih zahtjeva za odlaskom
+HolidaysMonthlyUpdate=Mjesečna promjena
+ManualUpdate=Ručna promjena
+HolidaysCancelation=Odbijanje zahtjeva
+EmployeeLastname=Prezime zaposlenika
+EmployeeFirstname=Ime zaposlenika
 
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
-UpdateConfCPOK=Updated successfully.
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+LastUpdateCP=Zadnje automatsko ažuriranje raspodjele odlazaka
+MonthOfLastMonthlyUpdate=Mjesec zadnjeg automatskog ažuriranja raspodjele odlazaka
+UpdateConfCPOK=Uspješno promjenjeno
+Module27130Name= Upravljanje zahtjevima odsustva
+Module27130Desc= Upravljanje zahtjevima odsustva
+ErrorMailNotSend=Dogodila se greška kod slanja e-pošte:
+NoticePeriod=Otkazni rok
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
-FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
-NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+HolidaysToValidate=Ovjeri zahtjeve
+HolidaysToValidateBody=Dolje su zahtjevi za ovjeru
+HolidaysToValidateDelay=Ovaj zahtjev će stupiti na snagu unutar perioda manjeg od %s dana.
+HolidaysToValidateAlertSolde=Korisnik koji je kreirao zahtjev nema dovoljno dostupnih dana.
+HolidaysValidated=Ovjereni zahtjevi
+HolidaysValidatedBody=Vaš zahtjev za %s do %s je ovjeren.
+HolidaysRefused=Zahtjev odbijen
+HolidaysRefusedBody=Vaš zahtjev od %s do %s je odbijen zbog:
+HolidaysCanceled=Otkazani zahtjev
+HolidaysCanceledBody=Vaš zahtjev za %s do %s je otkazan.
+FollowedByACounter=1: Ovaj tip odsustva mora biti pračen brojačem. Brojač se povečava ručno ili automatski, a kada je zahtjev ovjeren, brojač se smanjuje.<br> 0: Nije pračeno brojačem.
+NoLeaveWithCounterDefined=Nema definiranih tipova zahtjeva koji moraju biti pračenjem brojačem
+GoIntoDictionaryHolidayTypes=Idite na <strong>Naslovnu - Podešavanje - Definicije - Tipovi odsustva</strong> za podešavanje različitih tipova odsustva.
diff --git a/htdocs/langs/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
index 6730da53d2d..6ae14e763de 100644
--- a/htdocs/langs/hr_HR/hrm.lang
+++ b/htdocs/langs/hr_HR/hrm.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - en_US - hrm
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are-you sure to delete this establishment ?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+HRM_EMAIL_EXTERNAL_SERVICE=E-pošta za sprečavanje vanjskog HRM servisa
+Establishments=Ustanove
+Establishment=Ustanova
+NewEstablishment=Nova ustanova
+DeleteEstablishment=Obriši ustanovu
+ConfirmDeleteEstablishment=Jeste li sigurni da želite obrisati ustanovu ?
+OpenEtablishment=Otvori ustanovu
+CloseEtablishment=Zatvori ustanovu
 # Dictionary
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Function list
+DictionaryDepartment=HRM - popis odjela
+DictionaryFunction=HRM - popis funkcija
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
+Employees=Zaposlenici
+Employee=Zaposlenik
+NewEmployee=Novi zaposlenik
diff --git a/htdocs/langs/hr_HR/incoterm.lang b/htdocs/langs/hr_HR/incoterm.lang
index 7ff371e3a95..b6e33607c35 100644
--- a/htdocs/langs/hr_HR/incoterm.lang
+++ b/htdocs/langs/hr_HR/incoterm.lang
@@ -1,3 +1,3 @@
 Module62000Name=Incoterm
-Module62000Desc=Add features to manage Incoterm
+Module62000Desc=Dodaj mogučnosti za upravljanje Incoterm-om
 IncotermLabel=Incoterms
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index ce41ae75a30..cc97ff18cc6 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -86,7 +88,7 @@ DirectoryRecommendation=It is recommanded to use a directory outside of your dir
 LoginAlreadyExists=Already exists
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back, if you want to create another one.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Neuspješno kreiranje administratorskog računa.
 WarningRemoveInstallDir=Warning, for security reasons, once the install or upgrade is complete, to avoid using install tools again, you should add a file called <b>install.lock</b> into Dolibarr document directory, in order to avoid malicious use of it.
 FunctionNotAvailableInThisPHP=Not available on this PHP
 ChoosedMigrateScript=Choose migration script
@@ -133,13 +135,17 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
 MigrationFixData=Fix for denormalized data
 MigrationOrder=Data migration for customer's orders
 MigrationSupplierOrder=Data migration for supplier's orders
-MigrationProposal=Data migration for commercial proposals
+MigrationProposal=Migracija podataka za ponude
 MigrationInvoice=Data migration for customer's invoices
 MigrationContract=Data migration for contracts
 MigrationSuccessfullUpdate=Upgrade successfull
@@ -177,7 +183,7 @@ MigrationDeliveryOrderMatching=Delivery receipt update
 MigrationDeliveryDetail=Delivery update
 MigrationStockDetail=Update stock value of products
 MigrationMenusDetail=Update dynamic menus tables
-MigrationDeliveryAddress=Update delivery address in shipments
+MigrationDeliveryAddress=Ažuriraj adresu dostave kod isporuke
 MigrationProjectTaskActors=Data migration for llx_projet_task_actors table
 MigrationProjectUserResp=Data migration field fk_user_resp of llx_projet to llx_element_contact
 MigrationProjectTaskTime=Update time spent in seconds
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/hr_HR/interventions.lang b/htdocs/langs/hr_HR/interventions.lang
index fb1b0b09362..b61a1e0455f 100644
--- a/htdocs/langs/hr_HR/interventions.lang
+++ b/htdocs/langs/hr_HR/interventions.lang
@@ -1,61 +1,62 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervention
-Interventions=Interventions
-InterventionCard=Intervention card
-NewIntervention=New intervention
-AddIntervention=Create intervention
-ListOfInterventions=List of interventions
-ActionsOnFicheInter=Actions on intervention
-LastInterventions=Latest %s interventions
-AllInterventions=All interventions
-CreateDraftIntervention=Create draft
-InterventionContact=Intervention contact
-DeleteIntervention=Delete intervention
-ValidateIntervention=Validate intervention
-ModifyIntervention=Modify intervention
-DeleteInterventionLine=Delete intervention line
-CloneIntervention=Clone intervention
-ConfirmDeleteIntervention=Are you sure you want to delete this intervention ?
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b> ?
-ConfirmModifyIntervention=Are you sure you want to modify this intervention ?
-ConfirmDeleteInterventionLine=Are you sure you want to delete this intervention line ?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention ?
-NameAndSignatureOfInternalContact=Name and signature of intervening :
-NameAndSignatureOfExternalContact=Name and signature of customer :
-DocumentModelStandard=Standard document model for interventions
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
-StatusInterInvoiced=Billed
-ShowIntervention=Show intervention
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
+Intervention=Intervencija
+Interventions=Intervencije
+InterventionCard=Kartica intervencije
+NewIntervention=Nova intervencija
+AddIntervention=Kreiraj intervenciju
+ListOfInterventions=Popis intervencija
+ActionsOnFicheInter=Akcije na intervencije
+LastInterventions=Zadnjih %s intervencija
+AllInterventions=Sve intervencije
+CreateDraftIntervention=Kreiraj skicu
+InterventionContact=Kontakt za intervenciju
+DeleteIntervention=Obriši intervenciju
+ValidateIntervention=Potvrdi intervenciju
+ModifyIntervention=Promjeni intervenciju
+DeleteInterventionLine=Obriši stavku intervencije
+CloneIntervention=Kloniraj intervenciju
+ConfirmDeleteIntervention=Jeste li sigurni da želite obrisati ovu intervenciju ?
+ConfirmValidateIntervention=Jeste li sigurni da želite potvrditi intervenciju pod imenom <b>%s</b> ?
+ConfirmModifyIntervention=Jeste li sigurni da želite promjeniti ovu intervenciju ?
+ConfirmDeleteInterventionLine=Jeste li sigurni da želite obrisati ovu stavku intervencije ?
+ConfirmCloneIntervention=Jeste li sigurni da želite klonirati intervenciju ?
+NameAndSignatureOfInternalContact=Ime i potpis osobe:
+NameAndSignatureOfExternalContact=Ime i potpis kupca:
+DocumentModelStandard=Standardni model dokumenta za intervencije
+InterventionCardsAndInterventionLines=Intervencije i stavke intervencija
+InterventionClassifyBilled=Označi "Naplačeno"
+InterventionClassifyUnBilled=Označi "Nenaplačeno"
+StatusInterInvoiced=Naplačeno
+ShowIntervention=Prikaži intervenciju
+SendInterventionRef=Podnošenje intervencije %s
+SendInterventionByMail=Pošalji intervenciju putem e-pošte
+InterventionCreatedInDolibarr=Intervencija %s kreirana
+InterventionValidatedInDolibarr=Intervencija %s ovjerena
+InterventionModifiedInDolibarr=Intervencija %s promjenjena
+InterventionClassifiedBilledInDolibarr=Intervencija %s je postavljena "Naplačena"
+InterventionClassifiedUnbilledInDolibarr=Intervencija %s je postavljena "Nenaplačena"
+InterventionSentByEMail=Intervencija %s poslana putem Emaila
+InterventionDeletedInDolibarr=Intervencija %s obrisana
+InterventionsArea=Sučelje intervencija
+DraftFichinter=Skica intervencija
+LastModifiedInterventions=Zadnjih %s izmjenjenih intervencija
 ##### Types de contacts #####
-TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
+TypeContact_fichinter_external_CUSTOMER=Sljedeći kontakt kupca
 # Modele numérotation
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+PrintProductsOnFichinter=Ispiši također stavke tipa "proizvod" (ne samo usluge) na kartici intervencija
+PrintProductsOnFichinterDetails=intervencije generirane iz narudžbi
+UseServicesDurationOnFichinter=Koristi trajanje usluge za intervencije generirane iz narudžbi
+InterventionStatistics=Statistika intervencija
+NbOfinterventions=Br. kartica intervencija
+NumberOfInterventionsByMonth=Br. intervencija po mjesecima (datum ovjere)
 ##### Exports #####
-InterId=Intervention id
-InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
-InterLineId=Line id intervention
-InterLineDate=Line date intervention
-InterLineDuration=Line duration intervention
-InterLineDesc=Line description intervention
+InterId=ID Intervencije
+InterRef=Ref. Intervencije
+InterDateCreation=Datum kreiranja
+InterDuration=Trajanje
+InterStatus=Status
+InterNote=Napomena
+InterLineId=Stavka ID
+InterLineDate=Stavka datuma
+InterLineDuration=Stavka trajanja
+InterLineDesc=Stavka opisa
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index 9a7bb67f81b..c20fd414bd2 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_ar_AR=Arapski
 Language_ar_SA=Arapski
-Language_bn_BD=Bengali
+Language_bn_BD=Bengalski
 Language_bg_BG=Bugarski
 Language_bs_BA=Bosanski
 Language_ca_ES=Katalonski
@@ -13,7 +13,7 @@ Language_de_AT=Njemački (Austrija)
 Language_de_CH=Njemački (Švicarska)
 Language_el_GR=Grčki
 Language_en_AU=Engleski (Australija)
-Language_en_CA=English (Canada)
+Language_en_CA=Engleski (Kanada)
 Language_en_GB=Engleski (United Kingdom)
 Language_en_IN=Engleski (Indija)
 Language_en_NZ=Engleski (Novi Zeland)
@@ -22,26 +22,26 @@ Language_en_US=Engleski (United States)
 Language_en_ZA=Engleski (Južna Afrika)
 Language_es_ES=Španjolski
 Language_es_AR=Španjolski (Argentina)
-Language_es_BO=Spanish (Bolivia)
+Language_es_BO=Španjolski (Bolivija)
 Language_es_CL=Španjolski (Čile)
-Language_es_CO=Spanish (Colombia)
+Language_es_CO=Španjolski (Kolumbija)
 Language_es_DO=Španjolski (Dominikanska Republika)
 Language_es_HN=Španjolski (Honduras)
 Language_es_MX=Španjolski (Meksiko)
 Language_es_PY=Španjolski (Paragvaj)
 Language_es_PE=Španjolski (Peru)
 Language_es_PR=Španjolski (Puerto Rico)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=Španjolski (Venezuela)
 Language_et_EE=Estonski
 Language_eu_ES=Baskijski
 Language_fa_IR=Persian
-Language_fi_FI=Finnish
+Language_fi_FI=Finski
 Language_fr_BE=Francuski (Belgija)
 Language_fr_CA=Francuski (Kanada)
 Language_fr_CH=Francuski (Švicarska)
 Language_fr_FR=Francuzi
 Language_fr_NC=Francuski (Nova Kaledonija)
-Language_fy_NL=Frisian
+Language_fy_NL=Frizijski
 Language_he_IL=Hebrew
 Language_hr_HR=Hrvatski
 Language_hu_HU=Mađarski
@@ -49,10 +49,10 @@ Language_id_ID=Indonezijski
 Language_is_IS=Islandski
 Language_it_IT=Talijanski
 Language_ja_JP=Japanski
-Language_ka_GE=Georgian
-Language_kn_IN=Kannada
+Language_ka_GE=Gruzijski
+Language_kn_IN=Kanada jezik
 Language_ko_KR=Korejski
-Language_lo_LA=Lao
+Language_lo_LA=Laoški
 Language_lt_LT=Litvanski
 Language_lv_LV=Letonski
 Language_mk_MK=Makedonski
@@ -71,8 +71,8 @@ Language_sv_SV=Švedski
 Language_sv_SE=Švedski
 Language_sq_AL=Albanski
 Language_sk_SK=Slovački
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
+Language_sr_RS=Srpski
+Language_sw_SW=Kišvalski
 Language_th_TH=Tajlandski
 Language_uk_UA=Ukrajinski
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/hr_HR/ldap.lang b/htdocs/langs/hr_HR/ldap.lang
index 23f0df862b9..f07dd33e336 100644
--- a/htdocs/langs/hr_HR/ldap.lang
+++ b/htdocs/langs/hr_HR/ldap.lang
@@ -1,23 +1,25 @@
 # Dolibarr language file - Source file is en_US - ldap
-DomainPassword=Password for domain
-YouMustChangePassNextLogon=Password for user <b>%s</b> on the domain <b>%s</b> must be changed.
-UserMustChangePassNextLogon=User must change password on the domain %s
-LDAPInformationsForThisContact=Information in LDAP database for this contact
-LDAPInformationsForThisUser=Information in LDAP database for this user
-LDAPInformationsForThisGroup=Information in LDAP database for this group
-LDAPInformationsForThisMember=Information in LDAP database for this member
-LDAPAttributes=LDAP attributes
-LDAPCard=LDAP card
-LDAPRecordNotFound=Record not found in LDAP database
-LDAPUsers=Users in LDAP database
+DomainPassword=Lozinka za domenu
+YouMustChangePassNextLogon=Lozinka za korisnika <b>%s</b> na domeni <b>%s</b> mora se promjeniti.
+UserMustChangePassNextLogon=Korisnik mora promjeniti lozinku na domeni %s
+LDAPInformationsForThisContact=Podaci u LDAP bazi za kontakt
+LDAPInformationsForThisUser=Podaci u LDAP bazi za korisnika
+LDAPInformationsForThisGroup=Podaci u LDAP bazi za grupu
+LDAPInformationsForThisMember=Podaci u LDAP bazi za člana
+LDAPAttributes=LDAP atributi
+LDAPCard=LDAP kartica
+LDAPRecordNotFound=Podatak nije pronađen u LDAP bazi
+LDAPUsers=Korisnici u LDAP bazi
 LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=First subscription date
-LDAPFieldFirstSubscriptionAmount=First subscription amount
-LDAPFieldLastSubscriptionDate=Last subscription date
-LDAPFieldLastSubscriptionAmount=Last subscription amount
-UserSynchronized=User synchronized
-GroupSynchronized=Group synchronized
-MemberSynchronized=Member synchronized
-ContactSynchronized=Contact synchronized
-ForceSynchronize=Force synchronizing Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Failed to read LDAP database. Check LDAP module setup and database accessibility.
+LDAPFieldFirstSubscriptionDate=Datum prve pretplate
+LDAPFieldFirstSubscriptionAmount=Iznos prve pretplate
+LDAPFieldLastSubscriptionDate=Datum zadnje pretplate
+LDAPFieldLastSubscriptionAmount=Iznos zadnnje pretplate
+LDAPFieldSkype=Skype ID
+LDAPFieldSkypeExample=Primjer: skypeIme
+UserSynchronized=Korisnik sinhroniziran
+GroupSynchronized=Grupa sinhronizirana
+MemberSynchronized=Član sinhroniziran
+ContactSynchronized=Kontakt sinhroniziran
+ForceSynchronize=Forsiraj sinhronizaciju Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Neuspješno čitanje LDAP baze. Provjerite postavke LDAP modula i pristupnost bazi.
diff --git a/htdocs/langs/hr_HR/link.lang b/htdocs/langs/hr_HR/link.lang
index 42c7555d469..9e5eb0d2868 100644
--- a/htdocs/langs/hr_HR/link.lang
+++ b/htdocs/langs/hr_HR/link.lang
@@ -1,9 +1,10 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Poveži novu datoteku/dokument
+LinkedFiles=Povezane datoteke i dokumenti
+NoLinkFound=Nema registriranih veza
+LinkComplete=Datoteka je uspješno povezana
+ErrorFileNotLinked=Datoteku je nemoguće povezati
+LinkRemoved=Veza %s je obrisana
+ErrorFailedToDeleteLink= Neuspješno brisanje veze '<b>%s</b>'
+ErrorFailedToUpdateLink= Neuspješna promjena veze '<b>%s</b>'
+URLToLink=URL prema vezi
diff --git a/htdocs/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
index de0d5a0525f..9882439a110 100644
--- a/htdocs/langs/hr_HR/loan.lang
+++ b/htdocs/langs/hr_HR/loan.lang
@@ -1,49 +1,49 @@
 # Dolibarr language file - Source file is en_US - loan
-Loan=Loan
-Loans=Loans
-NewLoan=New Loan
-ShowLoan=Show Loan
-PaymentLoan=Loan payment
-ShowLoanPayment=Show Loan Payment
-LoanCapital=Capital
-Insurance=Insurance
-Interest=Interest
-Nbterms=Number of terms
-LoanAccountancyCapitalCode=Accountancy code capital
-LoanAccountancyInsuranceCode=Accountancy code insurance
-LoanAccountancyInterestCode=Accountancy code interest
-ConfirmDeleteLoan=Confirm deleting this loan
-LoanDeleted=Loan Deleted Successfully
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Loan Paid
+Loan=Kredit
+Loans=Krediti
+NewLoan=Nova kredit
+ShowLoan=Prikaži kredit
+PaymentLoan=Isplata kredita
+ShowLoanPayment=Prikaži isplatu kredita
+LoanCapital=Kapital
+Insurance=Osiguranje
+Interest=Kamata
+Nbterms=Broj rata
+LoanAccountancyCapitalCode=Konto kapitala
+LoanAccountancyInsuranceCode=Konto osiguranja
+LoanAccountancyInterestCode=Konto kamata
+ConfirmDeleteLoan=Potvrdite brisanje kredita
+LoanDeleted=Kredit je uspješno obrisan
+ConfirmPayLoan=Potvrdite označivanje isplačen kredit
+LoanPaid=Kredit isplačen
 # Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
+LoanCalc=Kalkulatora bankovnih kredita
+PurchaseFinanceInfo=Informacije o nabavi i financiranju
+SalePriceOfAsset=Cijena imovine
 PercentageDown=Percentage Down
-LengthOfMortgage=Duration of loan
-AnnualInterestRate=Annual Interest Rate
-ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
-MortgagePaymentInformation=Mortgage Payment Information
-DownPayment=Down Payment
-DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
-InterestRateDesc=The <b>interest rate</b> = The annual interest percentage divided by 100
-MonthlyFactorDesc=The <b>monthly factor</b> = The result of the following formula
-MonthlyInterestRateDesc=The <b>monthly interest rate</b> = The annual interest rate divided by 12 (for the 12 months in a year)
-MonthTermDesc=The <b>month term</b> of the loan in months = The number of years you've taken the loan out for times 12
-MonthlyPaymentDesc=The montly payment is figured out using the following formula
-AmortizationPaymentDesc=The <a href="#amortization">amortization</a> breaks down how much of your monthly payment goes towards the bank's interest, and how much goes into paying off the principal of your loan.
-AmountFinanced=Amount Financed
-AmortizationMonthlyPaymentOverYears=Amortization For Monthly Payment: <b>%s</b> over %s years
-Totalsforyear=Totals for year
-MonthlyPayment=Monthly Payment
-LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
-GoToInterest=%s will go towards INTEREST
-GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
+LengthOfMortgage=Trajanje kredita
+AnnualInterestRate=Godišnja kamatna stopa
+ExplainCalculations=Objašnjenje izračuna
+ShowMeCalculationsAndAmortization=Prikaži izračun i amortizaciju
+MortgagePaymentInformation=Informacije hipotekarnog plačanja
+DownPayment=Predujam
+DownPaymentDesc=<b>Predujam</b> = Cijena doma pomnožena s percentage down, podjeljena sa 100 ( za 5% dolje postaje 5/100 ili 0.05)
+InterestRateDesc=<b>Kamatna stopa</b> = godišnji kamatni postotak podjeljen sa 100
+MonthlyFactorDesc=<b>Mjesečni faktor</b> = Rezultat sljedeće formule
+MonthlyInterestRateDesc=<b>Mjesečna kamatna stopa</b> = Godišnja kamatna stopa podjeljena sa 12 ( za 12 mjeseci u godini )
+MonthTermDesc=<b>Mjesečni period</b> plačanje kredita u mjesecima = Broj godina na koliko je uzet kredit pomnožen s 12
+MonthlyPaymentDesc=Mjesečna rata je izračunata korištenjem sljedeće formule
+AmortizationPaymentDesc=<a href="#amortization">Amortization</a> razgrađuje koliko vaše mjesčno plačanje ide u bankovne kamate, a koliko ide u plačanje glavnice vašeg kredita.
+AmountFinanced=Financirani iznos
+AmortizationMonthlyPaymentOverYears=Amortizacija za mjesečnu ratu: <b>%s</b> za %s godine
+Totalsforyear=Ukupno za godinu
+MonthlyPayment=Mjesečna rata
+LoanCalcDesc=<b>Hipotekarni kalkulator</b> se može koristiti za izračun mjesečnih rata kredita, bazirano na posuđenom iznosu, periodu kredita i kamatnoj stopi.<br>Ovaj kalkulator također uključuje PMI (privatno kreditno osiguranje) za kredite gdje je predujam manji od 20%% . Isto uzmite u obzir gradske poreze na nekretnine, i njihov utjecaj na ukupnu mjesečnu ratu kredita.
+GoToInterest=%s će otići u KAMATU
+GoToPrincipal=%s će otići u GLAVNICU
+YouWillSpend=Potrošit ćete %s u %s godina
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
+ConfigLoan=Konfiguracija modula kredita
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Predefiniran konto kapitala
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Predefiniran konto kamata
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Predefiniran konto osiguranja
diff --git a/htdocs/langs/hr_HR/mailmanspip.lang b/htdocs/langs/hr_HR/mailmanspip.lang
index bab4b3576b4..4558c6834fc 100644
--- a/htdocs/langs/hr_HR/mailmanspip.lang
+++ b/htdocs/langs/hr_HR/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
+MailmanSpipSetup=Podešavanje Mailman i SPIP modula
 MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+TestSubscribe=Testiranje pretplate na Mailman liste
+TestUnSubscribe=Testiranje odjave sa Mailman liste
+MailmanCreationSuccess=Test prijave je uspješno izvršen
+MailmanDeletionSuccess=Test odjave je uspješno izvršen
+SynchroMailManEnabled=Mailman će biti ažuriran
+SynchroSpipEnabled=SPIP će biti ažuriran
+DescADHERENT_MAILMAN_ADMINPW=Mailman lozinka administratora
+DescADHERENT_MAILMAN_URL=URL za Mailman prijave
+DescADHERENT_MAILMAN_UNSUB_URL=URL za Mailman odjave
+DescADHERENT_MAILMAN_LISTS=Lista(e) za automatsku prijavu novih članova (odvojeno zarezom)
+SPIPTitle=SPIP Upravitelj sadržajem
+DescADHERENT_SPIP_SERVEUR=SPIP server
+DescADHERENT_SPIP_DB=SPIP naziv baze
+DescADHERENT_SPIP_USER=SPIP korisničko ime baze
+DescADHERENT_SPIP_PASS=SPIP lozinka baze
+AddIntoSpip=Dodaj u SPIP
+AddIntoSpipConfirmation=Jeste li sigurni da želite dodati člana u SPIP?
+AddIntoSpipError=Neuspješno dodavanje korisnika u SPIP
+DeleteIntoSpip=Obriše iz SPIP-a
+DeleteIntoSpipConfirmation=Jeste li sigurni da želite obrisati člana iz SPIP-a
+DeleteIntoSpipError=Neuspješno brisanje korisnika iz SPIP-a
+SPIPConnectionFailed=Neuspješno spajanje na SPIP
+SuccessToAddToMailmanList=%s uspješno dodan na Mailman listu %s ili SPIP bazu
+SuccessToRemoveToMailmanList=%s uspješno obrisan iz Mailman liste %s ili SPIP baze
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index ffe7d5735d1..dfa1f73a906 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -42,9 +42,9 @@ MailingStatusNotContact=Don't contact anymore
 MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=Email recipient is empty
 WarningNoEMailsAdded=No new Email to add to recipient's list.
-ConfirmValidMailing=Are you sure you want to validate this emailing ?
-ConfirmResetMailing=Warning, by reinitializing emailing <b>%s</b>, you allow to make a mass sending of this email another time. Are you sure you this is what you want to do ?
-ConfirmDeleteMailing=Are you sure you want to delete this emailling ?
+ConfirmValidMailing=Jeste li sigurni da želite ovjeriti slanje e-pošte ?
+ConfirmResetMailing=Upozorenje, reinicijalizacijom slanje e-pošte <b>%s</b>, dozvoljavate slanje višestruko slanje ove e-pošte sljedeći put. Jeste li sigurni da želite to učiniti ?
+ConfirmDeleteMailing=Jeste li sigurni da želite obrisati slanje e-pošte ?
 NbOfUniqueEMails=Nb of unique emails
 NbOfEMails=Nb of EMails
 TotalNbOfDistinctRecipients=Number of distinct recipients
@@ -57,18 +57,19 @@ MailingAddFile=Attach this file
 NoAttachedFiles=No attached files
 BadEMail=Bad value for EMail
 CloneEMailing=Clone Emailing
-ConfirmCloneEMailing=Are you sure you want to clone this emailing ?
+ConfirmCloneEMailing=Jeste li sigurni da želite klonirati slanje e-pošte ?
 CloneContent=Clone message
 CloneReceivers=Cloner recipients
-DateLastSend=Date of latest sending
+DateLastSend=Datum zadnjeg slanja
 DateSending=Date sending
 SentTo=Sent to <b>%s</b>
 MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -80,7 +81,7 @@ LineInFile=Line %s in file
 RecipientSelectionModules=Defined requests for recipient's selection
 MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
-LastMailings=Last %s emailings
+LastMailings=Zadnjih %s slanja e-pošte
 TargetsStatistics=Targets statistics
 NbOfCompaniesContacts=Unique contacts/addresses
 MailNoChangePossible=Recipients for validated emailing can't be changed
@@ -89,7 +90,7 @@ SendMailing=Send emailing
 SendMail=Send email
 MailingNeedCommand=For security reason, sending an emailing is better when performed from command line. If you have one, ask your server administrator to launch the following command to send the emailing to all recipients:
 MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other.
-ConfirmSendingEmailing=If you can't or prefer sending them with your www browser, please confirm you are sure you want to send emailing now from your browser ?
+ConfirmSendingEmailing=Ako ne možete ili preferirate slanje putem web preglednika, molim potvrdite da ste sigurni da želite slanje e-pošte sada putem vašeg web preglednika ?
 LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
 TargetsReset=Clear list
 ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing
@@ -107,7 +108,7 @@ TagMailtoEmail=Recipient EMail (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Notifications
-NoNotificationsWillBeSent=No email notifications are planned for this event and company
+NoNotificationsWillBeSent=Nema planiranih obavijesti za ovaj događaj i tvrtku
 ANotificationsWillBeSent=1 notification will be sent by email
 SomeNotificationsWillBeSent=%s notifications will be sent by email
 AddNewNotification=Activate a new email notification target
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 368b9a6f41c..8cedb9c02df 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -7,7 +7,7 @@ DIRECTION=ltr
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
-SeparatorThousand=None
+SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
 FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
@@ -23,262 +23,269 @@ FormatDateHourShort=%m/%d/%Y %I:%M %p
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
-DatabaseConnection=Database connection
-NoTemplateDefined=No template defined for this email type
-AvailableVariables=Available substitution variables
+DatabaseConnection=Veza s bazom podataka
+NoTemplateDefined=Nema definiranog predloška za ovaj tip e-pošte
+AvailableVariables=Dostupne zamjenske varijable
 NoTranslation=Bez prijevoda
 NoRecordFound=Nema pronađenih bilješki
-NotEnoughDataYet=Not enough data
+NotEnoughDataYet=Nedovoljno podataka
 NoError=Bez greške
 Error=Greška
-Errors=Errors
+Errors=Greške
 ErrorFieldRequired=Potrebno je '%s' polje
 ErrorFieldFormat=Neispravna vrijednost u polju '%s'
 ErrorFileDoesNotExists=Datoteka %s ne postoji
 ErrorFailedToOpenFile=Datoteka %s nije uspješno otvorena
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Nemoguće kreirati mapu %s
+ErrorCanNotReadDir=Nemogu pročitati mapu %s
 ErrorConstantNotDefined=Značajka %s nije određena
 ErrorUnknown=Nepoznata greška
 ErrorSQL=Greška na SQL-u
 ErrorLogoFileNotFound=Datoteka s logom '%s' nije pronađena
-ErrorGoToGlobalSetup=Idite na postavke 'Tvrtka/Organizacija' kako bi ste ovo popravili
+ErrorGoToGlobalSetup=Idite na postavke 'Tvrtka/Zaklada' kako bi ste ovo popravili
 ErrorGoToModuleSetup=Idite na postavke modula kako bi ste ovo popravili
 ErrorFailedToSendMail=Elektronska pošta nije poslana (pošiljatelj=%s, primatelj=%s)
 ErrorFileNotUploaded=Datoteka nije učitana. Proverite da veličina ne prelazi dozvoljenu, da imate slobodnog mjesta na disku i da u ovoj mapi nema datoteke sa istim imenom.
 ErrorInternalErrorDetected=Pronađena greška
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
-ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
-ErrorWrongValue=Wrong value
-ErrorWrongValueForParameterX=Wrong value for parameter %s
-ErrorNoRequestInError=No request in error
-ErrorServiceUnavailableTryLater=Service not available for the moment. Try again later.
-ErrorDuplicateField=Duplicate value in a unique field
-ErrorSomeErrorWereFoundRollbackIsDone=Some errors were found. We rollback changes.
-ErrorConfigParameterNotDefined=Parameter <b>%s</b> is not defined inside Dolibarr config file <b>conf.php</b>.
-ErrorCantLoadUserFromDolibarrDatabase=Failed to find user <b>%s</b> in Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Error, no vat rates defined for country '%s'.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
-ErrorFailedToSaveFile=Error, failed to save file.
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
-BackgroundColorByDefault=Default background color
-FileUploaded=The file was successfully uploaded
-FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
-NbOfEntries=Nb of entries
-GoToWikiHelpPage=Read online help (Internet access needed)
-GoToHelpPage=Read help
-RecordSaved=Record saved
-RecordDeleted=Record deleted
-LevelOfFeature=Level of features
-NotDefined=Not defined
+ErrorWrongHostParameter=Krivi parametar host-a
+ErrorYourCountryIsNotDefined=Zemlja nije definirana. Idite na Naslovnu-Podešavanje-Uređivanje i ispunite ponovo obrazac.
+ErrorRecordIsUsedByChild=Neuspješno brisanje podatka. Ovaj podatak se koristi.
+ErrorWrongValue=Neispravna vrijednost
+ErrorWrongValueForParameterX=Neispravna vrijednost za parametar %s
+ErrorNoRequestInError=Nema zahtjeva s greškom
+ErrorServiceUnavailableTryLater=Servis nije trenutno dostupan. Pokušajte kasnije.
+ErrorDuplicateField=Dupla vrijednost za jedinstveno polje
+ErrorSomeErrorWereFoundRollbackIsDone=Pronađene su greške. Vraćamo promjene.
+ErrorConfigParameterNotDefined=Parametar <b>%s</b> nije definiran u Dolibarr konfiguracijskoj datoteci <b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Korisnik <b>%s</b> ne postoji u bazi.
+ErrorNoVATRateDefinedForSellerCountry=Greška, nisu definirane porezne stope za zemlju '%s'.
+ErrorNoSocialContributionForSellerCountry=Greška, nisu definirani društveni/fiskalni porezi za zemlju '%s'.
+ErrorFailedToSaveFile=Greška, neuspješno snimanje datoteke.
+NotAuthorized=Niste autorizirani za ovu akciju.
+SetDate=Postavi datum
+SelectDate=Izaberi datum
+SeeAlso=Vidi također %s
+SeeHere=Vidi ovdje
+BackgroundColorByDefault=Zadana boja pozadine
+FileRenamed=Ime datoteke uspješno promijenjeno
+FileUploaded=Datoteka je uspješno učitana
+FileWasNotUploaded=Datoteka je odabrana za prilogu ali nije još učitana. Klikni na "Priloži datoteku".
+NbOfEntries=Br. unosa
+GoToWikiHelpPage=Pročitajte Online pomoć ( potreban pristup Internetu)
+GoToHelpPage=Pročitaj pomoć
+RecordSaved=Podatak spremljen
+RecordDeleted=Podatak obrisan
+LevelOfFeature=Razina mogučnosti
+NotDefined=Nije definirano
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode is setup to <b>%s</b> in configuration file <b>conf.php</b>.<br>This means that password database is extern to Dolibarr, so changing this field may have no effects.
 Administrator=Administrator
-Undefined=Undefined
-PasswordForgotten=Password forgotten ?
-SeeAbove=See above
-HomeArea=Home area
-LastConnexion=Last connection
-PreviousConnexion=Previous connection
-PreviousValue=Previous value
-ConnectedOnMultiCompany=Connected on environment
-ConnectedSince=Connected since
-AuthenticationMode=Authentification mode
-RequestedUrl=Requested Url
-DatabaseTypeManager=Database type manager
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
-DolibarrHasDetectedError=Dolibarr has detected a technical error
-InformationToHelpDiagnose=This information can be useful for diagnostic
-MoreInformation=More information
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=Note (public)
-NotePrivate=Note (private)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
+Undefined=Nedefinirano
+PasswordForgotten=Zaboravljena lozinka ?
+SeeAbove=Vidi iznad
+HomeArea=Naslovna
+LastConnexion=Zadnje spajanje
+PreviousConnexion=Prijašnje spajanje
+PreviousValue=Prijašnja vrijednost
+ConnectedOnMultiCompany=Spojeno na okolinu
+ConnectedSince=Spojeno od
+AuthenticationMode=Način prijave
+RequestedUrl=Traženi URL
+DatabaseTypeManager=Tip upravitelja bazom podataka
+RequestLastAccessInError=Zadnja pogreška pristupa bazi
+ReturnCodeLastAccessInError=Povratni kod za zadnju grešku pristupa bazi
+InformationLastAccessInError=Informacije o zadnjoj grešci pristupa bazi
+DolibarrHasDetectedError=Dolibarr je detektirao tehničku grešku
+InformationToHelpDiagnose=Ova informacija može biti korisna za dijagnostiku
+MoreInformation=Više informacija
+TechnicalInformation=Tehničke informacije
+TechnicalID=Tehnički ID
+NotePublic=Napomena (javna)
+NotePrivate=Napomena (privatna)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr je podešen za ograničenje preciznosti jedinične cijene na <b>%s</b> decimala.
 DoTest=Test
 ToFilter=Filter
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
-MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
+NoFilter=Bez filtera
+WarningYouHaveAtLeastOneTaskLate=Upozorenje, imate najmanje jedan element koji je prekoračio toleranciju kašnjenja.
+yes=da
+Yes=Da
+no=ne
+No=Ne
+All=Sve
+Home=Početna
+Help=Pomoć
+OnlineHelp=Online pomoć
+PageWiki=Wiki stranica
+MediaBrowser=Preglednik medija
+Always=Uvijek
+Never=Nikad
+Under=pod
 Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-Enabled=Enabled
-Deprecated=Deprecated
-Disable=Disable
-Disabled=Disabled
-Add=Add
-AddLink=Add link
-RemoveLink=Remove link
-AddToDraft=Add to draft
-Update=Update
-Close=Close
-CloseBox=Remove widget from your dashboard
-Confirm=Confirm
-ConfirmSendCardByMail=Do you really want to send content of this card by mail to <b>%s</b> ?
-Delete=Delete
-Remove=Remove
-Resiliate=Resiliate
-Cancel=Cancel
-Modify=Modify
-Edit=Edit
-Validate=Validate
-ValidateAndApprove=Validate and Approve
-ToValidate=To validate
-Save=Save
-SaveAs=Save As
-TestConnection=Test connection
-ToClone=Clone
-ConfirmClone=Choose data you want to clone :
-NoCloneOptionsSpecified=No data to clone defined.
-Of=of
-Go=Go
-Run=Run
-CopyOf=Copy of
-Show=Show
-ShowCardHere=Show card
-Search=Search
-SearchOf=Search
-Valid=Valid
-Approve=Approve
-Disapprove=Disapprove
-ReOpen=Re-Open
-Upload=Send file
-ToLink=Link
-Select=Select
-Choose=Choose
-Resize=Resize
-Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-NoUserGroupDefined=No user group defined
-Password=Password
-PasswordRetype=Retype your password
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
-Name=Name
-Person=Person
-Parameter=Parameter
-Parameters=Parameters
-Value=Value
-PersonalValue=Personal value
-NewValue=New value
-CurrentValue=Current value
-Code=Code
-Type=Type
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
-Title=Title
-Label=Label
-RefOrLabel=Ref. or label
-Info=Log
-Family=Family
-Description=Description
-Designation=Description
+PeriodEndDate=Krajnji datum za period
+Activate=Aktiviraj
+Activated=Aktivirano
+Closed=Zatvoreno
+Closed2=Zatvoreno
+Enabled=Omogućeno
+Deprecated=Zastarijelo
+Disable=Onemogući
+Disabled=Onemogućeno
+Add=Dodaj
+AddLink=Dodaj vezu
+RemoveLink=Makni poveznicu
+AddToDraft=Dodaj u skice
+Update=Nadogradi
+Close=Zatvori
+CloseBox=Makni dodatak sa vaše kontrolne ploče
+Confirm=Potvrdi
+ConfirmSendCardByMail=Da li zaista želite poslati sadržaj ove kartice poštom <b>%s</b> ?
+Delete=Obriši
+Remove=Makni
+Resiliate=Povrat
+Cancel=Otkaži
+Modify=Izmjeni
+Edit=Uredi
+Validate=Ovjeri
+ValidateAndApprove=Ovjeri i odobri
+ToValidate=Za ovjeru
+Save=Spremi
+SaveAs=Spremi kao
+TestConnection=Provjera veze
+ToClone=Kloniraj
+ConfirmClone=Odaberite podatke koje želite klonirati:
+NoCloneOptionsSpecified=Nisu definirani podaci za kloniranje.
+Of=od
+Go=Idi
+Run=Pokreni
+CopyOf=Kopija od
+Show=Prikaži
+ShowCardHere=Prikaži karticu
+Search=Pretraži
+SearchOf=Pretraživanje
+Valid=Valjano
+Approve=Odobri
+Disapprove=Ne odobri
+ReOpen=Ponovo otvori
+Upload=Pošalji datoteku
+ToLink=Poveznica
+Select=Odaberi
+Choose=Izaberi
+Resize=Promjeni veličinu
+Recenter=Centriraj
+Author=Autor
+User=Korisnik
+Users=Korisnici
+Group=Grupa
+Groups=Grupe
+NoUserGroupDefined=Nisu definirane grupe
+Password=Lozinka
+PasswordRetype=Ponovo upiši lozinku
+NoteSomeFeaturesAreDisabled=Dosta mogućnosti/modula je onemogućeno u ovoj demonstraciji.
+Name=Ime
+Person=Osoba
+Parameter=Parametar
+Parameters=Parametri
+Value=Vrijednost
+PersonalValue=Osobna vrijednost
+NewValue=Nova vrijednost
+CurrentValue=Trenutna vrijednost
+Code=Kod
+Type=Tip
+Language=Jezik
+MultiLanguage=Višejezičnost
+Note=Napomena
+Title=Naslov
+Label=Oznaka
+RefOrLabel=Ref. ili oznaka
+Info=Dnevnik
+Family=Obitelj
+Description=Opis
+Designation=Opis
 Model=Model
-DefaultModel=Default model
-Action=Event
-About=About
-Number=Number
-NumberByMonth=Number by month
-AmountByMonth=Amount by month
-Numero=Number
+DefaultModel=Zadani model
+Action=Događaj
+About=O programu
+Number=Broj
+NumberByMonth=Broj po mjesecima
+AmountByMonth=Iznos po mjesecima
+Numero=Broj
 Limit=Limit
-Limits=Limits
-Logout=Logout
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=Connection
-Setup=Setup
-Alert=Alert
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
+Limits=Limiti
+Logout=Odjava
+NoLogoutProcessWithAuthMode=Nema mogučnosti aplikativnog odspajanja s <b>%s</b> načinom autentifikacije.
+Connection=Veza
+Setup=Podešavanje
+Alert=Obavijest
+Previous=Prijašnji
+Next=Sljedeći
+Cards=Kartice
+Card=Kartica
+Now=Sad
+HourStart=Početni sat
 Date=Date
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
-DateCreation=Creation date
-DateCreationShort=Creat. date
-DateModification=Modification date
-DateModificationShort=Modif. date
-DateLastModification=Last modification date
-DateValidation=Validation date
-DateClosing=Closing date
-DateDue=Due date
-DateValue=Value date
-DateValueShort=Value date
-DateOperation=Operation date
-DateOperationShort=Oper. Date
-DateLimit=Limit date
-DateRequest=Request date
-DateProcess=Process date
-DateBuild=Report build date
-DatePayment=Date of payment
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
-DurationYear=year
-DurationMonth=month
-DurationWeek=week
-DurationDay=day
-DurationYears=years
-DurationMonths=months
-DurationWeeks=weeks
-DurationDays=days
-Year=Year
-Month=Month
-Week=Week
-Day=Day
-Hour=Hour
-Minute=Minute
-Second=Second
-Years=Years
-Months=Months
-Days=Days
-days=days
-Hours=Hours
-Minutes=Minutes
-Seconds=Seconds
-Weeks=Weeks
-Today=Today
-Yesterday=Yesterday
-Tomorrow=Tomorrow
-Morning=Morning
-Afternoon=Afternoon
+DateAndHour=Datum i vrijeme
+DateToday=Današnji datum
+DateReference=Reference datum
+DateStart=Početni datum
+DateEnd=Završni datum
+DateCreation=Datum kreiranja
+DateCreationShort=Datum kreiranja
+DateModification=Datum izmjene
+DateModificationShort=Datum izmj.
+DateLastModification=Datum zadnje promjene
+DateValidation=Datum ovjere
+DateClosing=Datum zatvaranja
+DateDue=Datum dospjeća
+DateValue=Datum vrijednosti
+DateValueShort=Datum vrijednosti
+DateOperation=Operativan datum
+DateOperationShort=Oper. Datum
+DateLimit=Datum limita
+DateRequest=Datum zahtjeva
+DateProcess=Datum obrade
+DateBuild=Datum kreiranja izvještaja
+DatePayment=Datum plaćanja
+DateApprove=Datum odobrenja
+DateApprove2=Datum odobrenja (drugo odobrenje)
+UserCreation=Kreiranje korisnika
+UserModification=Izmjena korisnika
+UserCreationShort=Kreir. korisnika
+UserModificationShort=izmj. korisnika
+DurationYear=godina
+DurationMonth=mjesec
+DurationWeek=tjedan
+DurationDay=dan
+DurationYears=godine
+DurationMonths=mjeseci
+DurationWeeks=tjedni
+DurationDays=dani
+Year=Godina
+Month=Mjesec
+Week=Tjedan
+WeekShort=Tjedan
+Day=Dan
+Hour=Sat
+Minute=Minuta
+Second=Sekunda
+Years=Godine
+Months=Mjeseci
+Days=Dani
+days=dani
+Hours=Sati
+Minutes=Minute
+Seconds=Sekunde
+Weeks=Tjedni
+Today=Danas
+Yesterday=Jučer
+Tomorrow=Sutra
+Morning=Ujutro
+Afternoon=Poslije podne
 Quadri=Quadri
-MonthOfDay=Month of the day
+MonthOfDay=Mjesec dana
 HourShort=H
 MinuteShort=mn
-Rate=Rate
-UseLocalTax=Include tax
+Rate=Stopa
+CurrencyRate=Stopa konverzije valute
+UseLocalTax=Porez uključen
 Bytes=Bytes
 KiloBytes=Kilobytes
 MegaBytes=Megabytes
@@ -289,471 +296,488 @@ Kb=Kb
 Mb=Mb
 Gb=Gb
 Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-Price=Price
-UnitPrice=Unit price
-UnitPriceHT=Unit price (net)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
-Amount=Amount
-AmountInvoice=Invoice amount
-AmountPayment=Payment amount
-AmountHTShort=Amount (net)
-AmountTTCShort=Amount (inc. tax)
-AmountHT=Amount (net of tax)
-AmountTTC=Amount (inc. tax)
-AmountVAT=Amount tax
-MulticurrencyAmountHT=Amount (net of tax), original currency
-MulticurrencyAmountTTC=Amount (inc. of tax), original currency
-MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Amount RE
-AmountLT2ES=Amount IRPF
-AmountTotal=Total amount
-AmountAverage=Average amount
-PriceQtyMinHT=Price quantity min. (net of tax)
-Percentage=Percentage
-Total=Total
+Cut=Izreži
+Copy=Kopiraj
+Paste=Zalijepi
+Default=Zadano
+DefaultValue=Zadana vrijednost
+Price=Cijena
+UnitPrice=Jedinična cijena
+UnitPriceHT=Jedinična cijena (neto)
+UnitPriceTTC=Jedinična cijena
+PriceU=J.C.
+PriceUHT=J.C. (neto)
+PriceUHTCurrency=J.C. (valuta)
+PriceUTTC=J.C. (s porezom)
+Amount=Iznos
+AmountInvoice=Iznos računa
+AmountPayment=Iznos plaćanja
+AmountHTShort=Iznos (neto)
+AmountTTCShort=Iznos (s porezom)
+AmountHT=Iznos (neto od poreza)
+AmountTTC=Iznos (s porezom)
+AmountVAT=Iznos poreza
+MulticurrencyAmountHT=Iznos (neto od poreza), orginalna valuta
+MulticurrencyAmountTTC=Iznos (s porezom), orginalna valuta
+MulticurrencyAmountVAT=Iznos poreza, orginalna valuta
+AmountLT1=Iznos poreza 2
+AmountLT2=Iznos poreza 3
+AmountLT1ES=Iznos RE
+AmountLT2ES=Iznos IRPF
+AmountTotal=Ukupan iznos
+AmountAverage=Prosječan iznos
+PriceQtyMinHT=Cijena količinska min. (neto od poreza)
+Percentage=Postotak
+Total=Ukupno
 SubTotal=Subtotal
-TotalHTShort=Total (net)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=Total (inc. tax)
-TotalHT=Total (net of tax)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=Total (inc. tax)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
-TotalVAT=Total tax
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
-TotalLT1ES=Total RE
-TotalLT2ES=Total IRPF
-HT=Net of tax
-TTC=Inc. tax
-VAT=Sales tax
-VATs=Sales taxes
+TotalHTShort=Ukupno (neto)
+TotalHTShortCurrency=Ukupno (neto u valuti)
+TotalTTCShort=Ukupno (s porezom)
+TotalHT=Ukupno (neto od poreza)
+TotalHTforthispage=Ukupno (neto od poreza) za ovu stranicu
+Totalforthispage=Ukupno za ovu stranicu
+TotalTTC=Ukupno (s porezom)
+TotalTTCToYourCredit=Ukupno (s porezom) na vaš kredit
+TotalVAT=Ukupno porez
+TotalLT1=Ukupno porez 2
+TotalLT2=Ukupno porez 3
+TotalLT1ES=Ukupno RE
+TotalLT2ES=Ukupno IRPF
+HT=Neto od poreza
+TTC=Uklj. porez
+VAT=Prodajni porez
+VATs=Prodajni porezi
 LT1ES=RE
 LT2ES=IRPF
-VATRate=Tax Rate
-Average=Average
-Sum=Sum
+VATRate=Stopa poreza
+Average=Prosjek
+Sum=Zbroj
 Delta=Delta
-Module=Module
-Option=Option
-List=List
-FullList=Full list
-Statistics=Statistics
-OtherStatistics=Other statistics
+Module=Modul
+Option=Opcija
+List=Popis
+FullList=Kompletan popis
+Statistics=Statistika
+OtherStatistics=Ostale statistike
 Status=Status
-Favorite=Favorite
+Favorite=Favorit
 ShortInfo=Info.
 Ref=Ref.
-ExternalRef=Ref. extern
-RefSupplier=Ref. supplier
-RefPayment=Ref. payment
-CommercialProposalsShort=Commercial proposals
-Comment=Comment
-Comments=Comments
-ActionsToDo=Events to do
-ActionsToDoShort=To do
-ActionsDoneShort=Done
-ActionNotApplicable=Not applicable
-ActionRunningNotStarted=To start
-ActionRunningShort=Started
-ActionDoneShort=Finished
-ActionUncomplete=Uncomplete
-CompanyFoundation=Company/Foundation
-ContactsForCompany=Contacts for this third party
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Events about this third party
-ActionsOnMember=Events about this member
-NActionsLate=%s late
-RequestAlreadyDone=Request already recorded
+ExternalRef=Ref. vanjski
+RefSupplier=Ref. dobavljača
+RefPayment=Ref. plaćanja
+CommercialProposalsShort=Ponude
+Comment=Komentar
+Comments=Komentari
+ActionsToDo=Događaji za napraviti
+ActionsToDoShort=Za napraviti
+ActionsDoneShort=Učinjeno
+ActionNotApplicable=Nije primjenjivo
+ActionRunningNotStarted=Za početi
+ActionRunningShort=Započeto
+ActionDoneShort=Završeno
+ActionUncomplete=Nekompletno
+CompanyFoundation=Tvrtka/Zaklada
+ContactsForCompany=Kontakti komitenta
+ContactsAddressesForCompany=Kontakti/adrese komitenta
+AddressesForCompany=Adrese komitenta
+ActionsOnCompany=Događaji povezani s komitentom
+ActionsOnMember=Događaji za člana
+NActionsLate=%s kasni
+RequestAlreadyDone=Zahtjev je već pohranjen
 Filter=Filter
-FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=Remove filter
-ChartGenerated=Chart generated
-ChartNotGenerated=Chart not generated
-GeneratedOn=Build on %s
-Generate=Generate
-Duration=Duration
-TotalDuration=Total duration
-Summary=Summary
-DolibarrStateBoard=Statistics
-DolibarrWorkBoard=Work tasks board
-Available=Available
-NotYetAvailable=Not yet available
-NotAvailable=Not available
-Categories=Tags/categories
-Category=Tag/category
-By=By
+FilterOnInto=Kriterij pretraživanja '<strong>%s</strong>' unutar polja %s
+RemoveFilter=Makni filter
+ChartGenerated=Grafikon generiran
+ChartNotGenerated=Grafikon nije generiran
+GeneratedOn=Napravljeno %s
+Generate=Generiraj
+Duration=Trajanje
+TotalDuration=Ukupno trajanje
+Summary=Sažetak
+DolibarrStateBoard=Statistika
+DolibarrWorkBoard=Ploča radnih zadataka
+Available=Dostupno
+NotYetAvailable=Nije još dostupno
+NotAvailable=Nije dostupno
+Categories=Kategorije
+Category=Kategorija
+By=Od
 From=Od
-to=to
-and=and
-or=or
-Other=Other
-Others=Others
-OtherInformations=Other informations
-Quantity=Quantity
-Qty=Qty
-ChangedBy=Changed by
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
-ReCalculate=Recalculate
-ResultKo=Failure
-Reporting=Reporting
-Reportings=Reporting
-Draft=Draft
-Drafts=Drafts
-Validated=Validated
-Opened=Open
-New=New
-Discount=Discount
-Unknown=Unknown
-General=General
-Size=Size
-Received=Received
-Paid=Paid
-Topic=Subject
-ByCompanies=By third parties
-ByUsers=By users
-Links=Links
-Link=Link
-Rejects=Rejects
-Preview=Preview
-NextStep=Next step
-Datas=Data
-None=None
-NoneF=None
-Late=Late
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
-Photo=Picture
-Photos=Pictures
-AddPhoto=Add picture
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=Login
-CurrentLogin=Current login
-January=January
-February=February
-March=March
-April=April
-May=May
-June=June
-July=July
-August=August
-September=September
-October=October
-November=November
-December=December
-JanuaryMin=Jan
-FebruaryMin=Feb
-MarchMin=Mar
-AprilMin=Apr
-MayMin=May
-JuneMin=Jun
-JulyMin=Jul
-AugustMin=Aug
-SeptemberMin=Sep
-OctoberMin=Oct
-NovemberMin=Nov
-DecemberMin=Dec
-Month01=January
-Month02=February
-Month03=March
-Month04=April
-Month05=May
-Month06=June
-Month07=July
-Month08=August
-Month09=September
-Month10=October
-Month11=November
-Month12=December
-MonthShort01=Jan
-MonthShort02=Feb
-MonthShort03=Mar
-MonthShort04=Apr
-MonthShort05=May
-MonthShort06=Jun
-MonthShort07=Jul
-MonthShort08=Aug
-MonthShort09=Sep
-MonthShort10=Oct
-MonthShort11=Nov
-MonthShort12=Dec
-AttachedFiles=Attached files and documents
-FileTransferComplete=File was uploaded successfuly
+to=za
+and=i
+or=ili
+Other=Ostalo
+Others=Ostali
+OtherInformations=Ostale informacije
+Quantity=Količina
+Qty=Kol.
+ChangedBy=Promjenio
+ApprovedBy=Odobrio
+ApprovedBy2=Datum odobrenja (drugo odobrenje)
+Approved=Odobreno
+Refused=Odbijeno
+ReCalculate=Rekalkuliraj
+ResultKo=Greška
+Reporting=Izvještavanje
+Reportings=Izvještavanje
+Draft=Skica
+Drafts=Skice
+Validated=Ovjereno
+Opened=Otvori
+New=Novo
+Discount=Rabat
+Unknown=Nepoznat
+General=Generalno
+Size=Veličina
+Received=Primljeno
+Paid=Plaćeno
+Topic=Subjekt
+ByCompanies=Od komitenata
+ByUsers=Od korisnika
+Links=Veze
+Link=Veza
+Rejects=Odbijanja
+Preview=Pregled
+NextStep=Sljedeći korak
+Datas=Podatak
+None=Niti jedan
+NoneF=Niti jedan
+Late=Kasni
+LateDesc=Kašnjenje za definiranje ako podatak kasni ili ne ovisno o vašim postavkama. Tražite administratora da promjeni kašnjenje iz izbornika Naslovna - Podešavanje - Obavijesti.
+Photo=Slika
+Photos=Slike
+AddPhoto=Dodaj sliku
+DeletePicture=Brisanje slike
+ConfirmDeletePicture=Potvrdi brisanje slike?
+Login=Prijava
+CurrentLogin=Trenutna prijava
+January=Siječanj
+February=Veljača
+March=Ožujak
+April=Travanj
+May=Svibanj
+June=Lipanj
+July=Srpanj
+August=Kolovoz
+September=Rujan
+October=Listopad
+November=Studeni
+December=Prosinac
+JanuaryMin=Sje
+FebruaryMin=Velj
+MarchMin=Ožu
+AprilMin=Tra
+MayMin=Svi
+JuneMin=Lip
+JulyMin=Srp
+AugustMin=Kol
+SeptemberMin=Ruj
+OctoberMin=Lis
+NovemberMin=Stu
+DecemberMin=Pro
+Month01=Siječanj
+Month02=Veljača
+Month03=Ožujak
+Month04=Travanj
+Month05=Svibanj
+Month06=Lipanj
+Month07=Srpanj
+Month08=Kolovoz
+Month09=Rujan
+Month10=Listopad
+Month11=Studeni
+Month12=Prosinac
+MonthShort01=Sje
+MonthShort02=Velj
+MonthShort03=Ožu
+MonthShort04=Tra
+MonthShort05=Svi
+MonthShort06=Lip
+MonthShort07=Srp
+MonthShort08=Kol
+MonthShort09=Ruj
+MonthShort10=Lis
+MonthShort11=Stu
+MonthShort12=Pro
+AttachedFiles=Priložene datoteke i dokumenti
+FileTransferComplete=Datoteka je uspješno pohranjena
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
-ReportName=Report name
-ReportPeriod=Report period
-ReportDescription=Description
-Report=Report
-Keyword=Keyword
-Legend=Legend
-Fill=Fill
+ReportName=Naziv izvještaja
+ReportPeriod=Period izvještaja
+ReportDescription=Opis
+Report=Izvještaj
+Keyword=Ključna riječ
+Legend=Natpis
+Fill=Popuni
 Reset=Reset
-File=File
-Files=Files
-NotAllowed=Not allowed
-ReadPermissionNotAllowed=Read permission not allowed
-AmountInCurrency=Amount in %s currency
-Example=Example
-Examples=Examples
-NoExample=No example
-FindBug=Report a bug
-NbOfThirdParties=Number of third parties
-NbOfLines=Number of lines
-NbOfObjects=Number of objects
-NbOfObjectReferers=Number of related items
-Referers=Related items
-TotalQuantity=Total quantity
+File=Datoteka
+Files=Datoteke
+NotAllowed=Nije dozvoljeno
+ReadPermissionNotAllowed=Dozvola čitanja nije dozvoljena
+AmountInCurrency=Iznos u %s valuti
+Example=Primjer
+Examples=Primjeri
+NoExample=Nema primjera
+FindBug=Prijavi problem
+NbOfThirdParties=Broj komitenta
+NbOfLines=Broj stavaka
+NbOfObjects=Broj objekta
+NbOfObjectReferers=Broj povezanih stavaka
+Referers=Povezanih stavaka
+TotalQuantity=Ukupna količina
 DateFromTo=Od %s za %s
 DateFrom=Od %s
-DateUntil=Until %s
-Check=Check
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
-BuildDoc=Build Doc
-Entity=Environment
-Entities=Entities
-CustomerPreview=Customer preview
-SupplierPreview=Supplier preview
-ShowCustomerPreview=Show customer preview
-ShowSupplierPreview=Show supplier preview
-RefCustomer=Ref. customer
-Currency=Currency
-InfoAdmin=Information for administrators
-Undo=Undo
-Redo=Redo
-ExpandAll=Expand all
-UndoExpandAll=Undo expand
-Reason=Reason
-FeatureNotYetSupported=Feature not yet supported
-CloseWindow=Close window
-Response=Response
-Priority=Priority
-SendByMail=Send by EMail
-MailSentBy=Email sent by
-TextUsedInTheMessageBody=Email body
-SendAcknowledgementByMail=Send confirmation email
-EMail=E-mail
-NoEMail=No email
-NoMobilePhone=No mobile phone
-Owner=Owner
-FollowingConstantsWillBeSubstituted=The following constants will be replaced with the corresponding value.
-Refresh=Refresh
-BackToList=Back to list
-GoBack=Go back
-CanBeModifiedIfOk=Can be modified if valid
-CanBeModifiedIfKo=Can be modified if not valid
-RecordModifiedSuccessfully=Record modified successfully
-RecordsModified=%s records modified
-AutomaticCode=Automatic code
-FeatureDisabled=Feature disabled
-MoveBox=Move widget
-Offered=Offered
-NotEnoughPermissions=You don't have permission for this action
-SessionName=Session name
-Method=Method
-Receive=Receive
-PartialWoman=Partial
-TotalWoman=Total
-NeverReceived=Never received
-Canceled=Canceled
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
-YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=Color
-Documents=Linked files
-Documents2=Documents
-UploadDisabled=Upload disabled
-MenuECM=Documents
+DateUntil=Do %s
+Check=Provjeri
+Uncheck=Odznači
+Internal=Interno
+External=Vanjsko
+Internals=Interno
+Externals=Vanjsko
+Warning=Upozorenje
+Warnings=Upozorenja
+BuildDoc=Izradi dokument
+Entity=Okolina
+Entities=Subjekti
+CustomerPreview=Pregled kupca
+SupplierPreview=Pregled dobavljača
+ShowCustomerPreview=Prikaži pregled kupca
+ShowSupplierPreview=Prikaži pregled dobavljača
+RefCustomer=Ref. kupca
+Currency=Valuta
+InfoAdmin=Informacije za administratore
+Undo=Poništi
+Redo=Povrati
+ExpandAll=Proširi sve
+UndoExpandAll=Poništi proširenje
+Reason=Razlog
+FeatureNotYetSupported=Mogučnost nije još podržana
+CloseWindow=Zatvori prozor
+Response=Odaziv
+Priority=Prioritet
+SendByMail=Poslano putem e-pošte
+MailSentBy=E-poštu poslao
+TextUsedInTheMessageBody=Tijelo e-pošte
+SendAcknowledgementByMail=Pošalji e-poštu potvrde
+EMail=E-pošta
+NoEMail=Nema e-pošte
+NoMobilePhone=Nema mobilnog telefona
+Owner=Vlasnik
+FollowingConstantsWillBeSubstituted=Sljedeće konstante će biti zamjenjene sa odgovarajućom vrijednošću. 
+Refresh=Osvježi
+BackToList=Povratak na popis
+GoBack=Idi nazad
+CanBeModifiedIfOk=Može se mjenjanti ako je valjana
+CanBeModifiedIfKo=Može se mjenjanti ako nije valjana
+ValueIsValid=Vrijednost je u redu
+ValueIsNotValid=Vrijednost nije u redu
+RecordModifiedSuccessfully=Podatak je uspješno izmjenjen
+RecordsModified=%s podataka izmjenjeno
+RecordsDeleted=%s podataka obrisano
+AutomaticCode=Automatski kod
+FeatureDisabled=Mogučnost onemogućena
+MoveBox=Pomakni dodatak
+Offered=Ponuđeno
+NotEnoughPermissions=Nemate dozvolu za ovu akciju
+SessionName=Naziv sesije
+Method=Metoda
+Receive=Primi
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
+PartialWoman=Parcijalno
+TotalWoman=Ukupno
+NeverReceived=Nikad primljeno
+Canceled=Otkazano
+YouCanChangeValuesForThisListFromDictionarySetup=Možete promijeniti vrijednosti za ovaj popis kroz izbornik Podešavanje - definicije
+YouCanSetDefaultValueInModuleSetup=Možete podesiti zadanu vrijednost koju koristite kada kreirate novi podatak u postavkama modula.
+Color=Boja
+Documents=Povezane datoteke
+Documents2=Dokumenti
+UploadDisabled=Upload onemogućen
+MenuECM=Dokumenti
 MenuAWStats=AWStats
-MenuMembers=Members
+MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=No documents saved in this directory
-CurrentUserLanguage=Current language
-CurrentTheme=Current theme
-CurrentMenuManager=Current menu manager
-DisabledModules=Disabled modules
-For=For
-ForCustomer=For customer
-Signature=Signature
-HidePassword=Show command with password hidden
-UnHidePassword=Show real command with clear password
+NoFileFound=Nema spremljenih datoteka u ovoj mapi
+CurrentUserLanguage=Trenutni jezik
+CurrentTheme=Trenutna tema
+CurrentMenuManager=Trenutni upravitelj izbornikom
+DisabledModules=Onemogućeni moduli
+For=Za
+ForCustomer=Za kupca
+Signature=Potpis
+DateOfSignature=Datum potpisa
+HidePassword=Prikaži komandu sa skrivenom lozinkom
+UnHidePassword=Prikaži stvarnu komandu s čitljivom lozinkom
 Root=Root
-Informations=Informations
-Page=Page
-Notes=Notes
-AddNewLine=Add new line
-AddFile=Add file
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone object with its main attributes
-PDFMerge=PDF Merge
-Merge=Merge
-PrintContentArea=Show page to print main content area
-MenuManager=Menu manager
-WarningYouAreInMaintenanceMode=Warning, you are in a maintenance mode, so only login <b>%s</b> is allowed to use application at the moment.
-CoreErrorTitle=System error
-CoreErrorMessage=Sorry, an error occurred. Check the logs or contact your system administrator.
-CreditCard=Credit card
-FieldsWithAreMandatory=Fields with <b>%s</b> are mandatory
-FieldsWithIsForPublic=Fields with <b>%s</b> are shown on public list of members. If you don't want this, check off the "public" box.
-AccordingToGeoIPDatabase=(according to GeoIP convertion)
-Line=Line
-NotSupported=Not supported
-RequiredField=Required field
-Result=Result
+Informations=Informacije
+Page=Strana
+Notes=Napomene
+AddNewLine=Dodaj novu stavku
+AddFile=Dodaj datoteku
+FreeZone=Slobodan unos
+FreeLineOfType=Slobodan unos tipa
+CloneMainAttributes=Kloniraj objekt s svim glavnim atributima
+PDFMerge=Spoji PDF
+Merge=Spoji
+PrintContentArea=Prikaži stranicu za ispis
+MenuManager=Upravitelj izbornikom
+WarningYouAreInMaintenanceMode=Upozorenje, nalazite se u načinu održavanja, tako da samo prijava <b>%s</b> je dozvoljeno za korištenje aplikacije.
+CoreErrorTitle=Sistemska greška
+CoreErrorMessage=Žao nam je, dogodila se greška. Provjerite dnevnike ili kontaktirajte vašeg sistem administratora.
+CreditCard=Kreditna kartica
+FieldsWithAreMandatory=Polja s <b>%s</b> su obavezna
+FieldsWithIsForPublic=Polja sa <b>%s</b> su prikazani na javnom popisu članova. Ako to ne želite, odznačite kučicu "javno".
+AccordingToGeoIPDatabase=(sukladno GeoIP konverziji)
+Line=Stavka
+NotSupported=Nije podržano
+RequiredField=Obavezno polje
+Result=Rezultat
 ToTest=Test
-ValidateBefore=Card must be validated before using this feature
-Visibility=Visibility
-Private=Private
-Hidden=Hidden
-Resources=Resources
-Source=Source
-Prefix=Prefix
-Before=Before
-After=After
-IPAddress=IP address
-Frequency=Frequency
-IM=Instant messaging
-NewAttribute=New attribute
-AttributeCode=Attribute code
-URLPhoto=URL of photo/logo
-SetLinkToAnotherThirdParty=Link to another third party
-CreateDraft=Create draft
-SetToDraft=Back to draft
-ClickToEdit=Click to edit
-ObjectDeleted=Object %s deleted
-ByCountry=By country
-ByTown=By town
-ByDate=By date
-ByMonthYear=By month/year
-ByYear=By year
-ByMonth=By month
-ByDay=By day
-BySalesRepresentative=By sales representative
-LinkedToSpecificUsers=Linked to a particular user contact
-NoResults=No results
-AdminTools=Admin tools
-SystemTools=System tools
-ModulesSystemTools=Modules tools
+ValidateBefore=Kartica mora biti ovjerena prije korištenja ove mogućnosti
+Visibility=Vidljivost
+Private=Privatno
+Hidden=Skriveno
+Resources=Sredstva
+Source=Izvor
+Prefix=Prefiks
+Before=Prije
+After=Nakon
+IPAddress=IP adresa
+Frequency=Učestalost
+IM=Brzo slanje poruka
+NewAttribute=Novi atribut
+AttributeCode=Kod atributa
+URLPhoto=URL slike/loga
+SetLinkToAnotherThirdParty=Poveži sa drugim komitentom
+LinkTo=Poveži sa
+LinkToProposal=Poveži sa ponudom
+LinkToOrder=Poveži s narudžbom
+LinkToInvoice=Poveži sa računom
+LinkToSupplierOrder=Poveži s narudžbom dobavljača
+LinkToSupplierProposal=Poveži sa ponudom dobavljača
+LinkToSupplierInvoice=Poveži s računom dobavljača
+LinkToContract=Poveži sa ugovorom
+LinkToIntervention=Poveži sa intervencijom
+CreateDraft=Kreiraj skicu
+SetToDraft=Nazad na skice
+ClickToEdit=Klikni za uređivanje
+ObjectDeleted=Objekt %s obrisan
+ByCountry=Po zemlji
+ByTown=Po gradu
+ByDate=Po datumu
+ByMonthYear=Po mjesecu/godini
+ByYear=Po godini
+ByMonth=Po mjesecu
+ByDay=Po danu
+BySalesRepresentative=Prodajni predstavnik
+LinkedToSpecificUsers=Povezano sa određenim kontaktom korisnika
+NoResults=Nema rezultata
+AdminTools=Administracijski alati
+SystemTools=Sistemski alati
+ModulesSystemTools=Alati modula
 Test=Test
 Element=Element
-NoPhotoYet=No pictures available yet
-Dashboard=Dashboard
-Deductible=Deductible
+NoPhotoYet=Još nema dostupnih slika
+Dashboard=Kontrolna ploča
+Deductible=Povratno
 from=od
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction on bank account
-GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line ?
-NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
-TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
+toward=ispred
+Access=Pristup
+SelectAction=Odaberi akciju
+HelpCopyToClipboard=Koristi Ctrl+C za kopiranje u međuspremnik
+SaveUploadedFileWithMask=Spremite datoteku na server pod imenom  "<strong>%s</strong>" (u protivnom "%s")
+OriginFileName=Orginalna datoteka
+SetDemandReason=Postavi izvor
+SetBankAccount=Postavi bankovni račun
+AccountCurrency=Valuta računa
+ViewPrivateNote=Vidi napomene
+XMoreLines=%s stavaka(e) skriveno
+PublicUrl=Javni URL
+AddBox=Dodaj blok
+SelectElementAndClickRefresh=Odaberi element i klikni Osvježi
+PrintFile=Ispis datoteke %s
+ShowTransaction=Prikaži transakcije po bankovnom računu
+GoIntoSetupToChangeLogo=Idite na Home - Podešavanje - Tvrtka za promjenu logotipa ili idite na Home - Podešavanje - Prikaz za skrivanje.
+Deny=Odbij
+Denied=Odbijeno
+ListOfTemplates=Popis predložaka
+Gender=Spol
+Genderman=Muško
+Genderwoman=Žensko
+ViewList=Pregled popisa
+Mandatory=Obavezno
+Hello=Pozdrav
+Sincerely=Srdačno
+DeleteLine=Obriši stavku
+ConfirmDeleteLine=Jeste li sigurni da želite obrisati ovu stavku ?
+NoPDFAvailableForDocGenAmongChecked=PDF nije dostupan za generiranje dokumenta unutar označenih podataka
+TooManyRecordForMassAction=Previše podataka odabrano za masovnu akciju. Akcija je zabranjena za popis od %s podataka.
+MassFilesArea=Sučelje za datoteke stvorene masovnom akcijom
+ShowTempMassFilesArea=Prikaži sučelje datoteka stvorenih masovnom akcijom
+RelatedObjects=Povezani objekti
+ClassifyBilled=Označi kao naplaćena
+Progress=Napredak
+ClickHere=Klikni ovdje
+FrontOffice=Front office
+BackOffice=Back office
+View=Vidi
 # Week day
-Monday=Monday
-Tuesday=Tuesday
-Wednesday=Wednesday
-Thursday=Thursday
-Friday=Friday
-Saturday=Saturday
-Sunday=Sunday
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=We
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
-Day1=Monday
-Day2=Tuesday
-Day3=Wednesday
-Day4=Thursday
-Day5=Friday
-Day6=Saturday
-Day0=Sunday
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
+Monday=Ponedjeljak
+Tuesday=Utorak
+Wednesday=Srijeda
+Thursday=Četvrtak
+Friday=Petak
+Saturday=Subota
+Sunday=Nedjelja
+MondayMin=Po
+TuesdayMin=Ut
+WednesdayMin=Sr
+ThursdayMin=Če
+FridayMin=Pe
+SaturdayMin=Su
+SundayMin=Ne
+Day1=Ponedjeljak
+Day2=Utorak
+Day3=Srijeda
+Day4=Četvrtak
+Day5=Petak
+Day6=Subota
+Day0=Nedjelja
+ShortMonday=P
+ShortTuesday=U
+ShortWednesday=S
+ShortThursday=Č
+ShortFriday=P
 ShortSaturday=S
-ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
+ShortSunday=N
+SelectMailModel=Odaberi predložak e-pošte
+SetRef=Postavi ref.
 Select2ResultFoundUseArrows=
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
-SearchIntoLeaves=Leaves
+Select2NotFound=Ništa nije pronađeno
+Select2Enter=Unos
+Select2MoreCharacter=ili još znakova
+Select2MoreCharacters=ili više znakova
+Select2LoadingMoreResults=Učitaj više podataka...
+Select2SearchInProgress=Pretraživanje u tijeku...
+SearchIntoThirdparties=Komitenti
+SearchIntoContacts=Kontakti
+SearchIntoMembers=Članovi
+SearchIntoUsers=Korisnici
+SearchIntoProductsOrServices=Proizvodi ili usluge
+SearchIntoProjects=Projekti
+SearchIntoTasks=Zadaci
+SearchIntoCustomerInvoices=Računi za kupce
+SearchIntoSupplierInvoices=Račun dobavljača
+SearchIntoCustomerOrders=Narudžbe kupaca
+SearchIntoSupplierOrders=Narudžbe dobavljaču
+SearchIntoCustomerProposals=Ponude kupca
+SearchIntoSupplierProposals=Ponude dobavljača
+SearchIntoInterventions=Intervencije
+SearchIntoContracts=Ugovori
+SearchIntoCustomerShipments=Pošiljke kupcu
+SearchIntoExpenseReports=Izvještaji troška
+SearchIntoLeaves=Odsustva
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index 12a61c146be..17fc35b2925 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -1,43 +1,44 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
-Margins=Margins
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
+Margin=Marža
+Margins=Marže
+TotalMargin=Ukupno marže
+MarginOnProducts=Marža / Proizvodi
+MarginOnServices=Marža / Usluge
+MarginRate=Stopa marže
 MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
+DisplayMarginRates=Prikaži stope marže
 DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
-SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
-ProductService=Product or Service
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
-MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
+InputPrice=Ulazna cijena
+margin=Upravljanje profitnim maržama
+margesSetup=Podešavanje upravljanja profitnim maržama
+MarginDetails=Detalji marže
+ProductMargins=Marže proizvoda
+CustomerMargins=Marže kupaca
+SalesRepresentativeMargins=Marže prodajnog predstavnika
+UserMargins=Korisničke marže
+ProductService=Proizvod ili usluga
+AllProducts=Svi proizvodi i usluge
+ChooseProduct/Service=Odaberite proizvod ili uslugu
+ForceBuyingPriceIfNull=Forsiraj kupovno/troškovnu cijenu kao prodajnu cijenu ako nije definirano
+ForceBuyingPriceIfNullDetails=Ako kupovna/troškovna cijena nije definirana, i ova opcija je uključena, marža će biti nula na stavki ( kupovno/troškovna cijena = prodajna cijena), u protivnom (isključeno), marža će biti jednaka sugeriranoj vrijednosti.
+MARGIN_METHODE_FOR_DISCOUNT=Načini marže za globalne rabate
+UseDiscountAsProduct=Kao proizvod
+UseDiscountAsService=Kao usluga
+UseDiscountOnTotal=Na međuzbroju
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definira ako je globalni rabat tretiran kao prozvod ili usluga, ili samo na međusumi za izračun marže.
+MARGIN_TYPE=Kupovno/troškovna cijena sugerirana za izračun marže
+MargeType1=Marža prema najboljoj cijeni dobavljača
+MargeType2=Marža prema Procjenjenoj prosječnoj cijeni (PPC)
+MargeType3=Marža po cijeni troškova
 MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
-CostPrice=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
-AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
+CostPrice=Cijena troška
+UnitCharges=Troškovi jedinice
+Charges=Troškovi
+AgentContactType=Tip kontakta komercijalnog agenta
+AgentContactTypeDetails=Odredite koji tip kontakta (povezan na računu) će biti korišten za izvještaj marže po prodajnom predstavniku
+rateMustBeNumeric=Stopa mora biti brojčana vrijednost
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
+ShowMarginInfos=Prikaži infomacije o marži
+CheckMargins=Detalji marže
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 682b911945d..8cdcd6e3b9c 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -1,172 +1,172 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Members area
-MemberCard=Member card
-SubscriptionCard=Subscription card
-Member=Member
-Members=Members
-ShowMember=Show member card
-UserNotLinkedToMember=User not linked to a member
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
-MembersTickets=Members Tickets
-FundationMembers=Foundation members
-ListOfValidatedPublicMembers=List of validated public members
-ErrorThisMemberIsNotPublic=This member is not public
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, login: <b>%s</b>) is already linked to a third party <b>%s</b>. Remove this link first because a third party can't be linked to only a member (and vice versa).
-ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
-ThisIsContentOfYourCard=This is details of your card
-CardContent=Content of your member card
-SetLinkToUser=Link to a Dolibarr user
-SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Members business cards
-MembersList=List of members
-MembersListToValid=List of draft members (to be validated)
-MembersListValid=List of valid members
-MembersListUpToDate=List of valid members with up to date subscription
-MembersListNotUpToDate=List of valid members with subscription out of date
-MembersListResiliated=List of resiliated members
-MembersListQualified=List of qualified members
-MenuMembersToValidate=Draft members
-MenuMembersValidated=Validated members
-MenuMembersUpToDate=Up to date members
-MenuMembersNotUpToDate=Out of date members
-MenuMembersResiliated=Resiliated members
-MembersWithSubscriptionToReceive=Members with subscription to receive
-DateSubscription=Subscription date
-DateEndSubscription=Subscription end date
-EndSubscription=End subscription
-SubscriptionId=Subscription id
-MemberId=Member id
-NewMember=New member
-MemberType=Member type
-MemberTypeId=Member type id
-MemberTypeLabel=Member type label
-MembersTypes=Members types
-MemberStatusDraft=Draft (needs to be validated)
-MemberStatusDraftShort=Draft
-MemberStatusActive=Validated (waiting subscription)
-MemberStatusActiveShort=Validated
-MemberStatusActiveLate=subscription expired
-MemberStatusActiveLateShort=Expired
-MemberStatusPaid=Subscription up to date
-MemberStatusPaidShort=Up to date
-MemberStatusResiliated=Resiliated member
-MemberStatusResiliatedShort=Resiliated
-MembersStatusToValid=Draft members
-MembersStatusResiliated=Resiliated members
-NewCotisation=New contribution
-PaymentSubscription=New contribution payment
-SubscriptionEndDate=Subscription's end date
-MembersTypeSetup=Members type setup
-NewSubscription=New subscription
+MembersArea=Sučelje članova
+MemberCard=Kartica člana
+SubscriptionCard=Kartica pretplate
+Member=Član
+Members=Članovi
+ShowMember=Prikaži karticu člana
+UserNotLinkedToMember=Korisnik nije povezan s članom
+ThirdpartyNotLinkedToMember=Komitent nije povezan sa članom
+MembersTickets=Članske ulaznice
+FundationMembers=Članovi zaklade
+ListOfValidatedPublicMembers=Popis ovjerenih javnih članova
+ErrorThisMemberIsNotPublic=Ovaj član nije javni
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <b>%s</b>) je već povezan s komitentom <b>%s</b>. Obrišite prije taj link jer komitent ne može biti povezan samo na jednog člana (i obrnuto).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate dodjeliti dozvole svim korisnicima da mogu povezivati članove s korisnicima koji nisu vaši.
+ThisIsContentOfYourCard=Ovo su detalji vaše kartice
+CardContent=Sadržaj vaše članske kartice
+SetLinkToUser=Poveži s Dolibarr korisnikom
+SetLinkToThirdParty=Veza na Dolibarr komitenta
+MembersCards=Članske vizit kartice
+MembersList=Popis članova
+MembersListToValid=Popis članova u skicama ( za ovjeru )
+MembersListValid=Popis valjanih članova
+MembersListUpToDate=Popis valjanih članova sa važećom pretplatom
+MembersListNotUpToDate=Popis valjanih članova sa isteklom pretplatom
+MembersListResiliated=Popis povučenih članova
+MembersListQualified=Popis kvalificiranih članova
+MenuMembersToValidate=Skice članova
+MenuMembersValidated=Ovjereni članovi
+MenuMembersUpToDate=Važeći članovi
+MenuMembersNotUpToDate=Istekli članovi
+MenuMembersResiliated=Otkazani članovi
+MembersWithSubscriptionToReceive=Članovi koji primaju pretplatu
+DateSubscription=Datum pretplate
+DateEndSubscription=Datum kraja pretplate
+EndSubscription=Kraj pretplate
+SubscriptionId=Pretplata ID
+MemberId=Član ID
+NewMember=Novi član
+MemberType=Tip člana
+MemberTypeId=Tip ID člana
+MemberTypeLabel=Oznaka tipa člana
+MembersTypes=Tipovi članova
+MemberStatusDraft=Skica (potrebna potvrditi)
+MemberStatusDraftShort=Skica
+MemberStatusActive=Ovjereno (čeka odobrenje)
+MemberStatusActiveShort=Ovjereno
+MemberStatusActiveLate=pretplata istekla
+MemberStatusActiveLateShort=Isteklo
+MemberStatusPaid=Pretplata valjana
+MemberStatusPaidShort=Valjano
+MemberStatusResiliated=Otkazani član
+MemberStatusResiliatedShort=Otkazano
+MembersStatusToValid=Skice članova
+MembersStatusResiliated=Otkazani članovi
+NewCotisation=Novi doprinos
+PaymentSubscription=Novo plačanje doprinosa
+SubscriptionEndDate=Datum kraja pretplate
+MembersTypeSetup=Podešavanje tipa članova
+NewSubscription=Nova pretplata
 NewSubscriptionDesc=This form allows you to record your subscription as a new member of the foundation. If you want to renew your subscription (if already a member), please contact foundation board instead by email %s.
-Subscription=Subscription
-Subscriptions=Subscriptions
-SubscriptionLate=Late
-SubscriptionNotReceived=Subscription never received
-ListOfSubscriptions=List of subscriptions
-SendCardByMail=Send card by Email
-AddMember=Create member
-NoTypeDefinedGoToSetup=No member types defined. Go to menu "Members types"
-NewMemberType=New member type
-WelcomeEMail=Welcome e-mail
-SubscriptionRequired=Subscription required
-DeleteType=Delete
-VoteAllowed=Vote allowed
-Physical=Physical
-Moral=Moral
-MorPhy=Moral/Physical
-Reenable=Reenable
-ResiliateMember=Resiliate a member
-ConfirmResiliateMember=Are you sure you want to resiliate this member ?
-DeleteMember=Delete a member
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his subscriptions) ?
-DeleteSubscription=Delete a subscription
-ConfirmDeleteSubscription=Are you sure you want to delete this subscription ?
-Filehtpasswd=htpasswd file
-ValidateMember=Validate a member
-ConfirmValidateMember=Are you sure you want to validate this member ?
+Subscription=Pretplata
+Subscriptions=Pretplate
+SubscriptionLate=Kasni
+SubscriptionNotReceived=Pretplata nikad zaprimljena
+ListOfSubscriptions=Popis pretplata
+SendCardByMail=Pošalji karticu e-poštom
+AddMember=Kreiraj člana
+NoTypeDefinedGoToSetup=Nema definiranih tipova člana. Idite na izbornik "Tipovi članova"
+NewMemberType=Novi tip člana
+WelcomeEMail=E-pošta dobrodošlice
+SubscriptionRequired=Potrebna pretplata
+DeleteType=Obriši
+VoteAllowed=Glasanje dozvoljeno
+Physical=Fizički
+Moral=Moralno
+MorPhy=Moralno/Fizički
+Reenable=Ponovo omogući
+ResiliateMember=Otkaži člana
+ConfirmResiliateMember=Jeste li sigurni da želite otkazati člana ?
+DeleteMember=Obriši člana
+ConfirmDeleteMember=Jeste li sigurni da želite obrisati člana ( Brisanjem člana obrisat ćete sve njegove pretplate) ?
+DeleteSubscription=Obriši pretplatu
+ConfirmDeleteSubscription=Jeste li sigurni da želite obrisati ovu pretplatu ?
+Filehtpasswd=htpasswd datoteka
+ValidateMember=Ovjeri člana
+ConfirmValidateMember=Jeste li sigurni da želite ovjeriti člana ?
 FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formated pages, provided as example to show how to list members database.
-PublicMemberList=Public member list
-BlankSubscriptionForm=Public auto-subscription form
+PublicMemberList=Javni popis članova
+BlankSubscriptionForm=Javna pristupnica
 BlankSubscriptionFormDesc=Dolibarr can provide you a public URL to allow external visitors to ask to subscribe to the foundation. If an online payment module is enabled, a payment form will also be automatically provided.
-EnablePublicSubscriptionForm=Enable the public auto-subscription form
-ExportDataset_member_1=Members and subscriptions
-ImportDataset_member_1=Members
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+EnablePublicSubscriptionForm=Omogući javnu pristupnicu
+ExportDataset_member_1=Članovi i pretplate
+ImportDataset_member_1=Članovi
+LastMembersModified=Zadnjih %s izmenjenih članova
+LastSubscriptionsModified=Zadnjih %s izmjenjenih pretplata
 String=String
-Text=Text
+Text=Tekst
 Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
-ShowSubscription=Show subscription
-SendAnEMailToMember=Send information email to member
+DateAndTime=Datum i vrijeme
+PublicMemberCard=Javna članska kartica
+SubscriptionNotRecorded=Pretplata nije pohranjena
+AddSubscription=Kreiraj pretplatu
+ShowSubscription=Prikaži pretplatu
+SendAnEMailToMember=Pošalji članu e-poštu informacija
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation
-DescADHERENT_MAIL_VALID=EMail for member validation
-DescADHERENT_MAIL_COTIS_SUBJECT=EMail subject for subscription
-DescADHERENT_MAIL_COTIS=EMail for subscription
-DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
-DescADHERENT_MAIL_RESIL=EMail for member resiliation
-DescADHERENT_MAIL_FROM=Sender EMail for automatic emails
-DescADHERENT_ETIQUETTE_TYPE=Format of labels page
-DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
-DescADHERENT_CARD_TYPE=Format of cards page
-DescADHERENT_CARD_HEADER_TEXT=Text printed on top of member cards
-DescADHERENT_CARD_TEXT=Text printed on member cards (align on left)
-DescADHERENT_CARD_TEXT_RIGHT=Text printed on member cards (align on right)
-DescADHERENT_CARD_FOOTER_TEXT=Text printed on bottom of member cards
-ShowTypeCard=Show type '%s'
-HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated to this member
-MembersAndSubscriptions= Members and Subscriptions
-MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a subscription
-MoreActionBankDirect=Create a direct transaction record on account
-MoreActionBankViaInvoice=Create an invoice and payment on account
-MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Naslov e-pošte za člansku autopretplatu
+DescADHERENT_AUTOREGISTER_MAIL=E-pošta za člansku autopretplatu
+DescADHERENT_MAIL_VALID_SUBJECT=Naslov e-pošte za potvrdu člana
+DescADHERENT_MAIL_VALID=E-pošta za potvrdu člana
+DescADHERENT_MAIL_COTIS_SUBJECT=Naslov e-pošte za pretplatu
+DescADHERENT_MAIL_COTIS=E-pošta za pretplatu
+DescADHERENT_MAIL_RESIL_SUBJECT=Naslov e-pošte za otkazivanje člana
+DescADHERENT_MAIL_RESIL=e-pošta za otkazivanje člana
+DescADHERENT_MAIL_FROM=E-pošta pošiljatelja za automatske poruke e-poštom
+DescADHERENT_ETIQUETTE_TYPE=Format stranice naljepnica
+DescADHERENT_ETIQUETTE_TEXT=Tekst za ispis na adresnim listovima člana
+DescADHERENT_CARD_TYPE=Fromat stranice iskaznica
+DescADHERENT_CARD_HEADER_TEXT=Tekst za ispis na vrhu članske iskaznice
+DescADHERENT_CARD_TEXT=Tekst za ispis na članskim iskaznicama (poravnato lijevo)
+DescADHERENT_CARD_TEXT_RIGHT=Tekst za ispis na članskim iskaznicama (poravnato desno)
+DescADHERENT_CARD_FOOTER_TEXT=Tekst za ispis na dnu članske iskaznice
+ShowTypeCard=Prikaži tip %s
+HTPasswordExport=generiranje htpassword datoteke
+NoThirdPartyAssociatedToMember=Nema komitenta povezanih s ovim članom
+MembersAndSubscriptions= Članovi i pretplate
+MoreActions=Dodatna akcija za snimanje
+MoreActionsOnSubscription=Dodatne akcije, predloži kao zadano kod pohrane pretplate
+MoreActionBankDirect=Kreiraj direktni zapis transakcije na račun
+MoreActionBankViaInvoice=Kreirajte račun i plačanje na račun
+MoreActionInvoiceOnly=Kreiraj račun bez plačanja
+LinkToGeneratedPages=Genereiraj vizit kartu
 LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-DocForAllMembersCards=Generate business cards for all members
-DocForOneMemberCards=Generate business cards for a particular member
-DocForLabels=Generate address sheets
-SubscriptionPayment=Subscription payment
-LastSubscriptionDate=Last subscription date
-LastSubscriptionAmount=Last subscription amount
-MembersStatisticsByCountries=Members statistics by country
-MembersStatisticsByState=Members statistics by state/province
-MembersStatisticsByTown=Members statistics by town
-MembersStatisticsByRegion=Members statistics by region
-NbOfMembers=Number of members
-NoValidatedMemberYet=No validated members found
+DocForAllMembersCards=Generiraj vizit karte za sve članove
+DocForOneMemberCards=Generiraj vizit kartu za određenog člana
+DocForLabels=Generiraj listu adresa
+SubscriptionPayment=Plaćanje pretplate
+LastSubscriptionDate=Zadnji datum pretplate
+LastSubscriptionAmount=Zadnji iznos pretplate
+MembersStatisticsByCountries=Statistika članova po zemlji
+MembersStatisticsByState=Statistika članova po regiji/provinciji
+MembersStatisticsByTown=Statistika članova po gradu
+MembersStatisticsByRegion=Statistika članova po regiji
+NbOfMembers=Broj članova
+NoValidatedMemberYet=Nisu pronađeni valjani članovi
 MembersByCountryDesc=This screen show you statistics on members by countries. Graphic depends however on Google online graph service and is available only if an internet connection is is working.
 MembersByStateDesc=This screen show you statistics on members by state/provinces/canton.
 MembersByTownDesc=This screen show you statistics on members by town.
-MembersStatisticsDesc=Choose statistics you want to read...
-MenuMembersStats=Statistics
-LastMemberDate=Last member date
-Nature=Nature
-Public=Information are public
+MembersStatisticsDesc=Odaberite statistiku koju želite vidjeti...
+MenuMembersStats=Statistika
+LastMemberDate=Zadnji datum člana
+Nature=Vrsta
+Public=Informacije su javne
 Exports=Exports
-NewMemberbyWeb=New member added. Awaiting approval
-NewMemberForm=New member form
-SubscriptionsStatistics=Statistics on subscriptions
-NbOfSubscriptions=Number of subscriptions
-AmountOfSubscriptions=Amount of subscriptions
-TurnoverOrBudget=Turnover (for a company) or Budget (for a foundation)
-DefaultAmount=Default amount of subscription
-CanEditAmount=Visitor can choose/edit amount of its subscription
-MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
-ByProperties=By characteristics
-MembersStatisticsByProperties=Members statistics by characteristics
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
-VATToUseForSubscriptions=VAT rate to use for subscriptions
-NoVatOnSubscription=No TVA for subscriptions
+NewMemberbyWeb=Novi član je dodan. Čeka odobrenje
+NewMemberForm=Obrazac novog člana
+SubscriptionsStatistics=Statistika o pretplatama
+NbOfSubscriptions=Broj pretplata
+AmountOfSubscriptions=Iznos pretplata
+TurnoverOrBudget=Promet (za tvrtke) ili proračun (za zaklade) 
+DefaultAmount=Zadani iznos pretplate
+CanEditAmount=Posjetitelj može odabrati/mjenjati iznos svoje pretplate
+MEMBER_NEWFORM_PAYONLINE=Idi na integriranu stranicu online plaćanja
+ByProperties=Po karakteristikama
+MembersStatisticsByProperties=Statistika članova po karakteristikama
+MembersByNature=Ovaj ekran prikazuje statistiku članova po vrsti.
+MembersByRegion=Ovaj ekran prikazuje statistiku članova po regiji.
+VATToUseForSubscriptions=PDV stopa za pretplate
+NoVatOnSubscription=Nema PDV-a za pretplate
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Proizvod koji se koristi za stavku pretplate na računu: %s
diff --git a/htdocs/langs/hr_HR/oauth.lang b/htdocs/langs/hr_HR/oauth.lang
index f8dfee9788f..844e5b662f1 100644
--- a/htdocs/langs/hr_HR/oauth.lang
+++ b/htdocs/langs/hr_HR/oauth.lang
@@ -1,15 +1,26 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Configuration
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received ans saved
-ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
-RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
-UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
+ConfigOAuth=Konfiguracija OAUTH
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
+NoAccessToken=Nema pristupnog tokena u lokalnoj bazi
+HasAccessToken=Token je generiran i pohranjen u lokalnu bazu
+NewTokenStored=Token je primljen i pohranjen
+ToCheckDeleteTokenOnProvider=Za provjeru/brisanje autorizacije spremljenu od %s OAUTH davaoca
+TokenDeleted=Token obrisan
+RequestAccess=Kliknite ovdje za zahtjev/obnavljanje i primanje novog tokena za pohranu
+DeleteAccess=Kliknite ovdje za brisanje tokena
+UseTheFollowingUrlAsRedirectURI=Koristite sljedeći URL kao URL preusmjeravanja kada kreirate vašu akreditaciju kod vašeg OAUTH davatelja
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/hr_HR/opensurvey.lang b/htdocs/langs/hr_HR/opensurvey.lang
index a1046030172..6059ce3e738 100644
--- a/htdocs/langs/hr_HR/opensurvey.lang
+++ b/htdocs/langs/hr_HR/opensurvey.lang
@@ -1,59 +1,59 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Poll
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
-AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
-OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
-RemoveAllHours=Remove all hours
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
-with=with
-OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-RemovePoll=Remove poll
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
-CheckBox=Simple checkbox
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
-TitleChoice=Choice label
-ExportSpreadsheet=Export result spreadsheet
-ExpireDate=Limit date
-NbOfSurveys=Number of polls
-NbOfVoters=Nb of voters
-SurveyResults=Results
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5 more choices
-Against=Against
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
-AddADate=Add a date
-AddStartHour=Add start hour
-AddEndHour=Add end hour
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-BackToCurrentMonth=Back to current month
-ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=There was an error while inserting your comment
-MoreChoices=Enter more choices for the voters
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
-EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+Survey=Anketa
+Surveys=Ankete
+OrganizeYourMeetingEasily=Jednostavno organizirajte sastanke i ankete. Prvo odaberite tip ankete...
+NewSurvey=Nova anketa
+OpenSurveyArea=Sučelje anketa
+AddACommentForPoll=Možete dodati komentar u anketu...
+AddComment=Dodaj komentar
+CreatePoll=Kreiraj anketu
+PollTitle=Naziv ankete
+ToReceiveEMailForEachVote=Primi e-poštu za svaki glas
+TypeDate=Vremenski tip
+TypeClassic=Standardni tip
+OpenSurveyStep2=Odaberite datume između slobodnih dana (sivo). Odabarni dani su zeleni. Odabir možete poništiti tako da kliknete ponovo na dan koji ste odabrali
+RemoveAllDays=Makni sve dane
+CopyHoursOfFirstDay=Kopiraj sate prvog dana
+RemoveAllHours=Makni sve sate
+SelectedDays=Odabrani dani
+TheBestChoice=Najbolji izbor trenutno je 
+TheBestChoices=Najbolji izbori trenutno su
+with=sa
+OpenSurveyHowTo=Ako se slažete sa glasanjem u ovoj anketi, morate ostaviti svoje ime, odabrati vrijednosti koje se najbolje slažu sa vama i ovjeriti s plus gumbom na kraju reda.
+CommentsOfVoters=Komentari glasača
+ConfirmRemovalOfPoll=Jeste li sigurni da želite maknuti ovo glasanje (i sve glasove)
+RemovePoll=Makni anketu
+UrlForSurvey=URL za direktni pristup anketi
+PollOnChoice=Kreirate anketu s više odabira u anketi. Prvo unesite sve moguće odabire za vašu anketu:
+CreateSurveyDate=Kreiraj vremensku anketu
+CreateSurveyStandard=Kreiraj standardnu anketu
+CheckBox=Jednostavni checkbox
+YesNoList=Popis (prazno/da/ne)
+PourContreList=Popis (prazno/za/protiv)
+AddNewColumn=Dodaj novu kolonu
+TitleChoice=Oznaka odabira
+ExportSpreadsheet=Izvezi rezultate u tabelu
+ExpireDate=Ograničen datum
+NbOfSurveys=Broj anketa
+NbOfVoters=Br. glasača
+SurveyResults=Rezultati
+PollAdminDesc=Niste ovlašteni za promjenu svih linija u anketi. Možete maknuti kolonu ili liniju sa %s. Također možete dodati novu kolonu sa %s.
+5MoreChoices=Još 5 odabira
+Against=Protiv
+YouAreInivitedToVote=Pozvani ste da ispunite anketu
+VoteNameAlreadyExists=Ovo ime je već u upotrebi za anketu
+AddADate=Dodaj datum
+AddStartHour=Dodaj sat početka
+AddEndHour=Dodaj sat završetka
+votes=glas(ova)
+NoCommentYet=Nema komentara za anketu
+CanComment=Glasači mogu komentirati anketu
+CanSeeOthersVote=Glasači mogu vidjeti glasove drugih glasača
+SelectDayDesc=Za svaki odabrani dan, možete odabrati, ili ne morate, sat sastanka u sljedećem formatu: <br>- prazno,<br>- "8h", "8H" ili "8:00" za početak sastanka,<br>- "8-11", "8h-11h", "8H-11H" ili "8:00-11:00" za početak i kraj sastanka,<br>- "8h15-11h15", "8H15-11H15" ili "8:15-11:15" za isto samo sa minutama.
+BackToCurrentMonth=Povratak na trenutni mjesec
+ErrorOpenSurveyFillFirstSection=Niste popunili prvi dio kreiranja ankete
+ErrorOpenSurveyOneChoice=Unesite barem jedan odabir
+ErrorInsertingComment=Dogodila se greška kod unosa vašeg komentara
+MoreChoices=Unesite još odabira za glasače
+SurveyExpiredInfo=Anketa je zatvorena ili glasanje je završeno.
+EmailSomeoneVoted=%s je ispunio liniju. \nVašu anketu možete pronaći na linku:\n%s
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index 1ab3056513f..a4b703abce4 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Customers orders area
-SuppliersOrdersArea=Suppliers orders area
-OrderCard=Order card
-OrderId=Order Id
+OrdersArea=Sučelje narudžba kupaca
+SuppliersOrdersArea=Sučelje narudžba dobavljačima
+OrderCard=Kartica nardžbi
+OrderId=Broj narudžbe
 Order=Narudžba
 Orders=Narudžbe
-OrderLine=Order line
+OrderLine=Stavka narudžbe
 OrderDate=Datum narudžbe
-OrderDateShort=Order date
-OrderToProcess=Order to process
+OrderDateShort=Datum narudžbe
+OrderToProcess=Obrada narudžbe
 NewOrder=Nova narudžba
 ToOrder=Napravi narudžbu
 MakeOrder=Napravi narudžbu
@@ -16,144 +16,145 @@ SupplierOrder=Narudžba dobavljaču
 SuppliersOrders=Narudžbe dobavljaču
 SuppliersOrdersRunning=Trenutne narudžbe dobavljaču
 CustomerOrder=Narudžbe kupaca
-CustomersOrders=Customer orders
-CustomersOrdersRunning=Current customer orders
-CustomersOrdersAndOrdersLines=Customer orders and order lines
-OrdersToBill=Customer orders delivered
-OrdersInProcess=Customer orders in process
-OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
-StatusOrderCanceledShort=Canceled
+CustomersOrders=Narudžbe kupaca
+CustomersOrdersRunning=Trenutne narudžbe kupaca
+CustomersOrdersAndOrdersLines=Narudžba kupca i stavke narudžbe
+OrdersToBill=Isporučene narudžbe kupca
+OrdersInProcess=Narudžbe kupca u obradi
+OrdersToProcess=Narudžbe kupca za obradu
+SuppliersOrdersToProcess=Narudžbe dobavljača za obradu
+StatusOrderCanceledShort=Otkazano
 StatusOrderDraftShort=Skica
 StatusOrderValidatedShort=Ovjereno
 StatusOrderSentShort=U obradi
-StatusOrderSent=Dostava u tijeku
-StatusOrderOnProcessShort=Ordered
-StatusOrderProcessedShort=Processed
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
+StatusOrderSent=Isporuka u tijeku
+StatusOrderOnProcessShort=Naručeno
+StatusOrderProcessedShort=Obrađeno
+StatusOrderDelivered=Dostavljeno
+StatusOrderDeliveredShort=Dostavljeno
 StatusOrderToBillShort=Dostavljeno
 StatusOrderApprovedShort=Odobreno
 StatusOrderRefusedShort=Odbijeno
-StatusOrderBilledShort=Billed
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Everything received
+StatusOrderBilledShort=Naplaćeno
+StatusOrderToProcessShort=Za obradu
+StatusOrderReceivedPartiallyShort=Djelomično isporučeno
+StatusOrderReceivedAllShort=Kompletno isporučeno
 StatusOrderCanceled=Poništeno
-StatusOrderDraft=Draft (needs to be validated)
+StatusOrderDraft=Skica (potrebno potvrditi)
 StatusOrderValidated=Ovjereno
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Naručeno - Čeka prijem
+StatusOrderOnProcessWithValidation=Naručeno - Čeka prijem ili odobrenje
 StatusOrderProcessed=Obrađeno
 StatusOrderToBill=Dostavljeno
 StatusOrderApproved=Odobreno
 StatusOrderRefused=Odbijeno
-StatusOrderBilled=Billed
+StatusOrderBilled=Naplaćeno
 StatusOrderReceivedPartially=Djelomično primljeno
 StatusOrderReceivedAll=Primljena cijela pošiljka
-ShippingExist=Dostava postoji
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
-MenuOrdersToBill=Orders delivered
-MenuOrdersToBill2=Billable orders
+ShippingExist=Isporuka postoji
+ProductQtyInDraft=Količina robe u skicama narudžbi
+ProductQtyInDraftOrWaitingApproved=Količina proizvoda u skicama ili odobrenim narudžbama, nije još naručena
+MenuOrdersToBill=Isporučene narudžbe
+MenuOrdersToBill2=Naplative narudžbe
 ShipProduct=Pošalji proizvod
 CreateOrder=Kreiraj narudžbu
 RefuseOrder=Odbij narudžbu
-ApproveOrder=Approve order
-Approve2Order=Approve order (second level)
+ApproveOrder=Odobri narudžbu
+Approve2Order=Odobri narudžbu (druga razina)
 ValidateOrder=Ovjeri narudžbu
-UnvalidateOrder=Unvalidate order
+UnvalidateOrder=Neovjeri narudžbu
 DeleteOrder=Obriši narudžbu
 CancelOrder=Poništi narudžbu
-OrderReopened= Order %s Reopened
-AddOrder=Create order
-AddToDraftOrders=Add to draft order
+OrderReopened= Narudžba %s ponovo otvorena
+AddOrder=Kreiraj narudžbu
+AddToDraftOrders=Dodati u skice narudžbe
 ShowOrder=Prikaži narudžbu
-OrdersOpened=Orders to process
-NoDraftOrders=No draft orders
-NoOrder=No order
-NoSupplierOrder=No supplier order
-LastOrders=Latest %s customer orders
-LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
-LastModifiedOrders=Latest %s modified orders
+OrdersOpened=Narudžbe za obradu
+NoDraftOrders=Nema skica narudžbi
+NoOrder=Nema narudžbe
+NoSupplierOrder=Nema narudžbe dobavljača
+LastOrders=Zadnjih %s narudžba kupaca
+LastCustomerOrders=Zadnjih %s narudžba kupaca
+LastSupplierOrders=Zadnjih %s narudžba dobavljača
+LastModifiedOrders=Zadnjih %s promjenjenih narudžba
 AllOrders=Sve narudžbe
 NbOfOrders=Broj narudžbe
 OrdersStatistics=Statistike narudžbe
-OrdersStatisticsSuppliers=Supplier order's statistics
-NumberOfOrdersByMonth=Number of orders by month
-AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+OrdersStatisticsSuppliers=Statistika narudžbi dobavljačima
+NumberOfOrdersByMonth=Broj narudžba tijekom mjeseca
+AmountOfOrdersByMonthHT=Iznos narudžbi po mjesecu (bez PDV-a)
 ListOfOrders=Lista narudžbi
 CloseOrder=Zatvori narudžbu
-ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed.
-ConfirmDeleteOrder=Are you sure you want to delete this order ?
-ConfirmValidateOrder=Are you sure you want to validate this order under name <b>%s</b> ?
-ConfirmUnvalidateOrder=Are you sure you want to restore order <b>%s</b> to draft status ?
-ConfirmCancelOrder=Are you sure you want to cancel this order ?
-ConfirmMakeOrder=Are you sure you want to confirm you made this order on <b>%s</b> ?
+ConfirmCloseOrder=Jeste li sigurni da želite postaviti ovu narudžbu kao isporučenu ? Jednom kada je narudžba isporučena, može se prebaciti na naplatu.
+ConfirmDeleteOrder=Jeste li sigurni da želite obrisati ovu narudžbu ?
+ConfirmValidateOrder=Jeste li sigurni da želite ovjeriti ovu narudžbu pod imenom <b>%s</b> ?
+ConfirmUnvalidateOrder=Jeste li sigurni da želite vratiti narudžbu <b>%s</b> nazad u skice ?
+ConfirmCancelOrder=Jeste li sigurni da želite poništiti ovu narudžbu?
+ConfirmMakeOrder=Jeste li sigurni da želite potvrditi da ste izradili ovu narudžbu na <b>%s</b> ?
 GenerateBill=Kreiraj račun
-ClassifyShipped=Classify delivered
-DraftOrders=Draft orders
-DraftSuppliersOrders=Draft suppliers orders
-OnProcessOrders=In process orders
-RefOrder=Ref. order
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
-SendOrderByMail=Send order by mail
-ActionsOnOrder=Events on order
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
-OrderMode=Order method
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-CloneOrder=Clone order
-ConfirmCloneOrder=Are you sure you want to clone this order <b>%s</b> ?
-DispatchSupplierOrder=Receiving supplier order %s
-FirstApprovalAlreadyDone=First approval already done
-SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
-SupplierOrderClassifiedBilled=Supplier order %s set billed
+ClassifyShipped=Označi kao isporučeno
+DraftOrders=Skica narudžbi
+DraftSuppliersOrders=Skice narudžbi dobavljača
+OnProcessOrders=Narudžbe u obradi
+RefOrder=Ref. narudžbe
+RefCustomerOrder=Ref. narudžba kupca
+RefOrderSupplier=Ref. narudžba dobavljača
+SendOrderByMail=Pošalji narudžbu e-poštom
+ActionsOnOrder=Događaji vezani uz narudžbu
+NoArticleOfTypeProduct=Ne postoji stavka tipa proizvod tako da nema isporučive stavke za ovu narudžbu
+OrderMode=Metoda narudžbe
+AuthorRequest=Autor zahtjeva
+UserWithApproveOrderGrant=Korisniku je dozvoljeno "odobravanje narudžbi"
+PaymentOrderRef=Plaćanje po narudžbi %s
+CloneOrder=Kloniranje narudžbe
+ConfirmCloneOrder=Jeste li sigurni da želite klonirati ovu narudžbu <b>%s</b> ?
+DispatchSupplierOrder=Zaprimanje narudžbe dobavljača %s
+FirstApprovalAlreadyDone=Prvo odobrenje je već napravljeno
+SecondApprovalAlreadyDone=Drugo odobrenje je već napravljeno
+SupplierOrderReceivedInDolibarr=Narudžba dobavljaču %s zaprimljena %s
+SupplierOrderSubmitedInDolibarr=Narudžba dobavljaču %s poslana
+SupplierOrderClassifiedBilled=Narudžba dobavljaču %s postavljena za naplatu
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Representative following-up customer order
-TypeContact_commande_internal_SHIPPING=Representative following-up shipping
-TypeContact_commande_external_BILLING=Customer invoice contact
-TypeContact_commande_external_SHIPPING=Customer shipping contact
-TypeContact_commande_external_CUSTOMER=Customer contact following-up order
-TypeContact_order_supplier_internal_SALESREPFOLL=Representative following-up supplier order
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
-TypeContact_order_supplier_external_BILLING=Supplier invoice contact
-TypeContact_order_supplier_external_SHIPPING=Supplier shipping contact
-TypeContact_order_supplier_external_CUSTOMER=Supplier contact following-up order
+TypeContact_commande_internal_SALESREPFOLL=Predstavnik praćena narudžbe kupca
+TypeContact_commande_internal_SHIPPING=Predstavnik praćenja utovara
+TypeContact_commande_external_BILLING=Kontakt osoba za račun
+TypeContact_commande_external_SHIPPING=Kontakt osoba za isporuku
+TypeContact_commande_external_CUSTOMER=Kontakt kupca prateće narudžbe
+TypeContact_order_supplier_internal_SALESREPFOLL=Predstavnik praćenja narudžbe dobavljača
+TypeContact_order_supplier_internal_SHIPPING=Predstavnik praćenja utovara
+TypeContact_order_supplier_external_BILLING=Osoba za račune pri dobavljaču
+TypeContact_order_supplier_external_SHIPPING=Osoba za pošiljke pri dobavljaču
+TypeContact_order_supplier_external_CUSTOMER=Kontakt dobavljača prateće narudžbe
 
-Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_OrderNotChecked=No orders to invoice selected
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Konstanta COMMANDE_SUPPLIER_ADDON nije definirana
+Error_COMMANDE_ADDON_NotDefined=Konstanta COMMANDE_ADDON nije definirana
+Error_OrderNotChecked=Nisu odabrane narudžbe za izradu računa
 # Sources
-OrderSource0=Commercial proposal
+OrderSource0=Ponuda
 OrderSource1=Internet
-OrderSource2=Mail campaign
-OrderSource3=Phone compaign
-OrderSource4=Fax campaign
-OrderSource5=Commercial
-OrderSource6=Store
-QtyOrdered=Qty ordered
+OrderSource2=Mail kampanja
+OrderSource3=Telefonska kampnja
+OrderSource4=FAX kampanja
+OrderSource5=Komercijala
+OrderSource6=Trgovina
+QtyOrdered=Količina naručena
 # Documents models
-PDFEinsteinDescription=A complete order model (logo...)
-PDFEdisonDescription=A simple order model
-PDFProformaDescription=A complete proforma invoice (logo…)
+PDFEinsteinDescription=Cjeloviti model narudžbe (logo...)
+PDFEdisonDescription=Jednostavan model narudžbe
+PDFProformaDescription=Cjeloviti predračun (logo...)
 # Orders modes
-OrderByMail=Mail
+OrderByMail=Pošta
 OrderByFax=Fax
-OrderByEMail=EMail
+OrderByEMail=E-pošta
 OrderByWWW=Online
-OrderByPhone=Phone
-CreateInvoiceForThisCustomer=Bill orders
-NoOrdersToInvoice=No orders billable
-CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-OrderCreation=Order creation
-Ordered=Ordered
-OrderCreated=Your orders have been created
-OrderFail=An error happened during your orders creation
-CreateOrders=Create orders
-ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+OrderByPhone=Telefon
+CreateInvoiceForThisCustomer=Naplata narudžbi
+NoOrdersToInvoice=Nema narudžbi za naplatu
+CloseProcessedOrdersAutomatically=Odredi "Procesuirano" sve odabrane narudžbe.
+OrderCreation=Izrada narudžbe
+Ordered=Naručeno
+OrderCreated=Vaša narudžba je kreirana
+OrderFail=Dogodila se greška prilikom kreiranja narudžbe
+CreateOrders=Kreiranje narudžbi
+ToBillSeveralOrderSelectCustomer=Za kreiranje računa za nekoliko narudžbi, prvo kliknite na kupca, te odaberite "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 1d0452a2596..1ccfc428227 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -21,12 +21,12 @@ Notify_ORDER_SUPPLIER_REFUSE=Supplier order refused
 Notify_PROPAL_VALIDATE=Customer proposal validated
 Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
 Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
-Notify_PROPAL_SENTBYMAIL=Commercial proposal sent by mail
+Notify_PROPAL_SENTBYMAIL=Ponuda poslana poštom
 Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
 Notify_WITHDRAW_CREDIT=Credit withdrawal
 Notify_WITHDRAW_EMIT=Perform withdrawal
-Notify_COMPANY_CREATE=Third party created
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
+Notify_COMPANY_CREATE=Komitent kreiran
+Notify_COMPANY_SENTBYMAIL=Pošta poslana s kartice komitenta
 Notify_BILL_VALIDATE=Customer invoice validated
 Notify_BILL_UNVALIDATE=Customer invoice unvalidated
 Notify_BILL_PAYED=Customer invoice payed
@@ -61,7 +61,7 @@ PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carria
 PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nPonudu __PROPREF__ ćete pronaći ovdje\n\n__PERSONALIZED__Srdačno\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
@@ -71,8 +71,8 @@ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
 DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
 ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
-DemoFundation=Manage members of a foundation
-DemoFundation2=Manage members and bank account of a foundation
+DemoFundation=Upravljanje članovima zaklade
+DemoFundation2=Upravljanje članovima i bankovnim računom zaklade
 DemoCompanyServiceOnly=Manage a freelance activity selling service only
 DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
 DemoCompanyProductAndStocks=Manage a small or medium company selling products
@@ -82,12 +82,12 @@ ModifiedBy=Modified by %s
 ValidatedBy=Validated by %s
 ClosedBy=Closed by %s
 CreatedById=User id who created
-ModifiedById=User id who made latest change
+ModifiedById=ID korisnika koji je mjenjao
 ValidatedById=User id who validated
 CanceledById=User id who canceled
 ClosedById=User id who closed
 CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
+ModifiedByLogin=Korisničko ime koji je mjenjao
 ValidatedByLogin=User login who validated
 CanceledByLogin=User login who canceled
 ClosedByLogin=User login who closed
@@ -144,7 +144,7 @@ SendNewPasswordDesc=This form allows you to request a new password. It will be s
 BackToLoginPage=Back to login page
 AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br />In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
 EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>Prof Id %s</b> is an information depending on third party country.<br>For example, for country <b>%s</b>, it's code <b>%s</b>.
+ProfIdShortDesc=<b>Prof Id %s</b> je podatak ovisan o državi komitenta. <br> Na primjer, za zemlju <b>%s</b>, kod je <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistics in number of products/services units
 StatsByNumberOfEntities=Statistics in number of referring entities
@@ -202,7 +202,7 @@ SourcesRepository=Repository for sources
 Chart=Chart
 
 ##### Calendar common #####
-NewCompanyToDolibarr=Company %s added
+NewCompanyToDolibarr=Tvrtka %s je dodana
 ContractValidatedInDolibarr=Contract %s validated
 PropalClosedSignedInDolibarr=Proposal %s signed
 PropalClosedRefusedInDolibarr=Proposal %s refused
@@ -215,7 +215,7 @@ MemberValidatedInDolibarr=Member %s validated
 MemberResiliatedInDolibarr=Member %s resiliated
 MemberDeletedInDolibarr=Member %s deleted
 MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
+ShipmentValidatedInDolibarr=Isporuka %s je ovjerena
 ShipmentClassifyClosedInDolibarr=Shipment %s classify billed
 ShipmentUnClassifyCloseddInDolibarr=Shipment %s classify reopened
 ShipmentDeletedInDolibarr=Shipment %s deleted
diff --git a/htdocs/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang
index c0cb8e649f0..020d6827ad3 100644
--- a/htdocs/langs/hr_HR/paybox.lang
+++ b/htdocs/langs/hr_HR/paybox.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - paybox
-PayBoxSetup=PayBox module setup
+PayBoxSetup=Podešavanje PayBox modula
 PayBoxDesc=This module offer pages to allow payment on <a href="http://www.paybox.com" target="_blank">Paybox</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
-PaymentForm=Payment form
-WelcomeOnPaymentPage=Welcome on our online payment service
-ThisScreenAllowsYouToPay=This screen allow you to make an online payment to %s.
+PaymentForm=Obrazac plaćanja
+WelcomeOnPaymentPage=Dobro došli na naš servis online plaćanja
+ThisScreenAllowsYouToPay=Ova stranica vam dozvoljava da vršite online plaćanje prema %s
 ThisIsInformationOnPayment=This is information on payment to do
-ToComplete=To complete
-YourEMail=Email to receive payment confirmation
-Creditor=Creditor
-PaymentCode=Payment code
-PayBoxDoPayment=Go on payment
-YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-Continue=Next
-ToOfferALinkForOnlinePayment=URL for %s payment
+ToComplete=Za završiti
+YourEMail=E-pošta za prijem potvrde uplate
+Creditor=Kreditor
+PaymentCode=Kod plaćanja
+PayBoxDoPayment=Idi na plaćanje
+YouWillBeRedirectedOnPayBox=Biti ćete preusmjereni na sigurnu stranicu PayBox servisa gdje možete unijeti podatke o svojoj kreditnoj kartici
+Continue=Sljedeće
+ToOfferALinkForOnlinePayment=URL za %s plaćanje
 ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
 ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment user interface for a customer invoice
 ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment user interface for a contract line
@@ -21,18 +21,18 @@ ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment user i
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment user interface for a member subscription
 YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=Setup your PayBox with url <b>%s</b> to have payment created automatically when validated by paybox.
-YourPaymentHasBeenRecorded=This page confirms that your payment has been recorded. Thank you.
-YourPaymentHasNotBeenRecorded=You payment has not been recorded and transaction has been canceled. Thank you.
-AccountParameter=Account parameters
-UsageParameter=Usage parameters
-InformationToFindParameters=Help to find your %s account information
-PAYBOX_CGI_URL_V2=Url of Paybox CGI module for payment
-VendorName=Name of vendor
+YourPaymentHasBeenRecorded=Ova stranica potvrđuje da je vaše plaćanje pohranjeno. Hvala Vam.
+YourPaymentHasNotBeenRecorded=Vaša uplata nije pohranjena i transakcija je otkazana. Hvala Vam.
+AccountParameter=Parametri računa
+UsageParameter=Parametri korištenja
+InformationToFindParameters=Pomoć za pronalaženje podataka o računu %s
+PAYBOX_CGI_URL_V2=URL PayBox CGI modula za plaćanje
+VendorName=Naziv pružatelja
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 MessageOK=Message on validated payment return page
 MessageKO=Message on canceled payment return page
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
+NewPayboxPaymentReceived=Primljena nova PayBox uplata
+NewPayboxPaymentFailed=PayBox uplata probana ali s greškom
 PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
 PAYBOX_PBX_SITE=Value for PBX SITE
 PAYBOX_PBX_RANG=Value for PBX Rang
diff --git a/htdocs/langs/hr_HR/paypal.lang b/htdocs/langs/hr_HR/paypal.lang
index 0588047748d..b4b0476bafb 100644
--- a/htdocs/langs/hr_HR/paypal.lang
+++ b/htdocs/langs/hr_HR/paypal.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal module setup
+PaypalSetup=PayPal postavljanje modula
 PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
-PaypalOrCBDoPayment=Pay with credit card or Paypal
-PaypalDoPayment=Pay with Paypal
-PAYPAL_API_SANDBOX=Mode test/sandbox
-PAYPAL_API_USER=API username
-PAYPAL_API_PASSWORD=API password
-PAYPAL_API_SIGNATURE=API signature
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
-PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=PayPal only
-PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page
-ThisIsTransactionId=This is id of transaction: <b>%s</b>
+PaypalOrCBDoPayment=Plaćanje kreditnom karticom ili putem PayPal-a
+PaypalDoPayment=Plaćanje putem PayPal-a
+PAYPAL_API_SANDBOX=Test mod/sandbox
+PAYPAL_API_USER=API korisničko ima
+PAYPAL_API_PASSWORD=API lozinka
+PAYPAL_API_SIGNATURE=API potpis
+PAYPAL_SSLVERSION=Curl SSL Verzija
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Ponuda plaćanja "integralna" (kreditna kartica+PayPal) ili samo PayPal
+PaypalModeIntegral=Integralno
+PaypalModeOnlyPaypal=Samo PayPal
+PAYPAL_CSS_URL=Opcionalni URL do CSS stila na stranici naplate
+ThisIsTransactionId=Ovo je ID tranksakcije: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
 PredefinedMailContentLink=You can click on the secure link below to make your payment (PayPal) if it is not already done.\n\n%s\n\n
-YouAreCurrentlyInSandboxMode=You are currently in the "sandbox" mode
-NewPaypalPaymentReceived=New Paypal payment received
-NewPaypalPaymentFailed=New Paypal payment tried but failed
+YouAreCurrentlyInSandboxMode=Trenutno ste u "sandbox" modu
+NewPaypalPaymentReceived=Primljena nova PayPay uplata
+NewPaypalPaymentFailed=PayPal uplata probana ali s greškom
 PAYPAL_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or not)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
+ReturnURLAfterPayment=Povratni URL nakon uplate
+ValidationOfPaypalPaymentFailed=Greška prilikom provjere PayPal uplate
 PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
-DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
+DetailedErrorMessage=Detaljna poruka greške
+ShortErrorMessage=Kratka poruka greške
+ErrorCode=Kod greške
 ErrorSeverityCode=Error Severity Code
diff --git a/htdocs/langs/hr_HR/printing.lang b/htdocs/langs/hr_HR/printing.lang
index 2da614e96f9..90ac6e372ee 100644
--- a/htdocs/langs/hr_HR/printing.lang
+++ b/htdocs/langs/hr_HR/printing.lang
@@ -1,53 +1,49 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
+Module64000Name=Direktni ispis
+Module64000Desc=Omogući sistem direktnog ispisa
+PrintingSetup=Podešavanje sistema direktnog ispisa
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+MenuDirectPrinting=Zadaci direktnog ispisa
+DirectPrint=Direktni ispis
 PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
-SetupDriver=Driver setup
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP_INFO=Google OAuth API setup
-PRINTGCP_AUTHLINK=Authentication
+ListDrivers=Popis upravljačkih programa
+PrintTestDesc=Popis pisača.
+FileWasSentToPrinter=Datoteka %s je poslana na pisač
+NoActivePrintingModuleFound=Nema aktivnih modula za ispis dokumenta
+PleaseSelectaDriverfromList=Molim odaberite upravljački program s popisa
+PleaseConfigureDriverfromList=Molim podesite odabrani upravljački program s popisa.
+SetupDriver=Podešavanje upravljačkog programa
+TargetedPrinter=Odredišni pisač
+UserConf=Podešavanje prema korisniku
+PRINTGCP_INFO=Podešavanje Google OAuth API
+PRINTGCP_AUTHLINK=Autentifikacija
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
+GCP_Name=Naziv
+GCP_displayName=Prikazani naziv
+GCP_Id=ID pisača
+GCP_OwnerName=Vlasnik
+GCP_State=Stanje pisača
+GCP_connectionStatus=Online stanje
+GCP_Type=Tip pisača
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
-IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
+PRINTIPP_USER=Korisničko ime
+PRINTIPP_PASSWORD=Lozinka
+NoDefaultPrinterDefined=Nije definiran predefiniran pisač
+DefaultPrinter=Predefinirani pisač
+Printer=Pisač
+IPP_Uri=URL Pisača
+IPP_Name=Naziv pisača
+IPP_State=Stanje pisača
+IPP_State_reason=Razlog stanja
+IPP_State_reason1=Razlog stanja1
+IPP_BW=CB
+IPP_Color=Kolor
+IPP_Device=Uređaj
+IPP_Media=Medij pisača
+IPP_Supported=Tip medija
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index c3d78f7ff7f..c8f6bedeb46 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -1,21 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ManageLotSerial=Koristi lot/serijski broj
+ProductStatusOnBatch=DA (lot/serijski broj potreban)
+ProductStatusNotOnBatch=NE (lot/serijski broj ne koristi)
+ProductStatusOnBatchShort=DA
+ProductStatusNotOnBatchShort=NE
+Batch=Lot/serijski broj
+atleast1batchfield=Upotrebljivo datum ili datum isteka ili lot/serijski broj
+batch_number=Lot/serijski broj
+BatchNumberShort=Lot/serijski broj
+EatByDate=Upotrebljivo datum:
+SellByDate=Datum isteka
+DetailBatchNumber=Detalji lot/serijski
+DetailBatchFormat=Lot/Serial: %s - Upotrebljivo: %s - Istek: %s (kol : %d)
+printBatch=Lot/Serijski: %s
+printEatby=Upotrebljivo: %s
+printSellby=Istek: %s
+printQty=Količina: %d
+AddDispatchBatchLine=Dodaj stavku za otpremu na police
+WhenProductBatchModuleOnOptionAreForced=Kada je modul Lot/serijski uključen, način povečanja/smanjenja zaliha je korište kao zadnji izbor i ne može se mjenjati. Ostale opcije mogu biti definirane kako želite.
+ProductDoesNotUseBatchSerial=Ovaj proizvod ne koristi lot/serijski broj
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 07888fd7890..6c3230089a7 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -1,82 +1,84 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Product ref.
-ProductLabel=Product label
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
-ProductServiceCard=Products/Services card
+ProductRef=Proizvod ref.
+ProductLabel=Oznaka proizvoda
+ProductLabelTranslated=Prevedena oznaka proizvoda
+ProductDescriptionTranslated=Preveden opis proizvoda
+ProductNoteTranslated=Prevedena napomena proizvoda
+ProductServiceCard=Kartica proizvoda/usluga
 Products=Proizvodi
 Services=Usluge
 Product=Proizvod
 Service=Usluga
-ProductId=Product/service id
+ProductId=ID proizvoda/usluge
 Create=Izradi
 Reference=Reference
 NewProduct=Novi proizvod
 NewService=Nova usluga
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductVatMassChange=Masovna promjena PDV-a
+ProductVatMassChangeDesc=Ova stranica se može koristiti za promjenu stope PDV definirane na proizvodima ili uslugama s jedne vrijednosti na drugu. Upozorenje, ova promjena mijenja sve podatke u bazi.
+MassBarcodeInit=Masovni init barkoda
+MassBarcodeInitDesc=Ova stranica se može koristiti za inicijalizaciju barkoda na objektima koji nemaju definiran barkod. Provjerite prije da li su postavke barcode modula podešene.
+ProductAccountancyBuyCode=Konto (kupnja)
+ProductAccountancySellCode=Konto (prodaja)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi ili usluge
 ProductsOrServices=Proizvodi ili usluge
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product card
-CardProduct1=Service card
+ProductsOnSell=Proizvod za prodaju ili za nabavu
+ProductsNotOnSell=Proizvod nije za prodaju niti za nabavu
+ProductsOnSellAndOnBuy=Proizvoda za prodaju i za nabavu
+ServicesOnSell=Usluge za prodaju ili za nabavu
+ServicesNotOnSell=Usluga nije za prodaju
+ServicesOnSellAndOnBuy=Usluga za prodaju i za nabavu
+LastModifiedProductsAndServices=Zadnjih %s izmjenjenih proizvoda/usluga
+LastRecordedProducts=Zadnjih %s pohranjenih proizvoda
+LastRecordedServices=Zadnjih %s pohranjenih usluga
+CardProduct0=Kartica proizvoda
+CardProduct1=Kartica usluge
 Stock=Zaliha
 Stocks=Zalihe
 Movements=Kretanja
 Sell=Prodaja
 Buy=Kupovine
-OnSell=u
-OnBuy=Za kupovinu
+OnSell=Za prodaju
+OnBuy=Za nabavu
 NotOnSell=Nije za prodaju
 ProductStatusOnSell=Za prodaju
 ProductStatusNotOnSell=Nije za prodaju
 ProductStatusOnSellShort=Za prodaju
 ProductStatusNotOnSellShort=Nije za prodaju
-ProductStatusOnBuy=Za kupovinu
-ProductStatusNotOnBuy=Nije za kupovinu
-ProductStatusOnBuyShort=Za kupovinu
-ProductStatusNotOnBuyShort=Nije za kupovinu
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+ProductStatusOnBuy=Za nabavu
+ProductStatusNotOnBuy=Nije za nabavu
+ProductStatusOnBuyShort=Za nabavu
+ProductStatusNotOnBuyShort=Nije za nabavu
+UpdateVAT=Promjeni PDV
+UpdateDefaultPrice=Promjeni predefiniranu cijenu
+UpdateLevelPrices=Promijeni cijene za svaki nivo
 AppliedPricesFrom=Cijene preuzete od
 SellingPrice=Prodajna cijena
 SellingPriceHT=Prodajna cijena (bez PDV-a)
 SellingPriceTTC=Prodajna cijena (sa PDV-om)
-CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceDescription=Cijena (bez poreza) može se koristiti za pohranu prosječnog iznosa troškova proizvoda u vašoj tvrtci. To može biti bilo koja cijana koju sami izračunate, npr. iz prosječne nabavne cijene plus prosječni trošak proizvodnje i distribucije.
+CostPriceUsage=U narednim verzijama, ova vrijednost će biti korištena za izračun marže.
+SoldAmount=Prodani iznos
+PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
-MinPrice=Min. selling price
+MinPrice=Min. prodajna cijena
 CantBeLessThanMinPrice=Prodajna cijena za ovaj proizvod (%s bez PDV-a) ne može biti manja od najmanje dozvoljene. Ova poruka može se pojaviti i kada ste upisali bitan popust.
 ContractStatusClosed=Zatvoreno
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
-ErrorProductBadRefOrLabel=Wrong value for reference or label.
-ErrorProductClone=There was a problem while trying to clone the product or service.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorProductBadRefOrLabel=Neispravna vrijednost za referencu ili oznaku.
+ErrorProductClone=Dogodila se greška prilikom kloniranja proizvoda ili usluge
+ErrorPriceCantBeLowerThanMinPrice=Greška, cijena ne može biti niža od minimalne cijene.
 Suppliers=Dobavljači
-SupplierRef=Supplier's product ref.
+SupplierRef=Dobavljačeva ref. proizvoda
 ShowProduct=Prikaži proizvod
 ShowService=Prikaži uslugu
 ProductsAndServicesArea=Sučelje proizvoda i usluga
 ProductsArea=Sučelje proizvoda
 ServicesArea=Sučelje usluga
 ListOfStockMovements=Popis kretanja zaliha
-BuyingPrice=Buying price
-PriceForEachProduct=Products with specific prices
+BuyingPrice=Nabavna cijena
+PriceForEachProduct=Proizvodi s specifičnom cijenom
 SupplierCard=Kartica dobavljača
 PriceRemoved=Cijena uklonjena
 BarCode=Barkod
@@ -85,172 +87,172 @@ SetDefaultBarcodeType=Odredi tip barkoda
 BarcodeValue=Vrijednost barkoda
 NoteNotVisibleOnBill=Bilješka (ne vidi se na računima, ponudama...)
 ServiceLimitedDuration=Ako je proizvod usluga ograničenog trajanja:
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Nekoliko odjela cijena po proizvodu/usluzi ( svaki kupac je u jednom odjelu)
 MultiPricesNumPrices=Broj cijena
-AssociatedProductsAbility=Activate the package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this package product
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
+AssociatedProductsAbility=Uključi mogučnost grupnog proizvoda
+AssociatedProducts=Grupirani proizvod
+AssociatedProductsNumber=Broj proizvoda koji čine ovaj grupirani proizvod
+ParentProductsNumber=Broj matičnih grupiranih proizvoda
+ParentProducts=Matični proizvod
+IfZeroItIsNotAVirtualProduct=Ako je 0, ovaj proizvod nije grupirani proizvod
+IfZeroItIsNotUsedByVirtualProduct=Ako je 0, ovaj proizvod nije korišten niti u jednom grupiranom proizvodu
 Translation=Prijevod
-KeywordFilter=Keyword filter
-CategoryFilter=Category filter
+KeywordFilter=Filter po ključnim riječima
+CategoryFilter=Filter po kategoriji
 ProductToAddSearch=Pronađi proizvod za dodavanje
 NoMatchFound=Ništa slično nije pronađeno
-ProductAssociationList=List of products/services that are component of this virtual product/package
-ProductParentList=List of package products/services with this product as a component
-ErrorAssociationIsFatherOfThis=One of selected product is parent with current product
-DeleteProduct=Delete a product/service
-ConfirmDeleteProduct=Are you sure you want to delete this product/service?
-ProductDeleted=Product/Service "%s" deleted from database.
+ProductAssociationList=Popis proizvoda/usluga koje su sačinjavaju ovaj virtualni proizvod/grupirani proizvod
+ProductParentList=Popis grupiranih proizvoda/usluga koje sačinjavaju ovaj proizvod kao komponentu
+ErrorAssociationIsFatherOfThis=Jedan od odabranih proizvoda je matični proizvod trenutnog proizvoda
+DeleteProduct=Obriši proizvod/uslugu
+ConfirmDeleteProduct=Jeste li sigurni da želite izbrisati ovaj proizvod/uslugu
+ProductDeleted=Proizvod/usluga "%s" je izbrisan.
 ExportDataset_produit_1=Proizvodi
 ExportDataset_service_1=Usluge
 ImportDataset_produit_1=Proizvodi
 ImportDataset_service_1=Usluge
 DeleteProductLine=Izbriši stavku proizvoda
 ConfirmDeleteProductLine=Jeste li sigurni da želite izbrisati stavku proizvoda?
-ProductSpecial=Special
+ProductSpecial=Specijalni
 QtyMin=Najmanja količina
 PriceQtyMin=Cijena za ovu najmanju količinu (bez popusta)
 VATRateForSupplierProduct=Stopa PDV-a (za ovog dobavljača/proizvod)
 DiscountQtyMin=Osnovi popust za količinu
 NoPriceDefinedForThisSupplier=Cijena/količina nije određena za ovog dobavljača/proizvod
 NoSupplierPriceDefinedForThisProduct=Za ovaj proizvod nije određena cijena/količina dobavljača
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Generate thumb
+PredefinedProductsToSell=Predefinirani proizvod za prodaju
+PredefinedServicesToSell=Predifinirana usluga za prodaju
+PredefinedProductsAndServicesToSell=Predefinirani proizvodi/usluge za prodaju
+PredefinedProductsToPurchase=Predefinirani proizvod za kupovinu
+PredefinedServicesToPurchase=Predifinirana usluga za kupovinu
+PredefinedProductsAndServicesToPurchase=Predefinirani proizvodi/usluge za kupovinu
+NotPredefinedProducts=Nije predefiniran proizvod/usluga
+GenerateThumb=Generiraj sličicu
 ServiceNb=Usluga #%s
 ListProductServiceByPopularity=Popis proizvoda/usluga poredanih po popularnosti
 ListProductByPopularity=Popis proizvoda poredanih po popularnosti
 ListServiceByPopularity=Popis usluga poredanih po popularnosti
-Finished=Manufactured product
-RowMaterial=Raw Material
-CloneProduct=Clone product or service
-ConfirmCloneProduct=Are you sure you want to clone product or service <b>%s</b> ?
-CloneContentProduct=Clone all main informations of product/service
-ClonePricesProduct=Clone main informations and prices
-CloneCompositionProduct=Clone packaged product/service
-ProductIsUsed=This product is used
-NewRefForClone=Ref. of new product/service
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
-CustomCode=Customs code
-CountryOrigin=Origin country
-Nature=Nature
-ShortLabel=Short label
-Unit=Unit
-p=u.
-set=set
-se=set
-second=second
+Finished=Proizveden proizvod
+RowMaterial=Materijal
+CloneProduct=Kloniraj proizvod ili uslugu
+ConfirmCloneProduct=Jeste li sigurni da želite klonirati ovaj proizvod ili uslugu <b>%s</b> ?
+CloneContentProduct=Kloniraj sve glavne informacije o proizvodu/usluzi
+ClonePricesProduct=Kloniraj glavne informacije i cijene
+CloneCompositionProduct=Kloniraj grupirani proizvod/uslugu
+ProductIsUsed=Ovaj proizvod je korišten
+NewRefForClone=Ref. novog proizvoda/usluge
+SellingPrices=Prodajne cijene
+BuyingPrices=Nabavne cijene
+CustomerPrices=Cijene kupaca
+SuppliersPrices=Cijena dobavljača
+SuppliersPricesOfProductsOrServices=Cijena dobavljača (proizvoda ili usluga)
+CustomCode=Carinska tarifa
+CountryOrigin=Zemlja porijekla
+Nature=Vrsta proizvoda
+ShortLabel=Kratka oznaka
+Unit=Jedinica
+p=j.
+set=postavi
+se=postavi
+second=sekunda
 s=s
-hour=hour
-h=h
-day=day
+hour=sat
+h=h.
+day=dan
 d=d
 kilogram=kilogram
 kg=Kg
 gram=gram
 g=g
-meter=meter
+meter=metar
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=litra
 l=L
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
-CurrentProductPrice=Current price
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Different prices by quantity
-PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
+ProductCodeModel=Predložak ref. proizvoda
+ServiceCodeModel=Predložak ref. usluge
+CurrentProductPrice=Trenutna cijena
+AlwaysUseNewPrice=Uvijek koristi trenutnu cijenu za proizvod/uslugu
+AlwaysUseFixedPrice=Koristi fiksnu cijenu
+PriceByQuantity=Različite cijene prema količini
+PriceByQuantityRange=Raspon količine
+MultipriceRules=Pravila odjelnih cijena
+UseMultipriceRules=Koristite pravila odjelova cijena (definiranih u postavkama modula proizvoda) za automatski izračun cijena ostalih dijelova sukladno prema prvom dijelu
+PercentVariationOver=%% varijacija preko %s
+PercentDiscountOver=%% popust preko %s
 ### composition fabrication
-Build=Produce
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=1st. Quarter
-Quarter2=2nd. Quarter
-Quarter3=3rd. Quarter
-Quarter4=4th. Quarter
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-MinCustomerPrice=Minimum customer price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+Build=Proizvodi
+ProductsMultiPrice=Proizvodi i cijene za svaki cijenovni odjel
+ProductsOrServiceMultiPrice=Cijene kupaca (proizvoda ili usluga, multi)
+ProductSellByQuarterHT=Tromjesečni promet proizvoda prije poreza
+ServiceSellByQuarterHT=Tromjesečni promet usluga prije poreza
+Quarter1=1. tromjesečje
+Quarter2=2. tromjesečje
+Quarter3=3. tromjesečje
+Quarter4=4. tromjesečje
+BarCodePrintsheet=Ispiši bar kod
+PageToGenerateBarCodeSheets=Ovim alatom, možete ispisati list barkod naljepnice. Odaberite format vaše stranice s naljepnicama, tip barkoda i vrijednost barkoda, te kliknite na gumb <b>%s</b>.
+NumberOfStickers=Broj naljepnica za ispis na stranici
+PrintsheetForOneBarCode=Ispiši nekoliko naljepnica s istim barkodom
+BuildPageToPrint=Generiraj stranicu za ispis
+FillBarCodeTypeAndValueManually=Popuni ručno tip barkoda i vrijednost.
+FillBarCodeTypeAndValueFromProduct=Popuni tip barkoda i vrijednost iz barkoda proizvoda.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Definicija tipa ili vrijednosti barkoda nije kompletna za proizvod %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
+BarCodeDataForProduct=Barkod podaci za proizvod %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
+ResetBarcodeForAllRecords=Definiraj vrijednost barkoda za sve podatke (ovo će također zamjeniti već postavljene barkod vrijednosti s novima)
+PriceByCustomer=Različite cijene za svakog kupca
+PriceCatalogue=Jedinstvena prodajna cijena po proizvodu/usluzi
+PricingRule=Pravila za prodajne cijene
+AddCustomerPrice=Dodaj cijenu po kupcu
+ForceUpdateChildPriceSoc=Postavi istu cijenu za sve poslovnice kupca
+PriceByCustomerLog=Zabilježi prijašnje cijene kupca
+MinimumPriceLimit=Minimalna cijena ne može biti niža od %s.
+MinimumRecommendedPrice=Preporučena minimalna cijena je: %s
+PriceExpressionEditor=Uređivanje izraza cijena
+PriceExpressionSelected=Odabrani izraz cijene
+PriceExpressionEditorHelp1="cijena = 2 + 2" ili "2 + 2" za postavljanje cijene. Koristite ; za odvajanje izraza
+PriceExpressionEditorHelp2=Možete pristupiti EkstraPoljima s varijablama <b>#extrafield_myextrafieldkey#</b> i globalnim varijablama <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=U oba slučaja proizvod/usluga i cijena dobavljača dostupne su varijable: <br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=U cijeni proizvoda/usluge samo: <b>#supplier_min_price#</b><br> U cijeni dobavljača samo: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Dostupne globalne vrijednosti:
+PriceMode=Način cijena
+PriceNumeric=Broj
+DefaultPrice=Predefinirana cijena
+ComposedProductIncDecStock=Povečaj/smanji zalihu po promjeni matičnog proizvoda
+ComposedProduct=Pod-proizvod
+MinSupplierPrice=Minimalna cijena dobavljača
+MinCustomerPrice=Minimalna cijena kupca
+DynamicPriceConfiguration=Dinamična konfiguracija cijene
+DynamicPriceDesc=Na kartici proizvoda, s uključenim ovim modulom, u mogučnosti ste postaviti matematičke funkcije za izračun Prodajne i Nabavne cijene. Takva funkcija koristi sve matematičke operatore, konstante i varijable. Ovdje možete postaviti varijable koje želite da budu dostupne i ako se varijabla mora automatski mijenjati, vanjsku URL poveznicu za automatsku promjenu.
+AddVariable=Dodaj varijablu
+AddUpdater=Dodaj promjenjivač
+GlobalVariables=Globalne varijable
+VariableToUpdate=Variabla za promjeniti
+GlobalVariableUpdaters=Globalne varijable promjene
+UpdateInterval=Interval promjene (minute)
+LastUpdated=Zadnja promjena
+CorrectlyUpdated=Ispravno promjenjeno
+PropalMergePdfProductActualFile=Datoteke za dodati u PDF Azur su/je
+PropalMergePdfProductChooseFile=Odaberite PDF datoteke
+IncludingProductWithTag=Ukljući proizvode/usluge iz kategorije
+DefaultPriceRealPriceMayDependOnCustomer=Predefinirana cijena, stvarna cijena može ovisiti o kupcu
+WarningSelectOneDocument=Molimo odaberite barem jedan dokument
+DefaultUnitToShow=Jedinica
+NbOfQtyInProposals=Količina po ponudama
+ClinkOnALinkOfColumn=Kliknite na poveznicu kolone %s za detaljan pregled...
+TranslatedLabel=Prevedena oznaka
+TranslatedDescription=Preveden opis
+TranslatedNote=Prevedene napomene
+ProductWeight=Težina 1 proizvoda
+ProductVolume=Volumen 1 proizvoda
+WeightUnits=Jedinica težine
+VolumeUnits=Jedinica volumena
+SizeUnits=Jedinica veličine
+DeleteProductBuyPrice=Obriši nabavnu cijenu
+ConfirmDeleteProductBuyPrice=Jeste li sigurni da želite obrisati ovu nabavnu cijenu ?
 
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 30e2699a30c..f68c5e74889 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -1,192 +1,193 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
+RefProject=Ref. projekt
+ProjectRef=Projekt ref.
+ProjectId=Projekt ID
+ProjectLabel=Oznaka projekta
 Project=Projekt
 Projects=Projekti
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=Everybody
-PrivateProject=Project contacts
-MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
-ProjectsPublicDesc=This view presents all projects you are allowed to read.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
-ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
-ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
-TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
-TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
-AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
-OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
+ProjectsArea=Sučelje projekata
+ProjectStatus=Status projekta
+SharedProject=Svi
+PrivateProject=Kontakti projekta
+MyProjectsDesc=Ovaj popis je ograničen samo na projekte gdje ste navedeni za kontakt ( bez obzira na tip)
+ProjectsPublicDesc=Ovaj popis predstavlja sve projekte za koje imate dozvolu.
+TasksOnProjectsPublicDesc=Ovaj popis predstavlja sve zadatke na projektima za koje imate dozvolu.
+ProjectsPublicTaskDesc=Ovaj popis predstavlja sve projekte i zadatke za koje imate dozvolu.
+ProjectsDesc=Ovaj popis predstavlja sve projekte (vaše korisničke dozvole odobravaju vam da vidite sve).
+TasksOnProjectsDesc=Ovaj popis predstavlja sve zadatke na svim projektima (vaše korisničke dozvole odobravaju vam da vidite sve).
+MyTasksDesc=Ovaj popis je ograničen samo na projekte ili zadatke gdje ste navedeni za kontakt ( bez obzira na tip)
+OnlyOpenedProject=Samo otvoreni projekti su vidljivi (projekti u skicama ili zatvorenog statusa nisu vidljivi).
+ClosedProjectsAreHidden=Zatvoreni projekti nisu vidljivi.
+TasksPublicDesc=Ovaj popis predstavlja sve projekte i zadatke za koje imate dozvolu.
+TasksDesc=Ovaj popis predstavlja sve projekte i zadatke (vaše korisničke dozvole odobravaju vam da vidite sve).
+AllTaskVisibleButEditIfYouAreAssigned=Svi zadaci za ovakav projekt su vidljivi, ali možete unijeti vrijeme samo za vama dodjeljenom zadatku. Dodjelite si zadatak ako želiti unjeti vrijeme za njega.
+OnlyYourTaskAreVisible=Samo zadaci koji su vam dodjeljeni su vidljivi. Dodjelite si zadatak ako želite unjeti vrijeme.
 NewProject=Novi projekt
-AddProject=Create project
+AddProject=Kreiraj projekt
 DeleteAProject=Izbriši projekt
 DeleteATask=Izbriši zadatak
 ConfirmDeleteAProject=Jeste li sigurni da želite izbrisati ovaj projekt?
-ConfirmDeleteATask=Are you sure you want to delete this task ?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+ConfirmDeleteATask=Jeste li sigurni da želite obrisati ovaj zadatak ?
+OpenedProjects=Otvoreni projekti
+OpenedTasks=Otvoreni zadaci
+OpportunitiesStatusForOpenedProjects=Mogući iznos otvorenih projekata po statusu
+OpportunitiesStatusForProjects=Iznos šanse za projekte po statusu
 ShowProject=Prikaži projekt
 SetProject=Postavi projekt
 NoProject=Nema definiranih ili vlastih projekata
-NbOfProjects=Nb of projects
+NbOfProjects=Br. projekata
 TimeSpent=Vrijeme utrošeno
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=Vaše utrošeno vrijeme
+TimeSpentByUser=Utrošeno vrijeme korisnika
 TimesSpent=Vrijeme utrošeno
-RefTask=Ref. task
-LabelTask=Label task
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
+RefTask=Ref. zadatka
+LabelTask=Oznaka zadatka
+TaskTimeSpent=Utrošeno vrijeme zadataka
+TaskTimeUser=Korisnik
+TaskTimeNote=Bilješka
 TaskTimeDate=Date
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
-NewTimeSpent=New time spent
-MyTimeSpent=My time spent
-Tasks=Tasks
-Task=Task
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=New task
-AddTask=Create task
-Activity=Activity
-Activities=Tasks/activities
-MyActivities=My tasks/activities
-MyProjects=My projects
-MyProjectsArea=My projects Area
-DurationEffective=Effective duration
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
-Time=Time
-ListOfTasks=List of tasks
-GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Go to list of tasks
-ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
-ListContractAssociatedProject=List of contracts associated with the project
-ListFichinterAssociatedProject=List of interventions associated with the project
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
-ListDonationsAssociatedProject=List of donations associated with the project
-ListActionsAssociatedProject=List of events associated with the project
-ListTaskTimeUserProject=List of time consumed on tasks of project
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=Activity on project this week
-ActivityOnProjectThisMonth=Activity on project this month
-ActivityOnProjectThisYear=Activity on project this year
+TasksOnOpenedProject=Zadaci u otvorenim projektima
+WorkloadNotDefined=Opterećenje nije definirano
+NewTimeSpent=Novo utrošeno vrijeme
+MyTimeSpent=Moje utrošeno vrijeme
+Tasks=Zadaci
+Task=Zadatak
+TaskDateStart=Početak zadatka
+TaskDateEnd=Završetak zadatka
+TaskDescription=Opis zadatka
+NewTask=Novi zadatak
+AddTask=Kreiraj zadatak
+Activity=Aktivnost
+Activities=Zadaci/aktovnosti
+MyActivities=Moji zadaci/aktivnosti
+MyProjects=Moji projekti
+MyProjectsArea=Sučelje mojih projekata
+DurationEffective=Efektivno trajanje
+ProgressDeclared=Objavljeni napredak
+ProgressCalculated=Izračunati napredak
+Time=Vrijeme
+ListOfTasks=Popis zadataka
+GoToListOfTimeConsumed=Idi na popis utrošenog vremena
+GoToListOfTasks=Idi na popis zadataka
+ListProposalsAssociatedProject=Popis ponuda dodjeljenih projektu
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListContractAssociatedProject=Popis ugovora povezanih sa projektom
+ListFichinterAssociatedProject=Popis intervencija povezanih sa projektom
+ListExpenseReportsAssociatedProject=Popis izvještaja troškova povezanih sa projektom
+ListDonationsAssociatedProject=Popis donacija povezanih sa projektom
+ListActionsAssociatedProject=Popis događaja povezanih sa projektom
+ListTaskTimeUserProject=Popis utrošenog vremena po zadacima projekta
+ActivityOnProjectToday=Današnja aktivnost na projektu
+ActivityOnProjectYesterday=Jučerašnja aktivnost na projektu
+ActivityOnProjectThisWeek=Aktivnosti na projektu ovog tjedna
+ActivityOnProjectThisMonth=Aktivnosti na projektu ovog mjeseca
+ActivityOnProjectThisYear=Aktivnosti na projektu ove godine
 ChildOfTask=Child of project/task
-NotOwnerOfProject=Not owner of this private project
-AffectedTo=Allocated to
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See referers tab.
-ValidateProject=Validate projet
-ConfirmValidateProject=Are you sure you want to validate this project ?
-CloseAProject=Close project
-ConfirmCloseAProject=Are you sure you want to close this project ?
-ReOpenAProject=Open project
-ConfirmReOpenAProject=Are you sure you want to re-open this project ?
-ProjectContact=Project contacts
-ActionsOnProject=Events on project
-YouAreNotContactOfProject=You are not a contact of this private project
-DeleteATimeSpent=Delete time spent
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
-ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
-NoTasks=No tasks for this project
-LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not assigned to you
-ErrorTimeSpentIsEmpty=Time spent is empty
-ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
-IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
-CloneProject=Clone project
-CloneTasks=Clone tasks
-CloneContacts=Clone contacts
-CloneNotes=Clone notes
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
-ConfirmCloneProject=Are you sure to clone this project ?
-ProjectReportDate=Change task date according project start date
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Project %s created
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Opportunity status
-OpportunityStatusShort=Opp. status
-OpportunityProbability=Opportunity probability
-OpportunityProbabilityShort=Opp. probab.
-OpportunityAmount=Opportunity amount
-OpportunityAmountShort=Opp. amount
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+NotOwnerOfProject=Nije vlasnik ovog privatnog projekta
+AffectedTo=Dodjeljeno 
+CantRemoveProject=Ovaj projekt se ne može maknuti jer je povezan sa drugim objektima (računi, narudžbe ili sl.). Vidite tab Izvora.
+ValidateProject=Ovjeri projekt
+ConfirmValidateProject=Jeste li sigurni da želite ovjeriti ovaj projekt ?
+CloseAProject=Zatvori projekt
+ConfirmCloseAProject=Jeste li sigurni da želite zatvoriti ovaj projekt ?
+ReOpenAProject=Otvori projekti
+ConfirmReOpenAProject=Jeste li sigurni da želite ponovo otvoriti projekt ?
+ProjectContact=Kontakti projekta
+ActionsOnProject=Događaji projekta
+YouAreNotContactOfProject=Niste kontakt za ovaj privatni projekti
+DeleteATimeSpent=Obriši utrošeno vrijeme
+ConfirmDeleteATimeSpent=Jeste li sigurni da želite obrisati utrošeno vrijeme ?
+DoNotShowMyTasksOnly=Vidi također zadatke koji nisu dodjeljeni meni
+ShowMyTasksOnly=Vidi samo zadatke dodjeljene meni
+TaskRessourceLinks=Resursi
+ProjectsDedicatedToThisThirdParty=Projekti posvećeni komitentu
+NoTasks=Nema zadataka u ovom projektu
+LinkedToAnotherCompany=Povezano s drugim komitentom
+TaskIsNotAffectedToYou=Zadatak nije dodjeljen vama
+ErrorTimeSpentIsEmpty=Utrošeno vrijeme je prazno
+ThisWillAlsoRemoveTasks=Ova akcija će također obrisati sve zadatke projekta (<b>%s</b> zadataka u ovom trenutku) i sve unose utrošenog vremena.
+IfNeedToUseOhterObjectKeepEmpty=Ako neki objekti (računi, narudžbe,...), pripadaju drugom komitentu, moraju biti povezani s projektom koji se kreira, ostavite prazno da bi projekt bio za više komitenata.
+CloneProject=Kloniraj projekt
+CloneTasks=Kloniraj zadatke
+CloneContacts=Kloniraj kontakte
+CloneNotes=Kloniraj bilješke
+CloneProjectFiles=Kloniraj projektne datoteke
+CloneTaskFiles=Kloniraj datoteke(u) zadatka ( ako su zadatak(ci) klonirani)
+CloneMoveDate=Ažuriraj datume projekat/zadataka od sad ? 
+ConfirmCloneProject=Jeste li sigurni da želite klonirati projekt ?
+ProjectReportDate=Promjeni datum zadatka suklado početnom datumu projekta
+ErrorShiftTaskDate=Nemoguće pomaknuti datum zadatka sukladno novom početnom datumu projekta
+ProjectsAndTasksLines=Projekti i zadaci 
+ProjectCreatedInDolibarr=Projekt %s je kreiran
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=Zadatak %s kreiran
+TaskModifiedInDolibarr=Zadatak %s izmjenjen
+TaskDeletedInDolibarr=Zadatak %s obrisan
+OpportunityStatus=Status šanse
+OpportunityStatusShort=Šansa status
+OpportunityProbability=Vjerojatnost šanse
+OpportunityProbabilityShort=Vjer. šanse
+OpportunityAmount=Iznos šanse
+OpportunityAmountShort=Šansa iznos
+OpportunityAmountAverageShort=Prosječan iznos šanse
+OpportunityAmountWeigthedShort=Vjerojatan iznos šanse
+WonLostExcluded=Izostavi Dobiveno/Izgubljeno
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Project leader
-TypeContact_project_external_PROJECTLEADER=Project leader
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_task_internal_TASKEXECUTIVE=Task executive
-TypeContact_project_task_external_TASKEXECUTIVE=Task executive
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
+TypeContact_project_internal_PROJECTLEADER=Vođa projekta
+TypeContact_project_external_PROJECTLEADER=Vođa projekta
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Suradnik
+TypeContact_project_external_PROJECTCONTRIBUTOR=Suradnik
+TypeContact_project_task_internal_TASKEXECUTIVE=Izvršitelj zadatka
+TypeContact_project_task_external_TASKEXECUTIVE=Izvršitelj zadatka
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Suradnik
+TypeContact_project_task_external_TASKCONTRIBUTOR=Suradnik
+SelectElement=Odaberi element
+AddElement=Poveži s elementom
 # Documents models
-DocumentModelBeluga=Project template for linked objects overview
-DocumentModelBaleine=Project report template for tasks
-PlannedWorkload=Planned workload
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
-TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
-ResourceNotAssignedToTheTask=Not assigned to the task
-AssignTaskToMe=Assign task to me
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=Nb of created projects by month
-ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
-ProjectsStatistics=Statistics on projects/leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
-OpenedProjectsByThirdparties=Open projects by thirdparties
-OnlyOpportunitiesShort=Only opportunities
-OpenedOpportunitiesShort=Open opportunities
-NotAnOpportunityShort=Not an opportunity
-OpportunityTotalAmount=Opportunities total amount
+DocumentModelBeluga=Predložak projekta za pregled povezanih objekata
+DocumentModelBaleine=Predložak izvještaja za zadatke projekta 
+PlannedWorkload=Planirano opterećenje
+PlannedWorkloadShort=Opterećenje
+ProjectReferers=Povezane stavke
+ProjectMustBeValidatedFirst=Projekt mora biti prvo ovjeren
+FirstAddRessourceToAllocateTime=Dodjeli korisnka u zadatak za alokaciju vremena
+InputPerDay=Unos po danu
+InputPerWeek=Unos po tjednu
+InputPerAction=Unos po akciji
+TimeAlreadyRecorded=Utrošeno vrijeme je već zabilježeno za ovaj zadatak/dan i za korisnika %s
+ProjectsWithThisUserAsContact=Projekti s ovim korisnikom kao kontakt osoba
+TasksWithThisUserAsContact=Zadaci dodjeljeni korisniku
+ResourceNotAssignedToProject=Nije dodjeljen projektu
+ResourceNotAssignedToTheTask=Nije dodjeljen zadatku
+AssignTaskToMe=Dodjeli zadatak meni
+AssignTask=Dodjeli
+ProjectOverview=Pregled
+ManageTasks=Koristi projekte za pračenje zadataka i vremena 
+ManageOpportunitiesStatus=Koristi projekte za praćenje prednosti/šansi
+ProjectNbProjectByMonth=Br. kreiranih projektata po mjesecu 
+ProjectOppAmountOfProjectsByMonth=Iznos šansi po mjesecu
+ProjectWeightedOppAmountOfProjectsByMonth=Važniji iznosi šansi po mjesecu
+ProjectOpenedProjectByOppStatus=Otvoreni projekti/prednosti po statusu šanse
+ProjectsStatistics=Statistika po projektima/prednostima
+TaskAssignedToEnterTime=Zadatak dodjeljen. Unos vremena za zadatak je moguće.
+IdTaskTime=ID vre. zad.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
+OpenedProjectsByThirdparties=Otvoreni projekti za komitente
+OnlyOpportunitiesShort=Samo šanse
+OpenedOpportunitiesShort=Otvorene šanse
+NotAnOpportunityShort=Nije šansa
+OpportunityTotalAmount=Ukupan iznos šansi
 OpportunityPonderatedAmount=Opportunities weighted amount
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
+OpportunityPonderatedAmountDesc=Iznosi šanse po važnosti sa vjerojatnošću
+OppStatusPROSP=Prospekcija
+OppStatusQUAL=Kvalifikacija
+OppStatusPROPO=Ponuda
+OppStatusNEGO=Pregovor
+OppStatusPENDING=Čekanje
+OppStatusWON=Dobio
+OppStatusLOST=Izgubljeno
+Budget=Proračun
diff --git a/htdocs/langs/hr_HR/propal.lang b/htdocs/langs/hr_HR/propal.lang
index 1ccce9db324..0a5c7895836 100644
--- a/htdocs/langs/hr_HR/propal.lang
+++ b/htdocs/langs/hr_HR/propal.lang
@@ -1,32 +1,32 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Trgovačke ponude
-Proposal=Trgovačka ponuda
+Proposals=Ponude
+Proposal=Ponuda
 ProposalShort=Ponuda
-ProposalsDraft=Skice trgovačkih ponuda
-ProposalsOpened=Open commercial proposals
-Prop=Trgovačke ponude
-CommercialProposal=Trgovačka ponuda
+ProposalsDraft=Skice ponuda
+ProposalsOpened=Otvori ponude
+Prop=Ponude
+CommercialProposal=Ponuda
 ProposalCard=Kartica ponude
-NewProp=Nova trgovačka ponuda
+NewProp=Nova ponuda
 NewPropal=Nova ponuda
 Prospect=Mogući kupac
-DeleteProp=Izbriši trgovačku ponudu
-ValidateProp=Ovjeri trgovačku ponudu
+DeleteProp=Izbriši ponudu
+ValidateProp=Ovjeri ponudu
 AddProp=Izradi ponudu
-ConfirmDeleteProp=Jeste li sigurni da želite izbrisati ovu trgovačku ponudu?
-ConfirmValidateProp=Jesti li sigurni da želite ovjeriti ovu trgovačku ponudu pod imenom <b>%s</b>?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+ConfirmDeleteProp=Jeste li sigurni da želite izbrisati ovu ponudu?
+ConfirmValidateProp=Jeste li sigurni da želite ovjeriti ovu ponudu pod imenom <b>%s</b>?
+LastPropals=Zadnjih %s ponuda
+LastModifiedProposals=Zadnjih %s izmjenjenih ponuda
 AllPropals=Sve ponude
 SearchAProposal=Pronađi ponudu
-NoProposal=No proposal
-ProposalsStatistics=Statistika trgovačkih ponuda
+NoProposal=Bez ponude
+ProposalsStatistics=Statistika ponuda
 NumberOfProposalsByMonth=Broj u mjesecu
 AmountOfProposalsByMonthHT=Iznos po mjesecu (netto bez PDV-a)
-NbOfProposals=Broj trgovačkih ponuda
+NbOfProposals=Broj ponuda
 ShowPropal=Prikaži ponudu
 PropalsDraft=Skice
-PropalsOpened=Open
+PropalsOpened=Otvori
 PropalStatusDraft=Skica (potrebno ovjeriti)
 PropalStatusValidated=Ovjerena (otvorena ponuda)
 PropalStatusSigned=Potpisana (za naplatu)
@@ -37,28 +37,28 @@ PropalStatusClosedShort=Zatvorena
 PropalStatusSignedShort=Potpisana
 PropalStatusNotSignedShort=Nije potpisana
 PropalStatusBilledShort=Naplaćena
-PropalsToClose=Trgovačke ponude za zatvaranje
-PropalsToBill=Potpisane trgovačke ponude za naplatu
-ListOfProposals=Popis trgovačkih ponuda
+PropalsToClose=Ponude za zatvaranje
+PropalsToBill=Potpisane ponude za naplatu
+ListOfProposals=Popis ponuda
 ActionsOnPropal=Događaji vezani uz ponudu
-RefProposal=Broj trgovačke ponude
-SendPropalByMail=Pošalji trgovačku ponudu e-poštom
+RefProposal=Broj ponude
+SendPropalByMail=Pošalji ponudu e-poštom
 DatePropal=Datum ponude
 DateEndPropal=Datum dospijeća
 ValidityDuration=Vrijedi do
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Postavi status na
+SetAcceptedRefused=Postavi prihvaćeno/odbijeno
 ErrorPropalNotFound=Ponuda %s nije pronađena
 AddToDraftProposals=Dodati skici ponude
 NoDraftProposals=Nema skica ponuda
-CopyPropalFrom=Izradi trgovačku ponudu preslikanjem postojeće ponude
+CopyPropalFrom=Izradi ponudu preslikom postojeće ponude
 CreateEmptyPropal=Izradi prazan predložak ponude ili popis proizvoda i usluga
-DefaultProposalDurationValidity=Osnovni rok valjanosti trgovačke ponude (u danima)
-UseCustomerContactAsPropalRecipientIfExist=Koristiti adresu kupca za ponude umjesto adrese Treće osobe ako je tako određeno
-ClonePropal=Kloniraj trgovačku ponudu
-ConfirmClonePropal=Jeste li sigurni da želite klonirati trgovačku ponudu <b>%s</b> ?
-ConfirmReOpenProp=Jeste li sigurno da želite ponovo otvoriti trgovačku ponudu <b>%s</b> ?
-ProposalsAndProposalsLines=Trgovačke ponude i stavke
+DefaultProposalDurationValidity=Osnovni rok valjanosti ponude (u danima)
+UseCustomerContactAsPropalRecipientIfExist=Ako je navedena, za ponudu upotrijebi adresu kontakta pri kupcu umjesto adrese tvrtke
+ClonePropal=Kloniraj ponudu
+ConfirmClonePropal=Jeste li sigurni da želite klonirati ponudu <b>%s</b> ?
+ConfirmReOpenProp=Jeste li sigurni da želite ponovo otvoriti ponudu <b>%s</b> ?
+ProposalsAndProposalsLines=Ponude i stavke
 ProposalLine=Stavka ponude
 AvailabilityPeriod=Odgoda dostupnosti
 SetAvailability=Odredi odgodu dostupnosti
@@ -78,5 +78,5 @@ DocModelAzurDescription=Cjeloviti model ponude (logo...)
 DefaultModelPropalCreate=Izrada osnovnog modela
 DefaultModelPropalToBill=Osnovni predložak prilikom zatvaranja poslovne ponude (za naplatu)
 DefaultModelPropalClosed=Osnovni predložak prilikom zatvaranja poslovne ponude (nenaplaćeno)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalCustomerSignature=Pismeno prihvaćanje, pečat tvrtke, datum i potpis
+ProposalsStatisticsSuppliers=Statistika ponuda dobavljača
diff --git a/htdocs/langs/hr_HR/receiptprinter.lang b/htdocs/langs/hr_HR/receiptprinter.lang
index 756461488cc..a19dea1addc 100644
--- a/htdocs/langs/hr_HR/receiptprinter.lang
+++ b/htdocs/langs/hr_HR/receiptprinter.lang
@@ -1,44 +1,44 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
+ReceiptPrinterSetup=Podešavanje modula Pisača za ispis računa
+PrinterAdded=Pisač %s je dodan
+PrinterUpdated=Pisač %s je promjenjen
+PrinterDeleted=Pisač %s je obrisan
+TestSentToPrinter=Test je poslan na pisač %s
+ReceiptPrinter=Pisači za račune
+ReceiptPrinterDesc=Postavljanje pisača za ispis računa
+ReceiptPrinterTemplateDesc=Postavljanje predložaka
+ReceiptPrinterTypeDesc=Opis tipa pisača za račune
+ReceiptPrinterProfileDesc=Opis profila pisača za račune
+ListPrinters=Popis pisača
+SetupReceiptTemplate=Podešavanje predloška
 CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+CONNECTOR_NETWORK_PRINT=Mrežni pisač
+CONNECTOR_FILE_PRINT=Lokalni pisač
+CONNECTOR_WINDOWS_PRINT=Lokalni Windows pisač
+CONNECTOR_DUMMY_HELP=Lažni pisač za test, ne radi ništa
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile Help
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
-DOL_USE_FONT_A=Use font A of printer
-DOL_USE_FONT_B=Use font B of printer
-DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
-DOL_CUT_PAPER_FULL=Cut ticket completely
-DOL_CUT_PAPER_PARTIAL=Cut ticket partially
-DOL_OPEN_DRAWER=Open cash drawer
-DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
+PROFILE_DEFAULT=Predefinirani profil
+PROFILE_SIMPLE=Jednostavan profil
+PROFILE_EPOSTEP=EPOS TEP profil
+PROFILE_P822D=P822D Profil
+PROFILE_STAR=Star Profil
+PROFILE_DEFAULT_HELP=Predefinirani profil odgovarajući za Epson pisače
+PROFILE_SIMPLE_HELP=Jednostavan profil bez grafike
+PROFILE_EPOSTEP_HELP=Epos Tep Profile pomoć
+PROFILE_P822D_HELP=P822D Profil bez grafike
+PROFILE_STAR_HELP=Star Profil
+DOL_ALIGN_LEFT=Lijevo poravnati tekst
+DOL_ALIGN_CENTER=Centrirani tekst
+DOL_ALIGN_RIGHT=Desno poravnati tekst
+DOL_USE_FONT_A=Koristi font A pisača
+DOL_USE_FONT_B=Koristi font B pisača
+DOL_USE_FONT_C=Koristi font C pisača
+DOL_PRINT_BARCODE=Ispis barkoda
+DOL_PRINT_BARCODE_CUSTOMER_ID=Ispiši barkod ID kupca
+DOL_CUT_PAPER_FULL=Kompletno odreži
+DOL_CUT_PAPER_PARTIAL=Parcijalno odreži
+DOL_OPEN_DRAWER=Otvori ladicu za novac
+DOL_ACTIVATE_BUZZER=Uključi zvučni signal
+DOL_PRINT_QRCODE=Ispiši QR barkod
diff --git a/htdocs/langs/hr_HR/resource.lang b/htdocs/langs/hr_HR/resource.lang
index f95121db351..484a5e4f674 100644
--- a/htdocs/langs/hr_HR/resource.lang
+++ b/htdocs/langs/hr_HR/resource.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Sredstva
+MenuResourceAdd=Novo sredstvo
+DeleteResource=Obriši sredstvo
+ConfirmDeleteResourceElement=Potvrdite brisanje sredstva za ovaj element
+NoResourceInDatabase=Nema sredstava u bazi
+NoResourceLinked=Nema povezanih sredstava
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Popis sredstava
+ResourceSingular=Sredstvo
+ResourceCard=Kartica sredstva
+AddResource=Kreiraj sredstvo
+ResourceFormLabel_ref=Naziv sredstva
+ResourceType=Tip sredstva
+ResourceFormLabel_description=Opis sredstva
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Sredstva povezana s elementom
 
-ShowResource=Show resource
+ShowResource=Prikaži sredstvo
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Sredstva elementa
+ResourceCreatedWithSuccess=Sredstvo uspješno kreirano
+RessourceLineSuccessfullyDeleted=Stavka sredstva uspješno obrisana
+RessourceLineSuccessfullyUpdated=Stavka sredstva uspješno promjenjena
+ResourceLinkedWithSuccess=Sredstvo uspješno povezano
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=Potvrdite brisanje sredstva
+RessourceSuccessfullyDeleted=Sredstvo uspješno obrisano
+DictionaryResourceType=Tipovi sredstava
 
-SelectResource=Select resource
+SelectResource=Odaberite sredstvo
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index da177410860..5d636a9a698 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
-Salary=Salary
-Salaries=Salaries
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
-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
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Konto za isplate plaća
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Konto za financijske isplate
+Salary=Plaća
+Salaries=Plaće
+NewSalaryPayment=Nova isplata plaće
+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
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index a56069a0b7c..8c5c74751c8 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -1,67 +1,67 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. shipment
-Sending=Pošiljka
-Sendings=Pošiljke
-AllSendings=All Shipments
+RefSending=Ref. isporuke
+Sending=Isporuka
+Sendings=Isporuke
+AllSendings=Sve otpremnice
 Shipment=Pošiljka
 Shipments=Pošiljke
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
-SendingsArea=Shipments area
+ShowSending=Prikaži otrpemnice
+Receivings=Dostavne primke
+SendingsArea=Sučelje otprema
 ListOfSendings=Popis pošiljki
 SendingMethod=Metoda dostave
-LastSendings=Latest %s shipments
+LastSendings=Zadnjih %s isporuka
 StatisticsOfSendings=Statistike pošiljki
 NbOfSendings=Broj pošiljki
 NumberOfShipmentsByMonth=Broj pošiljki tijekom mjeseca
-SendingCard=Shipment card
+SendingCard=Kartica otpreme
 NewSending=Nova pošiljka
 CreateASending=Kreiraj pošiljku
 QtyShipped=Količina poslana
 QtyToShip=Količina za poslat
 QtyReceived=Količina primljena
-KeepToShip=Remain to ship
-OtherSendingsForSameOrder=Other shipments for this order
-SendingsAndReceivingForSameOrder=Shipments and receivings for this order
-SendingsToValidate=Shipments to validate
+KeepToShip=Preostalo za isporuku
+OtherSendingsForSameOrder=Ostale isporuke za ovu narudžbu
+SendingsAndReceivingForSameOrder=Isporuke i primke za ovu narudžbu
+SendingsToValidate=Isporuke za ovjeru
 StatusSendingCanceled=Poništeno
 StatusSendingDraft=Skica
-StatusSendingValidated=Validated (products to ship or already shipped)
+StatusSendingValidated=Ovjereno (proizvodi za isporuku ili su isporučeni)
 StatusSendingProcessed=Obrađen
 StatusSendingDraftShort=Skica
 StatusSendingValidatedShort=Ovjereno
 StatusSendingProcessedShort=Obrađen
-SendingSheet=Shipment sheet
+SendingSheet=Otpremni list
 ConfirmDeleteSending=Jeste li sigurni da želite izbrisati ovu pošiljku?
 ConfirmValidateSending=jeste li sigurni da želite ovjeriti ovu pošiljku sa referencom <b>%s</b> ?
 ConfirmCancelSending=Jeste li sigurni da želite poništiti ovu pošiljku?
 DocumentModelSimple=Jednostavan model dokumenta
 DocumentModelMerou=Merou A5 model
-WarningNoQtyLeftToSend=Warning, no products waiting to be shipped.
-StatsOnShipmentsOnlyValidated=Statistics conducted on shipments only validated. Date used is date of validation of shipment (planed delivery date is not always known).
-DateDeliveryPlanned=Planned date of delivery
+WarningNoQtyLeftToSend=Upozorenje, nema prozvoda za isporuku.
+StatsOnShipmentsOnlyValidated=Statistika se vodi po otpremnicama koje su ovjerene. Korišteni datum je datum ovjere otpremnice (planirani datum isporuke nije uvjek poznat).
+DateDeliveryPlanned=Planirani dan isporuke
 DateReceived=Datum primitka pošiljke
-SendShippingByEMail=Pošalji pošiljku Emailom
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Events on shipment
-LinkToTrackYourPackage=Link to track your package
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the order card.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
-NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
-ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
+SendShippingByEMail=Pošalji pošiljku putem e-pošte
+SendShippingRef=Podnošenje otpeme %s
+ActionsOnShipping=Događaji na otpremnici
+LinkToTrackYourPackage=Poveznica za pračenje pošiljke
+ShipmentCreationIsDoneFromOrder=Trenutno, kreiranje nove otpremnice se radi iz kartice narudžbe.
+ShipmentLine=Stavka otpremnice
+ProductQtyInCustomersOrdersRunning=Količina proizvoda u otvorenim narudžbama kupaca
+ProductQtyInSuppliersOrdersRunning=Količina proizvoda u otvorenim narudžbama dobavljača
+ProductQtyInShipmentAlreadySent=Količina proizvoda s otvorenih narudžba kupaca već poslano
+ProductQtyInSuppliersShipmentAlreadyRecevied=Količina proizvoda s otvorenih narudžba dobavljača već primljeno
+NoProductToShipFoundIntoStock=Nije pronađen proizvod za isporuku u skladištu <b>%s</b>. Ispravite zalihe ili se vratite nazad i odaberite drugo skladište. 
+WeightVolShort=Težina/Volumen
+ValidateOrderFirstBeforeShipment=Prvo morate ovjeriti narudžbu prije izrade otpremnice.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=More complete document model for delivery receipts (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
+DocumentModelTyphon=Kompletan model dokumenta za dostavnu primku (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstanta EXPEDITION_ADDON_NUMBER nije definirana
 SumOfProductVolumes=Ukupni volumen proizvoda
 SumOfProductWeights=Ukupna težina proizvoda
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
+DetailWarehouseNumber= Skladišni detalji
 DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/hr_HR/sms.lang b/htdocs/langs/hr_HR/sms.lang
index 2b41de470d2..61408278216 100644
--- a/htdocs/langs/hr_HR/sms.lang
+++ b/htdocs/langs/hr_HR/sms.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - sms
-Sms=Sms
-SmsSetup=Sms setup
-SmsDesc=This page allows you to define globals options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
-SmsFrom=Sender
-SmsTo=Target
-SmsTopic=Topic of SMS
-SmsText=Message
-SmsMessage=SMS Message
-ShowSms=Show Sms
-ListOfSms=List SMS campains
-NewSms=New SMS campain
-EditSms=Edit Sms
-ResetSms=New sending
-DeleteSms=Delete Sms campain
-DeleteASms=Remove a Sms campain
-PreviewSms=Previuw Sms
-PrepareSms=Prepare Sms
-CreateSms=Create Sms
-SmsResult=Result of Sms sending
-TestSms=Test Sms
-ValidSms=Validate Sms
-ApproveSms=Approve Sms
-SmsStatusDraft=Draft
-SmsStatusValidated=Validated
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
-SmsStatusError=Error
-SmsStatusNotSent=Not sent
-SmsSuccessfulySent=Sms correctly sent (from %s to %s)
-ErrorSmsRecipientIsEmpty=Number of target is empty
-WarningNoSmsAdded=No new phone number to add to target list
-ConfirmValidSms=Do you confirm validation of this campain ?
-NbOfUniqueSms=Nb dof unique phone numbers
-NbOfSms=Nbre of phon numbers
-ThisIsATestMessage=This is a test message
-SendSms=Send SMS
-SmsInfoCharRemain=Nb of remaining characters
-SmsInfoNumero= (format international ie : +33899701761)
-DelayBeforeSending=Delay before sending (minutes)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
-SmsNoPossibleRecipientFound=No target available. Check setup of your SMS provider.
+Sms=SMS
+SmsSetup=Podešavanje SMS
+SmsDesc=Ova stranica vam dozvoljava da definirate globalne opcije za SMS mogučnost
+SmsCard=SMS kartica
+AllSms=Sve SMS kampanje
+SmsTargets=Ciljevi
+SmsRecipients=Ciljevi
+SmsRecipient=Cilj
+SmsTitle=Opis
+SmsFrom=Pošiljatelj
+SmsTo=Cilj
+SmsTopic=Opis SMS
+SmsText=Poruka
+SmsMessage=SMS poruka
+ShowSms=Prikaži SMS
+ListOfSms=Popis SMS kampanja
+NewSms=Nova SMS kampanja
+EditSms=Uredi SMS
+ResetSms=Novo slanje
+DeleteSms=Obriši SMS kampanju
+DeleteASms=Makni SMS kampanju
+PreviewSms=Pregled SMS-a
+PrepareSms=Pripremi SMS
+CreateSms=Kreiraj SMS
+SmsResult=Rezultat slanja SMS-a
+TestSms=Test SMS
+ValidSms=Potvrdi SMS
+ApproveSms=Odobri SMS
+SmsStatusDraft=Skica
+SmsStatusValidated=Potvrđeno
+SmsStatusApproved=Odobreno
+SmsStatusSent=Poslano
+SmsStatusSentPartialy=Djelomično poslano
+SmsStatusSentCompletely=Kompletno poslano
+SmsStatusError=Greška
+SmsStatusNotSent=Nije poslano
+SmsSuccessfulySent=SMS ispravno poslani (od %s do %s)
+ErrorSmsRecipientIsEmpty=Broj ciljeva je prazan
+WarningNoSmsAdded=Nema novih brojeva za dodavanje na ciljanu listu
+ConfirmValidSms=Da li potvrđujete ovu kampanju ?
+NbOfUniqueSms=Br. DOF jedinstvenih tel. brojeva
+NbOfSms=Br. tel. brojeva
+ThisIsATestMessage=Ovo je test poruka
+SendSms=Pošalji SMS
+SmsInfoCharRemain=Br. preostalih znakova
+SmsInfoNumero= (internacionalni format npr: +33899701761)
+DelayBeforeSending=Kašnjenje prije slanja (minuta)
+SmsNoPossibleSenderFound=Pošiljatelj nije dostupan. Provjerite postavke SMS davaoca usluga.
+SmsNoPossibleRecipientFound=Ciljevi nisu dostupni. Provjerite postavke SMS davaoca usluga.
 
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 8d2d1739a69..a843ca9d537 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -1,134 +1,143 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warehouse card
-Warehouse=Warehouse
-Warehouses=Warehouses
-NewWarehouse=New warehouse / Stock area
-WarehouseEdit=Modify warehouse
-MenuNewWarehouse=New warehouse
-WarehouseSource=Source warehouse
-WarehouseSourceNotDefined=No warehouse defined,
-AddOne=Add one
-WarehouseTarget=Target warehouse
-ValidateSending=Delete sending
-CancelSending=Cancel sending
-DeleteSending=Delete sending
-Stock=Stock
-Stocks=Stocks
-StocksByLotSerial=Stocks by lot/serial
-Movements=Movements
-ErrorWarehouseRefRequired=Warehouse reference name is required
-ListOfWarehouses=List of warehouses
-ListOfStockMovements=List of stock movements
-StocksArea=Warehouses area
-Location=Location
-LocationSummary=Short name location
-NumberOfDifferentProducts=Number of different products
-NumberOfProducts=Total number of products
-LastMovement=Last movement
-LastMovements=Last movements
-Units=Units
-Unit=Unit
-StockCorrection=Correct stock
-StockTransfer=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
-StockLowerThanLimit=Stock lower than alert limit
-EnhancedValue=Value
-PMPValue=Weighted average price
-PMPValueShort=WAP
-EnhancedValueOfWarehouses=Warehouses value
-UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
-IndependantSubProductStock=Product stock and subproduct stock are independant
-QtyDispatched=Quantity dispatched
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
-OrderDispatch=Stock dispatching
-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
-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 suppliers orders approbation
-ReStockOnDispatchOrder=Increase real stocks on manual dispatching into warehouses, after supplier order receiving
-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 theoretical stock
-NoPredefinedProductToDispatch=No predefined products for this object. So no dispatching in stock is required.
-DispatchVerb=Dispatch
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-PhysicalStock=Physical stock
-RealStock=Real Stock
-VirtualStock=Virtual stock
-IdWarehouse=Id warehouse
-DescWareHouse=Description warehouse
-LieuWareHouse=Localisation warehouse
-WarehousesAndProducts=Warehouses and products
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
-AverageUnitPricePMPShort=Weighted average input price
-AverageUnitPricePMP=Weighted average input price
-SellPriceMin=Selling Unit Price
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=Input stock value
-EstimatedStockValue=Input stock value
-DeleteAWarehouse=Delete a warehouse
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b> ?
-PersonalStock=Personal stock %s
-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
-DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
-StockToBuy=To order
-Replenishment=Replenishment
-ReplenishmentOrders=Replenishment orders
-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
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-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
-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.
-Replenishments=Replenishments
-NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
-NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-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)
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
-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
-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 for internal actions
-OpenShipping=Open for shippings
-OpenDispatch=Open for dispatch
+WarehouseCard=Kartica skladišta
+Warehouse=Skladište
+Warehouses=Skladišta
+NewWarehouse=Novo skladište
+WarehouseEdit=Promjeni skladište
+MenuNewWarehouse=Novo skladište
+WarehouseSource=Izvorno skladište
+WarehouseSourceNotDefined=Skladište nije definirano,
+AddOne=Dodajte jedno
+WarehouseTarget=Odredišno skladište
+ValidateSending=Obriši slanje
+CancelSending=Odustani od slanja
+DeleteSending=Obriši slanje
+Stock=Zaliha
+Stocks=Zalihe
+StocksByLotSerial=Zaliha po lot/serijskom
+LotSerial=Lot/serijski
+LotSerialList=Popis lot/serijskih brojeva
+Movements=Kretanja
+ErrorWarehouseRefRequired=Referenca skladišta je obavezna
+ListOfWarehouses=Popis skladišta
+ListOfStockMovements=Popis kretanja zaliha
+StocksArea=Sučelje skladišta
+Location=Lokacija
+LocationSummary=Kratki naziv lokacije
+NumberOfDifferentProducts=Broj različitih proizvoda
+NumberOfProducts=Ukupan broj proizvoda
+LastMovement=Posljednja kretnja
+LastMovements=Posljednje kretnje
+Units=Jedinica
+Unit=Jedinica
+StockCorrection=Ispravi zalihu
+StockTransfer=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
+StockLowerThanLimit=Zaliha je niža od granice
+EnhancedValue=Vrijednost
+PMPValue=Procjenjena prosječna cijena
+PMPValueShort=PPC
+EnhancedValueOfWarehouses=Vrijednost skladišta
+UserWarehouseAutoCreate=Kreiraj skladište automatski kada se kreira korisnik
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
+IndependantSubProductStock=Zaliha proizvoda i podproizvoda su nezavisne
+QtyDispatched=Otpremljena količina
+QtyDispatchedShort=Otpremljena količina
+QtyToDispatchShort=Količina za otpremu
+OrderDispatch=Otprema zalihe
+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
+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=Povečaj stvarnu zalihu kod potvrde narudžbe dobavljača
+ReStockOnDispatchOrder=Povečaj stvarnu zalihu kod ručnog stavljanja na skladište, nakon primitka narudžbe dobavljača
+OrderStatusNotReadyToDispatch=Narudžba nije stigla ili nema status koji dozvoljava stavljanje proizvoda na zalihu skladišta.
+StockDiffPhysicTeoric=Objašnjenje za razliku između fizičke i teoretske zalihe
+NoPredefinedProductToDispatch=Nema predefiniranih proizvoda za ovaj objekt. Potrebno je staviti robu na zalihu.
+DispatchVerb=Otpremi
+StockLimitShort=Razina za obavijest
+StockLimit=Stanje zaliha za obavjest
+PhysicalStock=Fizička zaliha
+RealStock=Stvarna zaliha
+VirtualStock=Umjetna zaliha
+IdWarehouse=ID skladišta
+DescWareHouse=Opis skladišta
+LieuWareHouse=Lokalizacija skladišta
+WarehousesAndProducts=Skladišta i proizvodi
+WarehousesAndProductsBatchDetail=Skladišta i proizvodi (s detaljima po lot/serijskom)
+AverageUnitPricePMPShort=Procjenjena prosječna ulazna cijena
+AverageUnitPricePMP=Procjenjena prosječna ulazna cijena
+SellPriceMin=Jed. prodajna cijena 
+EstimatedStockValueSellShort=Vrijednost za prodaju
+EstimatedStockValueSell=Vrijednost za prodaju
+EstimatedStockValueShort=Ulazna vrijednost zalihe
+EstimatedStockValue=Ulazna vrijednost zalihe
+DeleteAWarehouse=Obriši skladište
+ConfirmDeleteWarehouse=Jeste li sigurni da želite obrisati skladište <b>%s</b>
+PersonalStock=Osobna zaliha %s
+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
+DesiredStockDesc=Ovaj iznos zalihe će biti vrijednost korištena a popunjavanje zaliha kod mogučnosti popunjavanja.
+StockToBuy=Za naručiti
+Replenishment=Popunjavanje
+ReplenishmentOrders=Nadopunjavanje narudžbe
+VirtualDiffersFromPhysical=Sukladno opcija povečanja/smanjenja zaliha, fizička zaliha i umjetna zaliha (fizički + trenutne narudžbe) mogu se razlikovati
+UseVirtualStockByDefault=Koristi umjetnu zalihu, umjesto fizičke zalihe, za mogučnost popunjavanja
+UseVirtualStock=Koristi umjetnu zalihu
+UsePhysicalStock=Koristi fizičku zalihu
+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
+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.
+Replenishments=Popunjavanje
+NbOfProductBeforePeriod=Količina proizvoda %s na zalihi prije odabranog perioda (< %s)
+NbOfProductAfterPeriod=Količina proizvoda %s na zalihi nakon odabranog perioda (> %s)
+MassMovement=Masovno kretanje
+SelectProductInAndOutWareHouse=Odaberite proizvod, količinu, izvorno skladište i odredišno skladište, onda kliknite "%s". Kada završite za sva potrebna kretanja, kliknite na "%s".
+RecordMovement=Zabilježi prijenos
+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)
+MovementLabel=Oznaka kretanja
+InventoryCode=Kretanje ili inventarni kod
+IsInPackage=Sadržane u grupiranim proizvodima
+WarehouseAllowNegativeTransfer=Zaliha ne može biti negativna
+qtyToTranferIsNotEnough=Nemate dovoljnu zalihu na izvornom skladištu
+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
+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=Otvoreno za interne akcije
+OpenShipping=Otvoreno za slanje
+OpenDispatch=Otvoreno za otpremu
+UseDispatchStatus=Koristi status otpreme (odobreno/odbijeno)
+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
diff --git a/htdocs/langs/hr_HR/supplier_proposal.lang b/htdocs/langs/hr_HR/supplier_proposal.lang
index 909a4d713c1..5ecaf924b91 100644
--- a/htdocs/langs/hr_HR/supplier_proposal.lang
+++ b/htdocs/langs/hr_HR/supplier_proposal.lang
@@ -1,53 +1,54 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
-SupplierProposalDate=Delivery date
-SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b> ?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
-SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
-CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-CloneAsk=Clone price request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b> ?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b> ?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
-SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request ?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposal=List of supplier proposal requests
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
-LastSupplierProposals=Last price requests
-AllPriceRequests=All requests
+SupplierProposal=Ponude dobavljača
+supplier_proposalDESC=Upravljaj zahtjevima za cijene prema dobavljačima
+SupplierProposalNew=Novi zahtjev
+CommRequest=Tražena cijena
+CommRequests=Tražene cijene
+SearchRequest=Pronađi zahtjev
+DraftRequests=Skica zahtjeva
+SupplierProposalsDraft=Skice ponuda dobavljača
+LastModifiedRequests=Zadnjih %s promjenjenih zahtjeva za cijenom
+RequestsOpened=Otvoreni zahtjevi
+SupplierProposalArea=Sučelje ponuda dobavljača
+SupplierProposalShort=Ponuda dobavljača
+SupplierProposals=Ponude dobavljača
+SupplierProposalsShort=Ponude dobavljača
+NewAskPrice=Novo traženje cijene
+ShowSupplierProposal=Prikaži zahtjev
+AddSupplierProposal=Kreiraj zahtjev za cijenom
+SupplierProposalRefFourn=Ref. dobavljača
+SupplierProposalDate=Datum isporuke
+SupplierProposalRefFournNotice=Prije zatvaranja s "Prihvačeno", provjerite reference dobavljača.
+ConfirmValidateAsk=Jeste li sigurni da želite ovjeriti ovaj zahtjev za cijenom pod imenom <b>%s</b> ?
+DeleteAsk=Obriši zahtjev
+ValidateAsk=Ovjeri zahtjev
+SupplierProposalStatusDraft=Skica (potrebna ovjera)
+SupplierProposalStatusValidated=Ovjereno (zahtjev je otvoren)
+SupplierProposalStatusClosed=Zatvoreno
+SupplierProposalStatusSigned=Prihvačeno
+SupplierProposalStatusNotSigned=Odbijeno
+SupplierProposalStatusDraftShort=Skica
+SupplierProposalStatusClosedShort=Zatvoreno
+SupplierProposalStatusSignedShort=Prihvačeno
+SupplierProposalStatusNotSignedShort=Odbijeno
+CopyAskFrom=Kreiraj zahtjev za cijenom kopirajući postojeći zahtjev
+CreateEmptyAsk=Kreiraj prazan zahtjev
+CloneAsk=Kloniraj zahtjev 
+ConfirmCloneAsk=Jeste li sigurni da želite klonirati zahtjev za cijenom <b>%s</b> ?
+ConfirmReOpenAsk=Jeste li sigurni da želite ponovo otvoriti zahtjev za cijenom <b>%s</b> ?
+SendAskByMail=Pošalji zahtjev za cijenom poštom
+SendAskRef=Slanje zahtjeva za cijenom %s
+SupplierProposalCard=Kartica zahtjeva
+ConfirmDeleteAsk=Jeste li sigurni da želite obrisati zahtjev ?
+ActionsOnSupplierProposal=Događaji na zahtjevu
+DocModelAuroreDescription=Kompletan zahtjev (logo ... )
+CommercialAsk=Zahtjev za cijenom
+DefaultModelSupplierProposalCreate=Izrada osnovnog modela
+DefaultModelSupplierProposalToBill=Osnovni predložak prilikom zatvaranja zahtjeva (prihvačeno)
+DefaultModelSupplierProposalClosed=Osnovni predložak prilikom zatvaranja zahtjeva (odbijeno)
+ListOfSupplierProposal=Popis zahtjeva za ponudama dobavljača
+ListSupplierProposalsAssociatedProject=Popis ponuda dobavljača dodjeljenih projektu
+SupplierProposalsToClose=Ponude dobavljača za zatvaranje
+SupplierProposalsToProcess=Ponude dobavljača za obradu
+LastSupplierProposals=Zadnji zahtjev
+AllPriceRequests=Svi zahtjevi
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 10b4a5e60c8..84ac50d1c58 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -1,43 +1,43 @@
 # Dolibarr language file - Source file is en_US - suppliers
-Suppliers=Suppliers
-SuppliersInvoice=Suppliers invoice
-ShowSupplierInvoice=Show Supplier Invoice
-NewSupplier=New supplier
-History=History
-ListOfSuppliers=List of suppliers
-ShowSupplier=Show supplier
-OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
-SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
-NoRecordedSuppliers=No suppliers recorded
-SupplierPayment=Supplier payment
-SuppliersArea=Suppliers area
-RefSupplierShort=Ref. supplier
-Availability=Availability
-ExportDataset_fournisseur_1=Supplier invoices list and invoice lines
-ExportDataset_fournisseur_2=Supplier invoices and payments
-ExportDataset_fournisseur_3=Supplier orders and order lines
-ApproveThisOrder=Approve this order
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b> ?
-DenyingThisOrder=Deny this order
-ConfirmDenyingThisOrder=Are you sure you want to deny this order <b>%s</b> ?
-ConfirmCancelThisOrder=Are you sure you want to cancel this order <b>%s</b> ?
-AddSupplierOrder=Create supplier order
-AddSupplierInvoice=Create supplier invoice
-ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
-SentToSuppliers=Sent to suppliers
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
-SupplierReputation=Supplier reputation
-DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
-ReputationForThisProduct=Reputation
+Suppliers=Dobavljači
+SuppliersInvoice=Računi dobavljača
+ShowSupplierInvoice=Prikaži račune dobavljača
+NewSupplier=Novi dobavljač
+History=Povijest
+ListOfSuppliers=Popis dobavljača
+ShowSupplier=Prikaži dobavljača
+OrderDate=Datum narudžbe
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
+SomeSubProductHaveNoPrices=Neki od pod proizvoda nemaju definiranu cijenu
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ova ref. dobavljača već je povezana s ref.: %s
+NoRecordedSuppliers=Nema dobavljača
+SupplierPayment=Plaćanje dobavljača
+SuppliersArea=Sučelje dobavljača
+RefSupplierShort=Ref. dobavljača
+Availability=Dostupnost
+ExportDataset_fournisseur_1=Računi dobavljača i stavke računa
+ExportDataset_fournisseur_2=Računi dobavljača i plaćanja
+ExportDataset_fournisseur_3=Narudžbe dobavljača i stavke narudžbe
+ApproveThisOrder=Odobri narudžbu
+ConfirmApproveThisOrder=Jeste li sigurni da želite odobriti narudžbu <b>%s</b> ?
+DenyingThisOrder=Zabrani narudžbu
+ConfirmDenyingThisOrder=Jeste li sigurni da želite zabraniti ovu narudžbu <b>%s</b> ?
+ConfirmCancelThisOrder=Jeste li sigurni da želite poništiti ovu narudžbu <b>%s</b> ?
+AddSupplierOrder=Kreiraj narudžbu dobavljaču
+AddSupplierInvoice=Kreiraj račun dobavljača
+ListOfSupplierProductForSupplier=Popis proizvoda i cijena za dobavljača <b>%s</b>
+SentToSuppliers=Poslano dobavljačima
+ListOfSupplierOrders=Popis narudžbi dobavljača
+MenuOrdersSupplierToBill=Narudžbe dobavljača u račune
+NbDaysToDelivery=Kašnjenje isporuke u danima
+DescNbDaysToDelivery=Najveće kašnjenje za proizvode s ove narudžbe
+SupplierReputation=Reputacija dobavljača
+DoNotOrderThisProductToThisSupplier=Nemoj naručiti
+NotTheGoodQualitySupplier=Loša kvaliteta
+ReputationForThisProduct=Reputacija
+BuyerName=Naziv kupca
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index bb1aafc141e..c9b3304f31b 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -1,87 +1,87 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=Expense reports
-Trips=Expense reports
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=List of fees
-ShowTrip=Show expense report
-NewTrip=New expense report
-CompanyVisited=Company/foundation visited
-FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
-ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
-TF_OTHER=Other
-TF_TRIP=Transportation
-TF_LUNCH=Lunch
+ExpenseReport=Izvještaj troška
+ExpenseReports=Izvještaji troška
+Trips=Izvještaji troška
+TripsAndExpenses=Izvještaji troškova
+TripsAndExpensesStatistics=Statistika izvještaja troška
+TripCard=Kartica izvještaja troška
+AddTrip=Kreiraj izvještaj troška
+ListOfTrips=Popis izvještaja troškova
+ListOfFees=Popis pristojbi
+ShowTrip=Prikaži izvještaj troška
+NewTrip=Novi izvještaj troška
+CompanyVisited=Tvrtka/zaklada posječena
+FeesKilometersOrAmout=Iznos ili kilometri
+DeleteTrip=Obriši izvještaj troška
+ConfirmDeleteTrip=Jeste li sigurni da želite obrisati izvještaj o troškovima ?
+ListTripsAndExpenses=Popis izvještaja troškova
+ListToApprove=Čeka na odobrenje
+ExpensesArea=Sučelje izvještaja troška
+ClassifyRefunded=Označi 'Povrat'
+ExpenseReportWaitingForApproval=Novi izvještaj troška je predan za odobrenje
+ExpenseReportWaitingForApprovalMessage=Novi izvještaj troška je predan i čeka odobrenje.\n- Korisnik: %s\n- Period: %s\nKliknite ovdje za ovjeru: %s
+TripId=Izvještaj troška ID
+AnyOtherInThisListCanValidate=Osoba za obavjest za ovjeru.
+TripSociete=Više o tvrtci
+TripNDF=Informacije izvještaja troška
+PDFStandardExpenseReports=Standardni predložak za generiranje PDF dokumenta za izvještaje troškova
+ExpenseReportLine=Stavka izvještaja troška
+TF_OTHER=Ostalo
+TF_TRIP=Prijevoz
+TF_LUNCH=Ručak
 TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
+TF_TRAIN=Vlak
+TF_BUS=Autobus
+TF_CAR=Auto
+TF_PEAGE=Cestarina
+TF_ESSENCE=Gorivo
 TF_HOTEL=Hotel
 TF_TAXI=Taxi
 
-ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
-AucuneLigne=There is no expense report declared yet
+ErrorDoubleDeclaration=Objavili ste još jedan izvještaj troška u sličnom razdoblju.
+AucuneLigne=Još nije objavljen izvještaj troška
 
-ModePaiement=Payment mode
+ModePaiement=Način isplate
 
-VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+VALIDATOR=Odgovorna osoba za odobrenje
+VALIDOR=Odobrio
+AUTHOR=Snimio
+AUTHORPAIEMENT=Platio
+REFUSEUR=Odbio
+CANCEL_USER=Obrisao
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=Razlog
+MOTIF_CANCEL=Razlog
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=Datum odbijanja
+DATE_SAVE=Datum ovjere
+DATE_CANCEL=Datum odustajanja
+DATE_PAIEMENT=Datum isplate
 
-BROUILLONNER=Reopen
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
+BROUILLONNER=Ponovo otvori
+ValidateAndSubmit=Ovjeri i predaj za odobrenje
+ValidatedWaitingApproval=Ovjereno (čeka odobrenje)
 
-NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+NOT_AUTHOR=Vi niste autor izvještaja troška. Operacija je prekinuta.
 
-ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+ConfirmRefuseTrip=Jeste li sigurni da želite odbiti izvještaj o troškovima ?
 
-ValideTrip=Approve expense report
-ConfirmValideTrip=Are you sure you want to approve this expense report ?
+ValideTrip=Odobri izvještaj troška
+ConfirmValideTrip=Jeste li sigurni da želite odobriti izvještaj o troškovima ?
 
-PaidTrip=Pay an expense report
-ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+PaidTrip=Isplati troškove
+ConfirmPaidTrip=Jeste li sigurni da želite promjeniti status izvještaja troškova u "Plaćeno" ?
 
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+ConfirmCancelTrip=Jeste li sigurni da želite otkazati izvjetaj troškova ?
 
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=Vrati izvještaj troška nazad na status "Skica"
+ConfirmBrouillonnerTrip=Jeste li sigurni da želite staviti izvještaj troškova u status "Skica" ?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=Ovjeri trošak
+ConfirmSaveTrip=Jeste li sigurni da želite ovjeriti izvještaj troškova ?
 
-NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
+NoTripsToExportCSV=Nema izvještaja troška za izvoz u ovom razdoblju.
+ExpenseReportPayment=Isplata izvještaja troška
 
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
+ExpenseReportsToApprove=Troškovi za odobrenje
+ExpenseReportsToPay=Troškovi za platiti
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index c25f77f7438..059139ebeb2 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
+HRMArea=HRM sučelje
 UserCard=Kartica korisnika
 GroupCard=Kartica grupe
 Permission=Dopuštenje
@@ -11,7 +11,7 @@ PasswordChangedTo=Lozinka promjenjena u: %s
 SubjectNewPassword=Vaša nova lozinka za Dolibarr
 GroupRights=Grupna dopuštenja
 UserRights=Korisnička dopuštenja
-UserGUISetup=User display setup
+UserGUISetup=Podešavanje korisničkog prikaza
 DisableUser=Onemogući
 DisableAUser=Onemogući korisnika
 DeleteUser=Obriši
@@ -19,12 +19,12 @@ DeleteAUser=Obriši korisnika
 EnableAUser=Onemogući korisnika
 DeleteGroup=Izbriši
 DeleteAGroup=Obriši grupu
-ConfirmDisableUser=Are you sure you want to disable user <b>%s</b> ?
-ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b> ?
-ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b> ?
-ConfirmEnableUser=Are you sure you want to enable user <b>%s</b> ?
-ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b> ?
-ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b> ?
+ConfirmDisableUser=Jeste li sigurni da želite onemogućiti korisnika <b>%s</b>?
+ConfirmDeleteUser=Jeste li sigurni da želite obrisati korisnika <b>%s</b>?
+ConfirmDeleteGroup=Jeste li sigurni da želite obrisati grupu <b>%s</b>?
+ConfirmEnableUser=Jeste li sigurni da želite omogućiti korisnika <b>%s</b>?
+ConfirmReinitPassword=Jeste li sigurni da želite generirati novu lozinku za korisnika <b>%s</b>?
+ConfirmSendNewPassword=Jeste li sigurni da želite generirati novu lozinku za korisnika <b>%s</b>?
 NewUser=Novi korisnik
 CreateUser=Stvori korisnika
 LoginNotDefined=Prijava nije definirana
@@ -33,70 +33,73 @@ ListOfUsers=Lista korisnika
 SuperAdministrator=Super administrator
 SuperAdministratorDesc=Globalni administrator
 AdministratorDesc=Administrator
-DefaultRights=Default permissions
-DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
+DefaultRights=Zadane dozvole
+DefaultRightsDesc=Definirajte <u>zadana</u> dozvole koje su automatski dodjeljena <u>novo kreiranom</u> korisniku (Idite na karticu korisnika kako biste promjenili dozvole postojećem korisniku)
 DolibarrUsers=Dolibarr korisnik
-LastName=Last Name
+LastName=Prezime
 FirstName=Ime
 ListOfGroups=Lista grupa
 NewGroup=Nova grupa
 CreateGroup=Kreiraj grupu
 RemoveFromGroup=Ukloni iz grupe
-PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
-PasswordChangeRequestSent=Request to change password for <b>%s</b> sent to <b>%s</b>.
+PasswordChangedAndSentTo=Lozinka je promjenjena i poslana <b>%s</b>.
+PasswordChangeRequestSent=Zahtjev za promjenom lozinke za <b>%s</b> je poslana <b>%s</b>.
 MenuUsersAndGroups=Korisnici & Grupe
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Zadnjih %s kreiranih grupa
+LastUsersCreated=Zadnjih %s kreiranih korisnika
 ShowGroup=Prikaži grupu
 ShowUser=Prikaži korisnika
-NonAffectedUsers=Non assigned users
-UserModified=User modified successfully
-PhotoFile=Photo file
-ListOfUsersInGroup=List of users in this group
-ListOfGroupsForUser=List of groups for this user
-LinkToCompanyContact=Link to third party / contact
-LinkedToDolibarrMember=Link to member
-LinkedToDolibarrUser=Link to Dolibarr user
-LinkedToDolibarrThirdParty=Link to Dolibarr third party
+NonAffectedUsers=Nedodjeljeni korisnici
+UserModified=Korisnik je uspješno izmjenjen
+PhotoFile=Datoteka slika
+ListOfUsersInGroup=Popis korisnika u grupi
+ListOfGroupsForUser=Popis grupa za korisnika
+LinkToCompanyContact=Veza na komitenta/kontakt
+LinkedToDolibarrMember=Poveži s članom
+LinkedToDolibarrUser=Poveži s korisnikom
+LinkedToDolibarrThirdParty=Veza na Dolibarr komitenta
 CreateDolibarrLogin=Kreiraj korisnika
-CreateDolibarrThirdParty=Kreiraj treću stranu
-LoginAccountDisableInDolibarr=Account disabled in Dolibarr.
-UsePersonalValue=Use personal value
-InternalUser=Internal user
-ExportDataset_user_1=Dolibarr's users and properties
-DomainUser=Domain user %s
-Reactivate=Reactivate
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/foundation.<br>An <b>external</b> user is a customer, supplier or other.<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
-PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
-Inherited=Inherited
-UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
-UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
-IdPhoneCaller=Id phone caller
+CreateDolibarrThirdParty=Kreiraj komitenta
+LoginAccountDisableInDolibarr=Račun je onemogučen u Dolibarr-u.
+UsePersonalValue=Koristi osobnu vrijednost
+InternalUser=Interni korisnik
+ExportDataset_user_1=Korisnici i svojstva
+DomainUser=Korisnik na domeni %s
+Reactivate=Reaktiviraj
+CreateInternalUserDesc=Ova forma omogućuje vam kreiranje internog korisnika u vašoj tvrtci/zakladi. Za kreiranje vanjskog korisnika (kupca, dobavljača, ...), koristite ovaj gumb 'Kreiraj Dolibarr korisnika' sa kartice kontakata komitenta.
+InternalExternalDesc=<b>Interni</b> korisnik je korisnik koji je dio vaše tvrtke/zaklade. <br> <b>Vanjski</b> korisnik je kupac, dobavljač ili sl. <br><br>U oba slučaja, dozvole definiraju prava u Dolibarru, isto tako vanjski korisnik može imati drugačiji izbornik od internog korisnika ( vidi Naslovna - Podešavanje - Prikaz)
+PermissionInheritedFromAGroup=Dozvola odobrena jer je nasljeđeno od jedne od korisničkih grupa.
+Inherited=Nasljeđeno
+UserWillBeInternalUser=Kreirani korisnik će biti interni korisnik (jer nije vezan za određenog komitenta)
+UserWillBeExternalUser=Kreirani korisnik će biti vanjski korisnik (jer je vezan za određenog komitenta)
+IdPhoneCaller=Pozivatelj ID
 NewUserCreated=Korisnik %s kreiran
 NewUserPassword=Lozinka promjenjena za %s
-EventUserModified=Korisnik %s modificiran
+EventUserModified=Korisnik %s promjenjen
 UserDisabled=Korisnik %s onemogućen
 UserEnabled=Korisnik %s aktiviran
 UserDeleted=Korisnik %s uklonjen
 NewGroupCreated=Grupa %s kreirana
-GroupModified=Group %s modified
+GroupModified=Grupa %s je izmjenjena
 GroupDeleted=Grupa %s uklonjena
-ConfirmCreateContact=Are you sure you want to create a Dolibarr account for this contact ?
-ConfirmCreateLogin=Are you sure you want to create a Dolibarr account for this member ?
-ConfirmCreateThirdParty=Are you sure you want to create a third party for this member ?
+ConfirmCreateContact=Jeste li sigurni da želite kreirati račun za ovaj kontakt ?
+ConfirmCreateLogin=Jeste li sigurni da želite kreirati račun za ovog člana ?
+ConfirmCreateThirdParty=Jeste li sigurni da želite kreirati komitenta za ovog člana ?
 LoginToCreate=Prijavite se za stvaranje
-NameToCreate=Ime treće strane kreirano
+NameToCreate=Naziv komitenta za kreiranje
 YourRole=Vaše uloge
-YourQuotaOfUsersIsReached=Your quota of active users is reached !
+YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je dostignuta !
 NbOfUsers=Broj korisnika
-DontDowngradeSuperAdmin=Only a superadmin can downgrade a superadmin
-HierarchicalResponsible=Supervisor
-HierarchicView=Hierarchical view
-UseTypeFieldToChange=Use field Type to change
+DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
+HierarchicalResponsible=Nadglednik
+HierarchicView=Hijerarhijski prikaz
+UseTypeFieldToChange=Koristi polje Tip za promjenu
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
+LoginUsingOpenID=Koristi OpenID za prijavu
+WeeklyHours=Tjedno sati
+ColorUser=Boja korisnika
+DisabledInMonoUserMode=Onemogućeno u načinu održavanja
+UserAccountancyCode=Korisnički konto
+UserLogoff=Odjava korisnika
+UserLogged=Korisnik prijavljen
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index b1b51cfedc2..92889fb3a1a 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -1,25 +1,28 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=Code
-WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
-ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS content
-MediaFiles=Media library
-EditCss=Edit Style/CSS
-EditMenu=Edit menu
-EditPageMeta=Edit Meta
-EditPageContent=Edit Content
-Website=Web site
-AddPage=Add page
-PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
-RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
-PageDeleted=Page '%s' of website %s deleted
-PageAdded=Page '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+Shortname=Kod
+WebsiteSetupDesc=Kreirajte različitih unosa koliko god to želite ovisno koliko web mjesta želite. Nakon toga idite na Websites izbornik za uređivanje istih.
+DeleteWebsite=Obriši Web mjesto
+ConfirmDeleteWebsite=Jeste li sigurni da želite obrisati ovo web mjesto. Sve stranice i sadržaj biti će isto obrisan.
+WEBSITE_PAGENAME=Naziv stranice/alias
+WEBSITE_CSS_URL=URL vanjske CSS datoteke
+WEBSITE_CSS_INLINE=CSS sadržaj
+MediaFiles=Mediji
+EditCss=Uredi stil/CSS
+EditMenu=Uredi izbornik
+EditPageMeta=Uredi meta
+EditPageContent=Uredi sadržaj
+Website=Website
+Webpage=Web page
+AddPage=Dodaj stranicu
+PreviewOfSiteNotYetAvailable=Pregled vašeg web mjesta <strong>%s</strong> nije još dostupan. Prvo morate dodati stranicu.
+RequestedPageHasNoContentYet=Tražena stranica pod ID %s nema sadržaja ili je cache obrisan. Uredite sadržaj stranice da biste riješili problem.
+PageDeleted=Stranica %s od web lokacije %s je obrisana
+PageAdded=Stranica '%s' je dodana
+ViewSiteInNewTab=Pogledaj lokaciju u novom tabu
+ViewPageInNewTab=Pogledaj stranicu u novom tabu
+SetAsHomePage=Postavi kao početnu stranicu
+RealURL=Pravi URL
+ViewWebsiteInProduction=Pogledaj web lokaciju koristeći URL naslovnice
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index ad63525ee64..64e66168cf7 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -1,88 +1,104 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
-StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
-AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
-NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
-ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
-MakeWithdrawRequest=Make a withdraw request
-ThirdPartyBankCode=Third party bank code
-NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
-ClassCredited=Classify credited
-ClassCreditedConfirm=Are you sure you want to classify this withdrawal receipt as credited on your bank account?
-TransData=Transmission date
-TransMetod=Transmission method
-Send=Send
-Lines=Lines
-StandingOrderReject=Issue a rejection
-WithdrawalRefused=Withdrawal refused
-WithdrawalRefusedConfirm=Are you sure you want to enter a withdrawal rejection for society
-RefusedData=Date of rejection
-RefusedReason=Reason for rejection
-RefusedInvoicing=Billing the rejection
-NoInvoiceRefused=Do not charge the rejection
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusWaiting=Waiting
-StatusTrans=Sent
-StatusCredited=Credited
-StatusRefused=Refused
-StatusMotif0=Unspecified
-StatusMotif1=Insufficient funds
-StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
-StatusMotif4=Customer Order
-StatusMotif5=RIB unusable
-StatusMotif6=Account without balance
-StatusMotif7=Judicial Decision
-StatusMotif8=Other reason
-CreateAll=Withdraw all
-CreateGuichet=Only office
-CreateBanque=Only bank
-OrderWaiting=Waiting for treatment
-NotifyTransmision=Withdrawal Transmission
-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 withdraws
-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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing 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"
-ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
-StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
-WithdrawRequestAmount=Withdraw request amount:
-WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil amount.
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
+StandingOrderToProcess=Za obradu
+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
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Još nije moguće. Status isplate mora biti postavljen na 'kerditirano' prije objave odbitka na određenim stavkama.
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
+AmountToWithdraw=Iznos za isplatu
+WithdrawsRefused=Direct debit refused
+NoInvoiceToWithdraw=Nema računa kupaca u načinu plaćanja "isplata" na čekanju. Idite na tab "Isplata" na kartici računa za kreiranje zahtjeva.
+ResponsibleUser=Ovlaštena osoba
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
+MakeWithdrawRequest=Napravi isplatni zahtjev
+ThirdPartyBankCode=Kod banke komitenta
+NoInvoiceCouldBeWithdrawed=Račun nije uspješno isplačen. Provjerite da li račun glasi na tvrtku s valjanim BAN-om.
+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
+TransMetod=Način prijenosa
+Send=Pošalji
+Lines=Stavke
+StandingOrderReject=Razlog odbijanja
+WithdrawalRefused=Isplata odbijena
+WithdrawalRefusedConfirm=Jeste li sigurni da želite unjeti otkazivanje isplate za društvo
+RefusedData=Datum odbijanja
+RefusedReason=Razlog odbijanja
+RefusedInvoicing=Naplati odbijanje
+NoInvoiceRefused=Nemoj naplatiti odbijanje
+InvoiceRefused=Račun odbijen (Naplati odbijanje kupcu)
+StatusWaiting=Čeka
+StatusTrans=Poslano
+StatusCredited=Kreditirano
+StatusRefused=Odbijeno
+StatusMotif0=Nedefinirano
+StatusMotif1=Nedovoljno sredstva
+StatusMotif2=Zahtjev osporen
+StatusMotif3=No direct debit payment order
+StatusMotif4=Narudžba kupca
+StatusMotif5=RIB neupotrebljiv
+StatusMotif6=Račun bez stanja
+StatusMotif7=Sudska odluka
+StatusMotif8=Ostali razlog
+CreateAll=Isplati sve
+CreateGuichet=Samo ured
+CreateBanque=Samo banka
+OrderWaiting=Čeka tretman
+NotifyTransmision=Prijenos isplate
+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
+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. 
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
+ThisWillAlsoAddPaymentOnInvoice=Ovo se također odnosi na plaćanje računa i označit će ih kao "Plaćeno"
+StatisticsByLineStatus=Statistika statusa stavki
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
+WithdrawRequestAmount=Zahtjevan iznos isplate:
+WithdrawRequestErrorNilAmount=Nemoguće kreirati isplatni zahtjev za prazan iznos.
+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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
-InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Option for real mode was not set, we stop after this simulation
+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>
+InfoTransData=Iznos: %s<br>Način: %s<br>Datum: %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
+ModeWarning=Opcija za stvarni način nije postavljena, zaustavljamo nakon ove simulacije
diff --git a/htdocs/langs/hr_HR/workflow.lang b/htdocs/langs/hr_HR/workflow.lang
index 014c1887415..8d0b6e8977f 100644
--- a/htdocs/langs/hr_HR/workflow.lang
+++ b/htdocs/langs/hr_HR/workflow.lang
@@ -1,11 +1,13 @@
-# Dolibarr language file - Source file is en_US - admin
-WorkflowSetup=Workflow module setup
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Podešavanje modula radnog procesa
+WorkflowDesc=Ovaj modul je dizajniran da mijenja ponašanje automatskih akcija u aplikaciji. Prema predefiniranom, radni proces je otvoren (možete raditi stvari po redu kako želite). Možete uključiti automatske akcije za koje ste zainteresirani.
+ThereIsNoWorkflowToModify=Nema dostupnih promjena radnog procesa za aktivirane module.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatski kreiraj narudžbu kupca kada je ponuda ovjerena potpisom
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatski kreiraj račun kupca nakon što je ponuda ovjerena potpisom
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatski kreiraj račun kupca nakon što je ugovor ovjeren
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatski kreiraj račun kupca nakon što je narudžba kupca zatvorena
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označi povezanu ponudu kao naplaćeno kada je narudžba kupca postavljena kao plaćena
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označi vezanu narudžbu(e) kupca naplaćeno kada je račun kupca postavljen kao plaćeno
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označi vezanu narudžbu(e) kupca naplaćeno kada je račun kupca postavljen kao ovjereno
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Označi povezanu ponudu kao naplaćeno kada je račun kupca ovjeren
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index d06e470377f..80500ba4d2a 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Naplók
 JournalFinancial=Pénzügyi mérleg naplók
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Riportok
 NewAccount=New accounting account
 Create=Készít
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Kválasztott sorok
 Lineofinvoice=Számlasor
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Partner számla
-
-NewAccountingMvt=Új mozgás
-NumMvts=Mozgások száma
-ListeMvts=Mozgások Listája
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=Partnerek számláinak listája
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Számlaosztály
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Teljes eladási marzs
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Képlet
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 68de4a4e997..a344001b175 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Kísérleti
 VersionDevelopment=Fejlesztői
 VersionUnknown=Ismeretlen
 VersionRecommanded=Ajánlott
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Hiányzó fájlok
 FilesUpdated=Frissített fájlok
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Munkamenet-azonosító
 SessionSaveHandler=Munkamenet mentésének kezelője
 SessionSavePath=Munkamenetek tárhelye
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Hiba, nagyobb mint <b>%s</b> pontosság nem t
 DictionarySetup=Szótár beállítása
 Dictionary=Szótárak
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=A "system" és a "systemauto" típusértékek foglaltak. Saját bejegyzés hozzáadására használhatja a "user" értéket.
 ErrorCodeCantContainZero=A kód nem tartalmazhatja a 0 értéket
 DisableJavascript=A Javascript és Ajax funkciók kikapcsolása. (Látássérültek számára, vagy szöveges böngészők használata esetén ajánlott)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Keresést kiváltó karakterek száma: %s
 NotAvailableWhenAjaxDisabled=Nem érhető el, ha az Ajax le van tiltva
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript letiltva
 UsePreviewTabs=Előnézeti lapok használata
 ShowPreview=Előnézet megtekintése
@@ -92,7 +97,7 @@ MultiCurrencySetup=Multi-currency setup
 MenuLimits=Korlátok és pontosság
 MenuIdParent=Szülő menü ID
 DetailMenuIdParent=Szülő menü azonosítója (a főmenü esetében üres)
-DetailPosition=A menu sorrendjét meghatározó szám
+DetailPosition=A menü sorrendjét meghatározó szám
 AllMenus=Minden
 NotConfigured=A modul nincs konfigurálva
 Active=Aktív
@@ -113,81 +118,82 @@ OSTZ=A szerver operációs rendszerének időzónája
 PHPTZ=A PHP szerver időzónája
 DaylingSavingTime=Nyári időszámítás
 CurrentHour=PHP óra (szerver)
-CurrentSessionTimeOut=Jelenlegi munkamenet lejárása
+CurrentSessionTimeOut=Jelenlegi munkamenet elévülési ideje
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
 Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Boxes=Widgetek
+MaxNbOfLinesForBoxes=A widgetek által elfoglalt sorok száma max.
 PositionByDefault=Alapértelmezett sorrend
 Position=Pozíció
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
-MenuForUsers=Menü a felhasználók
-LangFile=File. Lang
+MenusDesc=A menükezelők a két menüsor (vízszintes és függőleges) tartalmát állítják be.
+MenusEditorDesc=A menüszerkesztő lehetővé teszi egyedi menüelemek létrehozását. Óvatosan kezdjen hozzá a stabilitás érdekében és kerülje az elérhetetlen menüpontok létrehozását!<br />Néhány modul saját menüpontot illeszt be (leginkább a <b>Mind</b> alá) Ha véletlenül eltávolít innen egy elemet, a modul kikapcsolásával majd bekapcsolásával újból aktiválni tudja a menütpontot.
+MenuForUsers=Felhasználói menü
+LangFile=.lang fájl
 System=Rendszer
 SystemInfo=Rendszerinformációk
 SystemToolsArea=Rendszereszközök területe
 SystemToolsAreaDesc=Ez a terület ad adminisztrációs funkciókat. Használja a menüt a funkciót, amit keresel.
-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 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 file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+Purge=Tisztítsd
+PurgeAreaDesc=Ezen az oldalon a Dolibarr által generált fájlokat  törölhet (ideiglenes fájlokat vagy minden fájlt a <b>%s</b> könyvtárban) Ennek a funkciónak a használata nem kötelező. Leginkább hosztolt környezetben lehet hasznos ahol a szolgáltató nem ad jogosultságot a webszerver logfájljainak törlésére.
+PurgeDeleteLogFile=A Syslog modulban definiált <b>%s</b> logfájl törlése (nem vezet adatvesztéshez)
+PurgeDeleteTemporaryFiles=Töröljön minden ideiglenes fájlt (nincs adatvesztés lehetősége)
 PurgeDeleteTemporaryFilesShort=Ideiglenes fájlok törlése
 PurgeDeleteAllFilesInDocumentsDir=Összes fájl törlése <b>%s</b> könyvtárban. Az ideiglenes fájlok, hanem adatbázis mentés guba, csatolt fájlok elemek (harmadik fél, számlák, ...) és feltölteni az ECM modul törlődik.
-PurgeRunNow=Tisztíts meg most
-PurgeNothingToDelete=No directory or files to delete.
+PurgeRunNow=Ürítsd ki most
+PurgeNothingToDelete=Nincs törlésre váró fájl vagy könyvtár
 PurgeNDirectoriesDeleted=<b>%s</b> törölt fájlokat vagy könyvtárakat.
-PurgeAuditEvents=Tisztíts meg minden biztonsági esemény
-ConfirmPurgeAuditEvents=Biztosan meg akarja tisztítani az összes biztonsági esemény? Minden biztonsági naplók törlésre kerül, semmilyen más adat törlődik.
-GenerateBackup=Generálása mentés
+PurgeAuditEvents=Üríts minden biztonsági eseményt
+ConfirmPurgeAuditEvents=Biztosan üríteni akarja az összes biztonsági eseményt? Minden biztonsági napló törlésre kerül, semmilyen más adat nem törlődik.
+GenerateBackup=Biztonsági mentés indítása
 Backup=Biztonsági mentés
-Restore=Visszaállítása
+Restore=Visszaállítás
 RunCommandSummary=Backup indult a következő paranccsal
 BackupResult=Backup eredmény
-BackupFileSuccessfullyCreated=Backup file sikeresen generált
-YouCanDownloadBackupFile=Generált fájlok most már letölthető
-NoBackupFileAvailable=Nem backup fájlokat rendelkezésre.
+BackupFileSuccessfullyCreated=Backup file sikeresen létrehozva
+YouCanDownloadBackupFile=A generált fájlok mostmár letölthetők
+NoBackupFileAvailable=Nem állnak rendelkezésre biztonsági mentések.
 ExportMethod=Export módszer
 ImportMethod=Import módszer
-ToBuildBackupFileClickHere=Ahhoz, hogy épít egy backup fájlt, kattintson <a href="%s">ide</a> .
-ImportMySqlDesc=Importálása backup fájlt, akkor kell használni mysql parancsot parancssorból:
-ImportPostgreSqlDesc=Importálása backup fájlt, akkor kell használni pg_restore parancsot parancssorból:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ToBuildBackupFileClickHere=A biztonsági mentés kialakításáshoz, kattintson <a href="%s">ide</a> .
+ImportMySqlDesc=A biztonsági mentés importálásához a parancssorból kell kiadni a következő mysql parancsot:
+ImportPostgreSqlDesc=A biztonsági mentés importálásához a parancssorból kell kiadni a pg_restore parancsot:
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Fájlnév generálni
+FileNameToGenerate=A generált fájlnév
 Compression=Tömörítés
-CommandsToDisableForeignKeysForImport=Paranccsal lehet letiltani a külföldi import kulcsok
+CommandsToDisableForeignKeysForImport=Az idegen kulcsok letiltásához használható parancs import esetén
 CommandsToDisableForeignKeysForImportWarning=Kötelező, ha később szeretné visszaállítani a most elmentett adatokat.
-ExportCompatibility=Kompatibilitása generált export file
+ExportCompatibility=A generált export fájl kompatibilitása
 MySqlExportParameters=MySQL export paraméterek
 PostgreSqlExportParameters= PostgreSQL export paraméterei
-UseTransactionnalMode=Használja tranzakciós mód
-FullPathToMysqldumpCommand=Teljes elérési útvonal mysqldump parancs
-FullPathToPostgreSQLdumpCommand=Teljes elérési útvonal paranccsal pg_dump
+UseTransactionnalMode=Tranzakciós mód használata
+FullPathToMysqldumpCommand=A mysqldump parancs teljes elérési útvonala
+FullPathToPostgreSQLdumpCommand=A pg_dump parancs teljes elérési útvonala
 ExportOptions=Export opciók
-AddDropDatabase=Add DROP DATABASE parancs
-AddDropTable=Add DROP TABLE parancs
+AddDropDatabase=DROP DATABASE parancs használata
+AddDropTable=DROP TABLE parancs használata
 ExportStructure=Struktúra
 NameColumn=Név oszlopok
 ExtendedInsert=Kiterjesztett INSERT
-NoLockBeforeInsert=Nem zár körül INSERT parancsok
-DelayedInsert=Késleltetett betét
-EncodeBinariesInHexa=Kódolni bináris adatokat hexadecimális
-IgnoreDuplicateRecords=Figyelmen kívül hagyja a hibák ismétlődő rekordok (INSERT IGNORE)
-AutoDetectLang=Autodetect (böngésző nyelv)
-FeatureDisabledInDemo=Tiltva demo
+NoLockBeforeInsert=Az INSERT parancsok körül ne zároljon
+DelayedInsert=Késleltetett INSERT
+EncodeBinariesInHexa=Bináris adatokat kódolja hexadecimálisan
+IgnoreDuplicateRecords=Az ismétlődő rekordok hibáit figyelmen kívül hagyja (INSERT IGNORE)
+AutoDetectLang=Automatikus nyelvfelismerés (a böngésző nyelve)
+FeatureDisabledInDemo=Demó módban kikapcsolva
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Engedélyek
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Csak az elemek <a href="%s">bekapcsolt modulok</a> jelennek meg.
-ModulesDesc=Dolibarr modulok meghatározzák, mely funkció engedélyezve van a szoftverben. Néhány modul szükséges engedélyeket be kell nyújtani a felhasználók számára, lehetővé téve modul után. Kattints a gombra on / off oszlopban &quot;Állapot&quot;, hogy egy modul / funkciót.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+BoxesDesc=A widgetek olyan elemek melyek segítségével egyes oldalak testreszabhatók. A widget ki/bekapcsolását a cél-oldal kiválasztásával az 'Aktiválás'-ra kattintva érheti el illetve a kukára kattintva kikapcsolhatja.
+OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesMarketPlaceDesc=Az interneten további modulokat találhat...
 ModulesMarketPlaces=További modulok ...
-DoliStoreDesc=DoliStore, a hivatalos piaci hely Dolibarr ERP / CRM külső modulok
+DoliStoreDesc=DoliStore, a hivatalos Dolibarr ERP / CRM piactér külső modulok számára
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=Referencia oldalak további modulok beszerzéséhez...
 URL=Link
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesAvailable=Elérhető widgetek
+BoxesActivated=Aktivált widgetek
 ActivateOn=Aktiválás
 ActiveOn=Aktiválódik
 SourceFile=Forrás fájl
@@ -196,86 +202,87 @@ Required=Kötelező
 UsedOnlyWithTypeOption=Used by some agenda option only
 Security=Biztonság
 Passwords=Jelszavak
-DoNotStoreClearPassword=Do No Store egyértelmű jelszavakat adatbázisban tárolja, de csak a titkosított érték (aktivált ajánlott)
-MainDbPasswordFileConfEncrypted=Adatbázis jelszó titkosítva conf.php (aktivált ajánlott)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+DoNotStoreClearPassword=Ne használjon olvasható jelszavakat az adatbázisban, csak a titkosított értéket tárolja (ajánlott aktiválni)
+MainDbPasswordFileConfEncrypted=Titkosítsa az adatbázis jelszót a conf.php-ban (ajánlott aktiválni)
+InstrucToEncodePass=A jelszavak titkosításához a <b>conf.php</b>-ben cserélje ki a <br><b>$dolibarr_main_db_pass="...";</b><br>sort erre:<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Védelme generált pdf fájlok (aktivált nem ajánlott, megtöri tömeges pdf generálás)
-ProtectAndEncryptPdfFilesDesc=Védelem a PDF dokumentum tartja elérhetővé olvasni és nyomtatni bármilyen PDF böngészőben. Azonban a szerkesztés és másolás nem lehetséges többé. Megjegyzendő, hogy ezt a szolgáltatást használja, hogy az épület globális összesített pdf nem működik (például kifizetetlen számlák).
-Feature=Feature
+ProtectAndEncryptPdfFiles=A generált pdf fájlok védelme (nem ajánlott aktiválni, mivel a tömeges pdf generálást ellehetetleníti)
+ProtectAndEncryptPdfFilesDesc=A PDF dokumentum védelme lehetővé teszi az olvasást és nyomtatást bármilyen PDF böngészőben. Azonban a dokumentum szerkesztése és másolása többé nem lesz lehetséges. Megjegyzendő, amennyiben ezt a szolgáltatást használja, a globális sorozatos pdf generálás nem fog működni (például kifizetetlen számlák).
+Feature=Funkció
 DolibarrLicense=Engedély
 Developpers=Fejlesztők / közreműködők
 OfficialWebSite=Dolibarr nemzetközi hivatalos honlapján
 OfficialWebSiteLocal=Local web site (%s)
 OfficialWiki=Dolibarr dokumentáció Wiki
 OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Hivatalos piac külső modulok / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialMarketPlace=Hivatalos piactér külső modulok / kiegészítők számára
+OfficialWebHostingService=Referencia tárhely szolgáltatások (Cloud hosting)
 ReferencedPreferredPartners=Preferred Partners
 OtherResources=Autres ressources
 ForDocumentationSeeWiki=A felhasználó vagy fejlesztői dokumentáció (doc, GYIK ...), <br> vessünk egy pillantást a Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=Ha bármilyen további kérdése / help, akkor használja a fórumot Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
-HelpCenterDesc1=Ez a terület is segít, hogy a Help támogató szolgáltatás Dolibarr.
-HelpCenterDesc2=Néhány része a szolgáltatás <b>csak angolul érhető el.</b>
+HelpCenterDesc1=Ebben a részben a Dolibarral kapcsolatos segítségnyújtási szolgáltatást veheti igénybe.
+HelpCenterDesc2=A szolgáltatás néhány eleme <b>csak angolul érhető el.</b>
 CurrentMenuHandler=Aktuális menü kezelő
-MeasuringUnit=Mérőegység
-Emails=E-mail
+MeasuringUnit=Mértékegység
+Emails=E-mailek
 EMailsSetup=E-mail beállítása
-EMailsDesc=Ez az oldal lehetővé teszi, hogy felülírja a PHP paramétereit e-mailek küldését. A legtöbb esetben a Unix / Linux operációs rendszer, a PHP beállítás helyes, és ezek a paraméterek haszontalan.
+EMailsDesc=Ez az oldal lehetővé teszi, hogy felülírja a PHP paramétereit az e-mailek küldése során. A legtöbb esetben a Unix / Linux operációs rendszerben a PHP beállítása helyes, nincs szükség módosításra.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS Port (alapértelmezés a php.ini-ben: <b>%s)</b>
 MAIN_MAIL_SMTP_SERVER=SMTP / SMTPS Host (alapértelmezés a php.ini-ben: <b>%s)</b>
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (nem definiált a PHP-t Unix szerű rendszereken)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (nem definiált a PHP-t Unix szerű rendszereken)
-MAIN_MAIL_EMAIL_FROM=Feladó e-mail automatikus e-maileket (alapértelmezés a php.ini-ben: <b>%s)</b>
-MAIN_MAIL_ERRORS_TO=Feladó e-mail használt hiba visszatér elküldött e-mailek
-MAIN_MAIL_AUTOCOPY_TO= Küldje szisztematikusan rejtett szén-másolatot az összes elküldött e-mailek
-MAIN_DISABLE_ALL_MAILS=Tiltsa le az összes e-mailek küldésének (vizsgálati célokra, vagy demo)
-MAIN_MAIL_SENDMODE=Módszer használata küldjön e-mailt
-MAIN_MAIL_SMTPS_ID=SMTP hitelesítés szükséges, ha ID
-MAIN_MAIL_SMTPS_PW=SMTP jelszó hitelesítés szükséges, ha
-MAIN_MAIL_EMAIL_TLS= Használja a TLS (SSL) titkosítja
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPS Port (nem definiált a PHP-ben Unix szerű rendszereken)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS Host (nem definiált a PHP-ben Unix szerű rendszereken)
+MAIN_MAIL_EMAIL_FROM=Feladó e-mail címe automatikus e-mailek esetén (alapértelmezés a php.ini-ben: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Feladó e-mail címe a hibás levelek kézbesítési jelentéseiben
+MAIN_MAIL_AUTOCOPY_TO= Küldjön szisztematikusan rejtett másolatot az összes elküldött e-mail-ről ide:
+MAIN_DISABLE_ALL_MAILS=Tiltsa le minden e-mail küldését (hibakeresési vagy demó célokra)
+MAIN_MAIL_SENDMODE=E-mail küldéséhez használt metódus
+MAIN_MAIL_SMTPS_ID=SMTP azonosító ha szükséges a hitelesítés
+MAIN_MAIL_SMTPS_PW=SMTP jelszó ha szükséges a hitelesítés
+MAIN_MAIL_EMAIL_TLS= Használjon TLS (SSL) titkosítást
 MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
-MAIN_DISABLE_ALL_SMS=Tiltsa le az összes SMS-küldések (vizsgálati célokra, vagy demo)
-MAIN_SMS_SENDMODE=Módszer használatát, hogy küldjön SMS-
-MAIN_MAIL_SMS_FROM=Alapértelmezett küldő telefonszámát az SMS-küldés
-FeatureNotAvailableOnLinux=Szolgáltatás nem elérhető Unix szerű rendszereken. Teszteld a sendmail program helyben.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+MAIN_DISABLE_ALL_SMS=Tiltsa le minden SMS-küldését (hibakeresési vagy demó célokra)
+MAIN_SMS_SENDMODE=SMS küldésére használt metódus
+MAIN_MAIL_SMS_FROM=Alapértelmezett küldő telefonszám az SMS-küldés során
+FeatureNotAvailableOnLinux=A szolgáltatás nem elérhető Unix szerű rendszereken. Teszteld a sendmail programot helyben.
+SubmitTranslation=Ha a fordítás nem teljes vagy hibákat talál, kijavíthatja a <b>langs/%s</b> könyvtárban található fájlokban és elküldheti a javítást a www.transifex.com/dolibarr-association/dolibarr/ címre
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
-ModuleSetup=Modul telepítés
+ModuleSetup=Modul beállítása
 ModulesSetup=Modulok beállítása
 ModuleFamilyBase=Rendszer
-ModuleFamilyCrm=Ügyfél kapcsolat kezelés (CRM)
+ModuleFamilyCrm=Ügyfélkapcsolat kezelés (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
 ModuleFamilyProducts=Termékkezelés (PM)
 ModuleFamilyHr=Emberi Erőforrás Kezelés (HR)
-ModuleFamilyProjects=Projektek / kollaboratív munkát
+ModuleFamilyProjects=Projektek / kollaboratív munka
 ModuleFamilyOther=Más
 ModuleFamilyTechnic=Multi-modulok eszközök
 ModuleFamilyExperimental=Kísérleti modulok
 ModuleFamilyFinancial=Pénzügyi modulok (Számviteli / Kincstár)
-ModuleFamilyECM=Elektronikus Content Management (ECM)
+ModuleFamilyECM=Elektronikus Tartalom Kezelés (ECM)
 ModuleFamilyPortal=Web sites and other frontal application
 ModuleFamilyInterface=Interfaces with external systems
-MenuHandlers=Menü rakodók
-MenuAdmin=Menu Editor
-DoNotUseInProduction=Ne használd a terméket
-ThisIsProcessToFollow=Ez a beállítási folyamat:
+MenuHandlers=Menü kezelők
+MenuAdmin=Menüszerkesztő
+DoNotUseInProduction=Ne használd élesben
+ThisIsProcessToFollow=A következő beállítási folyamat:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
-StepNb=Step %s
+StepNb=%s lépés
 FindPackageFromWebSite=Keressen olyan csomag, amely biztosítja a kívánt funkciót (például a hivatalos honlapján %s).
 DownloadPackageFromWebSite=Csomag letöltése (pl. a havatalos oldalról %s)
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
-SetupIsReadyForUse=Telepítése befejeződött, és Dolibarr kész, hogy ehhez az új alkatrész.
+UnpackPackageInDolibarrRoot=A tömörített fájlt a Dolibarr külső modulok számára fenntartott könyvtárába csomagolja ki: <b>%s</b>
+SetupIsReadyForUse=A telepítés befejeződött, a Dolibarr új komponense használatra kész.
 NotExistsDirect=Nincs megadva az alternatív gyökérkönyvtár. <br>
 InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
 InfDirExample=<br>Then declare it in the file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*These lines are commented with "#", to uncomment only remove the character.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
-CurrentVersion=Dolibarr jelenlegi verzió
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
+CurrentVersion=Dolibarr jelenlegi verziója
+CallUpdatePage=Lépjen az oldalra amiben az adatbázis struktúrát és adatokat frissíti: %s
+LastStableVersion=Utolsó stabil verzió
+LastActivationDate=Last activation date
 UpdateServerOffline=A szerver offline frissítése
 GenericMaskCodes=Megadhat bármilyen számozás maszk. Ebben a maszk, az alábbi címkék is használhatók: <br> <b>{000000}</b> felel meg egy számot, amelyet fogja megnövelni minden %s. Adja meg a nullákat, mint annyi a kívánt méretre a számláló. A számláló tölti nullákkal balról annak érdekében, hogy minél több nullák, mint a maszk. <br> <b>{000000} 000</b> ugyanaz, mint korábban, hanem ellensúlyozza számának megfelelő jobbra a + jel alkalmazzák kezdve az első %s. <br> <b>{000000} @ x</b> ugyanaz, mint korábban, de a számláló lenullázódik, ha havi x-ért (x 1 és 12 között, vagy 0 használni a korai hónapokban a pénzügyi év van megadva a konfiguráció). Ha ezt az opciót használjuk, és az x 2 vagy magasabb, akkor a sorozat nn {} {} vagy {mm yyyy}} {mm is szükség van. <br> <b>{} Dd</b> nap (01 31). <br> <b>{} Mm</b> hónap (01-12). <br> <b>Yy {}, {ÉÉÉÉ}</b> vagy <b>{} y</b> évben több mint 2, 4 vagy 1 számokat. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Az összes többi karakter a maszkban marad érintetlen. <br> A szóközök nem megengedettek. <br>
 GenericMaskCodes4a=<u>Példa a 99. %s a harmadik fél kész TheCompany 2007/01/31:</u> <br>
 GenericMaskCodes4b=<u>Példa: a harmadik fél létre 2007/03/01:</u> <br>
@@ -284,9 +291,9 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> will give <b>ABC0701-000099</b><br
 GenericNumRefModelDesc=Vissza szabható számot a meghatározott maszkot.
 ServerAvailableOnIPOrPort=Kiszolgálóhoz elérhető a címen <b>%s %s</b> porton
 ServerNotAvailableOnIPOrPort=A kiszolgáló nem elérhető címen <b>%s %s</b> porton
-DoTestServerAvailability=Teszt szerver kapcsolat
-DoTestSend=Tesztelje küldése
-DoTestSendHTML=Tesztelje küldök HTML
+DoTestServerAvailability=Szerver kapcsolat tesztelése
+DoTestSend=A küldés tesztelése
+DoTestSendHTML=HTML küldés tesztelése
 ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Hiba, nem tudja használni, ha az opció @ {sorozat} {nn mm ÉÉÉÉ} vagy {} {} mm nincs maszk.
 UMask=Umask paramétert az új fájlok a Unix / Linux / BSD fájlrendszer.
@@ -295,7 +302,7 @@ SeeWikiForAllTeam=Vessen egy pillantást a wiki oldalon a teljes lista az össze
 UseACacheDelay= Késleltetése caching export válasz másodpercben (0 vagy üres cache nélkül)
 DisableLinkToHelpCenter=Hide link <b>&quot;Segítségre van szüksége, vagy támogatják&quot;</b> a bejelentkezési oldalon
 DisableLinkToHelp=Az online segítség "<b>%s</b>" hivatkozásának elrejtése
-AddCRIfTooLong=Nincs automatikus tördelése, így ha sor az oldal dokumentumok, mert túl hosszú, akkor meg kell adnia magát kocsivisszát írva.
+AddCRIfTooLong=Nincs automatikus tördelés, így ha sor túllép a dokumentumon, mert túl hosszú, akkor meg kell adnia kézzel a szövegdobozban a sortörést.
 ConfirmPurge=Biztos vagy benne, hogy végre ez a tisztogatás? <br> Ez biztosan törli az összes adatot fájlokat nem lehet visszaállítani őket (ECM kép, csatolt fájlok ...).
 MinLength=Minimális hossz
 LanguageFilesCachedIntoShmopSharedMemory=Fájlok. Lang betöltve megosztott memória
@@ -306,9 +313,9 @@ NumberOfModelFilesFound=Azon könyvtárakban talált ODT / ODS sablonok száma
 ExampleOfDirectoriesForModelGen=Példák a szintaxis: <br> c: \\ mydir <br> / Home / mydir <br> DOL_DATA_ROOT / ECM / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ha tudod, hogyan kell létrehozni a odt dokumentumsablonok, mielőtt tárolja őket azokra a könyvtárakra, olvasd el a wiki dokumentáció:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Álláspontja név / vezetéknév
+FirstnameNamePosition=A név / vezetéknév sorrendje
 DescWeather=A következő kép jelenik meg a műszerfalon, amikor késő akciók száma eléri az alábbi értékeket:
-KeyForWebServicesAccess=Kulcs a webes szolgáltatások (paraméter &quot;dolibarrkey&quot; a webservice)
+KeyForWebServicesAccess=A webes szolgáltatások kulcsa ("dolibarrkey" paraméter a webszolgáltatásoknál)
 TestSubmitForm=Bemeneti teszt formájában
 ThisForceAlsoTheme=Ebben a menüben vezetője is használhatja a saját témája, amit a felhasználó választás. Szintén ebben a menüben menedzsere okostelefonokra szakosodott nem működik minden smartphone. Használjon egy másik menü vezető, ha problémákat tapasztal a tiéd.
 ThemeDir=Skins könyvtárba
@@ -331,7 +338,7 @@ UrlGenerationParameters=URL paraméterek biztosítása
 SecurityTokenIsUnique=Használjunk olyan egyedi securekey paraméter az URL
 EnterRefToBuildUrl=Adja meg az objektum referencia %s
 GetSecuredUrl=Get URL számított
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Régi ÁFA-kulcs
 NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -342,13 +349,14 @@ Int=Egész
 Float=Float
 DateAndTime=Dátum és idő
 Unique=Egyedi
-Boolean=Boolean (Checkbox)
+Boolean=Logikai (jelölőnégyzet)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Ár
 ExtrafieldMail = E-mail
-ExtrafieldSelect = Vlassz listát
+ExtrafieldSelect = Kiválasztó lista
 ExtrafieldSelectList = Válassz a táblából
 ExtrafieldSeparator=Elválasztó
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Jelölőnégyzet
 ExtrafieldRadio=Választógomb
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Felhasználók és csoportok
@@ -419,23 +430,23 @@ Module50Desc=Termék menedzsment
 Module51Name=Levelek tömeges
 Module51Desc=Mass papír levelezési vezetése
 Module52Name=Készletek
-Module52Desc=Stock irányítása termékek
+Module52Desc=Készlet kezelése (termékek)
 Module53Name=Szolgáltatások
-Module53Desc=Szolgáltatás menedzsment
+Module53Desc=Szolgáltatások kezelése
 Module54Name=Szerződések / Előfizetések
 Module54Desc=Management of contracts (services or reccuring subscriptions)
 Module55Name=Vonalkódok
-Module55Desc=Vonalkód vezetése
-Module56Name=Telefonálás
-Module56Desc=Telephony Integration
-Module57Name=Állandó megbízás
-Module57Desc=Állandó megbízások és felvételek kezelése. Tartalmazza a SEPA átutalásnál használt file készítését.
-Module58Name=ClickToDial
+Module55Desc=Vonalkód kezelés
+Module56Name=Telefon
+Module56Desc=Telefon-integráció
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module58Name=Kattintson a híváshoz
 Module58Desc=Integrációja ClickToDial rendszer (Asterisk, ...)
 Module59Name=Bookmark4u
 Module59Desc=Add függvényt generálni Bookmark4u figyelembe véve egy Dolibarr
 Module70Name=Beavatkozások
-Module70Desc=Beavatkozás vezetése
+Module70Desc=Beavatkozás kezelése
 Module75Name=Költségek és kirándulások jegyzetek
 Module75Desc=Költségek és kirándulások vezetésének figyelmét
 Module80Name=Küldemények
@@ -459,19 +470,19 @@ Module310Desc=Alapítvány tagjai menedzsment
 Module320Name=RSS Feed
 Module320Desc=Add RSS feed belül Dolibarr képernyőre
 Module330Name=Könyvjelzők
-Module330Desc=Bookmarks management
+Module330Desc=Könyvjelző kezelés
 Module400Name=Projects/Opportunities/Leads
 Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
 Module500Name=Különleges költségek
 Module500Desc=Különleges kiadások (adók, szociális vagy pénzügyi adók, osztalék) kezelése
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Értesítések
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Adományok
 Module700Desc=Adomány vezetése
 Module770Name=Expense reports
@@ -494,9 +505,9 @@ Module2300Name=Cron
 Module2300Desc=Scheduled job management
 Module2400Name=Agenda/Events
 Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
-Module2500Name=Elektronikus Content Management
+Module2500Name=Elektronikus Tartalom Kezelő
 Module2500Desc=Mentés és dokumentumok megosztása
-Module2600Name=API/Web services (SOAP server)
+Module2600Name=API/Web szolgáltatások (SOAP szerver)
 Module2600Desc=Enable the Dolibarr SOAP server providing API services
 Module2610Name=API/Web services (REST server)
 Module2610Desc=A Dolibarr REST API szerver engedélyezése
@@ -511,8 +522,8 @@ Module3100Name=Skype
 Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
 Module4000Name=HRM
 Module4000Desc=Human resources management
-Module5000Name=Multi-cég
-Module5000Desc=Lehetővé teszi, hogy több vállalat kezelése
+Module5000Name=Több-cég
+Module5000Desc=Több vállalat kezelését teszi lehetővé
 Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Weboldalak
@@ -535,7 +546,7 @@ Module55000Name=Poll, Survey or Vote
 Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
 Module59000Name=Margins
 Module59000Desc=Module to manage margins
-Module60000Name=Jogosultságok
+Module60000Name=Jutalékok
 Module60000Desc=Module to manage commissions
 Module63000Name=Erőforrások
 Module63000Desc=Erőforrások kezelése (nyomtatók, autók, helyiségek ...) melyeket események kapcsán oszthat meg
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Olvassa szolgáltatók
 Permission147=Olvassa statisztika
-Permission151=Állandó megrendelések olvasása
-Permission152=Állandó megbízáskérés készítése/módosítása
-Permission153=Átviteli állandó megbízások bevételek
-Permission154=Hitel / elutasítása házszabály bevételek
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export szállító számlák, attribútumok és kifizetések
 Permission1237=Export supplier orders and their details
 Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhelés)
 Permission1321=Export vevői számlák, attribútumok és kifizetések
+Permission1322=Reopen a paid bill
 Permission1421=Export vevői megrendelések és attribútumok
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label az alap, ha nincs fordítás megtalálható a kód
 LabelOnDocuments=Címke dokumentumok
 NbOfDays=Nb napok
 AtEndOfMonth=A hónap végén
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Mindig aktív
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=Itt tud belépni a Dolibarr eseményeire biztonságosa. A rendszerg
 AreaForAdminOnly=Ezeket a funkciókat lehet használni a <b>felhasználók</b> csak a <b>rendszergazda.</b>
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
 SystemAreaForAdminOnly=Ez a terület áll rendelkezésre a felhasználók csak rendszergazda. Egyik Dolibarr engedélyek csökkentheti ezt a határt.
-CompanyFundationDesc=Szerkesztése ezen az oldalon minden ismert információt a vállalat vagy alapítvány szeretne kezelni (Erre klikk, a &quot;Módosítás&quot; gombot a lap alján)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Választhat minden paramétert kapcsolatos Dolibarr kinézetét itt
 AvailableModules=Elérhető modulok
 ToActivateModule=Ha aktiválni modulok, menjen a Setup Terület (Home-> Beállítások-> Modulok).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Figyelem, egyes Linux rendszereken, hogy küldjön e-m
 PathToDocuments=Út a dokumentumok
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Fordítás beállítása
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Legalább egy modult engedélyezni kell
 ClassNotFoundIntoPathWarning=A(z) %s osztály nem található a PHP útvonalon
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Használja a TLS
 LDAPServerUseTLSExample=Az LDAP szerver használata TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Teljes DN (pl.: cn = adminldap, dc = társadalom, dc = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Rendszergazda jelszó
 LDAPUserDn=A felhasználók DN
 LDAPUserDnExample=Teljes DN (ex: ou = Users, dc = társadalom, dc = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Példa: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Példa: objectsid
 LDAPFieldEndLastSubscription=Születési előfizetés vége
-LDAPFieldTitle=Hozzászólás / Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP telepítés nem teljes (go másokra fül)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nem rendszergazdai jelszót vagy biztosított. LDAP hozzáférés lesz, névtelen és csak olvasható módba.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Termékek és szolgáltatások modulok beállítása
 NumberOfProductShowInSelect=Max. termékek száma a kombók válassza listák (0 = nincs korlát)
 ViewProductDescInFormAbility=Visualization a termékleírásokat a formanyomtatványok (egyébként a felugró eszköztipp)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization termékek leírását a thirdparty nyelven
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Alapértelmezett típusú vonalkód használatát termékek
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Felmondás modul beállítás
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Külső RSS import setup
 NewRSS=Új RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Mindig szerkeszthető
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Ön a legújabb stabil verziót használja!
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index af6d984db64..88a905fee56 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -27,13 +27,9 @@ AllTime=Elejétől
 Reconciliation=Egyeztetés
 RIB=Bankszámla száma
 IBAN=IBAN szám
-IbanValid=Az IBAN valós
-IbanNotValid=Az IBAN nem valós
 BIC=BIC / SWIFT száma
-SwiftValid=BIC / SWIFT valós
-SwiftNotValid=BIC / SWIFT nem valós
-StandingOrders=Állandó megbízás
-StandingOrder=Állandó érvényű parancs
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Számlakivonat
 AccountStatementShort=Nyilatkozat
 AccountStatements=Számlakivonatok
@@ -43,7 +39,7 @@ BankAccountDomiciliation=Számla-cím
 BankAccountCountry=Számla országa
 BankAccountOwner=Számlatulajdonos neve
 BankAccountOwnerAddress=Számlatulajdonos címe
-RIBControlError=Épségének ellenőrzése az értékek nem. Ez azt jelenti, információkat a számlaszám nem teljes vagy hibás (ellenőrzésére ország, számokat és IBAN).
+RIBControlError=Az adatok megfelelőségének ellenőrzése hibát jelzett. Ez azt jelenti, hogy a számlaszámhoz köthető információ hiányos vagy hibás (ellenőrizze az országot, számlaszámot és az IBAN számot).
 CreateAccount=Számla létrehozás
 NewAccount=Új számla fiók
 NewFinancialAccount=Új pénzügyi számla
@@ -78,6 +74,7 @@ AccountToCredit=Jóváirandó számla
 AccountToDebit=Terhelendő számla
 DisableConciliation=Letiltása összehangolási funkció erre a számlára
 ConciliationDisabled=Megbékélés funkció tiltva
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Nyitott
 StatusAccountClosed=Lezárt
 AccountIdShort=Szám
@@ -87,49 +84,52 @@ AddBankRecordLong=Add tranzakció kézzel
 ConciliatedBy=Egyeztetésenként
 DateConciliating=Összeegyeztetés dátuma
 BankLineConciliated=Összeegyeztetett tranzakció
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Vásárlói fizetés
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
+SupplierInvoicePayment=Beszállítói kifizetés
+SubscriptionPayment=Előfizetés kiegyenlítése
 WithdrawalPayment=Visszavont fizetés
 SocialContributionPayment=Szociális/költségvetési adó fizetés
 BankTransfer=Banki átutalás
 BankTransfers=Banki átutalások
-TransferDesc=Átutalás egyik fiókból a másikba, Dolibarr két rekordot fog írni (a terhelést a forrás számláról és a jóváírást a cél számlára, azonos számlákra. Ugyanazt a címkét és a dátumot fogja a tranzakciókhoz felhasználni)
+MenuBankInternalTransfer=Belső átutalás
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Feladó
 TransferTo=Címzett
 TransferFromToDone=A transzfer <b>%s</b> a <b>%s</b> a <b>%s</b> %s lett felvéve.
-CheckTransmitter=Adó
-ValidateCheckReceipt=Érvényesítése ezt az ellenőrzést átvételét?
+CheckTransmitter=Átutaló
+ValidateCheckReceipt=Jóváhagyja eme csekk befogadását?
 ConfirmValidateCheckReceipt=Biztos benne, hogy szeretné érvényesíteni ezt az ellenőrzést átvételét, semminemű változás nem lehetséges, ha ez megtörténik?
 DeleteCheckReceipt=Törölje a négyzet számlát?
-ConfirmDeleteCheckReceipt=Biztosan törölni szeretné ezt az ellenőrzést átvételét?
-BankChecks=Bank ellenőrzése
-BankChecksToReceipt=Checks awaiting deposit
-ShowCheckReceipt=Mutasd ellenőrizze betét kézhezvételétől
-NumberOfCheques=Nb csekk
-DeleteTransaction=Törlés tranzakció
+ConfirmDeleteCheckReceipt=Biztosan törölni szeretné ennek a csekknek a bizonylatát?
+BankChecks=Banki csekkek
+BankChecksToReceipt=Letétre váró csekkek
+ShowCheckReceipt=Mutasd a letéti csekk bizonylatát
+NumberOfCheques=Csekkek száma
+DeleteTransaction=Tranzakció törlése
 ConfirmDeleteTransaction=Biztos benne, hogy törli ezt a tranzakciót?
-ThisWillAlsoDeleteBankRecord=Ez azt is törölni keletkezett banki tranzakciók
-BankMovements=Movements
+ThisWillAlsoDeleteBankRecord=Ez a generált banki tranzakciókat is törölni fogja
+BankMovements=Pénzmozgások
 PlannedTransactions=Tervezett műveletek
 Graph=Grafika
 ExportDataset_banque_1=Banki tranzakciók és a számlakivonat
 ExportDataset_banque_2=Letéti irat
 TransactionOnTheOtherAccount=Tranzakció a másik számlára
-PaymentNumberUpdateSucceeded=Payment number updated successfully
-PaymentNumberUpdateFailed=Fizetési száma nem lehet frissíteni
-PaymentDateUpdateSucceeded=Payment date updated successfully
-PaymentDateUpdateFailed=Fizetési határidő nem lehet frissíteni
+PaymentNumberUpdateSucceeded=A fizetés száma sikeresen frissítve
+PaymentNumberUpdateFailed=A fizetés számát nem lehet frissíteni
+PaymentDateUpdateSucceeded=A fizetés időpontja sikeresen frissítve
+PaymentDateUpdateFailed=Fizetési határidőt nem lehet frissíteni
 Transactions=Tranzakciók
-BankTransactionLine=Bank tranzakció
-AllAccounts=Minden bank / készpénzszámlák
-BackToAccount=Visszalép a számla
-ShowAllAccounts=Mutasd az összes fiók
-FutureTransaction=Ügylet Futur. Semmiképpen egyeztetni.
+BankTransactionLine=Banki tranzakció
+AllAccounts=Minden bank / készpénzszámla
+BackToAccount=Visszalép a számlához
+ShowAllAccounts=Mutasd az összes fióknál
+FutureTransaction=Jövőbeni tranzakció. Nincs lehetőség egyeztetésre.
 SelectChequeTransactionAndGenerate=Válassza / filter ellenőrzéseket be kell vonni a csekket befizetés beérkezésének és kattintson a &quot;Create&quot;.
 InputReceiptNumber=Határozza meg az egyeztetéssel összefüggő bank kivonatot. Használjon egy rövidíthető szám értéket: ÉÉÉÉHH or ÉÉÉÉHHNN
 EventualyAddCategory=Végezetül, határozzon meg egy kategóriát, melybe beosztályozza a könyvelési belyegyzéseket
-ToConciliate=Egyeztetni?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Ezután, ellenőrizze a bank kivinathoz tartozó tételsorokat és kattintson
 DefaultRIB=Alaptértelmezett BAN
 AllRIB=Összes BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Biztosan meg szeretné jelölni visszavontként a csekket?
 RejectCheckDate=Csekk visszatéréséenk dátuma
 CheckRejected=Csekk visszatért
 CheckRejectedAndInvoicesReopened=Csekk visszatért és a számla újranyitott
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 0e54e5886a3..336cb68a54d 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Hiba, nem lehet törölni egy sz
 BillFrom=Feladó
 BillTo=Címzett
 ActionsOnBill=Műveletek a számlán
-RecurringInvoiceTemplate=Ismétlődő számla
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Árengedmény (kif. előtt tart)
 EscompteOfferedShort=Kedvezmény
 SendBillRef=Számla elküldése %s
 SendReminderBillRef=Számla elküldése %s (emlékeztető)
-StandingOrders=Állandó megbízás
-StandingOrder=Állandó érvényű parancs
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nincsenek tervezet számlák
 NoOtherDraftBills=Nincs más tervezet számlák
 NoDraftInvoices=Nincs számlaterv
@@ -351,8 +351,8 @@ VarAmount=Változó összeg (%% össz.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Inkasszó
-PaymentTypeShortPRE=Inkasszó
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Készpénz
 PaymentTypeShortLIQ=Kp
 PaymentTypeCB=Bankkártya
@@ -381,6 +381,7 @@ ExtraInfos=Extra infók
 RegulatedOn=Szabályozni
 ChequeNumber=Csekk N °
 ChequeOrTransferNumber=Csekk /  Transzfer N °
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Csekk bankja
 CheckBank=Csekk
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Ezzel a fizetéssel fizetve
 ClosePaidInvoicesAutomatically=Beállítás "Fizetett"-re, a kicserélt számla teljes kifizetés megtörtént.
 ClosePaidCreditNotesAutomatically=Beállítás "Fizetett"-ként. Az összes jóváírás teljes kifizetése megtörtén.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Minden számla nélkül is fizetni fogják automatikusan bezárja az állapota &quot;fizetni&quot;.
 ToMakePayment=Kifizetés
 ToMakePaymentBack=Visszafizetés
 ListOfYourUnpaidInvoices=Nyitott számlák listája
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Illetékbélyeg
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Számla PDF sablon Crabe. A teljes számla sablon (Sablon ajánlott)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Hiba történt az összeg módosításakor
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=A rendszeres jövőbeni számlák kézi készítéséhez válassza a <strong>%s - %s - %s</strong> menüpontot.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index 090dd255263..a8380188628 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Legrégebbi aktív lejárt szolgáltatások
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Ügyfél számlák
 ForCustomersOrders=Ügyfél megrendelések
 ForProposals=Javaslatok
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index c6a25851bde..7559e740d5f 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=azon
 CashDeskThirdParty=Harmadik fél
 ShoppingCart=Bevásárlókocsi
 NewSell=Új eladni
-BackOffice=Back-office
 AddThisArticle=Add hozzá ezt a cikket
 RestartSelling=Menj vissza eladni
-SellFinished=Eladás befejezte
+SellFinished=Sale complete
 PrintTicket=Nyomtatás jegy
 NoProductFound=Nem találtam cikket
 ProductFound=termék található
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index 8caf13be405..d04045fb4f3 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Alkategóriák
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Ez a kategória nem tartalmaz termékeket.
 ThisCategoryHasNoSupplier=Ez a kategória nem tartalmaz beszállítót.
 ThisCategoryHasNoCustomer=Ez a kategória nem tartalmaz vásárlót.
 ThisCategoryHasNoMember=Ez a kategória nem tartalmaz tagot.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 005fa4fa066..16f027eb0ac 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Új magánszemély
 NewCompany=Új cég (jelentkező, vevő, szállító)
 NewThirdParty=Új partner (jelentkező, vevő, szállító)
 CreateDolibarrThirdPartySupplier=Parnter (szállító) létrehozása
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Potenciális ​​terület
 IdThirdParty=Partner ID
 IdCompany=Cég ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Beszállítók
 ThirdPartyType=Partner típusa
 Company/Fundation=Cég / Alapítvány
 Individual=Magánszemély
-ToCreateContactWithSameName=Automatikus fizikai kapcsolatot hoz létre ugyanazokkal az információkkal
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Anyavállalat
 Subsidiaries=Leányvállalatok
 ReportByCustomers=Jelentés vevőnként
@@ -47,7 +49,7 @@ CivilityCode=Udvariassági kód
 RegisteredOffice=Bejegyzett iroda
 Lastname=Vezetéknév
 Firstname=Keresztnév
-PostOrFunction=Beosztás / Szerepkör
+PostOrFunction=Állás pozíció
 UserTitle=Cím
 Address=Cím
 State=Állam / Tartomány
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Hivatali telefon
 PhonePerso=Szem. telefon
 PhoneMobile=Mobil
-No_Email=Tömeges e-mail nem küldhető
+No_Email=Tömeges e-levelek megtagadása
 Fax=Fax
 Zip=Irányítószám
 Town=Város
@@ -73,10 +75,10 @@ Poste= Pozíció
 DefaultLang=Nyelv alapértelmezés szerint
 VATIsUsed=ÁFÁ-t használandó
 VATIsNotUsed=ÁFÁ-t nem használandó
-CopyAddressFromSoc=Cím kitöltése a partner címével
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=A harmadik fél nem vevő sem szállító, nincs elérhető hivatkozási objektum
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=Másodlagos adó használata
 LocalTax1IsUsedES= RE használandó
 LocalTax1IsNotUsedES= RE nem használandó
 LocalTax2IsUsed=Helyi adó használata
@@ -198,7 +200,7 @@ ProfId1MA=Szakma id 1 (RC)
 ProfId2MA=Szakma id 2 (Patente)
 ProfId3MA=Szakma id 3 (IF)
 ProfId4MA=Szakma id 4 (CNSS)
-ProfId5MA=Id prof. 5 (C.I.C.E.)
+ProfId5MA=Szakma id  5 (C.I.C.E.)
 ProfId6MA=-
 ProfId1MX=Szakma ID 1 (RFC).
 ProfId2MX=Szakma ID 2 (R.. P. IMSS)
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Adószám
 VATIntraShort=Adószám
 VATIntraSyntaxIsValid=Szintaxis érvényes
-VATIntraValueIsValid=Az érték érvényes
 ProspectCustomer=Jelentkező / Vevő
 Prospect=Jelentkező
 CustomerCard=Vevő-kártya
@@ -261,7 +262,9 @@ AddContactAddress=Kapcsolat/cím létrehozása
 EditContact=Kapcsoalt szerkesztése
 EditContactAddress=Kapcsolat/cím szerkesztése
 Contact=Kapcsolat
+ContactId=Kapcsolat id azonosító
 ContactsAddresses=Kapcsolatok / címek
+FromContactName=Name:
 NoContactDefinedForThirdParty=Nincs szerződés ehhez a partnerhez
 NoContactDefined=Nincs kapcsolat megadva
 DefaultContact=Alapértelmezett kapcsolat
@@ -284,7 +287,7 @@ CompanyDeleted="%s" cég törölve az adatbázisból.
 ListOfContacts=Névjegyek / címek
 ListOfContactsAddresses=Kapcsolatok listája
 ListOfThirdParties=Partnerek listája
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Kapcsolat mutatása
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
@@ -294,6 +297,7 @@ ContactForProposals=Jelentkező kapcsolattartó
 ContactForContracts=Szerződéses kapcsolattartó
 ContactForInvoices=Számla kapcsolattartó
 NoContactForAnyOrder=Egyetlen megrdelésben sem kapcsolattartó
+NoContactForAnyOrderOrShipments=Egyetlen megrendelésben vagy beszállításban sem kapcsolattartó
 NoContactForAnyProposal=Nem kapcsolattartó egyik kereskedelmi javaslatnál sem
 NoContactForAnyContract=Nem kapcsolattartó egyetlen szerződésnél sem
 NoContactForAnyInvoice=Nem kapcsolattartó egyik számlánál sem
@@ -311,7 +315,7 @@ VATIntraCheckableOnEUSite=Ellenőrizze a közösségen belüli ÁFA-t az európa
 VATIntraManualCheck=Ön is ellenőrizheti manuálisan az EU honlapján <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s).
 NorProspectNorCustomer=Nem jelentkező vagy vevő
-JuridicalStatus=Legal form
+JuridicalStatus=Legális formátum
 Staff=Személyzet
 ProspectLevelShort=Potenciális
 ProspectLevel=Jelentkezői potenciál
@@ -338,12 +342,12 @@ TE_PRIVATE=Magánszemély
 TE_OTHER=Más
 StatusProspect-1=Nincs kapcsolatfelvétel
 StatusProspect0=Kapcsolatfelvétel nem volt
-StatusProspect1=To be contacted
+StatusProspect1=Kapcsolatba lépett
 StatusProspect2=Kapcsolat folyamatban
 StatusProspect3=Kapcsolatfelévétel történt
 ChangeDoNotContact=Megváltoztás erre: 'Ne keresse'
 ChangeNeverContacted=Megváltoztatás erre: 'Soha nem lépett kapcsolatba'
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Megváltoztatás erre: 'Kapcsolatba lépett'
 ChangeContactInProcess=Megváltoztatás erre: 'Kapcsolat folyamatban'
 ChangeContactDone=Megváltoztatás erre: 'Kapcsolat létrejött'
 ProspectsByStatus=Jelentkezők állapot szerint
@@ -352,37 +356,37 @@ ExportCardToFormat=Kártya exportálása formázással
 ContactNotLinkedToCompany=Kapcsolat nincs partnerhez csatolva
 DolibarrLogin=Dolibarr bejelentkezés
 NoDolibarrAccess=Nem Dolibarr hozzáférés
-ExportDataset_company_1=Partner (Cég/alapítvány/magánszemély) és tulajdonságok
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kapcsolatok és tulajdonságai
-ImportDataset_company_1=Partner (Cég/alapítvány/magánszemély) és tulajdonságok
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kapcsolatok/címek (partner vagy nem) és attribútumok
 ImportDataset_company_3=Banki adatok
 ImportDataset_company_4=Harmadik fél/Kereskedelmi képviselők (Hatással van a vaállalatokhoz tartozó  kereskedelmi képviselő felhasználókra)
 PriceLevel=Árszint
 DeliveryAddress=Szállítási cím
-AddAddress=Add address
+AddAddress=Cím hozzáadása
 SupplierCategory=Szállítói kategória
-JuridicalStatus200=Independent
+JuridicalStatus200=Független
 DeleteFile=Fájl törlése
 ConfirmDeleteFile=Biztosan törölni akarja ezt a fájlt?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Értékesítési képviselőhöz hozzárendelve
 Organization=Szervezet
 FiscalYearInformation=Információ a pénzügyi évről
 FiscalMonthStart=Pénzügyi év kezdő hónapja
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=E-mail értesítő hozzáadásához először létre kell hozni egy e-mail-t ehhez a felhasználóhoz.
+YouMustCreateContactFirst=E-mail értesítő hozzáadásához létre kell hozni egy e-mail kapcsolatot a harmadik félhez.
 ListSuppliersShort=Szállítók listája
 ListProspectsShort=Jelenkezők listája
 ListCustomersShort=Vevők listája
 ThirdPartiesArea=Partner és a szerződés helye
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Legutóbb %s változtatott harmadik felet
 UniqueThirdParties=Összes egyedi parnter
 InActivity=Nyitott
 ActivityCeased=Lezárt
 ProductsIntoElements=Termékek / szolgáltatások listálya ide %s
 CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
-OutstandingBillReached=Max. for outstanding bill reached
+OutstandingBillReached=Max. a kintlévőség elért
 MonkeyNumRefModelDesc=Vevőkód a %yymm-nnnn, valamint a szállítókód a %syymm-nnnn szám formátumban, ahol yy év, mm a hónap és nnnn sorfolytonosan növekvő számsor, ami nem lehet nulla.
 LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Partnerek egyesítése megtörtént
 SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
 SaleRepresentativeFirstname=Kereskedelmi képviselő keresztneve
 SaleRepresentativeLastname=Kereskedelmi képviselő családi neve
+ErrorThirdpartiesMerge=Hiba történt a partner törlésekor. Ellenőrizd a log-ban. A változtatás visszavonva.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 0516b51214d..068230d98b8 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Különleges költségek
 MenuTaxAndDividends=Adók és osztalék
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 784fcb9eb48..fca83550932 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Módszer
 CronModule=Modul
 CronNoJobs=No jobs registered
 CronPriority=Prioritás
-CronLabel=Leírás
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/hu_HU/deliveries.lang b/htdocs/langs/hu_HU/deliveries.lang
index 547be1914c7..998baaa67bc 100644
--- a/htdocs/langs/hu_HU/deliveries.lang
+++ b/htdocs/langs/hu_HU/deliveries.lang
@@ -1,19 +1,19 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Kézbesítés
-DeliveryRef=Ref Delivery
+DeliveryRef=Szállító ref.
 DeliveryCard=Kézbesítés kártya
-DeliveryOrder=Megrendelés kézbesítése
+DeliveryOrder=Szállítólevél
 DeliveryDate=Kézbesítés dátuma
-CreateDeliveryOrder=Megrendelési szállítás generálása
+CreateDeliveryOrder=Szállítólevél generálása
 DeliveryStateSaved=Szállítási állapot mentve
 SetDeliveryDate=Szállítási dátum beállítása
 ValidateDeliveryReceipt=Szállítási bizonylat hitelesítése
 ValidateDeliveryReceiptConfirm=Biztos hitelesíteni akarja a szállítási bizonylatot?
-DeleteDeliveryReceipt=Törlés átvételi elismervényen
+DeleteDeliveryReceipt=Átvételi elismervény törlése
 DeleteDeliveryReceiptConfirm=Biztos benne, hogy törli a(z) <b>%s</b> átvételi elismervényt?
 DeliveryMethod=Szállítási mód
 TrackingNumber=Nyomonkövetési szám
-DeliveryNotValidated=Szállítási nem hitelesített
+DeliveryNotValidated=A szállítás nincs jóváhagyva
 StatusDeliveryCanceled=Visszavonva
 StatusDeliveryDraft=Piszkozat
 StatusDeliveryValidated=Kézbesítve
@@ -27,4 +27,4 @@ Recipient=Címzett
 ErrorStockIsNotEnough=Nincs elég raktáron
 Shippable=Szállítható
 NonShippable=Nem szállítható
-ShowReceiving=Show delivery receipt
+ShowReceiving=Mutassa az átvételi elismervényt
diff --git a/htdocs/langs/hu_HU/dict.lang b/htdocs/langs/hu_HU/dict.lang
index 49ffe7362a4..1d277889248 100644
--- a/htdocs/langs/hu_HU/dict.lang
+++ b/htdocs/langs/hu_HU/dict.lang
@@ -138,7 +138,7 @@ CountryLS=Lesotho
 CountryLR=Libéria
 CountryLY=Líbiai
 CountryLI=Liechtenstein
-CountryLT=Lithuania
+CountryLT=Litvánia
 CountryLU=Luxemburg
 CountryMO=Makaó
 CountryMK=Macedónia, volt Jugoszláv az
@@ -291,7 +291,7 @@ CurrencyXPF=CFP frank
 CurrencySingXPF=CFP frank
 CurrencyCentSingEUR=cent
 CurrencyCentINR=paisa
-CurrencyCentSingINR=paise
+CurrencyCentSingINR=paisa
 CurrencyThousandthSingTND=ezer
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=Internet
@@ -301,7 +301,7 @@ DemandReasonTypeSRC_CAMP_PHO=Telefon kampány
 DemandReasonTypeSRC_CAMP_FAX=Fax kampány
 DemandReasonTypeSRC_COMM=Kereskedelmi kapcsolat
 DemandReasonTypeSRC_SHOP=Shop kapcsolatban
-DemandReasonTypeSRC_WOM=Word of mouth
+DemandReasonTypeSRC_WOM=Szájról--szájra terjed
 DemandReasonTypeSRC_PARTNER=Parner
 DemandReasonTypeSRC_EMPLOYEE=Foglalkoztató
 DemandReasonTypeSRC_SPONSORING=Szponoráció
@@ -318,10 +318,10 @@ PaperFormatEUA6=Formátum A6
 PaperFormatUSLETTER=Levél formátum US
 PaperFormatUSLEGAL=Legális formátum US
 PaperFormatUSEXECUTIVE=Adminisztratív formátum US
-PaperFormatUSLEDGER=Format Ledger/Tabloid
-PaperFormatCAP1=Format P1 Canada
-PaperFormatCAP2=Format P2 Canada
-PaperFormatCAP3=Format P3 Canada
-PaperFormatCAP4=Format P4 Canada
-PaperFormatCAP5=Format P5 Canada
-PaperFormatCAP6=Format P6 Canada
+PaperFormatUSLEDGER=A3
+PaperFormatCAP1=A1
+PaperFormatCAP2=A2
+PaperFormatCAP3=A3
+PaperFormatCAP4=A4
+PaperFormatCAP5=A5
+PaperFormatCAP6=A6
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 921feb2645e..de4956ed9fe 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 051a2f47710..0fe9a052e11 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Ez a PHP verzió támogatja a munkameneteket.
 PHPSupportPOSTGETOk=Ez a PHP verzió támogatja POST és GET változókat.
 PHPSupportPOSTGETKo=Lehetséges, hogy az alkalmazott PHP verzió NEM támogatja a POST és/vagy GET változókat. Ellenõrizze a  <b>variables_order</b> paramétert a php.ini fájlban.
 PHPSupportGD=Ez a PHP verzió támogatja a GD grafikai funkciókat.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Ez a PHP verzió támogatja az UTF8 funkciókat.
 PHPMemoryOK=A munkamenetek maximális memóriája <b>%s</b>. Ennek elégnek kéne lennie.
 PHPMemoryTooLow=A munkamenetek maximális beállított memóriája <b>%s</b> byte. Ez kevés lesz. Állítsa át a <b>php.ini</b>-ben a <b>memory_limit</b> paramétert legalább <b>%s</b> byte-ra.
 Recheck=Kattintson ide egy részletesebb tesztért
 ErrorPHPDoesNotSupportSessions=Ez a PHP verzió NEM támogatja a munkameneteket. Erre szükség van a Dolibarr futtatásához. Kérjük ellenõrizze a PHP beállításait.
 ErrorPHPDoesNotSupportGD=Ez a PHP verzió NEM támogatja a GD grafikai funkciókat. A grafikonok nem lesznek elérhetõek.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Ez a PHP verzió NEM támogatja az UTF8 funkciókat. A Dolibarr így nem tud rendesen mûködni. Kérjük oldaj meg mielött végrehajtaná a telepítést.
 ErrorDirDoesNotExists=%s könyvtár nem létezik.
 ErrorGoBackAndCorrectParameters=Menjen vissza és javítsa ki a rossz paramétereket.
@@ -133,6 +135,10 @@ ActivateModule=Modul aktiválása %s
 ShowEditTechnicalParameters=Klikkelj ide a haladó beállítasok megtekintéséhez/szerkezstéséhez. (szakértő mód)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Az adatbázis verziója %s. Ez a verzió kritikus hibát tartalmaz az az adatbis struktúrájának megváltoztatásakor, ami a migrációs folyamat során szükséges. Ennek elkerülése érdekében a migráció nem engedélyezett, amíg az adatbázis nem kerül frissítésre egy magasabb stabil verzióra. (Az ismert hibás verziókat lásd itt:%s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Frissítés adatok akciók
 MigrationPaymentMode=Adatmigráció fizetési mód
 MigrationCategorieAssociation=Kategória migrálása
 MigrationEvents=Az események migrálásához az események tulajdonosát be kell állítani a szükséges táblában
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Modul újratöltése %s
 ShowNotAvailableOptions=Nem elérhető opciók mutatása
 HideNotAvailableOptions=Nem elérhető opciók elrejtése
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index 57aaae251f5..20ad54295f6 100644
--- a/htdocs/langs/hu_HU/interventions.lang
+++ b/htdocs/langs/hu_HU/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Ügyfél kapcsolat követés
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index b2de6e195ca..e71cd042c31 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_ar_AR=Arab
 Language_ar_SA=Arab
-Language_bn_BD=Bengali
+Language_bn_BD=Bengáli
 Language_bg_BG=Bolgár
 Language_bs_BA=Bosnyák
 Language_ca_ES=Katalán
@@ -10,32 +10,32 @@ Language_da_DA=Dán
 Language_da_DK=Dán
 Language_de_DE=Német
 Language_de_AT=Német (Ausztria)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Német (Svájc)
 Language_el_GR=Görög
 Language_en_AU=Angol (Ausztrália)
-Language_en_CA=English (Canada)
+Language_en_CA=Angol (Kanada)
 Language_en_GB=Angol (Egyesült Királyság)
 Language_en_IN=Angol (India)
 Language_en_NZ=Angol (Új Zéland)
 Language_en_SA=English (Szaúd-Arábia)
 Language_en_US=Angol (Egyesült Államok)
 Language_en_ZA=English (Dél-Afrika)
-Language_es_ES=Spanyo
+Language_es_ES=Spanyol
 Language_es_AR=Spanyo (Argentina)
-Language_es_BO=Spanish (Bolivia)
-Language_es_CL=Spanish (Chile)
-Language_es_CO=Spanish (Colombia)
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_BO=Spanyol (Bolívia)
+Language_es_CL=Spanyol (Chile)
+Language_es_CO=Spanyol (Kolumbia)
+Language_es_DO=Spanyol (Dominikai Köztársaság)
 Language_es_HN=Spanyol (Honduras)
 Language_es_MX=Spanyol (Mexikó)
 Language_es_PY=Spanyol (Paraguay)
 Language_es_PE=Spanyol (Peru)
 Language_es_PR=Spanyol (Puerto Rico)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=Spanyol (Venezuela)
 Language_et_EE=Észt
 Language_eu_ES=Baszk
 Language_fa_IR=Perzsa
-Language_fi_FI=Finnish
+Language_fi_FI=Finn
 Language_fr_BE=Francia (Belgium)
 Language_fr_CA=Francia (Kanada)
 Language_fr_CH=Francia (Svájc)
@@ -45,14 +45,14 @@ Language_fy_NL=Frisian
 Language_he_IL=Héber
 Language_hr_HR=Horvát
 Language_hu_HU=Magyar
-Language_id_ID=Indonesian
+Language_id_ID=Indonéz
 Language_is_IS=Grönlandi
 Language_it_IT=Olasz
 Language_ja_JP=Japán
-Language_ka_GE=Georgian
+Language_ka_GE=Grúz
 Language_kn_IN=Kannada
 Language_ko_KR=Koreai
-Language_lo_LA=Lao
+Language_lo_LA=Laoszi
 Language_lt_LT=Litván
 Language_lv_LV=Lett
 Language_mk_MK=Macedóniai
@@ -69,9 +69,9 @@ Language_tr_TR=Török
 Language_sl_SI=Szlovén
 Language_sv_SV=Svéd
 Language_sv_SE=Svéd
-Language_sq_AL=Albanian
+Language_sq_AL=Albán
 Language_sk_SK=Szlovák
-Language_sr_RS=Serbian
+Language_sr_RS=Szerb
 Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrán
diff --git a/htdocs/langs/hu_HU/ldap.lang b/htdocs/langs/hu_HU/ldap.lang
index 24f2660a9bd..d9fff1b2b1c 100644
--- a/htdocs/langs/hu_HU/ldap.lang
+++ b/htdocs/langs/hu_HU/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Első feliratkozási dátum
 LDAPFieldFirstSubscriptionAmount=Első feliratkozási mennyiség
 LDAPFieldLastSubscriptionDate=Utolsó feliratkozási dátum
 LDAPFieldLastSubscriptionAmount=Utolsó feliratkozási mennyiség
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Felhasználó szinkronizálva
 GroupSynchronized=Csoport szinkronizálva
 MemberSynchronized=Tag szinkronizálva
diff --git a/htdocs/langs/hu_HU/mails.lang b/htdocs/langs/hu_HU/mails.lang
index a740bd37806..79b3fcbec3c 100644
--- a/htdocs/langs/hu_HU/mails.lang
+++ b/htdocs/langs/hu_HU/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Olvas
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index e4c4647b574..1bbd68d8159 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=MM/dd/yyyy
 FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
 FormatDateShortJQueryInput=mm/dd/yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=ÓÓ:PP
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
@@ -28,16 +28,16 @@ NoTemplateDefined=No template defined for this email type
 AvailableVariables=Available substitution variables
 NoTranslation=Nincs fordítás
 NoRecordFound=Rekord nem található
-NotEnoughDataYet=Not enough data
+NotEnoughDataYet=Nincs elég adat
 NoError=Nincs hiba
 Error=Hiba
-Errors=Errors
+Errors=Hibák
 ErrorFieldRequired='%s' mező szükséges
 ErrorFieldFormat='%s' mezőnek rossz az értéke
 ErrorFileDoesNotExists=%s fájl nem létezik
 ErrorFailedToOpenFile=Nem sikerült a %s fájlt megnyitni
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Nem lehet a %s könyvtárat létrehozni
+ErrorCanNotReadDir=Nem lehet a %s könyvtárat olvasni
 ErrorConstantNotDefined=%s paraméter nincs definiálva
 ErrorUnknown=Ismeretlen hiba
 ErrorSQL=SQL Hiba
@@ -59,21 +59,22 @@ ErrorSomeErrorWereFoundRollbackIsDone=Nehány hibát találtunk. Visszafordítju
 ErrorConfigParameterNotDefined=<b>%s</b> paraméter nincs definiálva a Dolibarr configurációs fájlban (<b>conf.php</b>).
 ErrorCantLoadUserFromDolibarrDatabase=<b>%s</b> felhasználó nem található a Dolibarr adatbázisban.
 ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatározva.
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=Hiba, nincsenek meghatározva társadalombiztosítási és adóügyi adattípusok a '%s' ország részére.
 ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése.
-NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
+NotAuthorized=Nincs jogosultsága ehhez a tevékenységhez
+SetDate=Dátum beállítása
+SelectDate=Válasszon egy dátumot
+SeeAlso=Lásd még a %s
+SeeHere=Lásd itt
 BackgroundColorByDefault=Alapértelmezett háttérszin
-FileUploaded=The file was successfully uploaded
+FileRenamed=The file was successfully renamed
+FileUploaded=A fájl sikeresen fel lett töltve
 FileWasNotUploaded=Egy fájl ki lett választva csatolásra, de még nincs feltöltve. Kattintson a "Fájl Csatolása" gombra.
 NbOfEntries=Bejegyzések száma
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=Online súgó olvasása (Internet hozzáférés szükséges)
 GoToHelpPage=Segítség olvasása
 RecordSaved=Rekord elmentve
-RecordDeleted=Record deleted
+RecordDeleted=Rekord törölve
 LevelOfFeature=Funkciók szintje
 NotDefined=Nem meghatározott
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr hitelesítési mód beélítva ehhez <b>%s</b> a <b>conf.php</b> beállító fájlban.<br>Ez azt jelenti, hogy ez a jelszó adatbázis Dolibarr rendszertől független, így ennek a mezönek a megváltoztatása nem befolyásoló.
@@ -84,26 +85,26 @@ SeeAbove=Lásd feljebb
 HomeArea=Nyitólap
 LastConnexion=Utolsó kapocslódás
 PreviousConnexion=Előző kapcsolódás
-PreviousValue=Previous value
+PreviousValue=Előző érték
 ConnectedOnMultiCompany=Entitáson kapcsolódva
 ConnectedSince=Kapcslódás kezdete
 AuthenticationMode=Hitelesitési mód
 RequestedUrl=A kért URL
 DatabaseTypeManager=Adatbázis tipus kezelő
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+RequestLastAccessInError=Az utolsó adatbázis hozzáférés hibaüzenete
+ReturnCodeLastAccessInError=Az utolsó adatbázis hozzáférés hibakódja
+InformationLastAccessInError=Az utolsó adatbázis hozzáférési hiba leírása
 DolibarrHasDetectedError=A Dolibarr technikai hibát észlelt
-InformationToHelpDiagnose=This information can be useful for diagnostic
+InformationToHelpDiagnose=Ez az információ hibakeresés során lehet hasznos
 MoreInformation=További információ
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
+TechnicalInformation=Technikai információk
+TechnicalID=Technikai azon.
 NotePublic=Megjegyzés (nyilvános)
 NotePrivate=Megjegyzés (privát)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr beállított pontossági határral az egység árakhoz <b>%s</b> decimálisokkal.
 DoTest=Teszt
 ToFilter=Szűrő
-NoFilter=No filter
+NoFilter=Nincs szűrő
 WarningYouHaveAtLeastOneTaskLate=Figyelem, legalább egy eleme van ami túllépte a tűrés késleltetést.
 yes=igen
 Yes=Igen
@@ -114,7 +115,7 @@ Home=Nyitólap
 Help=Segítség
 OnlineHelp=Online segítség
 PageWiki=Wiki oldal
-MediaBrowser=Media browser
+MediaBrowser=Média böngésző
 Always=Mindíg
 Never=Soha
 Under=alatt
@@ -125,16 +126,16 @@ Activated=Aktiválva
 Closed=Zárva
 Closed2=Zárva
 Enabled=Bekapcsolt
-Deprecated=Deprecated
+Deprecated=Elavult
 Disable=Letilt
 Disabled=Kikapcsolva
 Add=Hozzáadás
 AddLink=Link hozzáadása
 RemoveLink=Remove link
-AddToDraft=Add to draft
+AddToDraft=Adja a vázlathoz
 Update=Frissítés
 Close=Zár
-CloseBox=Remove widget from your dashboard
+CloseBox=A widget eltávolítása a vezérlőpultról
 Confirm=Megerősít
 ConfirmSendCardByMail=Biztos el akarja küldeni ez a kártyát?
 Delete=Törlés
@@ -153,8 +154,8 @@ ToClone=Klónozás
 ConfirmClone=Válasszon adatot a klónozáshoz:
 NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva.
 Of=birtokában
-Go=Go
-Run=Run
+Go=Indít
+Run=Futtatás
 CopyOf=Másloata
 Show=Mutat
 ShowCardHere=Kártyát mutat
@@ -175,10 +176,10 @@ User=Felhasználó
 Users=Felhasználók
 Group=Csoport
 Groups=Csoportok
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Nincs felhasználói csoport meghatározva
 Password=Jelszó
 PasswordRetype=Adja meg újra a jelszavát
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+NoteSomeFeaturesAreDisabled=Megjegyzés: rengeteg modul/eszköz ki van kapcsolva ebben a demóban.
 Name=Név
 Person=Személy
 Parameter=Paraméter
@@ -222,12 +223,12 @@ Now=Most
 HourStart=Start hour
 Date=Dátum
 DateAndHour=Date and hour
-DateToday=Today's date
+DateToday=Mai dátum
 DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
+DateStart=Kezdet dátuma
+DateEnd=Befejezés dátuma
 DateCreation=Létrehozás dátuma
-DateCreationShort=Creat. date
+DateCreationShort=Létreh. dátuma
 DateModification=Szerkesztés dátuma
 DateModificationShort=Szerk. dátuma
 DateLastModification=Utolsó szerkesztés dátuma
@@ -245,6 +246,10 @@ DateBuild=Jelentés készítés dátuma
 DatePayment=Fizetés időpontja
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=év
 DurationMonth=hónap
 DurationWeek=hét
@@ -256,6 +261,7 @@ DurationDays=nap
 Year=Év
 Month=Hónap
 Week=Hét
+WeekShort=Week
 Day=Nap
 Hour=Óra
 Minute=Perc
@@ -267,18 +273,19 @@ days=nap
 Hours=Órák
 Minutes=Percek
 Seconds=Másodpercek
-Weeks=Weeks
+Weeks=Hét
 Today=Ma
 Yesterday=Tegnap
 Tomorrow=Holnap
-Morning=Morning
-Afternoon=Afternoon
+Morning=Reggel
+Afternoon=Délután
 Quadri=Negyed
 MonthOfDay=Nap hónapja
 HourShort=Ó
-MinuteShort=mn
+MinuteShort=p
 Rate=Arány
-UseLocalTax=Include tax
+CurrencyRate=Currency conversion rate
+UseLocalTax=ÁFÁ-val
 Bytes=Byte-ok
 KiloBytes=Kilobyte-ok
 MegaBytes=Megabyte-ok
@@ -301,7 +308,7 @@ UnitPriceTTC=Egység ár
 PriceU=E.Á.
 PriceUHT=E.Á. (nettó)
 PriceUHTCurrency=U.P (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUTTC=E.Á. (adóval)
 Amount=Mennyiség
 AmountInvoice=Számla mennyiség
 AmountPayment=Fizetés mennyiség
@@ -313,8 +320,8 @@ AmountVAT=ÁFA mennyiség
 MulticurrencyAmountHT=Amount (net of tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
+AmountLT1=ÁFA mennyiség 2
+AmountLT2=ÁFA mennyiség 3
 AmountLT1ES=RE mennyiség
 AmountLT2ES=IRPF mennyiség
 AmountTotal=Teljes mennyiség
@@ -327,13 +334,13 @@ TotalHTShort=Végösszeg (nettó)
 TotalHTShortCurrency=Total (net in currency)
 TotalTTCShort=Végösszeg (bruttó)
 TotalHT=Végösszeg (nettó)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
+TotalHTforthispage=Ezen oldal végösszege (nettó)
+Totalforthispage=Végösszeg ezen az oldalon
 TotalTTC=Végösszeg (bruttó)
-TotalTTCToYourCredit=Total (inc. tax) to your credit
+TotalTTCToYourCredit=Végösszeg (bruttó) terhelve az ön számláján
 TotalVAT=ÁFA összesen
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
+TotalLT1=ÁFA összesen 2
+TotalLT2=ÁFA összesen 3
 TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
 HT=Nettó
@@ -344,7 +351,7 @@ LT1ES=RE
 LT2ES=IRPF
 VATRate=ÁFA érték
 Average=Átlag
-Sum=Szuma
+Sum=Szumma
 Delta=Delta
 Module=Modul
 Option=Opció
@@ -353,7 +360,7 @@ FullList=Teljes lista
 Statistics=Statisztika
 OtherStatistics=Egyéb statisztikák
 Status=Állapot
-Favorite=Favorite
+Favorite=Kedvenc
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Ref. extern
@@ -368,16 +375,16 @@ ActionsDoneShort=Kész
 ActionNotApplicable=Nem alkalmazható
 ActionRunningNotStarted=Nincs elkezdve
 ActionRunningShort=Elkezdett
-ActionDoneShort=Végzett
-ActionUncomplete=Uncomplete
+ActionDoneShort=Befejezett
+ActionUncomplete=Befejezetlen
 CompanyFoundation=Cég/Alapítvány
-ContactsForCompany=Kapcsolat/cím ehhez a harmadikfélhez
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Ezzel a harmadikféllel kapcsolatos cselekvések
-ActionsOnMember=Események ebben a
+ContactsForCompany=Kapcsolat/cím ehhez a harmadik félhez
+ContactsAddressesForCompany=Kapcsolat/cím ehhez a harmadik félhez
+AddressesForCompany=Cím ehhez a harmadik félhez
+ActionsOnCompany=Ezzel a harmadik féllel kapcsolatos események
+ActionsOnMember=Események ezzel a taggal kapcsolatban
 NActionsLate=%s késés
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=A kérés már rögzítve
 Filter=Szűrő
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
 RemoveFilter=Szűrő eltávolítása
@@ -387,14 +394,14 @@ GeneratedOn=Generálás %s
 Generate=Generálás
 Duration=Időtartam
 TotalDuration=Teljes időtartam
-Summary=Összefolgalás
+Summary=Összefoglalás
 DolibarrStateBoard=Statisztikák
 DolibarrWorkBoard=Munkafeladatok felület
 Available=Elérhető
 NotYetAvailable=Még nem elérhető
 NotAvailable=Nem elérhető
-Categories=Tags/categories
-Category=Tag/category
+Categories=Címkék/kategóriák
+Category=Címke/kategória
 By=által
 From=Kitől?
 to=kinek
@@ -410,8 +417,8 @@ ApprovedBy=Approved by
 ApprovedBy2=Approved by (second approval)
 Approved=Approved
 Refused=Visszautasított
-ReCalculate=Recalculate
-ResultKo=Sikerleteln
+ReCalculate=Számolja újra
+ResultKo=Sikertelen
 Reporting=Jelentés
 Reportings=Jelentés
 Draft=Piszkozat
@@ -425,14 +432,14 @@ General=Általános
 Size=Méret
 Received=Kapott
 Paid=Fizetett
-Topic=Subject
+Topic=Tárgy
 ByCompanies=Harmadik fél által
 ByUsers=Felashználó által
 Links=Linkek
 Link=Link
 Rejects=Selejtek
 Preview=Előnézet
-NextStep=Kövektező lépés
+NextStep=Következő lépés
 Datas=Adat
 None=Nincs
 NoneF=Nincs
@@ -441,8 +448,8 @@ LateDesc=Delay to define if a record is late or not depends on your setup. Ask y
 Photo=Kép
 Photos=Képek
 AddPhoto=Kép hozzáadása
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
+DeletePicture=Kép törlése
+ConfirmDeletePicture=Megerősíti a kép törlését?
 Login=Bejelentkezés
 CurrentLogin=Jelenlegi bejelentkezés
 January=Január
@@ -457,44 +464,44 @@ September=Szeptember
 October=Október
 November=November
 December=December
-JanuaryMin=Január
-FebruaryMin=Február
+JanuaryMin=Jan
+FebruaryMin=Feb
 MarchMin=Mar
-AprilMin=Április
-MayMin=Május
-JuneMin=Június
-JulyMin=Július
-AugustMin=Augusztus
-SeptemberMin=Szeptember
-OctoberMin=Október
-NovemberMin=November
-DecemberMin=December
+AprilMin=Ápr
+MayMin=Máj
+JuneMin=Jún
+JulyMin=Júl
+AugustMin=Aug
+SeptemberMin=Szept
+OctoberMin=Okt
+NovemberMin=Nov
+DecemberMin=Dec
 Month01=január
 Month02=február
 Month03=március
 Month04=április
 Month05=május
 Month06=június
-Month07=júlis
+Month07=július
 Month08=augusztus
-Month09=sueptember
+Month09=szeptember
 Month10=október
 Month11=november
 Month12=december
 MonthShort01=jan
 MonthShort02=feb
-MonthShort03=mar
-MonthShort04=apr
-MonthShort05=may
-MonthShort06=jun
-MonthShort07=jul
+MonthShort03=már
+MonthShort04=ápr
+MonthShort05=máj
+MonthShort06=jún
+MonthShort07=júl
 MonthShort08=aug
-MonthShort09=sep
+MonthShort09=szept
 MonthShort10=okt
 MonthShort11=nov
 MonthShort12=dec
-AttachedFiles=Csatolt fájlok és dokumonetumok
-FileTransferComplete=A fájl sikeresen föl lett töltve
+AttachedFiles=Csatolt fájlok és dokumentumok
+FileTransferComplete=A fájl sikeresen fel lett töltve
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -502,10 +509,10 @@ ReportName=Jelentés neve
 ReportPeriod=Jelentés periódusa
 ReportDescription=Leírás
 Report=Jelentés
-Keyword=Keyword
+Keyword=Kulcsszó
 Legend=Jelmagyarázat
-Fill=Fill
-Reset=Reset
+Fill=Kitölt
+Reset=Nulláz
 File=Fájl
 Files=Fájlok
 NotAllowed=Nem engedélyezett
@@ -519,7 +526,7 @@ NbOfThirdParties=Harmadik felek száma
 NbOfLines=Sorok száma
 NbOfObjects=Objektumok szMa
 NbOfObjectReferers=Number of related items
-Referers=Related items
+Referers=Kapcsolódó elemek
 TotalQuantity=Teljes mennyiség
 DateFromTo=%s -től %s -ig
 DateFrom=%s -től
@@ -533,14 +540,14 @@ Externals=Külső
 Warning=Figyelemeztetés
 Warnings=Figyelemeztetések
 BuildDoc=Dokumentum generálása
-Entity=Entitás
+Entity=Környezet
 Entities=Entitások
 CustomerPreview=Ügyfél előnézet
 SupplierPreview=Beszállító előnézet
 ShowCustomerPreview=Ügyfél előnézet mutatása
 ShowSupplierPreview=Beszállító előnézet mutatása
 RefCustomer=Ügyfél Ref.
-Currency=Valuta
+Currency=Pénznem
 InfoAdmin=Információ adminisztrátorok számára
 Undo=Visszacsinál
 Redo=újracsinál
@@ -553,11 +560,11 @@ Response=Válasz
 Priority=Prioritás
 SendByMail=Küldés emailben
 MailSentBy=Email feladója
-TextUsedInTheMessageBody=Email test
-SendAcknowledgementByMail=Send confirmation email
+TextUsedInTheMessageBody=Email tartalma
+SendAcknowledgementByMail=Megerősítő email küldése
 EMail=E-mail
 NoEMail=Nincs email
-NoMobilePhone=No mobile phone
+NoMobilePhone=Nincs mobilszám
 Owner=Tulajdonos
 FollowingConstantsWillBeSubstituted=Az alábbi konstansok helyettesítve leszenek a hozzájuk tartozó értékekkel.
 Refresh=Frissítés
@@ -565,21 +572,25 @@ BackToList=Vissza a listához
 GoBack=Vissza
 CanBeModifiedIfOk=Módosítható ha hitelesített
 CanBeModifiedIfKo=Módosítható ha nem hitelesített
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=A rekord sikeresen módosítva lett
-RecordsModified=%s records modified
-AutomaticCode=Autómatikus kód
+RecordsModified=%s rekord módosítva
+RecordsDeleted=%s records deleted
+AutomaticCode=Automatikus kód
 FeatureDisabled=Tiltott funkció
-MoveBox=Move widget
+MoveBox=Mozgassa a widgetet
 Offered=Felajánlott
-NotEnoughPermissions=Nincs elég jogosúltsága
+NotEnoughPermissions=Nincs jogosultsága ehhez a művelethez
 SessionName=Munkamenet neve
 Method=Módszer
 Receive=Kap
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
 Canceled=Megszakítva
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=A lista elemeit megváltoztathatja a menüben: Beállítások->Szótár
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
 Color=Szín
 Documents=Kapcsolt fájlok
@@ -588,16 +599,17 @@ UploadDisabled=Feltöltés kikapcsolva
 MenuECM=Dokumentumok
 MenuAWStats=AWStats
 MenuMembers=Tagok
-MenuAgendaGoogle=Google napirend
+MenuAgendaGoogle=Google naptár
 ThisLimitIsDefinedInSetup=Dolibarr limit (Menu home-setup-security): %s Kb, PHP limit: %s Kb
-NoFileFound=Nincs dokumentum ebben a könyvtárba
+NoFileFound=Nincs mentett dokumentum ebben a könyvtárban
 CurrentUserLanguage=Jelenlegi nyelv
 CurrentTheme=Jelenlegi téma
 CurrentMenuManager=Current menu manager
-DisabledModules=Kikapcsolt modlok
+DisabledModules=Kikapcsolt modulok
 For=For
 ForCustomer=Ügyfél részére
 Signature=Aláírás
+DateOfSignature=Date of signature
 HidePassword=Parancs mutatása rejtett jelszóval
 UnHidePassword=Igazi parancs mutatása üres jelszóval
 Root=Gyökér
@@ -616,7 +628,7 @@ MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Figyelem, karbantartási mód, csak <b>%s</b> jelentkezhet be.
 CoreErrorTitle=Rendszerhiba
 CoreErrorMessage=Sajnáljuk, de hiba történt. Ellenőrizze a naplókat vagy lépjen kapcsolatba a rendszer kezelőjével.
-CreditCard=Hitel kártya
+CreditCard=Hitelkártya
 FieldsWithAreMandatory=<b>%s</b>-al jelölt mezők kötelezőek
 FieldsWithIsForPublic=<b>%s</b>-al jelölt mezők publikusak. Ha ezt nem akarja jelölje be a "Publikus" dobozt.
 AccordingToGeoIPDatabase=(GeoIP converzió szerint)
@@ -635,18 +647,27 @@ Prefix=Előtag
 Before=Előtt
 After=Után
 IPAddress=IP-cím
-Frequency=Frekvencia
+Frequency=Gyakoriság
 IM=Azonnali üzenetküldés
 NewAttribute=Új attribútum
 AttributeCode=Attribútum kód
 URLPhoto=Url fotó / logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Tervezet készítése
-SetToDraft=Back to draft
-ClickToEdit=Kattintson a szerkeszteni
-ObjectDeleted=Az objektum törölve %s
+SetToDraft=Vissza a vázlathoz
+ClickToEdit=Kattintson a szerkesztéshez
+ObjectDeleted=Az %s objektum törölve
 ByCountry=Ország szerint
-ByTown=A város
+ByTown=Város szerint
 ByDate=Dátum szerint
 ByMonthYear=Az év / hónap
 ByYear=Az év
@@ -661,46 +682,49 @@ ModulesSystemTools=Modul eszközök
 Test=Teszt
 Element=Elem
 NoPhotoYet=Nem érhető el még fénykép
-Dashboard=Dashboard
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+Dashboard=Vezérlőpult
+Deductible=Levonható
+from=tól
+toward=felé
+Access=Hozzáférés
+SelectAction=Válasszon tevékenységet
+HelpCopyToClipboard=Használja a Ctrl+C kombinációt a vágólapra másoláshoz
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
+OriginFileName=Eredeti fájlnév
+SetDemandReason=Forrás beállítása
+SetBankAccount=Bankszámla megadása
+AccountCurrency=Számla pénzneme
+ViewPrivateNote=Megjegyzések
+XMoreLines=%s sor rejtve maradt
+PublicUrl=Nyílvános URL
 AddBox=Add box
 SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
+PrintFile=%s fájl nyomtatása
 ShowTransaction=Show transaction on bank account
 GoIntoSetupToChangeLogo=Go into Home - Setup - Company to change logo or go into Home - Setup - Display to hide.
 Deny=Deny
 Denied=Denied
 ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
+Gender=Nem
+Genderman=Férfi
+Genderwoman=Nő
 ViewList=List view
-Mandatory=Mandatory
+Mandatory=Kötelező kitölteni
 Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line ?
+Sincerely=Tisztelettel
+DeleteLine=Sor törlése
+ConfirmDeleteLine=Biztosan törölni akarja ezt a sort?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
 TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
 MassFilesArea=Area for files built by mass actions
 ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
+RelatedObjects=Kapcsolódó objektumok
+ClassifyBilled=Minősítse kiszámlázottként
+Progress=Előrehaladás
+ClickHere=Kattintson ide
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Hétfő
 Tuesday=Kedd
@@ -709,13 +733,13 @@ Thursday=Csütörtök
 Friday=Péntek
 Saturday=Szombat
 Sunday=Vasárnap
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=Mi
-ThursdayMin=Th
-FridayMin=Fr
-SaturdayMin=Sa
-SundayMin=Su
+MondayMin=Hé
+TuesdayMin=Ke
+WednesdayMin=Sze
+ThursdayMin=Csüt
+FridayMin=Pé
+SaturdayMin=Szo
+SundayMin=Vas
 Day1=Hétfő
 Day2=Kedd
 Day3=Szerda
@@ -733,27 +757,27 @@ ShortSunday=V
 SelectMailModel=Select email template
 SetRef=Set ref
 Select2ResultFoundUseArrows=
-Select2NotFound=No result found
+Select2NotFound=Nincs találat
 Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
-SearchIntoMembers=Members
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
+Select2MoreCharacter=vagy több betű
+Select2MoreCharacters=vagy több karakter
+Select2LoadingMoreResults=További eredmények betöltése...
+Select2SearchInProgress=Keresés folyamatban...
+SearchIntoThirdparties=Partnerek
+SearchIntoContacts=Kapcsolatok
+SearchIntoMembers=Tagok
+SearchIntoUsers=Felhasználók
+SearchIntoProductsOrServices=Termékek vagy Szolgáltatások
+SearchIntoProjects=Projektek
+SearchIntoTasks=Tennivalók
+SearchIntoCustomerInvoices=Ügyfél számlák
+SearchIntoSupplierInvoices=Beszállítói számlák
 SearchIntoCustomerOrders=Ügyfél megrendelések
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=Expense reports
+SearchIntoSupplierOrders=Beszállítói megrendelések
+SearchIntoCustomerProposals=Ügyfél ajánlatok
+SearchIntoSupplierProposals=Beszállítói ajánlatok
+SearchIntoInterventions=Beavatkozások
+SearchIntoContracts=Szerződések
+SearchIntoCustomerShipments=Vásárlói kiszállítások
+SearchIntoExpenseReports=Költség kimutatások
 SearchIntoLeaves=Leaves
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index 3e04327b345..ad55c18405b 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/hu_HU/oauth.lang b/htdocs/langs/hu_HU/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/hu_HU/oauth.lang
+++ b/htdocs/langs/hu_HU/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index 27c9e11b714..51e1c3cd0ff 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=A megrendelései elkészültek
 OrderFail=Hiba történt a megrendelések készítése közben
 CreateOrders=Megrendelések készítése
 ToBillSeveralOrderSelectCustomer=Több megrendeléshez tartozó számla elkészítéséhez először kattintson a partnerre, majd válassza ki: "%s"
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/hu_HU/printing.lang b/htdocs/langs/hu_HU/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/hu_HU/printing.lang
+++ b/htdocs/langs/hu_HU/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 16ee8de0cec..9bdf2550134 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Számviteli kód (vásárolni)
-ProductAccountancySellCode=Számviteli kód (eladás)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Termék vagy Szolgáltatás
 ProductsAndServices=Termékek és Szolgáltatások
 ProductsOrServices=Termékek vagy Szolgáltatások
@@ -34,8 +34,8 @@ LastRecordedProducts=Latest %s recorded products
 LastRecordedServices=Latest %s recorded services
 CardProduct0=Product card
 CardProduct1=Service card
-Stock=Részvény
-Stocks=Részvények
+Stock=Készlet
+Stocks=Készletek
 Movements=Mozgások
 Sell=Értékesítés
 Buy=Vásárlások
@@ -50,17 +50,19 @@ ProductStatusOnBuy=A vásárlás
 ProductStatusNotOnBuy=Nem vásárolható
 ProductStatusOnBuyShort=A vásárlás
 ProductStatusNotOnBuyShort=Nem vásárolható
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+UpdateVAT=ÁFA frissítése
+UpdateDefaultPrice=Alapár fissítése
+UpdateLevelPrices=Árak frissítése minden szinten
 AppliedPricesFrom=Alkalmazott árak
 SellingPrice=Eladási ár
 SellingPriceHT=Eladási ár (nettó)
 SellingPriceTTC=Eladási ár (bruttó)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Új ár
-MinPrice=Min. selling price
+MinPrice=Min. eladási ár
 CantBeLessThanMinPrice=Az eladási ár nem lehet kisebb a minimum árnál (nettó %s)
 ContractStatusClosed=Lezárva
 ErrorProductAlreadyExists=Egy terméke ezzel a referenciával %s már létezik.
@@ -109,8 +111,8 @@ ExportDataset_produit_1=Termékek
 ExportDataset_service_1=Szolgáltatások
 ImportDataset_produit_1=Termékek
 ImportDataset_service_1=Szolgáltatások
-DeleteProductLine=Termék vonal törlése
-ConfirmDeleteProductLine=Biztos törölni akarja ezt a termék vonalat?
+DeleteProductLine=Termékvonal törlése
+ConfirmDeleteProductLine=Biztos törölni akarja ezt a termékvonalat?
 ProductSpecial=Különleges
 QtyMin=Min. mennyiség
 PriceQtyMin=A min. mennyiség ára (áreng. nélkül)
@@ -139,30 +141,30 @@ ClonePricesProduct=Fő információk és árak klónozása
 CloneCompositionProduct=Előre csomagolt termék/szolgáltatás duplikálása
 ProductIsUsed=Ez a termék használatban van
 NewRefForClone=Új termék/szolgáltatás ref#.
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
+SellingPrices=Eladási árak
+BuyingPrices=Vételi árak
 CustomerPrices=Végfelhasználói árak
 SuppliersPrices=Beszállítói árak
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
+SuppliersPricesOfProductsOrServices=Beszállítói árak (termék vagy szolgáltatás)
 CustomCode=Vámkódex
 CountryOrigin=Származási ország
 Nature=Természet
-ShortLabel=Short label
-Unit=Unit
-p=u.
+ShortLabel=Rövid címke
+Unit=Egység
+p=db.
 set=set
 se=set
-second=second
-s=s
-hour=hour
-h=h
-day=day
-d=d
-kilogram=kilogram
+second=másodperc
+s=mp
+hour=óra
+h=ó
+day=nap
+d=n
+kilogram=kiló
 kg=Kg
-gram=gram
+gram=gramm
 g=g
-meter=meter
+meter=méter
 m=m
 lm=lm
 m2=m²
@@ -175,11 +177,11 @@ CurrentProductPrice=Aktuális ár
 AlwaysUseNewPrice=Mindig a termék/szolgáltatás aktuális árát használja
 AlwaysUseFixedPrice=Használja a fix árat
 PriceByQuantity=Mennyiségtől függő ár
-PriceByQuantityRange=Quantity range
-MultipriceRules=Price segment rules
+PriceByQuantityRange=Mennyiségi intervallum
+MultipriceRules=Árazási szabályok
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
+PercentVariationOver=%% változó ár %s fölött
+PercentDiscountOver=%% kedvezmény %s fölött
 ### composition fabrication
 Build=Produce
 ProductsMultiPrice=Termékek és árak ár szegmensenként
@@ -197,44 +199,44 @@ PrintsheetForOneBarCode=Több matrica nyomtatása egyetlen vonalkóddal
 BuildPageToPrint=Oldal generálása nyomtatáshoz
 FillBarCodeTypeAndValueManually=Adja meg a vonalkód típusát és értékét.
 FillBarCodeTypeAndValueFromProduct=Vonalkód típusának és értékének megadása létező termékről
-FillBarCodeTypeAndValueFromThirdParty=Harmadik féltől származó vonalkód használata
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=A %s termék számára megadott vonalkód nem teljes.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
+PriceByCustomer=Egyedi ár minden vevő számára
+PriceCatalogue=Egyetlen eladási ár termékenként/szolgáltatásonként
 PricingRule=Rules for sell prices
 AddCustomerPrice=Add price by customer
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+MinimumPriceLimit=A minimális ár nem lehet kisebb mint %s
+MinimumRecommendedPrice=A minimális ajánlott ár: %s
+PriceExpressionEditor=Ármeghatározó képletszerkesztő
+PriceExpressionSelected=Aktuális ármeghatározó képlet
+PriceExpressionEditorHelp1="price = 2 + 2" vagy "2 + 2" az ár meghatározásához. Használjon ";"-t a képletek elválasztásához
 PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
+PriceExpressionEditorHelp5=Elérhető globális értékek:
+PriceMode=Ár mód
+PriceNumeric=Szám
+DefaultPrice=Alapár
+ComposedProductIncDecStock=Növelje/csökkentse a készletet a szülő termék változásakor
 ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-MinCustomerPrice=Minimum customer price
+MinSupplierPrice=Minimális beszállítói ár
+MinCustomerPrice=Minimális végfelhasználói ár
 DynamicPriceConfiguration=Dynamic price configuration
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
 AddVariable=Add Variable
 AddUpdater=Add Updater
-GlobalVariables=Global variables
+GlobalVariables=Globális változók
 VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
+GlobalVariableUpdaters=Globális változók frissítése
+UpdateInterval=Frissítési periódus (perc)
+LastUpdated=Utoljára frissítve
+CorrectlyUpdated=Rendben frissítve
 PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
 PropalMergePdfProductChooseFile=Select PDF files
 IncludingProductWithTag=Including product/service with tag
@@ -242,15 +244,15 @@ DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on
 WarningSelectOneDocument=Please select at least one document
 DefaultUnitToShow=Unit
 NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
+ClinkOnALinkOfColumn=Kattintson a %s oszlop hivatkozására a részletes nézethez...
 TranslatedLabel=Translated label
 TranslatedDescription=Translated description
 TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
+ProductWeight=1 termék súlya
+ProductVolume=1 termék térfogata
+WeightUnits=Súly egység
+VolumeUnits=Térfogat egység
+SizeUnits=Méret egység
 DeleteProductBuyPrice=Delete buying price
 ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
 
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index beb0cd47134..3669a68412a 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=A projekthez tartozó kereskedelmi ajánlatok listája
-ListOrdersAssociatedProject=A projekthez tartozó ügyfél megrendelések listája
-ListInvoicesAssociatedProject=A projekthez tartozó ügyfél számlák listája
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=A projekthez tartozó beszállítói rendelések listája
-ListSupplierInvoicesAssociatedProject=A projekthez tartozó beszállítói számlák listája
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=A projekthez tartozó szerződések listája
 ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang
index f95121db351..e83bf66e481 100644
--- a/htdocs/langs/hu_HU/resource.lang
+++ b/htdocs/langs/hu_HU/resource.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Erőforrások
+MenuResourceAdd=Új erőforrás
+DeleteResource=Erőforrás törlése
+ConfirmDeleteResourceElement=Hagyja jóvá az elemhez tartozó erőforrás törlését
+NoResourceInDatabase=Nincs erőforrás az adatbázisban
+NoResourceLinked=Nincs kapcsolt erőforrás
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Erőforrás-lista
+ResourceSingular=Erőforrás
+ResourceCard=Erőforrás kártya
+AddResource=Erőforrás létrehozása
+ResourceFormLabel_ref=Erőforrás neve
+ResourceType=Erőforrás típusa
+ResourceFormLabel_description=Erőforrás leírása
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Elemhez kapcsolt erőforrások 
 
-ShowResource=Show resource
+ShowResource=Mutassa meg az erőforrást
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Erőforrások
+ResourceCreatedWithSuccess=Az erőforrás sikeresen létrehozva
+RessourceLineSuccessfullyDeleted=Az erőforrás vonal sikeresen törölve
+RessourceLineSuccessfullyUpdated=Az erőforrás vonal sikeresen frissítve
+ResourceLinkedWithSuccess=Az erőforrás kapcsolása sikeres
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=Hagyja jóvá az erőforrás törlését
+RessourceSuccessfullyDeleted=Az erőforrás sikeresen törölve
+DictionaryResourceType=Erőforrás típusa
 
-SelectResource=Select resource
+SelectResource=Válasszon erőforrást
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 0630420eeb5..1380df4edb3 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Küldés törlése
 Stock=Készlet
 Stocks=Készletek
 StocksByLotSerial=Készletek tétel/cikkszám alapján
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Mozgások
 ErrorWarehouseRefRequired=Raktár referencia név szükséges
 ListOfWarehouses=Raktárak listája
@@ -42,7 +44,8 @@ EnhancedValue=Érték
 PMPValue=Súlyozott átlagár
 PMPValueShort=SÁÉ
 EnhancedValueOfWarehouses=Raktárak értéke
-UserWarehouseAutoCreate=Raktár autómatikus létrehozása felhasználó létrehozásakor
+UserWarehouseAutoCreate=Raktár automatikus létrehozása felhasználó létrehozásakor
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=A termék és származtatott elemeinek készlete egymástól függetlenek
 QtyDispatched=Mennyiség kiküldése
 QtyDispatchedShort=Kiadott mennyiség
@@ -120,8 +123,8 @@ StockMustBeEnoughForShipment= Stock level must be enough to add product/service
 MovementLabel=Mozgás címkéje
 InventoryCode=Mozgás vagy leltár kód
 IsInPackage=Csomag tartalmazza
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
+WarehouseAllowNegativeTransfer=A készlet lehet negatív
+qtyToTranferIsNotEnough=Nincs elegendő készlete a forrásraktárban
 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
@@ -132,3 +135,9 @@ OpenAll=Nyitott minden műveletre
 OpenInternal=Nyitott belső műveletekre
 OpenShipping=Nyitott szállításra
 OpenDispatch=Nyitott feladásra
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index 6b2ef9e34df..11a01286351 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index 35eb1b1c13f..6dcf6d633da 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -7,13 +7,13 @@ History=Történet
 ListOfSuppliers=Beszállítók listája
 ShowSupplier=Bzállító mutatása
 OrderDate=Megrendelés dátuma
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Néhány altermékhez nincs ár megadva
-AddSupplierPrice=Beszállítói ár hozzáadása
-ChangeSupplierPrice=Beszállítói ár megváltoztatása
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ez a beszállító már hozzá van rendelve van ehhez az azonosítóhoz: %s
 NoRecordedSuppliers=Nincs beszállító bejegyezve
 SupplierPayment=Beszállítói kifizetése
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Beszállítói rendelések listája
 MenuOrdersSupplierToBill=Beszállítói rendelések számlázáshoz
 NbDaysToDelivery=Beszállítási késedelem napokban
 DescNbDaysToDelivery=A megrendelésben lévő termékek legnagyobb késedelme.
-UseDoubleApproval=Kétszeres jóváhagyást használjon ha az összeg (adó nélkül) nagyobb mint (A második jóváhagyást bármelyik, megfelelő engedéllyel rendelkező felhasználó elvégezheti. Állítsa 0-ra, ha nem akar kettős jóváhagyást)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index fcf108b6d21..6d103db6523 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Rendszergazda
 DefaultRights=Alapértelmezett engedélyek
 DefaultRightsDesc=Itt adhatja meg az <u>alapértelmezett</u> jogokat amiket az <u>új felhasználók</u> autómatikusan megkapnak (A meglévő felasználók engedélyeit a felhasználó kártyáján szerkesztheti).
 DolibarrUsers=Dolibarr felhasználók
-LastName=Last Name
+LastName=Vezetéknév
 FirstName=Keresztnév
 ListOfGroups=Csoportok listája
 NewGroup=Új csoport
@@ -45,8 +45,8 @@ RemoveFromGroup=Eltávolítás a csoportból
 PasswordChangedAndSentTo=A jelszó megváltoztatva és elküldve: <b>%s</b>.
 PasswordChangeRequestSent=<b>%s</b> által kért jelszóváltoztatás el lett küldve ide: <b>%s</b>.
 MenuUsersAndGroups=Felhasználók és csoportok
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Utóbbi %s létrehozott csoportok
+LastUsersCreated=Utóbbi %s létrehozott felhasználók
 ShowGroup=Csoport mutatása
 ShowUser=Felhasználó mutatása
 NonAffectedUsers=Nem érintett felhasználók
@@ -98,5 +98,8 @@ OpenIDURL=OpenID URL
 LoginUsingOpenID=Használd az OpenID-t a belépéshez
 WeeklyHours=Heti munkaóra
 ColorUser=A felhasználó színe
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
+DisabledInMonoUserMode=Karbantartási módban kikapcsolt
+UserAccountancyCode=Ügyfél számviteli kódja
+UserLogoff=Felhasználó kilépés
+UserLogged=Felhasználó naplózva
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 14c0d1198ec..90a8200d57f 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index 719bd051e77..442fd9a33fc 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Vásárlói házszabályok terület
-StandingOrders=Házszabályok
-StandingOrder=Házszabály
-NewStandingOrder=Új Házszabály
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Feldolgozásához
-WithdrawalsReceipts=Visszavonási bizonylatok
-WithdrawalReceipt=Visszavonási bizonylat
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Visszavonási sorok
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Visszavonásra váró bizonylat
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Visszavonási mennyiség
-WithdrawsRefused=Visszavonás elutasítva
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Felelős felhasználó
-WithdrawalsSetup=Visszavonás beállítás
-WithdrawStatistics=Visszavonási statisztikák
-WithdrawRejectStatistics=Visszavonás elutasitási statisztikák
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Visszavonási kérelem létrehozása
 ThirdPartyBankCode=Harmadik fél Bank kód
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Megtagadta
 StatusMotif0=Meghatározatlan
 StatusMotif1=Rendelkezni insuffisante
 StatusMotif2=Conteste tirázs
-StatusMotif3=Nem visszavonása érdekében
+StatusMotif3=No direct debit payment order
 StatusMotif4=Az ügyfelek érdekében
 StatusMotif5=RIB inexploitable
 StatusMotif6=Számla nélküli egyenleg
@@ -61,28 +62,43 @@ 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=Bankszámla kapni kilép
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Kifizetése érdekében állt a bank által %s
-InfoCreditMessage=A folyamatos rendelés %s fizettek a bank által <br> Adatok fizetési: %s
-InfoTransSubject=Továbbítása érdekében %s álló banki
-InfoTransMessage=A folyamatos rendelés %s már transmited a bank %s %s. <br><br>
+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>
 InfoTransData=Összeg: %s <br> Metode: %s <br> Dátum: %s
-InfoRejectSubject=Állandó érdekében hajlandó
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Opció a valós módban nem volt beállítva, akkor hagyja abba ezt követően szimuláció
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index d0c61267a01..cb71559b718 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow modul beállítása
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index 2c69df62352..18ed385c417 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Jurnal
 JournalFinancial=Jurnal Keuangan
 BackToChartofaccounts=Akun grafik pembalik
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Pilih bagan akun
 Addanaccount=Tambahkan sebuah akun akuntansi
 AccountAccounting=Akun akuntansi
 AccountAccountingShort=Akun
 AccountAccountingSuggest=Menyarankan akun akuntansi 
-Ventilation=Perincian
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Akuntansi
-CustomersVentilation=Perincian pelanggan
-SuppliersVentilation=Perincian pemasok
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Laporan
 NewAccount=Akun akuntansi baru
 Create=Buat
-CreateMvts=Buat perpindahan
-UpdateMvts=Modifikasi gerakan
-WriteBookKeeping=Mencatat akun di buku besar
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Buku besar
 AccountBalance=Saldo akun
 
 CAHTF=Total pembelian pemasok sebelum pajak
-InvoiceLines=Baris faktur untuk ventilasi
-InvoiceLinesDone=Tagihan baris berventilasi
-IntoAccount=Ventilasi di akun akuntansi
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilasi
+Ventilate=Bind
 
 Processing=Pengolahan
 EndProcessing=Akhir dari pengolahan
-AnyLineVentilate=Setiap baris untuk diventilasi
+AnyLineVentilate=Any lines to bind
 SelectedLines=Baris yg dipilih
 Lineofinvoice=Baris tagihan
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Panjang akun umum
-ACCOUNTING_LENGTH_AACCOUNT=Panjang akun pihak ketiga
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Jurnal Penjualan
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal Pembelian
@@ -81,32 +102,31 @@ Sens=Sen
 Codejournal=Jurnal
 NumPiece=Jumlah potongan
 AccountingCategory=Kategori akuntansi
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Hapus catatan buku besar
-
 DescSellsJournal=Jurnal Penjualan
 DescPurchasesJournal=Jurnal Pembelian
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Pembayaran Nota Pelanggan
-
 ThirdPartyAccount=Akun pihak ketiga
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debet dan Kredit tidak boleh ada nilai di saat yg sama
 
-ReportThirdParty=Daftar akun pihak ketiga
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Daftar akun-akun akunting
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total margin penjualan
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validasi Otomatis
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Kesalahan, Anda tidak dapat menghapus akun akuntansi ini karena digunakan
 MvtNotCorrectlyBalanced=Perpindahan tidak benar seimbang . Kredit = %s . Debit = %s
-FicheVentilation=Kartu rincian
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operasi ditulis dalam buku besar
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Terapkan kategori secara massal
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=init akuntansi
-InitAccountancyDesc=Halaman ini dapat digunakan untuk menginisialisasi akun akuntansi pada produk dan jasa yang tidak memiliki akun akuntansi yang ditetapkan untuk penjualan dan pembelian. Periksa dahulu seting modul akuntansi apakah selesai .
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Pilihan
 OptionModeProductSell=Mode penjualan
 OptionModeProductBuy=Mode pembelian
 OptionModeProductSellDesc=Tampilkan semua produk yang belum ditetapkan akun akuntansi untuk penjualan.
 OptionModeProductBuyDesc=Tampilkan semua produk yang belum ditetapkan akun akuntansi untuk pembelian.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Rentang akun-akun akuntansi
@@ -167,3 +196,9 @@ Formula=Rumus
 ErrorNoAccountingCategoryForThisCountry=Tidak ada kategori akuntansi yang tersedia untuk negara ini
 ExportNotSupported=Format ekspor yang diseting tidak sesuai untuk halaman ini
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 76e5c7dd3cf..342b439b75e 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Percobaan
 VersionDevelopment=Pengembangan
 VersionUnknown=Tidak diketahui
 VersionRecommanded=Direkomendasikan
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesi ID
 SessionSaveHandler=Handler untuk menyimpan sesi
 SessionSavePath=Peyimpanan untuk lokalisasi sesi
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Ada yang salah, presisi yang lebih tinggi dar
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Nilai atau value 'system' dan 'systemauto' untuk tipe / type sudah ada. Anda bisa menggunakan 'user' sebagai nilai / value untuk membuat pencatatan / record Anda sendiri.
 ErrorCodeCantContainZero=Kode tidak boleh menggandung nilai / value 0
 DisableJavascript=Menonaktifkan JavaScript dan Ajax fungsi (Direkomendasikan untuk orang buta orang atau teks browser)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr karakter untuk memicu pencarian:% s
 NotAvailableWhenAjaxDisabled=Tidak tersedia ketika Ajax dinonaktifkan
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript dinonaktifkan
 UsePreviewTabs=Gunakan tab pratinjau
 ShowPreview=Tampilkan pratinjau
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Izin
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Versi Dolibarr saat ini
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Suku VAT lama
 NewVATRates=Suku VAT baru
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Daftar Pilihan
 ExtrafieldSelectList = Pilih dari tabel
 ExtrafieldSeparator=Pembatas
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Pengguna & Grup
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifikasi
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Sumbangan
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=diakhir bulan
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Selalu Aktif
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index d6fe185cd02..220f2d62bd1 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 5ed3cfce50b..7d23b31bd7b 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Ada kesalahan, tagihan yang pern
 BillFrom=Dari
 BillTo=Kepada
 ActionsOnBill=Tindak lanjut tagihan
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/id_ID/boxes.lang b/htdocs/langs/id_ID/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/id_ID/boxes.lang
+++ b/htdocs/langs/id_ID/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/id_ID/categories.lang b/htdocs/langs/id_ID/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/id_ID/categories.lang
+++ b/htdocs/langs/id_ID/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 0cc440407ac..f9baf213027 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=ID Pihak Ketiga
 IdCompany=ID Perusahaan
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index 94c757db84a..cbb04367014 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 75716bc1c9c..0b010cba7ec 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=PHP ini mendukung fungsi grafik GD
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=PHP ini mendukung fungsi UTF8
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=PHP anda tidak mendukung fungsi grafik GD. Grafik tidak dapat ditampilkan
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=PHP anda tidak mendukung fungsi UTF8. Dolibarr tidak dapat berfungsi semestinya. Selesaikan hal tersebut sebelum proses instalasi Dolibarr
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/id_ID/interventions.lang b/htdocs/langs/id_ID/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/id_ID/interventions.lang
+++ b/htdocs/langs/id_ID/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/id_ID/ldap.lang b/htdocs/langs/id_ID/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/id_ID/ldap.lang
+++ b/htdocs/langs/id_ID/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/id_ID/mails.lang b/htdocs/langs/id_ID/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/id_ID/mails.lang
+++ b/htdocs/langs/id_ID/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index facae87437d..62f00179504 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/id_ID/margins.lang
+++ b/htdocs/langs/id_ID/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/id_ID/oauth.lang b/htdocs/langs/id_ID/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/id_ID/oauth.lang
+++ b/htdocs/langs/id_ID/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/id_ID/printing.lang b/htdocs/langs/id_ID/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/id_ID/printing.lang
+++ b/htdocs/langs/id_ID/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 6abeef7ee12..44df06e087e 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 52e40b871ea..aabafe76a3d 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 55a4ccc094d..bbf3eed9b46 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Pembayaran Gaji Baru
 SalaryPayment=Pembayaran Gaji
 SalariesPayments=Pembayaran Gaji
 ShowSalaryPayment=Menampilkan Pembayaran Gaji
-THM=rata - rata per jam
-TJM=rata - rata per hari
+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
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/id_ID/supplier_proposal.lang b/htdocs/langs/id_ID/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/id_ID/supplier_proposal.lang
+++ b/htdocs/langs/id_ID/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index 2b4cfcd70c5..5ce8241edfe 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -7,13 +7,13 @@ History=Riwayat
 ListOfSuppliers=Daftar Suplier
 ShowSupplier=Tampilkan suplier
 OrderDate=Tanggal Pemesanan
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Tambahkan harga suplier
-ChangeSupplierPrice=Ubah harga suplier
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=Tidak ada suplier tersimpan
 SupplierPayment=Pembayaran suplier
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Daftar pesanan suplier
 MenuOrdersSupplierToBill=Pesanan suplier menjadi invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/id_ID/website.lang b/htdocs/langs/id_ID/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/id_ID/website.lang
+++ b/htdocs/langs/id_ID/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/id_ID/withdrawals.lang b/htdocs/langs/id_ID/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/id_ID/withdrawals.lang
+++ b/htdocs/langs/id_ID/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/id_ID/workflow.lang b/htdocs/langs/id_ID/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/id_ID/workflow.lang
+++ b/htdocs/langs/id_ID/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 719f3db339c..fe3296f25f3 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Þróun
 VersionUnknown=Óþekkt
 VersionRecommanded=Mælt
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler að vista fundur
 SessionSavePath=Bílskúr fundur localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Villa, a nákvæmni hærra <b>en %s </b> er e
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=NBR af stöfum til að kalla fram leit: %s
 NotAvailableWhenAjaxDisabled=Ekki í boði þegar Ajax fatlaðra
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript fatlaðra
 UsePreviewTabs=Nota forsýning tabs
 ShowPreview=Sýna forskoðun
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Umrita tvöfaldur gögn í sextánskur
 IgnoreDuplicateRecords=Hunsa villurnar af afrit records (INSERT hunsa)
 AutoDetectLang=Finna sjálfkrafa (vafrara tungumál)
 FeatureDisabledInDemo=Lögun fatlaður í kynningu
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Heimildir
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Aðeins atriði frá <a href="%s">virkt einingar</a> eru birtar.
-ModulesDesc=Dolibarr mát tilgreina hvaða virkni er virkt í hugbúnaði. Sum mát þurfa leyfi þér að veita notendum eftir kleift mát.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Meira mát ...
 DoliStoreDesc=DoliStore, opinber markaður staður fyrir Dolibarr ERP / CRM ytri mát
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr núverandi útgáfa
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Þú getur fært inn hvaða tala lagsins. Í þessu maska gæti eftirfarandi tög að nota: <br> <b>(000000)</b> samsvarar fjölda sem verður incremented á hverjum %s . Sláðu inn eins mörg núll og löngun lengd borðið. Teljarinn verður lokið við núllum frá vinstri til að fá eins mörg núll og lagsins. <br> <b>(000000 000)</b> sami eins og fyrri en að vega upp á móti sem svarar til fjölda til hægri á + merki er notað sem hófst á fyrsta %s . <br> <b>(000000 @ x)</b> sami eins og fyrri en borðið er endurstilla á núll þegar mánaðar x er náð (x á milli 1 og 12). Ef þessi möguleiki er notaður og x er 2 eða hærra, þá röð (YY) (mm) eða (áááá) (mm) er einnig nauðsynleg. <br> <b>(Dd)</b> dag (01-31). <br> <b>(Mm)</b> mánuði (01-12). <br> <b>(YY), (áááá)</b> eða <b>(y)</b> ár yfir 2, 4 eða 1 númer. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Allir aðrir stafir í möskva haldast óbreytt. <br> Bil eru ekki leyfð. <br>
 GenericMaskCodes4a=<u>Dæmi um 99 %s  af þriðja aðila TheCompany gert 2007/01/31:</u> <br>
 GenericMaskCodes4b=<u>Dæmi um þriðja aðila skapa á 2007/3/1:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Breytur til að tryggja vefslóðir
 SecurityTokenIsUnique=Nota einstakt securekey breytu fyrir hvert slóð
 EnterRefToBuildUrl=Sláðu inn tilvísun til %s mótmæla
 GetSecuredUrl=Fá reiknað slóð
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Notendur & hópar
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Strikamerki er stjórnun
 Module56Name=Símtækni
 Module56Desc=Símtækni sameining
-Module57Name=Standandi pantanir
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sameining
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar sameining
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Tilkynningar
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Fjárframlög
 Module700Desc=Framlög í stjórnun
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lesa þjónustuveitenda
 Permission147=Lesa Stats
-Permission151=Lesa standa pantanir
-Permission152=Búa til / breyta standandi fyrirmæli ósk
-Permission153=Lesa standandi fyrirmæli kvittunum
-Permission154=Útlán / neita standa pantanir kvittanir
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Útflutningur birgir reikninga, eiginleika og greiðslur
 Permission1237=Export supplier orders and their details
 Permission1251=Setja massa innflutningi af ytri gögn inn í gagnagrunn (gögn álag)
 Permission1321=Útflutningur viðskiptavina reikninga, eiginleika og greiðslur
+Permission1322=Reopen a paid bill
 Permission1421=Útflutningur viðskiptavina pantanir og eiginleika
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Merki notaður við vanræksla, ef ekki þýðingu er að fin
 LabelOnDocuments=Merki um skjöl
 NbOfDays=ATH daga
 AtEndOfMonth=Í lok mánaðar
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Alltaf virkar
 Upgrade=Uppfærsla
@@ -950,7 +967,7 @@ LogEventDesc=Þú getur gert hér skráir þig inn Dolibarr öryggi viðburðir.
 AreaForAdminOnly=Þessir eiginleikar geta vera notaður af <b>notendum og stjórnandi</b> aðeins.
 SystemInfoDesc=Kerfi upplýsingar er ýmis tæknilegar upplýsingar sem þú færð í lesa aðeins háttur og sýnileg Aðeins kerfisstjórar.
 SystemAreaForAdminOnly=Þetta svæði er í boði fyrir notendur stjórnandi aðeins. Ekkert af Dolibarr leyfi getur dregið þessi mörk.
-CompanyFundationDesc=Breyta á þessari síðu öllum þekktum upplýsingum um fyrirtæki eða stofnun sem þú þarft til að stjórna
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Þú getur valið hvert stika sem tengist Dolibarr útlit og feel hér
 AvailableModules=Laus mát
 ToActivateModule=Til að virkja mát, fara á svæðinu skipulag (Home-> Uppsetning-> mát).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Aðvörun, á sumum Linux kerfi, að senda tölvupóst
 PathToDocuments=Path að skjölum
 PathDirectory=Listinn
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Nota TLS
 LDAPServerUseTLSExample=Your LDAP miðlara nota TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Stjórnandi DN
-LDAPAdminDnExample=Heill DN (Dæmi: cn = adminldap, DC = samfélaginu, DC = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Stjórnandi lykilorð
 LDAPUserDn=Notandi 'DN
 LDAPUserDnExample=Heill DN (Dæmi: OU = notendur, dc-= samfélaginu, DC = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Dæmi: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Dæmi: objectsid
 LDAPFieldEndLastSubscription=Dagsetning áskrift enda
-LDAPFieldTitle=Post / virka
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP skipulag heill ekki (fara á aðra tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nei stjórnandi eða aðgangsorðið sem þú fékkst. LDAP aðgang mun vera nafnlaus og lesa aðeins ham.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Vörur og Þjónusta einingar skipulag
 NumberOfProductShowInSelect=Max fjöldi vara í combos velja lista (0 = ótakmarkað)
 ViewProductDescInFormAbility=Sjónræn framsetning lýsingar vara í formum (annars eins og tól almenningur)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Sjónræn af vörum lýsingar á thirdparty tungumáli
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode tegund til nota fyrir vörur
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Uppsögn mát skipulag
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Ytri RSS innflutnings skipulag
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index 70b1eb49613..c80d3842098 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Sættir
 RIB=Bankareikningur Fjöldi
 IBAN=IBAN númer
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT númer
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standandi pantanir
-StandingOrder=Standandi pöntun
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Reikningsyfirlit
 AccountStatementShort=Yfirlýsing
 AccountStatements=Reikningur yfirlýsingar
@@ -78,6 +74,7 @@ AccountToCredit=Reikningur til að lána
 AccountToDebit=Reikning til skuldfærslu
 DisableConciliation=Slökkva á sáttum lögun fyrir þennan reikning
 ConciliationDisabled=Sættir lögun fatlaðra
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Loka
 AccountIdShort=Fjöldi
@@ -87,6 +84,8 @@ AddBankRecordLong=Bæta við viðskipti með höndunum
 ConciliatedBy=Sáttir við
 DateConciliating=Samræmdu dagsetningu
 BankLineConciliated=Færsla sáttir
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Viðskiptavinur greiðslu
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Afturköllun greiðslu
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Millifærslu
 BankTransfers=Millifærslur
-TransferDesc=Flytja frá einum reikningi til annars einn, Dolibarr skrifa tvær færslur (a skuldfærslu á reikningi uppspretta og inneign á reikningi miðað, að sömu upphæð. Sama merki og dagsetning verður notað fyrir þessa færslu)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Frá
 TransferTo=Til að
 TransferFromToDone=A flytja <b>úr %s  í %s  af %s %</b> s hefur verið skráð.
@@ -129,7 +129,7 @@ FutureTransaction=Færsla í futur. Engin leið til leitar sátta.
 SelectChequeTransactionAndGenerate=Select / sía ávísanir til fela í innborgun stöðva móttöku og smelltu á &quot;Create.&quot;
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 38cc70a68c4..c20ae657140 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Villa, get ekki hætt við reikn
 BillFrom=Frá
 BillTo=Senda á
 ActionsOnBill=Actions reikning
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Afsláttur í boði (greiðsla fyrir tíma)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standandi pantanir
-StandingOrder=Standandi pöntun
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nei drög reikninga
 NoOtherDraftBills=Engin önnur reikningum drög
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bankans til
-PaymentTypeShortPRE=Bankans til
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Kreditkort
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Skipulegra á
 ChequeNumber=Athugaðu n °
 ChequeOrTransferNumber=Athuga / Flytja n °
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Seðlabanka Athuga
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Borgað af þessari greiðslu
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu &quot;borgað&quot;.
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice líkan Crabe. A heill Reikningar líkan (styður VSK valkostur, afslætti, greiðslur skilyrði, merki, osfrv ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/is_IS/boxes.lang b/htdocs/langs/is_IS/boxes.lang
index 042fe4ef7f5..7736dade4ec 100644
--- a/htdocs/langs/is_IS/boxes.lang
+++ b/htdocs/langs/is_IS/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Elsta virkir útrunnin þjónustu
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=reikninga viðskiptavinar
 ForCustomersOrders=Customers orders
 ForProposals=Tillögur
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/is_IS/cashdesk.lang b/htdocs/langs/is_IS/cashdesk.lang
index b14d4ff3b1f..534899ba7ff 100644
--- a/htdocs/langs/is_IS/cashdesk.lang
+++ b/htdocs/langs/is_IS/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=á
 CashDeskThirdParty=Þriðja aðila
 ShoppingCart=Vörukarfa
 NewSell=Nýtt selja
-BackOffice=Til baka skrifstofa
 AddThisArticle=Bæta við þessa grein
 RestartSelling=Fara aftur á að selja
-SellFinished=Selja lokið
+SellFinished=Sale complete
 PrintTicket=Prenta miða
 NoProductFound=Engin grein fannst
 ProductFound=vara fannst
diff --git a/htdocs/langs/is_IS/categories.lang b/htdocs/langs/is_IS/categories.lang
index 2d79182afc2..fac5e2ef105 100644
--- a/htdocs/langs/is_IS/categories.lang
+++ b/htdocs/langs/is_IS/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Undirflokkar
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Þessi flokkur er þegar til með þessu tilv
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Þessi flokkur inniheldur ekki vöruna.
 ThisCategoryHasNoSupplier=Þessi flokkur inniheldur ekki birgir.
 ThisCategoryHasNoCustomer=Þessi flokkur inniheldur ekki allir viðskiptavinur.
 ThisCategoryHasNoMember=Þessi flokkur inniheldur ekki meðlimur.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 0ded2a1168d..ea7a39b5d7b 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New Einstaklingur
 NewCompany=Ný fyrirtæki (horfur, viðskiptavina, birgja)
 NewThirdParty=New þriðja aðila (horfur, viðskiptavina, birgja)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Auðkenni þriðja aðila
 IdCompany=Fyrirtækið Auðkenni
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Birgjar
 ThirdPartyType=Í þriðja aðila tegund
 Company/Fundation=Fyrirtæki / Stofnun
 Individual=Einstaklingur
-ToCreateContactWithSameName=Vilja stofna sjálfkrafa líkamlega snertingu við sömu upplýsingar
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Móðurfélag
 Subsidiaries=Dótturfélög
 ReportByCustomers=Skýrsla viðskiptavina
@@ -47,7 +49,7 @@ CivilityCode=Civility kóða
 RegisteredOffice=Skráð skrifstofa
 Lastname=Lastname
 Firstname=Firstname
-PostOrFunction=Post / virka
+PostOrFunction=Job position
 UserTitle=Titill
 Address=Heimilisfang
 State=Ríki / Hérað
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prófessor í síma
 PhonePerso=Pers. Síminn
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Staða
 DefaultLang=Tungumál sjálfgefið
 VATIsUsed=VSK er notaður
 VATIsNotUsed=VSK er ekki notaður
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VSK-númer
 VATIntraShort=VSK-númer
 VATIntraSyntaxIsValid=Setningafræði er í gildi
-VATIntraValueIsValid=Gildi er í gildi
 ProspectCustomer=Prospect / viðskiptavinar
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Breyta tengilið / netfang
 EditContactAddress=Edit contact/address
 Contact=Hafðu samband
+ContactId=Contact id
 ContactsAddresses=Tengiliðir / Vistfang
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=Engar skilgreind fyrir þessa þriðja aðila
 DefaultContact=Default samband
@@ -284,7 +287,7 @@ CompanyDeleted=Fyrirtæki " %s " eytt úr gagnagrunninum.
 ListOfContacts=Listi yfir tengiliði
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=Listi yfir þriðja aðila
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show samband
 ContactsAllShort=Öll (síu)
 ContactType=Hafðu tegund
@@ -294,6 +297,7 @@ ContactForProposals=Tillögunnar samband
 ContactForContracts=Samningur's samband
 ContactForInvoices=Invoice's samband
 NoContactForAnyOrder=Þessi tengiliður er ekki við tengilið fyrir hvaða röð
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Þessi tengiliður er ekki við tengilið fyrir hvaða auglýsing tillögu
 NoContactForAnyContract=Þessi tengiliður er ekki við tengilið fyrir samningi
 NoContactForAnyInvoice=Þessi tengiliður er ekki við tengilið fyrir reikning
@@ -352,9 +356,9 @@ ExportCardToFormat=Útflutningur kort til snið
 ContactNotLinkedToCompany=Hafðu tengist ekki til þriðja aðila
 DolibarrLogin=Dolibarr Innskráning
 NoDolibarrAccess=Nei Dolibarr aðgang
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Tengiliðir og eignir
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bankaupplýsingar
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/is_IS/compta.lang b/htdocs/langs/is_IS/compta.lang
index 1c4de76be3b..f99391963e8 100644
--- a/htdocs/langs/is_IS/compta.lang
+++ b/htdocs/langs/is_IS/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Skattar og arður
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index e0b8cd1de0f..68f0808fe4b 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Aðferð
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Forgangur
-CronLabel=Lýsing
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 16652b4d0c6..363109b1389 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 5c00f5f8655..ffa3230a55b 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Þetta PHP styður fundur.
 PHPSupportPOSTGETOk=Þetta PHP styður breytur POST og FÁ.
 PHPSupportPOSTGETKo=Það er hægt PHP skipulag þinn styður ekki breytur POST og / eða FÁ. Athugaðu <b>variables_order</b> þinn breytu í php.ini.
 PHPSupportGD=Þetta PHP stuðning GD grafísku aðgerðir.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Þetta PHP stuðning UTF8 virka.
 PHPMemoryOK=Your PHP max fundur minnið er stillt <b>á %s .</b> Þetta ætti að vera nóg.
 PHPMemoryTooLow=Your PHP max fundur minnið er stillt <b>á %s </b> bæti. Þetta ætti að vera of lág. Breyta <b>php.ini</b> þinn til að stilla <b>memory_limit</b> breytu til að minnsta <b>kosti %s </b> bæti.
 Recheck=Smelltu hér til að fá fleiri significative próf
 ErrorPHPDoesNotSupportSessions=PHP uppsetningu þinn styður ekki fundur. Þessi eiginleiki er nauðsynlegt til að gera Dolibarr vinna. Athugaðu PHP uppsetningu þína.
 ErrorPHPDoesNotSupportGD=PHP uppsetningu þinn styður ekki myndrænt fall GD. Nei línurit verður í boði.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=PHP uppsetningu þinn styður ekki UTF8 virka. Dolibarr get ekki virka rétt. Leysa þetta áður installing Dolibarr.
 ErrorDirDoesNotExists=Listinn %s  er ekki til.
 ErrorGoBackAndCorrectParameters=Fara aftur á bak og leiðrétta rangar breytur.
@@ -133,6 +135,10 @@ ActivateModule=Virkja mát %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Uppfæra upplýsingar um aðgerðir
 MigrationPaymentMode=Gögn fólksflutninga í ham greiðslu
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/is_IS/interventions.lang b/htdocs/langs/is_IS/interventions.lang
index 5a004baec0a..66f9fd2c2f8 100644
--- a/htdocs/langs/is_IS/interventions.lang
+++ b/htdocs/langs/is_IS/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Eftir upp viðskiptavina samband
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/is_IS/ldap.lang b/htdocs/langs/is_IS/ldap.lang
index 5cf840a5df8..baee4bf50cb 100644
--- a/htdocs/langs/is_IS/ldap.lang
+++ b/htdocs/langs/is_IS/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First áskrift dagsetningu
 LDAPFieldFirstSubscriptionAmount=Fist áskrift upphæð
 LDAPFieldLastSubscriptionDate=Síðasta áskrift dagsetningu
 LDAPFieldLastSubscriptionAmount=Síðasta áskrift upphæð
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Notandi samstilla
 GroupSynchronized=Group samstilla
 MemberSynchronized=Aðildarríkin samstilla
diff --git a/htdocs/langs/is_IS/mails.lang b/htdocs/langs/is_IS/mails.lang
index e73238a3d3a..01f21f8bb5d 100644
--- a/htdocs/langs/is_IS/mails.lang
+++ b/htdocs/langs/is_IS/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Lesa
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 355be72f12c..ad655a4eec7 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default bakgrunnslit
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A-skrá er valin fyrir viðhengi en var ekki enn upp. Smelltu á "Hengja skrá" fyrir þessu.
 NbOfEntries=ATH færslna
@@ -245,6 +246,10 @@ DateBuild=Skýrsla byggja dagsetningu
 DatePayment=Dagsetning greiðslu
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=ár
 DurationMonth=mánuður
 DurationWeek=viku
@@ -256,6 +261,7 @@ DurationDays=dagar
 Year=Ár
 Month=Mánuður
 Week=Vika
+WeekShort=Week
 Day=Dagur
 Hour=Klukkustund
 Minute=Mínúta
@@ -278,6 +284,7 @@ MonthOfDay=Mánuður dagsins
 HourShort=H
 MinuteShort=mn
 Rate=Verð
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kílóbæti
@@ -565,8 +572,11 @@ BackToList=Til baka í lista
 GoBack=Fara til baka
 CanBeModifiedIfOk=Hægt er að breyta ef gild
 CanBeModifiedIfKo=Hægt er að breyta ef ekki gilt
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Upptaka breytt hefur verið
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Sjálfvirk kóða
 FeatureDisabled=No links
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Þú hefur ekki leyfi til að þessar aðgerðir
 SessionName=Session nafn
 Method=Aðferð
 Receive=Fá
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Samtals
 NeverReceived=Aldrei fengið
@@ -598,6 +609,7 @@ DisabledModules=Fatlaðir mát
 For=Fyrir
 ForCustomer=Fyrir viðskiptavini
 Signature=Undirskrift
+DateOfSignature=Date of signature
 HidePassword=Sýna stjórn með lykilorð falinn
 UnHidePassword=Sýna raunveruleg stjórn með skýrum lykilorð
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=Nýtt eiginleiki
 AttributeCode=Eiginleiki númer
 URLPhoto=Url á mynd / lógó
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Búa til drög
 SetToDraft=Back to draft
 ClickToEdit=Smelltu til að breyta
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Mánudagur
 Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/margins.lang b/htdocs/langs/is_IS/margins.lang
index 893c9ae3851..76b9fb136d6 100644
--- a/htdocs/langs/is_IS/margins.lang
+++ b/htdocs/langs/is_IS/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/is_IS/oauth.lang b/htdocs/langs/is_IS/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/is_IS/oauth.lang
+++ b/htdocs/langs/is_IS/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index d5f08b1b33e..3e31e25ca7a 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/is_IS/printing.lang b/htdocs/langs/is_IS/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/is_IS/printing.lang
+++ b/htdocs/langs/is_IS/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 197947b088e..df725704fce 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Bókhalds-númer (kaupa)
-ProductAccountancySellCode=Bókhalds-númer (selja)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Vara eða þjónusta
 ProductsAndServices=Vörur og þjónusta
 ProductsOrServices=Vara eða þjónusta
@@ -59,6 +59,8 @@ SellingPriceHT=Selja verð (að frádregnum skatti)
 SellingPriceTTC=Söluverð (Inc skatt)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Ný verð
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Söluverð er ekki vera lægra en lágmarks leyfð fyrir þessa vöru ( %s  án skatta)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 70fb1f33f36..2b844067136 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Listi yfir auglýsing tillögum í tengslum við verkefnið
-ListOrdersAssociatedProject=Listi yfir pantanir viðskiptavina í tengslum við verkefnið
-ListInvoicesAssociatedProject=Listi yfir reikninga viðskiptavinar í tengslum við verkefnið
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Listi yfir pantanir birgis í tengslum við verkefnið
-ListSupplierInvoicesAssociatedProject=Listi yfir reikninga birgis í tengslum við verkefnið
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Listi yfir samninga í tengslum við verkefnið
 ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 7c7774ed059..f13fbd67345 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Eyða sendingu
 Stock=Stock
 Stocks=Verðbréf
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Hreyfing
 ErrorWarehouseRefRequired=Lager tilvísun nafn er krafist
 ListOfWarehouses=Listi yfir vöruhús
@@ -43,6 +45,7 @@ PMPValue=Vegið meðalverð
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Vöruhús gildi
 UserWarehouseAutoCreate=Búa til birgðir sjálfkrafa þegar þú býrð til notanda
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Magn send
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/is_IS/supplier_proposal.lang b/htdocs/langs/is_IS/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/is_IS/supplier_proposal.lang
+++ b/htdocs/langs/is_IS/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index 3560fda2328..4db1a22cb7f 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -7,13 +7,13 @@ History=Saga
 ListOfSuppliers=Listi yfir birgja
 ShowSupplier=Sýna birgir
 OrderDate=Panta dagsetningu
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Bæta við birgi verð
-ChangeSupplierPrice=Breyta birgir verð
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Þessi tilvísun birgir er nú þegar tengt með tilvísun: %s
 NoRecordedSuppliers=Nei birgja skráð
 SupplierPayment=Birgir greiðslu
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/is_IS/users.lang b/htdocs/langs/is_IS/users.lang
index 69f071e51d8..99a3a74efc8 100644
--- a/htdocs/langs/is_IS/users.lang
+++ b/htdocs/langs/is_IS/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/is_IS/website.lang b/htdocs/langs/is_IS/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/is_IS/website.lang
+++ b/htdocs/langs/is_IS/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/is_IS/withdrawals.lang b/htdocs/langs/is_IS/withdrawals.lang
index 5f3a165e643..39f1cd91d88 100644
--- a/htdocs/langs/is_IS/withdrawals.lang
+++ b/htdocs/langs/is_IS/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Viðskiptavinir standandi fyrirmæli area
-StandingOrders=Standandi pantanir
-StandingOrder=Standandi pantanir
-NewStandingOrder=Ný staða þess
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Til að ganga frá
-WithdrawalsReceipts=Uppsögn kvittunum
-WithdrawalReceipt=Uppsögn barst
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Uppsögn línur
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice að bíða eftir að afturkalla
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Upphæð til baka
-WithdrawsRefused=Segir upp neitaði
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Enginn viðskiptavinur reikning í ham greiðslu "afturkalla" er í bið. Fara á flipanum 'Dragið' reikning kort til að leggja fram beiðni.
 ResponsibleUser=Ábyrg notanda
-WithdrawalsSetup=Uppsögn skipulag
-WithdrawStatistics=tölfræði Dragið's
-WithdrawRejectStatistics=Dragið hafna's tölfræði
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Gerðu afturkalla beiðni
 ThirdPartyBankCode=Í þriðja aðila bankakóði
 NoInvoiceCouldBeWithdrawed=Engin reikningur withdrawed með góðum árangri. Athugaðu að Reikningar eru fyrirtæki með gilt bann.
@@ -46,7 +47,7 @@ StatusRefused=Neitaði
 StatusMotif0=Ótilgreint
 StatusMotif1=Kveða insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=Nei Uppsögn röð
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB inexploitable
 StatusMotif6=Reikningur án jafnvægi
@@ -61,28 +62,43 @@ NotifyCredit=Uppsögn Credit
 NumeroNationalEmetter=National Sendandi Fjöldi
 WithBankUsingRIB=Fyrir bankareikninga með RIB
 WithBankUsingBANBIC=Fyrir bankareikninga með IBAN / BIC / Swift
-BankToReceiveWithdraw=Bankareikning til að fá hættir
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Greiðsla standa röð %s af bankanum
-InfoCreditMessage=Það stendur til %s hefur verið greitt af bankanum <br> Gögn um greiðslu: %s
-InfoTransSubject=Sending standa röð %s í bankann
-InfoTransMessage=Það stendur til %s hefur verið transmited í bankann með %s %s. <br><br>
+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>
 InfoTransData=Upphæð: %s <br> Metode: %s <br> Date: %s
-InfoRejectSubject=Standandi þess neitaði
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Valkostur fyrir alvöru ham var ekki sett, að hætta við eftir þessa uppgerð
diff --git a/htdocs/langs/is_IS/workflow.lang b/htdocs/langs/is_IS/workflow.lang
index baf28523418..453207a74c6 100644
--- a/htdocs/langs/is_IS/workflow.lang
+++ b/htdocs/langs/is_IS/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Vinnuflæði mát skipulag
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 6f46e553a23..e67e157f148 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - en_US - Accounting Expert
 ACCOUNTING_EXPORT_SEPARATORCSV=Separatore delle colonne nel file di esportazione
 ACCOUNTING_EXPORT_DATE=Formato della data per i file di esportazione
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
+ACCOUNTING_EXPORT_PIECE=Esporta il numero di pezzi
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
 ACCOUNTING_EXPORT_LABEL=Export label
 ACCOUNTING_EXPORT_AMOUNT=Export amount
@@ -14,48 +14,69 @@ Journaux=Giornali
 JournalFinancial=Giornali finanziari
 BackToChartofaccounts=Ritorna alla lista dell'account
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Seleziona una lista degli account
 Addanaccount=Aggiungi un account di contabilità
 AccountAccounting=Account di contabilità
 AccountAccountingShort=Conto
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Contabilità
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Report
 NewAccount=Nuovo account di contabilità
 Create=Crea
-CreateMvts=Inserisci movimento
-UpdateMvts=Modifica di un movimento
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Contabilità generale
 AccountBalance=Saldo
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=In elaborazione
 EndProcessing=Fine del processo
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Righe selezionate
 Lineofinvoice=Riga fattura
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -80,33 +101,32 @@ Labelcompte=Etichetta account
 Sens=Verso
 Codejournal=Giornale
 NumPiece=Piece number
-AccountingCategory=Accounting category
-
-NotMatch=Not Set
-
+AccountingCategory=Categoria contabile
+NotMatch=Non impostato
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Giornale di vendita
 DescPurchasesJournal=Giornale acquisti
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=Nuovo movimento
-NumMvts=Numero movimento
-ListeMvts=Elenco movimenti
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debito e Credito non possono avere un valore contemporaneamente
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Margine totale sulle vendite
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Convalida automaticamente
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Movimento non bilanciato correttamente. Credito =%s. Debito =%s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Inizializza contabilità
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Opzioni
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -164,6 +193,12 @@ Calculated=Calcolato
 Formula=Formula
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
+ErrorNoAccountingCategoryForThisCountry=Nessuna categoria contabile è disponibile per questo paese
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index db056af6da2..e23fb3ff8b8 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Sperimentale
 VersionDevelopment=Sviluppo
 VersionUnknown=Sconosciuta
 VersionRecommanded=Raccomandata
-FileCheck=Integrità dei file
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=File mancanti
 FilesUpdated=File aggiornati
-FileCheckDolibarr=Controlla l'integrità dei file di Dolibarr
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID di sessione
 SessionSaveHandler=Handler per il salvataggio dell sessioni
 SessionSavePath=Percorso per il salvataggio delle sessioni
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Errore: Non è supportata una precisione supe
 DictionarySetup=Impostazioni dizionario
 Dictionary=Dizionari
 Chartofaccounts=Chart of accounts
-Fiscalyear=Anni Fiscali
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=I valori 'system' e 'systemauto' sono riservati. Puoi usare 'user' come valore da aggiungere al tuo record.
 ErrorCodeCantContainZero=Il codice non può contenere il valore 0
 DisableJavascript=Disabilita funzioni JavaScript and Ajax (Raccomandato per persone non vedenti o browser testuali)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=N ° di caratteri per attivare ricerca: %s
 NotAvailableWhenAjaxDisabled=Non disponibile quando Ajax è disabilitato
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disattivato
 UsePreviewTabs=Utilizzare le schede anteprima
 ShowPreview=Visualizza anteprima
@@ -116,12 +121,12 @@ CurrentHour=Orario PHP (server)
 CurrentSessionTimeOut=Timeout sessione corrente
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
 Box=Widget
-Boxes=Widget
+Boxes=Widgets
 MaxNbOfLinesForBoxes=Massimo numero di righe per componente
 PositionByDefault=Per impostazione predefinita
 Position=Posizione
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=Gestione del contenuto delle 2 barre dei menu (barra orizzontale e barra verticale).
+MenusEditorDesc=L'editor dei menu consente di definire voci personalizzate nei menu. Utilizzare con attenzione onde evitare di rendere instabile Dolibarr (es. voci di menu irraggiungibili per sempre). <br> Alcuni moduli aggiungono voci nei menu (nel menu <b> Tutti </b> nella maggior parte dei casi). Se alcune di queste voci vengono rimosse per errore, è possibile ripristinarle disattivando e riattivando il modulo.
 MenuForUsers=Menu per gli utenti
 LangFile=file .lang
 System=Sistema
@@ -129,8 +134,8 @@ SystemInfo=Informazioni di sistema
 SystemToolsArea=Sezione strumenti di gestione del sistema
 SystemToolsAreaDesc=Questa sezione offre funzioni di gestione. Utilizzare il menu per scegliere la funzione che stai cercando.
 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 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 file <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeAreaDesc=Questa pagina consente di eliminare tutti i file su disco creati da Dolibarr (file temporanei o tutti i file in <b> %s </b>). L'utilizzo di questa funzione non è strettamente necessario.<br> Viene fornita per gli utenti Dolibarr che utilizzano un servizio di hosting che non offre le autorizzazioni per eliminare i file temporanei dai server web.
+PurgeDeleteLogFile=Eliminia il log file <b>%s</b> definito nel modulo Syslog (nessun rischio di perdita di dati)
 PurgeDeleteTemporaryFiles=Elimina tutti i file temporanei (nessun rischio di perdere dati)
 PurgeDeleteTemporaryFilesShort=Cancella fle temporanei
 PurgeDeleteAllFilesInDocumentsDir=Elimina tutti i file nella directory <b> %s </b>. I file temporanei, ma anche file allegati di elementi (terze parti, fatture, ...) saranno cancellati.
@@ -176,15 +181,16 @@ EncodeBinariesInHexa=Codificare dati binari in esadecimale
 IgnoreDuplicateRecords=Ignora errori per record duplicati (INSERT IGNORE)
 AutoDetectLang=Rileva automaticamente (lingua del browser)
 FeatureDisabledInDemo=Funzione disabilitata in modalità demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Autorizzazioni
 BoxesDesc=I Widgets sono componenti che personalizzano le pagine aggiungendo delle informazioni.\nPuoi scegliere se mostrare il widget o meno cliccando 'Attiva' sulla la pagina di destinazione, o cliccando sul cestino per disattivarlo.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
-ModulesDesc=Attivazione della funzionalità dei moduli dell'applicazione. Alcuni moduli richiedono di concedere agli utenti delle autorizzazioni per il loro utilizzo.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDesc=I moduli di Dolibarr definiscono quale funzionalità è abilitata. Alcuni moduli richiedono permessi da abilitare agli utenti, dopo la loro abilitazione. Clicca su on/off per l'abilitazione del modulo.
+ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
 ModulesMarketPlaces=Più moduli ...
 DoliStoreDesc=DoliStore, il mercato ufficiale dei moduli esterni per Dolibarr ERP/CRM
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=Siti Web in cui è possibile cercare altri moduli ...
 URL=Collegamento
 BoxesAvailable=Widget disponibili
 BoxesActivated=Widget attivi
@@ -198,8 +204,8 @@ Security=Sicurezza
 Passwords=Password
 DoNotStoreClearPassword=Non memorizzare le password in chiaro nel database (raccomandato)
 MainDbPasswordFileConfEncrypted=Password del database crittata in conf.php (raccomandato)
-InstrucToEncodePass=To have password encoded into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="...";</b><br>by<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=To have password decoded (clear) into the <b>conf.php</b> file, replace the line <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>by<br><b>$dolibarr_main_db_pass="%s";</b>
+InstrucToEncodePass=Per avere la password codificata sostituisci nel file <b>conf.php</b> , la linea <br><b>$dolibarr_main_db_pass="...";</b><br>con<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Per avere la password decodificata (in chiaro) sostituisci nel file<b>conf.php</b> la linea <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>con<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protezione e crittografia dei PDF generati
 ProtectAndEncryptPdfFilesDesc=La protezione di un documento PDF rende possibile solo la lettura e la stampa con qualsiasi browser. La modifica e la copia non sono più possibili.
 Feature=Caratteristica
@@ -254,8 +260,8 @@ ModuleFamilyTechnic=Strumenti Multi-modulo
 ModuleFamilyExperimental=Moduli sperimentali
 ModuleFamilyFinancial=Moduli finanziari (Contabilità/Cassa)
 ModuleFamilyECM=ECM
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyPortal=Web sites ed altre applicazioni
+ModuleFamilyInterface=Interfacce con sistemi esterni
 MenuHandlers=Gestori menu
 MenuAdmin=Editor menu
 DoNotUseInProduction=Da non usare in produzione
@@ -271,11 +277,12 @@ InfDirAlt=A partire dalla versione 3 è possibile definire una directory root al
 InfDirExample=<br>Poi dichiaralo nel file conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Queste righe sono commentate con il "#", per levare il commento basta rimuovere il cancelletto.
 YouCanSubmitFile=For this step, you can send package using this tool: Select module file
 CurrentVersion=Versione attuale di Dolibarr
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
+CallUpdatePage=Vai alla pagina che aggiorna la struttura del database e dati su %s.
+LastStableVersion=Ultima versione stabile
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Puoi inserire uno schema di numerazione. In questo schema, possono essere utilizzati i seguenti tag : <br><b> {000000} </b> Corrisponde a un numero che sarà incrementato ad ogni aggiunta di %s. Inserisci il numero di zeri equivalente alla lunghezza desiderata per il contatore. Verranno aggiunti zeri a sinistra fino alla lunghezza impostata per il contatore. <br><b> {000000+000} </b> Come il precedente, ma con un offset corrispondente al numero a destra del segno + che viene applicato al primo inserimento %s. <br> <b> {000000@x} </b> Come sopra, ma il contatore viene reimpostato a zero quando si raggiunge il mese x (x compreso tra 1 e 12). Se viene utilizzata questa opzione e x è maggiore o uguale a 2, diventa obbligatorio inserire anche la sequenza {yy}{mm} o {yyyy}{mm}. <br> <b> {dd} </b> giorno (da 01 a 31). <br> <b> {mm} </b> mese (da 01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b> {y}  </b> anno con 2, 4 o 1 cifra.<br>
-GenericMaskCodes2=<b>{cccc}</b>il codice cliente di n caratteri<br><b>{cccc000}</b> il codice cliente di n caratteri è seguito da un contatore dedicato per cliente. Questo contatore dedicato per i clienti è azzerato allo stesso tempo di quello globale.<br><b>{tttt}</b> Il codice di terze parti composto da n caratteri (vedi dizionario - tipi di terze parti).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati. <br> Gli spazi non sono ammessi. <br>
 GenericMaskCodes4a=<u>Esempio sulla novantanovesima %s del terzo TheCompany fatta il 31/01/2007:</u> <br>
 GenericMaskCodes4b=<u>Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:</u> <br>
@@ -324,19 +331,19 @@ PDFAddressForging=Regole per il forge di caselle di indirizzi
 HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
 HideDescOnPDF=Nascondi le descrizioni dei prodotti nel pdf generato
 HideRefOnPDF=Nascondi il ref. prodotto nei PDF generati
-HideDetailsOnPDF=Hide product lines details on generated PDF
+HideDetailsOnPDF=Nascondi dettagli linee prodotti sui PDF generati
 PlaceCustomerAddressToIsoLocation=Usa la posizione predefinita francese (La Poste) per l'indirizzo del cliente
 Library=Libreria
 UrlGenerationParameters=Parametri di generazione degli indirizzi
 SecurityTokenIsUnique=Utilizzare un unico parametro securekey per ogni URL
 EnterRefToBuildUrl=Inserisci la reference per l'oggetto %s
 GetSecuredUrl=Prendi URL calcolato
-ButtonHideUnauthorized=Nasconti bottoni per azioni non autorizzate anziché mostrare bottoni disabilitati.
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
 MassConvert=Avvia conversione di massa
-String=String
+String=Stringa
 TextLong=Testo Lungo
 Int=Intero
 Float=Decimale
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Lista di selezione
 ExtrafieldSelectList = Seleziona dalla tabella
 ExtrafieldSeparator=Separatore
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Bottone Radio
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -356,12 +364,12 @@ ExtrafieldLink=Link to an object
 ExtrafieldParamHelpselect=I parametri della lista deveono avere una sintassi tipo chiave,valore<br><br> ad esempio: <br>1,valore1<br>2,valore2<br>3,valore3<br>...<br><br> In modo da avere una lista madre che dipenda da un altra:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=La lista dei parametri deve contenere chiave univoca e valore.<br><br>Per esempio:<br>1, valore1<br>2, valore2<br>3, valore3<br>...
 ExtrafieldParamHelpradio=La lista dei parametri deve rispettare il formato chiave,valore<br /><br /> per esempio: <br />1,valore1<br />2,valore2<br />3,valore3<br />...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpsellist=La lista dei parametri viene da una tabella<br>Sintassi: table_name:label_field:id_field::filter<br>Per esempio: c_typent:libelle:id::filter<br><br>filter può essere un semplice test (tipo active=1 per mostrare solo valori attivi) <br> se vuoi filtrare per extrafield usa la sintassi extra.fieldcode=... (dove fieldcode è il codice dell'extrafield)<br><br>Per far dipendere la lista da un'altra usa:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=La lista dei parametri viene da una tabella<br>Sintassi: table_name:label_field:id_field::filter<br>Per esempio: c_typent:libelle:id::filter<br><br>filter può essere un semplice test (tipo active=1 per mostrare solo valori attivi) <br> se vuoi filtrare per extrafield usa la sintassi extra.fieldcode=... (dove fieldcode è il codice del extrafield)<br><br>Per far dipendere la lista da un'altra usa:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
+LibraryToBuildPDF=Libreria utilizzata per generare PDF
 WarningUsingFPDF=Avviso: Il tuo <b>conf.php</b> contiene la direttiva <b>dolibarr_pdf_force_fpdf = 1.</b> Questo significa che si utilizza la libreria FPDF per generare file PDF. Questa libreria è obsoleta e non supporta un molte funzioni (Unicode, trasparenza dell'immagine, lingue cirillico, arabo e asiatico, ...), quindi potrebbero verificarsi errori durante la generazione di file PDF. <br> Per risolvere questo problema ed avere un supporto completo di generazione di file PDF, scarica <a href="http://www.tcpdf.org/" target="_blank">biblioteca TCPDF</a> , quindi commentare o rimuovere la riga <b>$ dolibarr_pdf_force_fpdf = 1,</b> e aggiungere invece <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
-LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
+LocalTaxDesc=Alcuni paesi applicano 2 or 3 tasse locali ad ogni fattura. Se questo è il caso, scegli il tipo di seconda e terza tassa ed il relativo valore. I possibili tipi sono:<br>1 : tassa locale applicata sui prodotti e servizi senza IVA (le tasse locali sono calcolate sull'importo al netto dell'IVA)<br>2 : tassa locale applicata sui prodotti e servizi IVA compresa (le tasse locali sono calcolate sull'importo + IVA) <br>3 : tassa locale applicata sui prodotti senza IVA (le tasse locali sono calcolate sull'importo al netto dell'IVA)<br>4 : tassa locale applicata sui prodotti IVA compresa (le tasse locali sono calcolate sull'importo + IVA)<br>5 : tassa locale applicata sui servizi senza IVA (le tasse locali sono calcolate sull'importo al netto dell'IVA)<br>6 : tassa locale applicata sui servizi IVA compresa (le tasse locali sono calcolate sull'importo + IVA)
 SMS=SMS
 LinkToTestClickToDial=Per testare l'indirizzo ClickToDial dell'utente <strong>%s</strong>, inserisci un numero di telefono
 RefreshPhoneLink=Link Aggiorna
@@ -383,11 +391,14 @@ EnableFileCache=Abilita file di cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=Nessun dettaglio nel piè di pagina
 DisplayCompanyInfo=Mostra indirizzo dell'azienda
-DisplayCompanyInfoAndManagers=Visualizza società e nomi responsabili
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Utenti e gruppi
@@ -428,8 +439,8 @@ Module55Name=Codici a barre
 Module55Desc=Gestione codici a barre
 Module56Name=Telefonia
 Module56Desc=Integrazione telefonia
-Module57Name=Ordini permanenti
-Module57Desc=Gli ordini permanenti e le domiciliazioni. Comprende anche la generazione di file di SEPA per i paesi europei.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
 Module59Name=Bookmark4u
@@ -451,27 +462,27 @@ Module200Desc=Sincronizzazione directory LDAP
 Module210Name=Postnuke
 Module210Desc=Integrazione Postnuke
 Module240Name=Esportazione dati
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Strumento per esportare i dati di Dolibarr (con assistenti)
 Module250Name=Importazione dati
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=Strumento per importare i dati in Dolibarr (con assistenti)
 Module310Name=Membri
 Module310Desc=Gestione membri della fondazione
 Module320Name=Feed RSS
 Module320Desc=Aggiungi feed RSS alle pagine di Dolibarr
 Module330Name=Segnalibri
-Module330Desc=Bookmarks management
+Module330Desc=Gestione segnalibri
 Module400Name=Projects/Opportunities/Leads
-Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
+Module400Desc=Gestione di progetti ed opportunità. Puoi assegnare ogni elemento (fattura, ordini, proposte commerciali, interventi, ...) ad un progetto ed avere una vista trasversale dalla scheda del progetto
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
 Module500Name=Spese speciali
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Stipendi
-Module510Desc=Management of employees salaries and payments
+Module500Desc=Gestione delle sepse speciali (tasse, contributi, dividendi)
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Prestito
 Module520Desc=Gestione dei prestiti
 Module600Name=Notifiche
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donazioni
 Module700Desc=Gestione donazioni
 Module770Name=Expense reports
@@ -487,7 +498,7 @@ Module1520Desc=Mass mail document generation
 Module1780Name=Tag/categorie
 Module1780Desc=Crea tag / categorie (prodotti, clienti, fornitori, contatti o membri)
 Module2000Name=FCKeditor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module2000Desc=Permette di utilizzare per alcune aree di testo un edito avanzato (basato su CKEditor)
 Module2200Name=Prezzi dinamici
 Module2200Desc=Abilita l'utilizzo di espressioni matematiche per i prezzi
 Module2300Name=Cron
@@ -500,7 +511,7 @@ Module2600Name=API/Web services (SOAP server)
 Module2600Desc=Attiva il server SOAP che fornisce i servizi di API
 Module2610Name=API/Web services (REST server)
 Module2610Desc=Attiva il server REST che fornisce i servizi di API
-Module2660Name=Call WebServices (SOAP client)
+Module2660Name=Chiamata WebServices (SOAP client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=Usa il servizio online Gravatar (www.gravatar.com) per mostrare le foto degli utenti/membri. Necessita dell'accesso a Internet
@@ -570,7 +581,7 @@ Permission71=Vedere schede membri
 Permission72=Creare/modificare membri
 Permission74=Eliminare membri
 Permission75=Imposta i tipi di sottoscrizione
-Permission76=Export data
+Permission76=Esportare i dati
 Permission78=Vedere le iscrizioni
 Permission79=Creare/modificare gli abbonamenti
 Permission81=Vedere ordini clienti
@@ -601,22 +612,22 @@ Permission121=Vedere soggetti terzi collegati all'utente
 Permission122=Creare/modificare terzi legati all'utente
 Permission125=Eliminare terzi legati all'utente
 Permission126=Esportare terzi
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission141=Legge tutti i progetti e tutti i compiti (anche progetti privati in cui non sono stato insertio come contatto)
+Permission142=Crea e mofica tutti i progetti e tutti i compiti (anche progetti privati in cui non sono stato insertio come contatto)
+Permission144=Cancella tutti i progetti e tutti i compiti (anche progetti privati in cui non sono stato insertio come contatto)
 Permission146=Vedere provider
 Permission147=Vedere statistiche
-Permission151=Vedere ordini permanenti
-Permission152=Creare/modificare richieste di ordini permanenti
-Permission153=Trasmettere fatture ordini permanenti
-Permission154=Pagare/rifiutare fatture ordini permanenti
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Leggi contratti / abbonamenti
 Permission162=Crea/modifica contratti/abbonamenti
 Permission163=Attiva un servizio/sottoscrizione di un contratto
 Permission164=Disable a service/subscription of a contract
 Permission165=Elimina contratti / abbonamenti
 Permission167=Esprta contratti
-Permission171=Read trips and expenses (yours and your subordinates)
+Permission171=Vedi viaggi e spese (propri e i suoi subordinati)
 Permission172=Crea/modifica nota spese
 Permission173=Elimina nota spese
 Permission174=Read all trips and expenses
@@ -747,6 +758,7 @@ Permission1236=Esportare fatture fornitore, attributi e pagamenti
 Permission1237=Esportazione ordini fornitori e loro dettagli
 Permission1251=Eseguire importazioni di massa di dati esterni nel database (data load)
 Permission1321=Esportare fatture cliente, attributi e pagamenti
+Permission1322=Reopen a paid bill
 Permission1421=Esportare ordini cliente e attributi
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,8 +792,12 @@ Permission55002=Crea/modifica sondaggi
 Permission59001=Leggi margini commerciali
 Permission59002=Definisci margini commerciali
 Permission59003=Read every user margin
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Tipi dei soggetti terzi
+DictionaryCompanyJuridicalType=forma legale dei soggetti terzi
 DictionaryProspectLevel=Prospect potential level
 DictionaryCanton=Stato/Provincia
 DictionaryRegion=Regioni
@@ -853,6 +869,7 @@ LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esis
 LabelOnDocuments=Descrizione sul documento
 NbOfDays=Numero di giorni
 AtEndOfMonth=Alla fine del mese
+CurrentNext=Current/Next
 Offset=Scostamento
 AlwaysActive=Sempre attivo
 Upgrade=Aggiornamento
@@ -903,7 +920,7 @@ CompanyZip=CAP
 CompanyTown=Città
 CompanyCountry=Paese
 CompanyCurrency=Principali valute
-CompanyObject=Object of the company
+CompanyObject=Mission della società
 Logo=Logo
 DoNotSuggestPaymentMode=Non suggerire
 NoActiveBankAccountDefined=Nessun conto bancario attivo definito
@@ -935,12 +952,12 @@ SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are requi
 SetupDescription5=Altre voci di menu consentono la gestione di parametri opzionali.
 LogEvents=Eventi di audit di sicurezza
 Audit=Audit
-InfoDolibarr=About Dolibarr
+InfoDolibarr=Informazioni su Dolibarr
 InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
+InfoOS=Informazioni OS
+InfoWebServer=Informazioni web server
+InfoDatabase=Informazioni database
+InfoPHP=Informazioni PHP
 InfoPerf=About Performances
 BrowserName=Browser
 BrowserOS=Sistema operativo
@@ -950,7 +967,7 @@ LogEventDesc=Qui è possibile attivare il registro eventi di sicurezza di Doliba
 AreaForAdminOnly=Tali funzioni possono essere utilizzate solo da utenti di tipo <b>amministratore</b>.<br/>
 SystemInfoDesc=Le informazioni di sistema sono dati tecnici visibili in sola lettura e solo dagli amministratori.
 SystemAreaForAdminOnly=Questa sezione è disponibile solo agli utenti di tipo <b>amministratore</b>. Nessuna delle autorizzazioni disponibili può alterare questo limite.
-CompanyFundationDesc=In questa pagina puoi modificare tutte le informazioni della società o fondazione che intendi gestire.
+CompanyFundationDesc=In questa pagina puoi modificare tutte le informazioni della società o fondazione che intendi gestire (Per farlo clicca sui pulsanti "Modifica" o "Salva" in fondo alla pagina)
 DisplayDesc=Qui è possibile scegliere i parametri relativi all'aspetto di Dolibarr
 AvailableModules=Moduli disponibili
 ToActivateModule=Per attivare i moduli, andare nell'area <b>Impostazioni</b> (Home->Impostazioni->Moduli).
@@ -964,8 +981,8 @@ TriggerAlwaysActive=I trigger in questo file sono sempre attivi, indipendentemen
 TriggerActiveAsModuleActive=I trigger in questo file sono attivi se il modulo <b>%s</b> è attivo.
 GeneratedPasswordDesc=Regola per la generazione di nuove password generate automaticamente
 DictionaryDesc=Insert all reference data. You can add your values to the default.
-ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
-MiscellaneousDesc=All other security related parameters are defined here.
+ConstDesc=Questa pagina ti permette di modificare tutti i parametri non disponibili nelle pagine precedenti. Si tratta di parametri riservati per lo sviluppo o il troubleshooting.
+MiscellaneousDesc=Definire qui tutti gli altri parametri relativi alla sicurezza.
 LimitsSetup=Limiti/impostazioni di precisione
 LimitsDesc=Da qui è possibile definire i limiti e la precisione utilizzati da Dolibarr.
 MAIN_MAX_DECIMALS_UNIT=Limite massimo di decimali per i prezzi unitari.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Attenzione: su alcuni sistemi Linux, per poter inviare
 PathToDocuments=Percorso documenti
 PathDirectory=Percorso directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configurazione della traduzione
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
 ClassNotFoundIntoPathWarning=La classe %s non è stata trovata al percorso PHP indicato
@@ -1097,7 +1122,7 @@ SuggestPaymentByRIBOnAccount=Suggerire il pagamento tramite bonifico bancario
 SuggestPaymentByChequeToAddress=Suggerire il pagamento mediante assegno a
 FreeLegalTextOnInvoices=Testo libero sulle fatture
 WatermarkOnDraftInvoices=Bozze delle fatture filigranate (nessuna filigrana se vuoto)
-PaymentsNumberingModule=Payments numbering model
+PaymentsNumberingModule=Modello per la numerazione dei documenti
 SuppliersPayment=Pagamenti fornitori
 SupplierPaymentSetup=Impostazioni pagamenti fornitori
 ##### Proposals #####
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Usa TLS
 LDAPServerUseTLSExample=Il server LDAP utilizza TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=DN dell'amministratore
-LDAPAdminDnExample=DN completo (per esempio: cn=adminldap,dc=society,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Password di amministratore
 LDAPUserDn=DN degli utenti
 LDAPUserDnExample=DN completo (per esempio: ou=users,dc=society,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Esempio: ditta
 LDAPFieldSid=SID
 LDAPFieldSidExample=Esempio: objectSid
 LDAPFieldEndLastSubscription=Data di fine abbonamento
-LDAPFieldTitle=Posizione/funzione
+LDAPFieldTitle=Posizione lavorativa
 LDAPFieldTitleExample=Esempio: titolo
 LDAPSetupNotComplete=Configurazione LDAP incompleta (vai alle altre schede)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nessun amministratore o password forniti. L'accesso a LDAP sarà eseguito in forma anonima e in sola lettura.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Impostazioni moduli prodotti e servizi
 NumberOfProductShowInSelect=Numero massimo di prodotti per le liste nelle combo di selezione  (0=nessun limite)
 ViewProductDescInFormAbility=Visualizzare la descrizione dei prodotti nei form (altrimenti appariranno come tooltip popup)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualizzazione delle descrizioni dei prodotti nella lingua di terzi
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Utilizza il form di ricerca per scegliere un prodotto (invece della lista a tendina)
 SetDefaultBarcodeTypeProducts=Tipo di codici a barre predefinito da utilizzare per i prodotti
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation è uno strumento di linea di comando (uti
 BarcodeInternalEngine=Motore interno
 BarCodeNumberManager=Manager per auto-definizione dei numeri barcode
 ##### Prelevements #####
-WithdrawalsSetup=Modulo impostazione prelievi
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Impostazioni RSS esterni
 NewRSS=Nuovo feed RSS
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Apri anno fiscale
 CloseFiscalYear=Chiudi anno fiscale
 DeleteFiscalYear=Elimina anno fiscale
 ConfirmDeleteFiscalYear=Vuoi davvero cancellare questo anno fiscale?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Può essere modificato in qualsiasi momento
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Numero minimo di caratteri maiuscoli
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Soglia
 BackupDumpWizard=Procedura guidata per creare file di backup del database (dump)
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Colore del titolo di pagina
 LinkColor=Colore dei link
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Inviare intervento
 MailToSendSupplierRequestForQuotation=Inviare richiesta di preventivo a fornitore
 MailToSendSupplierOrder=Inviare ordine fornitore
 MailToSendSupplierInvoice=Inviare fattura fornitore
-MailToThirdparty=Inviare email da pagina esterna
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Stai usando l'utima versione stabile
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1577,7 +1604,7 @@ TitleExampleForMaintenanceRelease=Example of message you can use to announce thi
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
+ModelModulesProduct=Modelli per documenti prodotto
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 AllPublishers=Tutti gli editori
@@ -1587,7 +1614,7 @@ AddDictionaries=Aggiungi dizionari
 AddBoxes=Aggiungi widget
 AddSheduledJobs=Aggiungi processi pianificati
 AddHooks=Aggiungi hook
-AddTriggers=Add triggers
+AddTriggers=Aggiungi trigger
 AddMenus=Aggiungi menu
 AddPermissions=Aggiungi autorizzazioni
 AddExportProfiles=Aggiungi profili di esportazione
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=Lista delle API disponibili
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 788485f5f26..cbed44269b4 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=ID evento
-Actions=Azioni
+Actions=Eventi
 Agenda=Agenda
 Agendas=Agende
 Calendar=Calendario
@@ -11,7 +11,7 @@ AffectedTo=Azione assegnata a
 Event=Evento
 Events=Eventi
 EventsNb=Numero di eventi
-ListOfActions=Lista delle azioni
+ListOfActions=Lista degli eventi
 Location=Luogo
 ToUserOfGroup=A qualsiasi utente nel gruppo
 EventOnFullDay=Dura tutto il giorno
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 57b29abee67..fa67ae2a2eb 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -27,13 +27,9 @@ AllTime=Dall'inizio
 Reconciliation=Riconciliazione
 RIB=Coordinate bancarie
 IBAN=Codice IBAN
-IbanValid=Il codice IBAN è valido
-IbanNotValid=Il codice IBAN non è valido
 BIC=Codice BIC (Swift)
-SwiftValid=Il codice BIC/SWIFT è valido
-SwiftNotValid=Il codice BIC/SWIFT non è valido
-StandingOrders=Mandati di incasso
-StandingOrder=Mandato di incasso
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Estratto conto
 AccountStatementShort=Est. conto
 AccountStatements=Estratti conto
@@ -78,6 +74,7 @@ AccountToCredit=Conto di accredito
 AccountToDebit=Conto di addebito
 DisableConciliation=Disattiva funzione di conciliazione per questo conto
 ConciliationDisabled=Funzione di conciliazione disabilitata
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Aperto
 StatusAccountClosed=Chiuso
 AccountIdShort=Numero di conto
@@ -87,14 +84,17 @@ AddBankRecordLong=Aggiungi operazione manualmente
 ConciliatedBy=Transazione conciliata da
 DateConciliating=Data di conciliazione
 BankLineConciliated=Transazione conclusa
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Pagamento fattura attiva
-SupplierInvoicePayment=Supplier payment
+SupplierInvoicePayment=Pagamento fornitore
 SubscriptionPayment=Subscription payment
 WithdrawalPayment=Ritiro pagamento
 SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici e giroconti
-TransferDesc=Trasferimento da un conto ad un altro, Dolibarr scriverà due record (uno di addebito nel conto di origine e uno di credito nel conto di destinazione), dello stesso importo. Per questa operazione verranno usate la stessa data e la stessa etichetta.
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
@@ -129,7 +129,7 @@ FutureTransaction=Transazione futura. Non è possibile conciliare.
 SelectChequeTransactionAndGenerate=Seleziona gli assegni dar includere nella ricevuta di versamento e clicca su &quot;Crea&quot;.
 InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG
 EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
-ToConciliate=Da conciliare?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Controlla tutte le informazioni prima di cliccare
 DefaultRIB=BAN di default
 AllRIB=Tutti i BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Sei sicuro di voler segnare questo assegno come rifiutato?
 RejectCheckDate=Data di restituzione dell'assegno
 CheckRejected=Assegno restituito
 CheckRejectedAndInvoicesReopened=Assegno restituito e fatture riaperte
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index d6f7f75dcba..1b352a2554c 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Errore, non si può annullare un
 BillFrom=Da
 BillTo=A
 ActionsOnBill=Azioni su fattura
-RecurringInvoiceTemplate=Fattura ricorrente
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Sconto offerto (pagamento prima del termine)
 EscompteOfferedShort=Sconto
 SendBillRef=Invio della fattura %s
 SendReminderBillRef=Invio della fattura %s (promemoria)
-StandingOrders=Mandati di pagamento
-StandingOrder=Mandato di pagamento
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nessuna bozza di fatture
 NoOtherDraftBills=Nessun'altra bozza di fatture
 NoDraftInvoices=Nessuna fattura in bozza
@@ -351,8 +351,8 @@ VarAmount=Importo variabile (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bonifico bancario
 PaymentTypeShortVIR=Bonifico bancario
-PaymentTypePRE=Domiciliazione bancaria
-PaymentTypeShortPRE=Domicil. banc.
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Pagamento in contanti
 PaymentTypeShortLIQ=Contanti
 PaymentTypeCB=Carta di credito
@@ -381,6 +381,7 @@ ExtraInfos=Extra info
 RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Banca emittente
 CheckBank=Controllo
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Pagato con questo pagamento
 ClosePaidInvoicesAutomatically=Classifica come "pagate" tutte le fatture standard, ad avanzamento lavori e le note di credito e di debito interamente saldate.
 ClosePaidCreditNotesAutomatically=Classifica come "Pagata" tutte le note di credito interamente rimborsate
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Tutte le fatture totalmente pagate saranno automaticamente chiuse allo stato "Pagato".
 ToMakePayment=Paga
 ToMakePaymentBack=Rimborsa
 ListOfYourUnpaidInvoices=Elenco fatture non pagate
 NoteListOfYourUnpaidInvoices=Nota: questo elenco contiene solo fatture che hai collegato ad un rappresentante.
 RevenueStamp=Marca da bollo
-YouMustCreateInvoiceFromThird=Questa opzione è disponibile quando crei fattura dalla scheda "cliente" di terze parti.
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Per creare un nuovo modelo bisogna prima creare una fattura normale e poi convertirla.
 PDFCrabeDescription=Modello di fattura Crabe. (Modello raccomandatoi)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -465,7 +468,7 @@ NotLastInCycle=Questa fattura non è la più recente e non può essere modificat
 DisabledBecauseNotLastInCycle=Il prossimo avanzamento lavori esiste già
 DisabledBecauseFinal=Questo è l'avanzamento lavori finale
 CantBeLessThanMinPercent=Il valore dell'avanzamento non può essere inferiore al valore precedente.
-NoSituations=No open situations
+NoSituations=Nessuna situazione aperta
 InvoiceSituationLast=Fattura a conclusione lavori
 PDFCrevetteSituationNumber=Situation N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situation invoice - COUNT
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=Per creare una fattura ricorrente per questo contratto, creare inizialmente la bozza di fattura, poi convertirla in un modello di fattura e definire quindi la frequenza di generazione delle future fatture.
 ToCreateARecurringInvoiceGene=Per generare regolarmente e manualmente le prossime fatture, basta andare sul menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/it_IT/bookmarks.lang b/htdocs/langs/it_IT/bookmarks.lang
index 59fb6463eb5..256f2cd1e13 100644
--- a/htdocs/langs/it_IT/bookmarks.lang
+++ b/htdocs/langs/it_IT/bookmarks.lang
@@ -14,5 +14,5 @@ BehaviourOnClick=Comportamento quando si clicca su un indirizzo
 CreateBookmark=Crea segnalibro
 SetHereATitleForLink=Dai un titolo al segnalibro
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Usa un indirizzo http esterno o uno relativo a Dolibarr
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Scegli se la pagina collegata deve essera aperta in nua nuova finestra oppure no
 BookmarksManagement=Gestione segnalibri
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index bb4b14c8236..fc7d9a8ceb9 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=I miei ultimi %s segnalibri
 BoxOldestExpiredServices=Servizi scaduti da più tempo ancora attivi
 BoxLastExpiredServices=Ultimi %s contatti con servizi scaduti ancora attivi
 BoxTitleLastActionsToDo=Ultime %s azioni da fare
-BoxTitleLastContracts=Ultimi %s contratti
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Ultime %s donazioni modificate
 BoxTitleLastModifiedExpenses=Ultime %s note spese modificate
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=proposte per mese
 NoTooLowStockProducts=Nessun prodotto sotto la soglia minima di scorte
 BoxProductDistribution=Distribuzione prodotti/servizi
 BoxProductDistributionFor=Distribuzione di %s per %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini dei clienti
 ForProposals=Proposte
 LastXMonthRolling=Ultimi %s mesi
-ChooseBoxToAdd=Aggiungi pulsante alla tua dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index fb89652d96a..20476c290a9 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=su
 CashDeskThirdParty=Soggetto terzo
 ShoppingCart=Carrello
 NewSell=Nuova vendita
-BackOffice=Backoffice
 AddThisArticle=Aggiungi questo articolo
 RestartSelling=Rimetti in vendita
-SellFinished=Vendita conclusa
+SellFinished=Sale complete
 PrintTicket=Stampa biglietto
 NoProductFound=Nessun articolo trovato
 ProductFound=Prodotto trovato
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 985292ad8e9..9cbc9eba484 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Area tag/categorie clienti
 MembersCategoriesArea=Area tag/categorie membri
 ContactsCategoriesArea=Area tag/categorie contatti
 AccountsCategoriesArea=Area tag/categorie conti
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Sub-categorie
 CatList=Lista delle tag/categorie
 NewCategory=Nuova tag/categoria
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Il soggetto terzo è collegato alle seguenti tag/
 MemberIsInCategories=Il membro è collegato alle seguenti tag/categorie membri
 ContactIsInCategories=Il contatto appartiene alle seguenti tag/categorie
 ProductHasNoCategory=Questo prodotto/servizio non è collegato ad alcuna tag/categoria
-CompanyHasNoCategory=Questo soggetto terzo non è collegato ad alcuna tag/categoria
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Questo membro non è collegato ad alcuna tag/categoria
 ContactHasNoCategory=Questo contatto non è collegato ad alcuna tag/categoria
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Aggiungi a tag/categoria
 NotCategorized=Senza etichetta/categoria
 CategoryExistsAtSameLevel=Questa categoria esiste già allo stesso livello
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Tag/categorie prodotti
 MembersCategoriesShort=Tag/categorie membri
 ContactCategoriesShort=Tag/categorie contatti
 AccountsCategoriesShort=Conti di tag/categorie
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Questa categoria non contiene alcun prodotto
 ThisCategoryHasNoSupplier=Questa categoria non contiene alcun fornitore
 ThisCategoryHasNoCustomer=Questa categoria non contiene alcun cliente
 ThisCategoryHasNoMember=Questa categoria non contiene alcun membro
 ThisCategoryHasNoContact=Questa categoria non contiene contatti
 ThisCategoryHasNoAccount=Non ci sono conti collegati a questa categoria
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=ID Tag/categoria
 CatSupList=Lista delle tag/categorie fornitori
 CatCusList=Lista delle tag/categorie clienti
@@ -71,6 +75,7 @@ CatContactList=Lista delle tag/categorie contatti
 CatSupLinks=Collegamenti tra fornitori e tag/categorie 
 CatCusLinks=Collegamenti tra clienti e tag/categorie
 CatProdLinks=Collegamenti tra prodotti/servizi e tag/categorie
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Elimina dalla tag/categoria
 ExtraFieldsCategories=Campi extra
 CategoriesSetup=Impostazioni Tag/categorie
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index 40dfeb9be05..7ec784cb3dc 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -28,8 +28,8 @@ ShowCustomer=Visualizza cliente
 ShowProspect=Visualizza cliente potenziale
 ListOfProspects=Elenco dei clienti potenziali
 ListOfCustomers=Elenco dei clienti
-LastDoneTasks=Latest %s completed tasks
-LastActionsToDo=Oldest %s not completed actions
+LastDoneTasks=Ultimi %s compiti completati
+LastActionsToDo=Le %s più vecchie azioni non completate
 DoneAndToDoActions=Azioni fatte o da fare
 DoneActions=Azioni fatte
 ToDoActions=Azioni da fare
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 4467c2ceace..4baaf3b514d 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nuovo privato
 NewCompany=Nuova società (cliente, cliente potenziale, fornitore)
 NewThirdParty=Nuovo soggetto terzo (cliente, cliente potenziale, fornitore)
 CreateDolibarrThirdPartySupplier=Crea una terza parte (fornitore)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Area clienti potenziali
 IdThirdParty=Id soggetto terzo
 IdCompany=Id società
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Fornitori
 ThirdPartyType=Tipo di soggetto terzo
 Company/Fundation=Società/Fondazione
 Individual=Privato
-ToCreateContactWithSameName=Creerà automaticamente un contatto fisico con le stesse informazioni
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Società madre
 Subsidiaries=Controllate
 ReportByCustomers=Report per clienti
@@ -47,11 +49,11 @@ CivilityCode=Titolo
 RegisteredOffice=Sede legale
 Lastname=Cognome
 Firstname=Nome
-PostOrFunction=Posizione/funzione
+PostOrFunction=Job position
 UserTitle=Titolo
 Address=Indirizzo
 State=Provincia/Cantone/Stato
-StateShort=State
+StateShort=Stato
 Region=Regione
 Country=Paese
 CountryCode=Codice del paese
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Telefono uff.
 PhonePerso=Telefono pers.
 PhoneMobile=Cellulare
-No_Email=Non inviare email di massa
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=CAP
 Town=Città
@@ -73,13 +75,13 @@ Poste= Posizione
 DefaultLang=Lingua predefinita
 VATIsUsed=L'IVA viene utilizzata
 VATIsNotUsed=L'IVA non viene utilizzata
-CopyAddressFromSoc=Compila l'indirizzo con l'indirizzo del soggetto terzo
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=Usa la seconda tassa
 LocalTax1IsUsedES= RE previsto
 LocalTax1IsNotUsedES= RE non previsto
-LocalTax2IsUsed=Use third tax
+LocalTax2IsUsed=Usa la terza tassa
 LocalTax2IsUsedES= IRPF previsto
 LocalTax2IsNotUsedES= IRPF non previsto
 LocalTax1ES=RE
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=N° Partita IVA
 VATIntraShort=P. IVA
 VATIntraSyntaxIsValid=La sintassi è valida
-VATIntraValueIsValid=Il valore è valido
 ProspectCustomer=Cliente/Cliente potenziale
 Prospect=Cliente potenziale
 CustomerCard=Scheda del cliente
@@ -261,7 +262,9 @@ AddContactAddress=Crea contatto/indirizzo
 EditContact=Modifica contatto/indirizzo
 EditContactAddress=Modifica contatto/indirizzo
 Contact=Contatto
+ContactId=Contact id
 ContactsAddresses=Contatti/Indirizzi
+FromContactName=Name:
 NoContactDefinedForThirdParty=Nessun contatto per questo soggetto terzo
 NoContactDefined=Nessun contatto definito
 DefaultContact=Contatto predefinito
@@ -284,7 +287,7 @@ CompanyDeleted=Società %s cancellata dal database.
 ListOfContacts=Elenco dei contatti
 ListOfContactsAddresses=Elenco di contatti/indirizzi
 ListOfThirdParties=Elenco dei soggetti terzi
-ShowCompany=Mostra soggetto terzo
+ShowCompany=Show third party
 ShowContact=Mostra contatti
 ContactsAllShort=Tutti (Nessun filtro)
 ContactType=Tipo di contatto
@@ -294,6 +297,7 @@ ContactForProposals=Contatto per le proposte commerciali
 ContactForContracts=Contatto per i contratti
 ContactForInvoices=Contatto per le fatture
 NoContactForAnyOrder=Questo contatto non è il contatto di nessun ordine
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Questo contatto non è il contatto di nessuna proposta commerciale
 NoContactForAnyContract=Questo contatto non è il contatto di nessun contratto
 NoContactForAnyInvoice=Questo contatto non è il contatto di nessuna fattura
@@ -311,7 +315,7 @@ VATIntraCheckableOnEUSite=Controllo partita IVA sul sito della Commissione Europ
 VATIntraManualCheck=È possibile controllareguire il controllo manualmente attraverso <a href="%s" target="_blank">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
 NorProspectNorCustomer=Né cliente, né cliente potenziale
-JuridicalStatus=Legal form
+JuridicalStatus=Stato giuridico
 Staff=Personale
 ProspectLevelShort=Cl. Pot.
 ProspectLevel=Liv. cliente potenziale
@@ -338,12 +342,12 @@ TE_PRIVATE=Privato
 TE_OTHER=Altro
 StatusProspect-1=Non contattare
 StatusProspect0=Mai contattato
-StatusProspect1=To be contacted
+StatusProspect1=Da contattare
 StatusProspect2=Contatto in corso
 StatusProspect3=Contattato
 ChangeDoNotContact=Cambia lo stato in "Non contattare"
 ChangeNeverContacted=Cambia lo stato in "Mai contattato"
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=Cambia lo stato in "Da contattare"
 ChangeContactInProcess=Cambia lo stato in "Contatto in corso"
 ChangeContactDone=Cambia lo stato in "Contatto fatto"
 ProspectsByStatus=Clienti potenziali per stato
@@ -352,30 +356,30 @@ ExportCardToFormat=Esportazione scheda nel formato
 ContactNotLinkedToCompany=Contatto non collegato ad alcuna società
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Senza accesso a Dolibarr
-ExportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contatti e attributi
-ImportDataset_company_1=Terze parti (Aziende/fondazioni/persone fisiche) e proprietà
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contatti/Indirizzi (per terze parti e non) e attributi
 ImportDataset_company_3=Informazioni bancarie
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
 PriceLevel=Livello dei prezzi
 DeliveryAddress=Indirizzo di consegna
-AddAddress=Add address
+AddAddress=Aggiungi un indirizzo
 SupplierCategory=Categoria fornitore
-JuridicalStatus200=Independent
+JuridicalStatus200=Indipendente
 DeleteFile=Cancella il file
 ConfirmDeleteFile=Vuoi davvero cancellare questo file?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=Assegna un commerciale
 Organization=Organizzazione
 FiscalYearInformation=Informazioni sull'anno fiscale
 FiscalMonthStart=Il mese di inizio dell'anno fiscale
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=E' necessario creare una email per questo utente per poter mandargli una notifica via email
+YouMustCreateContactFirst=Per poter inviare notifiche via email, è necessario definire almeno un contatto con una email valida all'interno del soggetto terzo
 ListSuppliersShort=Elenco fornitori
 ListProspectsShort=Elenco clienti potenziali
 ListCustomersShort=Elenco clienti
 ThirdPartiesArea=Area soggetti terzi e contatti
-LastModifiedThirdParties=Latest %s modified third parties
+LastModifiedThirdParties=Ultimi %s soggetti terzi modificati
 UniqueThirdParties=Totale soggetti terzi
 InActivity=In attività
 ActivityCeased=Cessata attività
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=I soggetti terzi sono stati uniti
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index d61ed407c9f..5bc6753f083 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Spese straordinarie
 MenuTaxAndDividends=Imposte e dividendi
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 796a70363d1..024fb44e60b 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Elimina processo pianificato
 Permission23104 = Esegui processo pianificato
 # Admin
 CronSetup= Impostazione delle azioni pianificate
-URLToLaunchCronJobs=URL che lancia i job di cron
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=O per lanciare un job specifico
 KeyForCronAccess=Chiave di sicurezza per l'URL che lancia i job di cron
 FileToLaunchCronJobs=Comando per lanciare i job di cron
@@ -23,7 +23,7 @@ CronCommand=Comando
 CronList=Processi pianificati
 CronDelete=Cancella i job programmati
 CronConfirmDelete=Sei sicuro di voler cancellare questi processi pianificati?
-CronExecute=Lanca i job programmati
+CronExecute=Launch scheduled job
 CronConfirmExecute=Sei sicuro di voler eseguire questi processi pianificati ora?
 CronInfo=Il modulo per i job programmati permette di eseguire operazioni definite in anticipoi 
 CronTask=Azione
@@ -39,7 +39,7 @@ CronMethod=Metodo
 CronModule=Modulo
 CronNoJobs=Nessun job registrato
 CronPriority=Priorità
-CronLabel=Descrizione
+CronLabel=Label
 CronNbRun=Num. lancio
 CronMaxRun=Max nb. launch
 CronEach=Ogni
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Vai nel menu "Home - Strumenti di amministrazion
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 0ec8c523216..ff629ab76cc 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Errore, il tuo PHP deve avere il modulo <b>%s</b> installato
 ErrorOpenIDSetupNotComplete=Hai impostato il config file di Dolibarr per permettere l'autenticazione tramite OpenID, ma l'URL del service di OpenID non è definita nella costante %s
 ErrorWarehouseMustDiffers=Il magazzino di origine e quello di destinazione devono essere differenti
 ErrorBadFormat=Formato non valido!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Errore, questo membro non è stato ancora collegato a nessuna terza parte. Collega il membro ad una delle terze parti esistenti o creane una nuova prima di creare sottoscrizioni con fattura.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Errore, ci sono alcune consegne collegate a questa spedizione. Cancellazione rifiutata.
 ErrorCantDeletePaymentReconciliated=Impossibile cancellare un pagamento che ha generato una transazione bancaria che è stata conciliata
 ErrorCantDeletePaymentSharedWithPayedInvoice=Impossibile cancellare un pagamento condiviso con almeno una fattura con lo stato Pagato
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index d41d18b0df7..abd99a0dd2b 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -40,20 +40,20 @@ TitleDeleteCP=Elimina la richiesta
 ConfirmDeleteCP=Vuoi davvero cancellare questa richiesta?
 ErrorCantDeleteCP=Errore: non hai i permessi necessari per eliminare questa richiesta.
 CantCreateCP=Non hai i permessi necessari per inserire richieste.
-InvalidValidatorCP=You must choose an approbator to your leave request.
+InvalidValidatorCP=Devi scegliere chi approverà la richiesta di assenza
 NoDateDebut=Bisogna selezionare una data di inizio.
 NoDateFin=Bisogna selezionare una data di fine.
-ErrorDureeCP=Your leave request does not contain working day.
+ErrorDureeCP=La tua richiesta di ferie non comprende giorni lavorativi.
 TitleValidCP=Approva la richiesta
-ConfirmValidCP=Are you sure you want to approve the leave request?
+ConfirmValidCP=Vuoi davvero approvare la richiesta di ferie?
 DateValidCP=Data approvazione
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
+TitleToValidCP=Invia richiesta di assenza
+ConfirmToValidCP=Vuoi davvero inoltrare la richiesta di ferie?
+TitleRefuseCP=Rifiuta la richiesta di assenza
+ConfirmRefuseCP=Vuoi davvero rifiutare la richiesta di ferie?
 NoMotifRefuseCP=Devi indicare un motivo per il rifiuto.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleCancelCP=Annulla la richiesta
+ConfirmCancelCP=Vuoi davvero annullare la richiesta di ferie?
 DetailRefusCP=Motivo del rifiuto
 DateRefusCP=Data del rifiuto
 DateCancelCP=Data dell'annullamento
@@ -69,28 +69,28 @@ ActionByCP=Eseguito da
 UserUpdateCP=Per l'utente
 PrevSoldeCP=Saldo precedente
 NewSoldeCP=Nuovo saldo
-alreadyCPexist=A leave request has already been done on this period.
+alreadyCPexist=C'è già una richiesta per lo stesso periodo.
 FirstDayOfHoliday=Primo giorno di assenza
 LastDayOfHoliday=Ultimo giorno di assenza
 BoxTitleLastLeaveRequests=Ultime %s richieste di assenza modificate 
 HolidaysMonthlyUpdate=Aggiornamento mensile
 ManualUpdate=Aggiornamento manuale
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+HolidaysCancelation=Cancellazione ferie
+EmployeeLastname=Cognome dipendente
+EmployeeFirstname=Nome dipendente
 
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
+LastUpdateCP=Ultimo aggiornamento automatico dell'assegnazione ferie
 MonthOfLastMonthlyUpdate=Mese dell'ultimo aggiornamento automatico delle ferie maturate
 UpdateConfCPOK=Aggiornato con successo
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
+Module27130Name= Gestione ferie
+Module27130Desc= Gestione ferie
 ErrorMailNotSend=Si è verificato un errore nell'invio dell'email:
 NoticePeriod=Periodo di avviso
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidate=Convalida ferie
+HolidaysToValidateBody=Di sotto una richiesta ferie da convalidare
+HolidaysToValidateDelay=Questa richiesta avrà luogo fra meno di %s giorni
 HolidaysToValidateAlertSolde=L'utente che ha fatto questa richiesta di ferie non ha abbastanza giorni disponibili.
 HolidaysValidated=Richieste di assenza approvate
 HolidaysValidatedBody=La tua richiesta di ferie dal %s al %s è stata approvata
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 267ef9dbe52..ccc5490e06b 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP supporta le sessioni.
 PHPSupportPOSTGETOk=PHP supporta le variabili GET e POST.
 PHPSupportPOSTGETKo=È possibile che l'installazione di PHP non supporti le variabili POST e/o GET. Controlla il parametro <b>variables_order</b> nel file <b>php.ini</b>.
 PHPSupportGD=PHP con supporto grafico GD.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=PHP supporta le funzioni UTF-8.
 PHPMemoryOK=La memoria massima per la sessione è fissata dal PHP a <b>%s</b>. Dovrebbe essere sufficiente.
 PHPMemoryTooLow=La memoria massima per la sessione è fissata dal PHP a <b>%s</b> byte. Cambia il file <b>php.ini</b> per impostare il parametro <b>memory_limit</b> ad almeno <b>%s</b> byte.
 Recheck=Clicca qui per ripetere i controlli
 ErrorPHPDoesNotSupportSessions=La tua installazione di PHP non supporta le sessioni. Dolibarr non può funzionare senza. Risolvere questo problema prima di installare Dolibarr.
 ErrorPHPDoesNotSupportGD=La tua installazione di PHP non supporta la funzione grafica GD. Non sarà disponibile alcun grafico.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=L'installazione di PHP non supporta funzioni UTF-8. Dolibarr non può funzionare correttamente.Risolvere questo problema prima di installare Dolibarr.
 ErrorDirDoesNotExists=La directory <b>%s</b> non esiste.
 ErrorGoBackAndCorrectParameters=Torna indietro e correggi i parametri sbagliati.
@@ -133,6 +135,10 @@ ActivateModule=Attiva modulo %s
 ShowEditTechnicalParameters=Clicca qui per mostrare/modificare i parametri avanzati (modalità esperti)
 WarningUpgrade=Attenzione:\nHai eseguito il backup del database prima?\nQuesto è fortemente consigliato: per esempio, a causa di qualche bug nel sistema del database (per es. versione mysql 5.5.40/41/42/43), qualche dato o tabella potrebbe essere persa durante il processo, quindi è fortemente raccomandato di avere un copia completa del database prima di procedere con la migrazione.\n\nClicca OK per iniziare il processo di migrazione...
 ErrorDatabaseVersionForbiddenForMigration=La tua versione del database è %s. Essa soffre di un bug critico se si cambia la struttura del database, come è richiesto dal processo di migrazione. Per questa ragione non sarà consentita la migrazione fino a quando non verrà aggiornato il database a una versione stabile più recente (elenco delle versioni probleematiche: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Aggiornare i dati sulle azioni
 MigrationPaymentMode=Migrazione dei dati delle modalità di pagamento
 MigrationCategorieAssociation=Migrazione delle categorie
 MigrationEvents=Migrazione degli eventi per aggiungere i proprietari nella tabella degli utilizzatori assegnati
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Ricarica modulo %s
 ShowNotAvailableOptions=Mostra opzioni non disponibili
 HideNotAvailableOptions=Nascondi opzioni non disponibili
diff --git a/htdocs/langs/it_IT/interventions.lang b/htdocs/langs/it_IT/interventions.lang
index 86443b65294..c6f4ecbbf63 100644
--- a/htdocs/langs/it_IT/interventions.lang
+++ b/htdocs/langs/it_IT/interventions.lang
@@ -6,7 +6,7 @@ NewIntervention=Nuovo intervento
 AddIntervention=Crea intervento
 ListOfInterventions=Elenco degli interventi
 ActionsOnFicheInter=Azioni di intervento
-LastInterventions=Latest %s interventions
+LastInterventions=Ultimi %s interventi
 AllInterventions=Tutti gli interventi
 CreateDraftIntervention=Crea bozza
 InterventionContact=Contatto per l'intervento
@@ -14,12 +14,12 @@ DeleteIntervention=Elimina intervento
 ValidateIntervention=Convalida intervento
 ModifyIntervention=Modificare intervento
 DeleteInterventionLine=Elimina riga di intervento
-CloneIntervention=Clone intervention
+CloneIntervention=Copia intervento
 ConfirmDeleteIntervention=Vuoi davvero eliminare questo intervento?
 ConfirmValidateIntervention=Vuoi davvero convalidare questo intervento?
 ConfirmModifyIntervention=Vuoi davvero modificare questo intervento?
 ConfirmDeleteInterventionLine=Vuoi davvero cancellare questa riga di intervento?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention ?
+ConfirmCloneIntervention=Vuoi davvero copiare questo intervento ?
 NameAndSignatureOfInternalContact=Nome e firma del partecipante:
 NameAndSignatureOfExternalContact=Nome e firma del cliente:
 DocumentModelStandard=Modello documento standard per gli interventi
@@ -37,24 +37,25 @@ InterventionClassifiedBilledInDolibarr=Intervento %s classificato come fatturato
 InterventionClassifiedUnbilledInDolibarr=Intervento %s classificato come non fatturato
 InterventionSentByEMail=Intervento %s inviato via email
 InterventionDeletedInDolibarr=Intervento %s eliminato
-InterventionsArea=Interventions area
+InterventionsArea=Zona dell'intervento
 DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
+LastModifiedInterventions=Ultimi %s interventi modificati
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=Contatto di follow-up del cliente
 # Modele numérotation
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
+PrintProductsOnFichinter=Stampa anche i "prodotti" (non solo i servizi) sulla scheda interventi
 PrintProductsOnFichinterDetails=interventi generati da ordini
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistiche degli interventi
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
 ##### Exports #####
-InterId=Intervention id
+InterId=ID intervento
 InterRef=Intervention ref.
-InterDateCreation=Date creation intervention
-InterDuration=Duration intervention
-InterStatus=Status intervention
-InterNote=Note intervention
+InterDateCreation=Data di creazione intervento
+InterDuration=Durata intervento
+InterStatus=Stato dell'intervento
+InterNote=Note intervento
 InterLineId=Line id intervention
 InterLineDate=Line date intervention
 InterLineDuration=Line duration intervention
diff --git a/htdocs/langs/it_IT/ldap.lang b/htdocs/langs/it_IT/ldap.lang
index a532293a049..fad7e12668a 100644
--- a/htdocs/langs/it_IT/ldap.lang
+++ b/htdocs/langs/it_IT/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Prima data di sottoscrizione
 LDAPFieldFirstSubscriptionAmount=Importo della prima sottoscrizione
 LDAPFieldLastSubscriptionDate=Data ultima sottoscrizione
 LDAPFieldLastSubscriptionAmount=Importo ultima sottoscrizione
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Utente sincronizzato
 GroupSynchronized=Gruppo sincronizzato
 MemberSynchronized=Membro sincronizzato
diff --git a/htdocs/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
index 30032c6adaf..10dedab1709 100644
--- a/htdocs/langs/it_IT/loan.lang
+++ b/htdocs/langs/it_IT/loan.lang
@@ -5,7 +5,7 @@ NewLoan=Nuovo prestito
 ShowLoan=Mostra prestito
 PaymentLoan=Pagamento prestito
 ShowLoanPayment=Mostra pagamento prestito
-LoanCapital=Capital
+LoanCapital=Capitale
 Insurance=Assicurazione
 Interest=Interesse
 Nbterms=Numero di rate
@@ -14,7 +14,7 @@ LoanAccountancyInsuranceCode=Codice contabilità per l'assicurazione
 LoanAccountancyInterestCode=Codice contabilità per gli interessi
 ConfirmDeleteLoan=Conferma l'eliminazione di questo prestito
 LoanDeleted=Prestito eliminato correttamente
-ConfirmPayLoan=Confirm classify paid this loan
+ConfirmPayLoan=Conferma questo prestito come ripagato
 LoanPaid=Prestito ripagato
 # Calc
 LoanCalc=Bank Loans Calculator
@@ -24,7 +24,7 @@ PercentageDown=Percentage Down
 LengthOfMortgage=Durata del prestito
 AnnualInterestRate=Tasso di interesse annuo
 ExplainCalculations=Explain Calculations
-ShowMeCalculationsAndAmortization=Show me the calculations and amortization
+ShowMeCalculationsAndAmortization=Mostrami interessi ed ammortamento
 MortgagePaymentInformation=Informazioni sul pagamento del mutuo ipotecario
 DownPayment=Anticipo
 DownPaymentDesc=The <b>down payment</b> = The price of the home multiplied by the percentage down divided by 100 (for 5% down becomes 5/100 or 0.05)
@@ -41,7 +41,7 @@ MonthlyPayment=Rata mensile
 LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
 GoToInterest=%s will go towards INTEREST
 GoToPrincipal=%s will go towards PRINCIPAL
-YouWillSpend=You will spend %s in year %s
+YouWillSpend=Spenderete %s in %s anni
 # Admin
 ConfigLoan=Configurazione del modulo prestiti
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Codice contabilità capitale di default
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index 8438a49e515..226f376f806 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Da leggere
 YourMailUnsubcribeOK=La mail <b>%s</b> è stata cancellata correttamente dalla lista di invio
 ActivateCheckReadKey=Chiave usata per crittare la URL usata nelle funzionalità "Conferma di lettura" e "Cancella sottoscrizione"
 EMailSentToNRecipients=Email inviata a %s destinatari
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> destinatari aggiunti alla lista di invio
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Num. selezionati
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Valore massimo
 AdvTgtSearchDtHelp=Usa intervallo per selezionare la data
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Aggiungi tutti
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index c79f2c600a0..e8f237ed725 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -67,6 +67,7 @@ SelectDate=Seleziona una data
 SeeAlso=Vedi anche %s
 SeeHere=Vedi qui
 BackgroundColorByDefault=Colore di sfondo predefinito
+FileRenamed=The file was successfully renamed
 FileUploaded=Il file è stato caricato con successo
 FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato. Clicca su <b>Allega file</b> per farlo
 NbOfEntries=Numero di voci
@@ -245,6 +246,10 @@ DateBuild=Data di creazione del report
 DatePayment=Data pagamento
 DateApprove=Approvato in data
 DateApprove2=Data di approvazione (seconda approvazione)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=anno
 DurationMonth=mese
 DurationWeek=settimana
@@ -256,6 +261,7 @@ DurationDays=giorni
 Year=Anno
 Month=Mese
 Week=Settimana
+WeekShort=Week
 Day=Giorno
 Hour=Ora
 Minute=Minuto
@@ -278,6 +284,7 @@ MonthOfDay=Mese del giorno
 HourShort=Ora
 MinuteShort=min
 Rate=Tariffa
+CurrencyRate=Currency conversion rate
 UseLocalTax=Tasse incluse
 Bytes=Byte
 KiloBytes=Kilobyte
@@ -565,8 +572,11 @@ BackToList=Torna alla lista
 GoBack=Torna indietro
 CanBeModifiedIfOk=Può essere modificato se valido
 CanBeModifiedIfKo=Può essere modificato se non valido
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modificati con successo
 RecordsModified=%s record modificati
+RecordsDeleted=%s records deleted
 AutomaticCode=Codice automatico
 FeatureDisabled=Funzionalità disabilitata
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Non hai l'autorizzazione per svolgere questa azione
 SessionName=Nome sessione
 Method=Metodo
 Receive=Ricevi
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Parziale
 TotalWoman=Totale
 NeverReceived=Mai ricevuto
@@ -598,6 +609,7 @@ DisabledModules=Moduli disabilitati
 For=Per
 ForCustomer=Per i clienti
 Signature=Firma
+DateOfSignature=Date of signature
 HidePassword=Mostra il comando con password offuscata
 UnHidePassword=Visualizza comando con password in chiaro
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=Nuovo attributo
 AttributeCode=Codice attributo
 URLPhoto=URL foto/logo
 SetLinkToAnotherThirdParty=Collega ad altro soggetto terzo
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Crea bozza
 SetToDraft=Ritorna a bozza
 ClickToEdit=Clicca per modificare
@@ -701,6 +722,9 @@ RelatedObjects=Oggetti correlati
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Lunedì
 Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index b8175262531..41b6c677f1a 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Il rapporto deve essere un numero
 markRateShouldBeLesserThan100=Il rapporto deve essere inferiore a 100
 ShowMarginInfos=Mostra informazioni sui margini
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/it_IT/oauth.lang b/htdocs/langs/it_IT/oauth.lang
index 32709cf9b34..781efd37787 100644
--- a/htdocs/langs/it_IT/oauth.lang
+++ b/htdocs/langs/it_IT/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configurazione Oauth
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Usa il seguente indirizzo come Redirect URI quando crei le credenziali sul tuo provider OAuth:
 ListOfSupportedOauthProviders=Inserisci qui le credenziali fornite dal tuo provider OAuth. Vengono visualizzati solo i provider supportati. Questa configurazione può essere usata ache dagli altri moduli che necessitano di autenticazione OAuth2.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Id Api Google
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index ad89b9e53c0..2d4082a4630 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=I tuoi ordini sono stati creati
 OrderFail=C'è stato un errore durante la creazione del tuo ordine
 CreateOrders=Crea ordini
 ToBillSeveralOrderSelectCustomer=Per creare una fattura per ordini multipli, clicca prima sul cliente, poi scegli "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/it_IT/printing.lang b/htdocs/langs/it_IT/printing.lang
index 3a10b32cc36..2b8bafd7d0b 100644
--- a/htdocs/langs/it_IT/printing.lang
+++ b/htdocs/langs/it_IT/printing.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
+Module64000Name=Stampa diretta
+Module64000Desc=Abilita il sistema di stampa diretta
 PrintingSetup=Impostazioni del sistema di stampa diretta
 PrintingDesc=Questo modulo aggiunge un pulsante per la stampa diretta dei documenti (senza aprire il pdf) usando vari moduli.
 MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+DirectPrint=Stampa diretta
 PrintingDriverDesc=Credenziali per i driver di stampa
 ListDrivers=Lista dei driver
 PrintTestDesc=Lista delle stampanti
@@ -18,13 +18,9 @@ UserConf=Impostazioni per utente
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Autenticazione
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Questo driver permette la stampa diretta del documento usando Google Cloud Print.
 GCP_Name=Nome
-GCP_displayName=Display Name
+GCP_displayName=Mostra Nome
 GCP_Id=ID stampante
 GCP_OwnerName=Nome del proprietario
 GCP_State=Stato della stampante
@@ -52,4 +48,4 @@ DirectPrintingJobsDesc=This page lists printing jobs found for available printer
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintTestDescprintgcp=Lista delle stampanti Google Cloud Print.
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 2986836fc21..630d6658259 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lotto/numero di serie
 atleast1batchfield=Data di scadenza o lotto/numero di serie
 batch_number=Lotto/numero di serie
 BatchNumberShort=Lotto/numero di serie
-l_eatby=Data di scadenza
-l_sellby=Data limite per la vendita
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=dettagli lotto/numero di serie
 DetailBatchFormat=Lotto/numero di serie: %s - Consumare entro: %s - Da vendere entro: %s (Quantità: %d)
 printBatch=Lotto/numero di serie: %s
@@ -19,3 +19,6 @@ printQty=Quantità: %d
 AddDispatchBatchLine=Aggiungi una riga per la durata a scaffale
 WhenProductBatchModuleOnOptionAreForced=Con il modulo lotti/numeri seriali attivo, l'incremento/diminuzione delle scorte viene impostato obbligatoriamente su "ultima scelta" e non può più essere reimpostato. Le altre opzioni restano modificabili.
 ProductDoesNotUseBatchSerial=Questo prodotto non usa lotto/numero di serie
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 1bb075b3077..7da9e0cdd46 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Modifica di massa dell'IVA
 ProductVatMassChangeDesc=Questa pagina è utile a modificare le tariffe delle tasse definite nei prodotti o servizi da un valore ad un altro. Attenzione: questa modifica influenza l'intero database
 MassBarcodeInit=Inizializzazione di massa dei codici a barre
 MassBarcodeInitDesc=Questa pagina può essere usata per inizializzare un codice a barre di un oggetto che non ha ancora un codice a barre definito. Controlla prima che il setup del modulo Codici a barre sia completo. 
-ProductAccountancyBuyCode=Codice contabilità (acquisto)
-ProductAccountancySellCode=Codice contabilità (vendita)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Prodotto o servizio
 ProductsAndServices=Prodotti e Servizi
 ProductsOrServices=Prodotti o servizi
@@ -29,10 +29,10 @@ ProductsOnSellAndOnBuy=Prodotti in vendit
 ServicesOnSell=Servizi in vendit
 ServicesNotOnSell=Servizi non in vendita
 ServicesOnSellAndOnBuy=Servizi in vendita
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product card
+LastModifiedProductsAndServices=Ultimi %s prodotti/servizi modificati
+LastRecordedProducts=Ultimi %s prodotti registrati
+LastRecordedServices=Ultimi %s servizi registrati
+CardProduct0=Scheda prodotto
 CardProduct1=Service card
 Stock=Scorte
 Stocks=Scorte
@@ -59,6 +59,8 @@ SellingPriceHT=Prezzo di vendita (al netto delle imposte)
 SellingPriceTTC=Prezzo di vendita (inclusa IVA)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In una versione futura, questo valore può essere utilizzato per il calcolo del margine.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nuovo prezzo
 MinPrice=Min. prezzo di vendita
 CantBeLessThanMinPrice=Il prezzo di vendita non può essere inferiore al minimo consentito per questo prodotto ( %s IVA esclusa)
@@ -197,15 +199,15 @@ PrintsheetForOneBarCode=Stampa più etichette per singolo codice a barre
 BuildPageToPrint=Genera pagina da stampare
 FillBarCodeTypeAndValueManually=Riempi il tipo di codice a barre e il valore manualmente
 FillBarCodeTypeAndValueFromProduct=Riempi il tipo di codice a barre e valore dal codice a barre del prodotto
-FillBarCodeTypeAndValueFromThirdParty=Riempi il tipo di codice a barre e il valore da un codice a barre di terze parti
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=La definizione del tipo o del valore del codice a barre non è completa per il prodotto %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=La definizione del tipo o valore del codice a barre non è completa per la terzaparte %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Informazioni codice a barre del prodotto %s :
-BarCodeDataForThirdparty=Informazioni codice a barre della terza parte %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definisci il valore del codice a barre per tutti quelli inseriti (questo resetta anche i valori già definiti dei codice a barre con nuovi valori)
-PriceByCustomer=Different prices for each customer
+PriceByCustomer=Prezzi diversi in base al cliente
 PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
+PricingRule=Reogle dei prezzi di vendita
 AddCustomerPrice=Aggiungere prezzo dal cliente
 ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
 PriceByCustomerLog=Log di precedenti prezzi clienti
@@ -251,6 +253,6 @@ ProductVolume=Volume for 1 product
 WeightUnits=Unità di peso
 VolumeUnits=Unità di volume
 SizeUnits=Unità di misura
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+DeleteProductBuyPrice=Cancella prezzo di acquisto
+ConfirmDeleteProductBuyPrice=Vuoi davvero eliminare questo prezzo di acquisto? 
 
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index c1e1c71c130..bb03bc08d9e 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Elenco delle proposte commerciali associate al progetto
-ListOrdersAssociatedProject=Elenco degli ordini associati al progetto
-ListInvoicesAssociatedProject=Elenco delle fatture attive associate al progetto
-ListPredefinedInvoicesAssociatedProject=Elenco dei modelli di fattura del cliente associati al progetto
-ListSupplierOrdersAssociatedProject=Elenco degli ordini fornitori associati al progetto
-ListSupplierInvoicesAssociatedProject=Elenco delle fatture passive associate al progetto
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Elenco dei contratti associati al progetto
 ListFichinterAssociatedProject=Elenco degli interventi associati al progetto
 ListExpenseReportsAssociatedProject=Lista delle note spese associate con il progetto
@@ -123,6 +123,7 @@ ProjectReportDate=Cambia la data del compito a seconda della data di inizio prog
 ErrorShiftTaskDate=Impossibile cambiare la data del compito a seconda della data di inizio del progetto
 ProjectsAndTasksLines=Progetti e compiti
 ProjectCreatedInDolibarr=Progetto %s creato
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Attività %s creata
 TaskModifiedInDolibarr=Attività %s modificata
 TaskDeletedInDolibarr=Attività %s cancellata
@@ -153,7 +154,7 @@ PlannedWorkload=Carico di lavoro previsto
 PlannedWorkloadShort=Carico di lavoro
 ProjectReferers=Elementi correlati
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
-FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
 InputPerAction=Input per azione
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Le statistiche relative a progetti/clienti interessati
 TaskAssignedToEnterTime=Compito assegnato. Inserire i tempi per questo compito dovrebbe esserre possibile.
 IdTaskTime=Tempo compito id
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Progetti aperti da terze parti
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/it_IT/resource.lang b/htdocs/langs/it_IT/resource.lang
index add1830a7f5..c0b3a6f6446 100644
--- a/htdocs/langs/it_IT/resource.lang
+++ b/htdocs/langs/it_IT/resource.lang
@@ -2,13 +2,13 @@
 MenuResourceIndex=Risorse
 MenuResourceAdd=Nuova risorsa
 DeleteResource=Elimina risorsa
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
+ConfirmDeleteResourceElement=Conferma l'eliminazione della risorsa da questo elemento
 NoResourceInDatabase=Nessuna risorsa nel database
 NoResourceLinked=Nessuna risorsa collegata
 
 ResourcePageIndex=Elenco delle risorse
 ResourceSingular=Risorsa
-ResourceCard=Resource card
+ResourceCard=Scheda risorsa
 AddResource=Crea una risorsa
 ResourceFormLabel_ref=Nome della risorsa
 ResourceType=Tipo di risorsa
@@ -16,16 +16,16 @@ ResourceFormLabel_description=Descrizione della risorsa
 
 ResourcesLinkedToElement=Risorse collegate all'elemento
 
-ShowResource=Show resource
+ShowResource=Mostra risorsa
 
 ResourceElementPage=Risorse dell'elemento
-ResourceCreatedWithSuccess=Resource successfully created
+ResourceCreatedWithSuccess=Risorsa creata con successo
 RessourceLineSuccessfullyDeleted=Resource line successfully deleted
 RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceLinkedWithSuccess=Risorsa collegata con successo
 
 ConfirmDeleteResource=Conferma l'eliminazione di questa risorsa
 RessourceSuccessfullyDeleted=Risorsa eliminata con successo
 DictionaryResourceType=Tipo di risorse
 
-SelectResource=Seleziona risorse
+SelectResource=Seleziona risorsa
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index d221674dd44..3efc73ad837 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nuovo pagamento stipendio
 SalaryPayment=Pagamento stipendio
 SalariesPayments=Pagamento stipendi
 ShowSalaryPayment=Mostra i pagamenti stipendio
-THM=Prezzo medio orario
-TJM=Prezzo medio giornaliero
+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=Attualmente il valore è solo un dato informativo e non viene usato per alcun calcolo automatico
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index b099f97c199..7d4fa90e176 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Elimina spedizione
 Stock=Scorta
 Stocks=Scorte
 StocksByLotSerial=Scorte per lotto/seriale
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movimenti
 ErrorWarehouseRefRequired=Riferimento magazzino mancante
 ListOfWarehouses=Elenco magazzini
@@ -43,6 +45,7 @@ PMPValue=Media ponderata prezzi
 PMPValueShort=MPP
 EnhancedValueOfWarehouses=Incremento valore dei magazzini
 UserWarehouseAutoCreate=Creare automaticamente un magazzino alla creazione di un utente
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Le scorte del prodotto e del sottoprodotto sono indipendenti
 QtyDispatched=Quantità spedita
 QtyDispatchedShort=Quantità spedita
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/it_IT/supplier_proposal.lang b/htdocs/langs/it_IT/supplier_proposal.lang
index b91b6c9b918..dc9eeb60740 100644
--- a/htdocs/langs/it_IT/supplier_proposal.lang
+++ b/htdocs/langs/it_IT/supplier_proposal.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Supplier commercial proposals
 supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New request
+SupplierProposalNew=Nuova richiesta
 CommRequest=Price request
 CommRequests=Price requests
 SearchRequest=Find a request
 DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
+SupplierProposalsDraft=Bozza di proposta fornitore
 LastModifiedRequests=Latest %s modified price requests
 RequestsOpened=Open price requests
 SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
+SupplierProposalShort=Proposta fornitore
 SupplierProposals=Proposte Fornitore
-SupplierProposalsShort=Supplier proposals
+SupplierProposalsShort=Proposte Fornitore
 NewAskPrice=New price request
 ShowSupplierProposal=Show price request
 AddSupplierProposal=Create a price request
 SupplierProposalRefFourn=Supplier ref
-SupplierProposalDate=Delivery date
+SupplierProposalDate=Data di spedizione
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
 ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b> ?
 DeleteAsk=Delete request
 ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
+SupplierProposalStatusDraft=Bozza (deve essere convalidata)
 SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
+SupplierProposalStatusClosed=Chiuso
+SupplierProposalStatusSigned=Accettato
 SupplierProposalStatusNotSigned=Rifiutato
-SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
+SupplierProposalStatusDraftShort=Bozza
+SupplierProposalStatusClosedShort=Chiuso
+SupplierProposalStatusSignedShort=Accettato
 SupplierProposalStatusNotSignedShort=Rifiutato
 CopyAskFrom=Create price request by copying existing a request
 CreateEmptyAsk=Create blank request
@@ -43,11 +43,12 @@ ConfirmDeleteAsk=Are you sure you want to delete this price request ?
 ActionsOnSupplierProposal=Events on price request
 DocModelAuroreDescription=A complete request model (logo...)
 CommercialAsk=Price request
-DefaultModelSupplierProposalCreate=Default model creation
+DefaultModelSupplierProposalCreate=Creazione del modello predefinito
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
+SupplierProposalsToClose=Proposta fornitore da elaborare
+SupplierProposalsToProcess=Proposta fornitori da elaborare
 LastSupplierProposals=Last price requests
-AllPriceRequests=All requests
+AllPriceRequests=Tutte le richieste
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index 9fe4d50ad51..d83da7ce4fb 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -7,13 +7,13 @@ History=Storico
 ListOfSuppliers=Elenco fornitori
 ShowSupplier=Visualizza fornitore
 OrderDate=Data ordine
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Per alcuni sottoprodotti non è stato definito un prezzo
-AddSupplierPrice=Aggiungi prezzo fornitore
-ChangeSupplierPrice=Cambia prezzo fornitore
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Il fornitore di riferimento è già associato a un prodotto: %s
 NoRecordedSuppliers=Non ci sono fornitori registrati
 SupplierPayment=Pagamento fornitore
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Elenco ordini fornitori
 MenuOrdersSupplierToBill=Ordini fornitori in fatture
 NbDaysToDelivery=Tempi di consegna in giorni
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index b4418c8864b..a8b970f260b 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Ore settimanali
 ColorUser=Colore dell'utente
 DisabledInMonoUserMode=Disabilitato in modalità manutenzione
 UserAccountancyCode=Codice contabile utente
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/it_IT/website.lang b/htdocs/langs/it_IT/website.lang
index 12e57c1ffd6..02ca20cb31f 100644
--- a/htdocs/langs/it_IT/website.lang
+++ b/htdocs/langs/it_IT/website.lang
@@ -12,6 +12,7 @@ EditMenu=Modifica menu
 EditPageMeta=Modifica metadati
 EditPageContent=Modifica contenuti
 Website=Sito web
+Webpage=Web page
 AddPage=Aggiungi pagina
 PreviewOfSiteNotYetAvailable=L'anteprima del sito <strong>%s</strong> non è ancora disponibile. Devi prima aggiungere almeno una pagina.
 RequestedPageHasNoContentYet=La pagina con id %s richiesta è ancora vuota o il file di cache .tpl.php è stato eliminato. Per risolvere il problema puoi modificare il contenuto della pagina.
@@ -22,4 +23,6 @@ ViewPageInNewTab=Visualizza pagina in una nuova scheda
 SetAsHomePage=Imposta come homepage
 RealURL=Indirizzo URL vero
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index 828433bd450..de98eaaf7f3 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Area ordini permanenti clienti
-StandingOrders=Ordini permanenti
-StandingOrder=Ordine permanente
-NewStandingOrder=Nuovo ordine permanente
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Da processare
-WithdrawalsReceipts=Ricevute domiciliazioni
-WithdrawalReceipt=Ricevuta domiciliazione
-LastWithdrawalReceipts=Ultime %s ricevute bancarie
-WithdrawalsLines=Righe dei domiciliazioni
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Numero di fattura con richiesta di prelievo
-NbOfInvoiceToWithdrawWithInfo=Numero di fattura con richiesta di prelievo per clienti che hanno inserito un conto corrente bancario
-InvoiceWaitingWithdraw=Fattura in attesa di domiciliazione
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Importo da prelevare
-WithdrawsRefused=Bonifico rifiutato
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Non ci sono fatture attive in attesa con modalità di pagamento "domiciliazione".
 ResponsibleUser=Utente responsabile
-WithdrawalsSetup=Impostazione domiciliazioni
-WithdrawStatistics=Statistiche domiciliazioni
-WithdrawRejectStatistics=Statistiche domiciliazioni respinti
-LastWithdrawalReceipt=Ultime %s ricevute bancarie
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Effettuare una richiesta di domiciliazione
 ThirdPartyBankCode=Codice bancario di soggetti terzi
 NoInvoiceCouldBeWithdrawed=Non ci sono fatture riscuotibili con domiciliazione. Verificare che sulle fatture sia riportato il corretto codice IBAN.
@@ -46,7 +47,7 @@ StatusRefused=Rifiutato
 StatusMotif0=Imprecisato
 StatusMotif1=Disponibilità insufficiente
 StatusMotif2=Bonifico contestato
-StatusMotif3=Nessun ordine
+StatusMotif3=No direct debit payment order
 StatusMotif4=Ordine del cliente
 StatusMotif5=IBAN non valido
 StatusMotif6=Conto in rosso
@@ -61,28 +62,43 @@ 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=Conto corrente bancario per il domiciliazione
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Verranno anche creati dei pagamenti tra le ricevuti e saranno classificati come pagati
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Il pagamento dell'ordine permanente %s da parte della banca
-InfoCreditMessage=La banca ha pagato l'ordine permanente %s.<br/>Dati di pagamento: %s
-InfoTransSubject=Trasmissione dell'ordine permanente %s alla banca
-InfoTransMessage=L'ordine permanente %s è stato trasmesso alla banca da %s %s.<br/><br/>
+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>
 InfoTransData=Importo: %s <br> Metodo: %s <br> Data: %s
-InfoRejectSubject=Ordine permanente rifiutato
-InfoRejectMessage=Salve,<br><br>il mandato di incasso per la fattura %s relativo alla ditta %s, per l'importo di %s, è stato rifiutato dalla banca.<br><br>--<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
 ModeWarning=Non è stata impostata la modalità reale, ci fermiamo dopo questa simulazione
diff --git a/htdocs/langs/it_IT/workflow.lang b/htdocs/langs/it_IT/workflow.lang
index 0231a906cad..f4aa11b2343 100644
--- a/htdocs/langs/it_IT/workflow.lang
+++ b/htdocs/langs/it_IT/workflow.lang
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Creare automaticamente una fattura attiva
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifica la proposta commerciale collegata come fatturare quando l'ordine cliente è impostato come pagato
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifica gli ordini dei clienti "fatturati" quando la fattura viene impostata come pagata
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica gli ordini dei clienti da fatturare quando la fattura è validata
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 496ae5e2ad0..f5eaa08a2db 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=実験的
 VersionDevelopment=開発
 VersionUnknown=未知の
 VersionRecommanded=推奨される
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=セッションID
 SessionSaveHandler=セッションを保存するためのハンドラ
 SessionSavePath=ストレージ·セッションのローカライズ
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=<b>%s</b>より精度の高いエラーは、
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=検索を開始する文字のNBR:%s
 NotAvailableWhenAjaxDisabled=Ajaxが無効になったときには使用できません
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScriptが無効になって
 UsePreviewTabs=プレビュータブを使用し
 ShowPreview=プレビューを表示する
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=進数のバイナリデータをエンコード
 IgnoreDuplicateRecords=(INSERT IGNORE)重複レコードのエラーを無視する
 AutoDetectLang=自動検出(ブラウザの言語)
 FeatureDisabledInDemo=デモで機能を無効にする
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=パーミッション
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示されます。
-ModulesDesc=Dolibarrモジュールはソフトウェアで有効になっている機能を定義します。いくつかのモジュールは、モジュールを有効にした後、ユーザーに付与する必要がありますアクセス許可が必要です。モジュール/機能を有効にするには、列 &quot;ステータス&quot;のオン/オフボタンをクリックします。
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=複数のモジュール...
 DoliStoreDesc=DoliStore、Dolibarr ERP / CRM外部モジュールのための公式の市場の場所
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr現在のバージョン
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=任意の番号マスクを入力することができます。このマスクには、以下のタグを使用することができます。 <br> <b>{00万}</b>各%sにインクリメントされる番号に対応しています。カウンタの希望の長さなどの多くのゼロとして入力します。カウンタは、マスクとして多くのゼロとして持たせるために、左からゼロで完了する予定です。 <br> <b>{00万000}</b>以前のが、最初の%sから始まる適用されている+記号の右にある数字に対応するオフセットと同じです。 <br> <b>{00万@ x}の</b>前のと同じですが、カウンタが月、xは(1〜12、または0の間でXコンフィギュレーションで定義された会計年度の初めに数ヶ月を使用する)に達したときにゼロにリセットされます。このオプションを使用すると、xが2以上ある場合、その列{YY} {ミリメートル}または{yyyyは} {}ミリメートルも要求されます。 <br> <b>{DD}</b>日(01〜31)。 <br> <b>{}ミリメートル</b>月(01〜12)。 <br> 2、4、または1の数値以上<b>{YY}、{探す}</b>または<b>{Y}</b>年。 <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=マスク内の他のすべての文字はそのまま残ります。 <br>スペースは許可されていません。 <br>
 GenericMaskCodes4a=<u>サードパーティTheCompany第99 %s上の例では、2007年1月31日に行わ:</u> <br>
 GenericMaskCodes4b=<u>2007年3月1日で作成されたサードパーティの例:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
 EnterRefToBuildUrl=オブジェクト%sの参照を入力します。
 GetSecuredUrl=計算されたURLを取得する
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=ユーザーとグループ
@@ -428,8 +439,8 @@ Module55Name=バーコード
 Module55Desc=バーコードの管理
 Module56Name=テレフォニー
 Module56Desc=テレフォニー統合
-Module57Name=立っている受注
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDialシステムの統合(アスタリスク、...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=のwebcalendar
 Module410Desc=のwebcalendar統合
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=通知
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=寄付
 Module700Desc=寄付金の管理
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=プロバイダを読む
 Permission147=統計を読む
-Permission151=立って注文を読み取る
-Permission152=立っている注文要求を作成する/変更
-Permission153=伝送に立って注文の領収書
-Permission154=クレジット/拒否立って注文の領収書
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=サプライヤーの請求書、属性、および支払いを
 Permission1237=Export supplier orders and their details
 Permission1251=データベース(データロード)に外部データの大量インポートを実行する
 Permission1321=顧客の請求書、属性、および支払いをエクスポートする
+Permission1322=Reopen a paid bill
 Permission1421=顧客の注文と属性をエクスポートします。
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=ない翻訳がコードに見つからない場合、デフ
 LabelOnDocuments=ドキュメントのラベル
 NbOfDays=日のNb
 AtEndOfMonth=今月末に
+CurrentNext=Current/Next
 Offset=オフセット
 AlwaysActive=常にアクティブ
 Upgrade=アップグレード
@@ -950,7 +967,7 @@ LogEventDesc=ここDolibarrセキュリティイベントのロギングを有
 AreaForAdminOnly=これらの機能は、 <b>管理者ユーザー</b>のみ ​​使用することができます。
 SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報です。
 SystemAreaForAdminOnly=この領域は、管理者ユーザーのために利用可能です。 Dolibarr権限のいずれも、この制限を減らすことはできません。
-CompanyFundationDesc=このページでは、(これをクリックし、ページの下部にある &quot;変更&quot;ボタン)を管理する必要がある企業や財団のすべての既知の情報を編集する
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=あなたがDolibarrの外観に関連する各パラメータを選択し、ここで感じることができる
 AvailableModules=使用可能なモジュール
 ToActivateModule=モジュールを有効にするには、設定エリア(ホーム - &gt;セットアップ - &gt;モジュール)に行く。
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=警告は、一部のLinuxシステムでは、電子
 PathToDocuments=ドキュメントへのパス
 PathDirectory=ディレクトリ
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=TLSを使用する
 LDAPServerUseTLSExample=LDAPサーバを使用するTLS
 LDAPServerDn=サーバーのDN
 LDAPAdminDn=管理者DN
-LDAPAdminDnExample=完全なDN(例:CN = adminldap、DC =社会、dc = comなど)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=管理者パスワード
 LDAPUserDn=ユーザーのDN
 LDAPUserDnExample=完全なDN(例:OU =ユーザー、DC =社会、dc = comなど)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=例:o
 LDAPFieldSid=SID
 LDAPFieldSidExample=例:objectSidが
 LDAPFieldEndLastSubscription=サブスクリプション終了の日付
-LDAPFieldTitle=/ポスト機能
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=(他のタブに行く)LDAPセットアップ完了していません
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されません。 LDAPのアクセスは匿名で、読み取り専用モードになります。
@@ -1293,7 +1318,7 @@ ProductServiceSetup=製品とサービスモジュールのセットアップ
 NumberOfProductShowInSelect=コンボselectリスト内の製品の最大数(0 =制限なし)
 ViewProductDescInFormAbility=フォーム内の​​製品の説明の可視化(それ以外のポップアップツールチップなど)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=thirdparty言語の製品の説明の可視化
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=製品に使用するデフォルトのバーコードの種類
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=撤退モジュールのセットアップ
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=外部のRSSをインポートセットアップ
 NewRSS=新しいRSSフィード
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 54b83142caa..cc5bc506c82 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=和解
 RIB=銀行の口座番号
 IBAN=IBAN番号
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT番号
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=立ち受注
-StandingOrder=立ち順
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=アカウントステートメント
 AccountStatementShort=ステートメント
 AccountStatements=アカウント文
@@ -78,6 +74,7 @@ AccountToCredit=クレジットのアカウント
 AccountToDebit=振替にアカウント
 DisableConciliation=このアカウントのための調整機能を無効にする
 ConciliationDisabled=和解の機能が無効になって
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=閉じ
 AccountIdShort=数
@@ -87,6 +84,8 @@ AddBankRecordLong=トランザクションを手動で追加します。
 ConciliatedBy=による和解
 DateConciliating=日付を調整する
 BankLineConciliated=トランザクション調整
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=顧客の支払い
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=撤退の支払い
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=銀行の転送
 BankTransfers=銀行振込
-TransferDesc=1つのアカウントから別の転送、Dolibarrは、2つのレコードを(同じ量のソースアカウントの借方とターゲットのアカウントにクレジット、同じラベルと日付がこのトランザクションに使用される)書き込みます。
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=からの
 TransferTo=への
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されています。
@@ -129,7 +129,7 @@ FutureTransaction=フューチャーのトランザクション。調停する
 SelectChequeTransactionAndGenerate=チェックの預金証書に含まれると、&quot;作成&quot;をクリックしてチェックをフィルタリング/選択してください。
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 91269bd5cbb..aed42016fd1 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、ドラフトの
 BillFrom=から
 BillTo=請求する
 ActionsOnBill=請求書上のアクション
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=提供される割引(用語の前にお支払い)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=立っている受注
-StandingOrder=立っているため、
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=いいえドラフトの請求なし
 NoOtherDraftBills=他のドラフトの請求なし
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=銀行のために
-PaymentTypeShortPRE=銀行のために
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=現金
 PaymentTypeShortLIQ=現金
 PaymentTypeCB=クレジットカード
@@ -381,6 +381,7 @@ ExtraInfos=余分に関する情報
 RegulatedOn=に規制
 ChequeNumber=Nを確認してください°
 ChequeOrTransferNumber=転送チェック/ N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=チェックの銀行
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=この支払によって支払った
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが &quot;支払った&quot;に閉鎖され支払うことに残っています。
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=請求書PDFテンプレートのカニ。完全な請求書テンプレート(テンプレートをおすすめ)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index efa13cb87e2..e521293028a 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=最も古いアクティブな期限切れのサービス
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=顧客の請求書
 ForCustomersOrders=Customers orders
 ForProposals=提案
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index bef8eef0f2c..d7bdb4fb5cf 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=上の
 CashDeskThirdParty=第三者
 ShoppingCart=ショッピングカート
 NewSell=新しい販売
-BackOffice=バックオフィス
 AddThisArticle=この記事を追加します。
 RestartSelling=販売に戻る
-SellFinished=完成した販売
+SellFinished=Sale complete
 PrintTicket=印刷チケット
 NoProductFound=記事見つかりません
 ProductFound=製品が見つかりました
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 4e219ed4094..ae2c59852f7 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=サブカテゴリ
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=このカテゴリには、このrefで既に存在している
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=このカテゴリにはどの製品も含まれていません。
 ThisCategoryHasNoSupplier=このカテゴリにはすべてのサプライヤーが含まれていません。
 ThisCategoryHasNoCustomer=このカテゴリにはすべての顧客が含まれていません。
 ThisCategoryHasNoMember=このカテゴリには、任意のメンバーが含まれていません。
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index b33950db39c..1f67812bb9a 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=新しい民間の個々の
 NewCompany=新会社(見通し、顧客、サプラ​​イヤー)
 NewThirdParty=新しいサードパーティ(見込み客、顧客、サプラ​​イヤー)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospectionエリア
 IdThirdParty=IDサードパーティ
 IdCompany=企業ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=サプライヤー
 ThirdPartyType=サードパーティ製のタイプ
 Company/Fundation=会社/財団
 Individual=私人
-ToCreateContactWithSameName=自動的に同じ情報と物理的に接触を作成します。
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=親会社
 Subsidiaries=子会社
 ReportByCustomers=お客様によるレポート
@@ -47,7 +49,7 @@ CivilityCode=礼儀正しさコード
 RegisteredOffice=登録事務所
 Lastname=姓
 Firstname=ファーストネーム
-PostOrFunction=/ポスト機能
+PostOrFunction=Job position
 UserTitle=タイトル
 Address=アドレス
 State=州/地方
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=教授の携帯電話
 PhonePerso=PERS。電話
 PhoneMobile=携帯電話
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=ファックス
 Zip=郵便番号
 Town=シティ
@@ -73,7 +75,7 @@ Poste= 位置
 DefaultLang=デフォルトでは、言語
 VATIsUsed=付加価値税(VAT)は使用されている
 VATIsNotUsed=付加価値税(VAT)は使用されていません
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT番号
 VATIntraShort=VAT番号
 VATIntraSyntaxIsValid=構文は有効です。
-VATIntraValueIsValid=値が有効です。
 ProspectCustomer=プロスペクト/顧客
 Prospect=見通し
 CustomerCard=顧客カード
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=コンタクト/アドレスを編集
 EditContactAddress=Edit contact/address
 Contact=連絡
+ContactId=Contact id
 ContactsAddresses=コンタクト/アドレス
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=この第三者のために定義された接触禁止
 DefaultContact=デフォルトの連絡先
@@ -284,7 +287,7 @@ CompanyDeleted=データベースから削除された会社 &quot;%s&quot;。
 ListOfContacts=連絡先/アドレスのリスト
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=第三者のリスト
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=連絡先を表示する
 ContactsAllShort=すべて(フィルタなし)
 ContactType=コンタクトタイプ
@@ -294,6 +297,7 @@ ContactForProposals=提案者の連絡先
 ContactForContracts=契約者の連絡先
 ContactForInvoices=請求書の連絡先
 NoContactForAnyOrder=この連絡先は任意の順序のための接触はありません
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=この連絡先は、任意の商業的な提案のための接触はありません
 NoContactForAnyContract=この接触は、いかなる契約の連絡はありません
 NoContactForAnyInvoice=この連絡先は、任意の請求書の連絡はありません
@@ -352,9 +356,9 @@ ExportCardToFormat=形式にカードをエクスポートする
 ContactNotLinkedToCompany=第三者にリンクされて接触しない
 DolibarrLogin=Dolibarrログイン
 NoDolibarrAccess=いいえDolibarrアクセス​​できない
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=連絡先とプロパティ
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=銀行の詳細
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index be001474122..7feed5380f6 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=税金と配当金
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index 281b941620a..93eef0cc97b 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=方法
 CronModule=モジュール
 CronNoJobs=No jobs registered
 CronPriority=優先順位
-CronLabel=説明
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index c1731b214ea..17fb1ee3f76 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 17edaefbcdd..498d7b5e73b 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=このPHPは、セッションをサポートしています
 PHPSupportPOSTGETOk=このPHPは、変数はPOSTとGETをサポートしています。
 PHPSupportPOSTGETKo=それはあなたのPHPの設定は変数のPOSTおよび/をサポートしたり、取得していない可能性があります。 php.iniのパラメータ<b>に、variables_orderを</b>確認<b>して</b>ください。
 PHPSupportGD=このPHPのサポートGDグラフィック機能。
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=このPHPは、UTF8の機能をサポートしています。
 PHPMemoryOK=あなたのPHPの最大のセッションメモリは<b>%s</b>に設定されています。これは十分なはずです。
 PHPMemoryTooLow=あなたのPHPの最大セッション·メモリーが<b>%s</b>バイトに設定されています。これはあまりにも低くする必要があります。少なくとも<b>%s</b>バイト<b>にmemory_limit</b>パラメータを設定するには、php.ini <b>を</b>変更してください。
 Recheck=もっと意味のあるテストはここをクリック
 ErrorPHPDoesNotSupportSessions=PHPのインストールでは、セッションをサポートしていません。この機能はDolibarrの作業を行う必要があります。 PHPの設定を確認してください。
 ErrorPHPDoesNotSupportGD=PHPのインストールはグラフィカル関数GDをサポートしていません。ないグラフは利用できません。
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=PHPのインストールは、UTF8の機能をサポートしていません。 Dolibarrが正しく動作することはできません。 Dolibarrをインストールする前にこの問題を解決する。
 ErrorDirDoesNotExists=ディレクトリの%sが存在しません。
 ErrorGoBackAndCorrectParameters=後方に移動して、不正なパラメータを修正してください。
@@ -133,6 +135,10 @@ ActivateModule=モジュール%sをアクティブにする
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=アクション上でデータを更新する
 MigrationPaymentMode=支払い·モードのデータ移行
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index f8791430640..9a71c2d815c 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=フォローアップ顧客との接触
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/ja_JP/ldap.lang b/htdocs/langs/ja_JP/ldap.lang
index 902fa460cda..02f67f68b15 100644
--- a/htdocs/langs/ja_JP/ldap.lang
+++ b/htdocs/langs/ja_JP/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=最初のサブスクリプションの日付
 LDAPFieldFirstSubscriptionAmount=最初のサブスクリプションの量
 LDAPFieldLastSubscriptionDate=最後のサブスクリプションの日付
 LDAPFieldLastSubscriptionAmount=最後のサブスクリプションの量
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=ユーザーの同期
 GroupSynchronized=グループは、同期
 MemberSynchronized=メンバーは、同期
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index c3981d9ad92..e46a7f6711a 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=読む
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index e9c62895783..10a7fbcef2e 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=デフォルトの背景色
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
 NbOfEntries=エントリのNb
@@ -245,6 +246,10 @@ DateBuild=日付をビルドレポート
 DatePayment=支払日
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=年
 DurationMonth=月
 DurationWeek=週
@@ -256,6 +261,7 @@ DurationDays=日
 Year=年
 Month=月
 Week=週
+WeekShort=Week
 Day=日
 Hour=時間
 Minute=分
@@ -278,6 +284,7 @@ MonthOfDay=その日の月
 HourShort=H
 MinuteShort=mn
 Rate=率
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=バイト
 KiloBytes=キロバイト
@@ -565,8 +572,11 @@ BackToList=一覧に戻る
 GoBack=戻る
 CanBeModifiedIfOk=有効であれば変更することができます
 CanBeModifiedIfKo=有効でない場合は変更することができます
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=レコードが正常に変更
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=自動コード
 FeatureDisabled=機能が無効に
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=このアクションの権限を持っていません
 SessionName=セッション名
 Method=方法
 Receive=受け取る
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=部分的な
 TotalWoman=合計
 NeverReceived=受信しませんでした
@@ -598,6 +609,7 @@ DisabledModules=ディセーブルになっているモジュール
 For=のために
 ForCustomer=顧客のために
 Signature=署名
+DateOfSignature=Date of signature
 HidePassword=隠されたパスワードを使用してコマンドを表示する
 UnHidePassword=明確なパスワードを使用して実際のコマンドを表示する
 Root=ルート
@@ -641,6 +653,15 @@ NewAttribute=新しい属性
 AttributeCode=属性コード
 URLPhoto=写真/ロゴのURL
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=ドラフトを作成します。
 SetToDraft=Back to draft
 ClickToEdit=クリックして編集
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=月曜日
 Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index 516410e9a1a..3e55463a2f2 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/ja_JP/oauth.lang b/htdocs/langs/ja_JP/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/ja_JP/oauth.lang
+++ b/htdocs/langs/ja_JP/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index e4f825bc1bf..a208c2f28f1 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ja_JP/printing.lang b/htdocs/langs/ja_JP/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/ja_JP/printing.lang
+++ b/htdocs/langs/ja_JP/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index b1c4fffada6..cbfc961ea55 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=会計コード(購入する)
-ProductAccountancySellCode=会計コード(販売)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=製品やサービス
 ProductsAndServices=製品とサービス
 ProductsOrServices=製品またはサービス
@@ -59,6 +59,8 @@ SellingPriceHT=(税引後)販売価格
 SellingPriceTTC=販売価格(税込)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=新価格
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=販売価格は、本製品(税抜き%s)に許可される最小値より小さくなることはありません。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示されますことができます。
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index ce853f1acf0..4fe20e8f272 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=プロジェクトに関連付けられている商用の提案のリスト
-ListOrdersAssociatedProject=プロジェクトに関連付けられた顧客の注文のリスト
-ListInvoicesAssociatedProject=プロジェクトに関連付けられた顧客の請求書の一覧
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=プロジェクトに関連付けられているサプライヤーの注文のリスト
-ListSupplierInvoicesAssociatedProject=プロジェクトに関連付けられている仕入先の請求書の一覧
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=プロジェクトに関連付けられている契約のリスト
 ListFichinterAssociatedProject=プロジェクトに関連付けられている介入のリスト
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 7ec68181d14..f038e175553 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=送信削除
 Stock=株式
 Stocks=ストック
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=動作
 ErrorWarehouseRefRequired=ウェアハウスの参照名を指定する必要があります
 ListOfWarehouses=倉庫のリスト
@@ -43,6 +45,7 @@ PMPValue=加重平均価格
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=倉庫の値
 UserWarehouseAutoCreate=ユーザーの作成時に自動的に倉庫を作成します。
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=数量派遣
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 55451a950d4..bf4c0e4da14 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -7,13 +7,13 @@ History=歴史
 ListOfSuppliers=サプライヤーのリスト
 ShowSupplier=サプライヤーを表示
 OrderDate=注文日
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=サプライヤ価格を追加します。
-ChangeSupplierPrice=サプライヤ価格を変更する
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=このリファレンス·サプライヤーは、すでに参照に関連付けられています。%s
 NoRecordedSuppliers=記録されていないサプライヤーません
 SupplierPayment=サプライヤーの支払い
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index 2f413ac2468..f010509bd15 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index 6c2a8288dbb..7c7ccd80741 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=ウェブサイト
+Webpage=Web page
 AddPage=ページの追加
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=ホームページに設定する
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index b45d5b99fab..a09efbe49f4 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=受注エリアに立ってお客さま
-StandingOrders=立っている受注
-StandingOrder=立っている受注
-NewStandingOrder=新しい常任順
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=処理するには
-WithdrawalsReceipts=撤退の領収書
-WithdrawalReceipt=撤退の領収書
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=撤退ライン
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=請求書は撤回を待っている
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=撤回する金額
-WithdrawsRefused=撤回は拒否
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=支払いモード &quot;撤退&quot;には顧客の請求書が待っているされていません。要求を行うために請求書、カードの &quot;引き出し&quot;タブをクリックしてください。
 ResponsibleUser=担当ユーザー
-WithdrawalsSetup=撤退のセットアップ
-WithdrawStatistics=の統計情報を引き出す
-WithdrawRejectStatistics=の拒否の統計情報を引き出す
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=撤回要求を行う
 ThirdPartyBankCode=サードパーティの銀行コード
 NoInvoiceCouldBeWithdrawed=ない請求書には成功してwithdrawedはありません。有効なBANしている企業であること請求書を確認してください。
@@ -46,7 +47,7 @@ StatusRefused=拒否
 StatusMotif0=特定されていない
 StatusMotif1=提供insuffisante
 StatusMotif2=ティラージュconteste
-StatusMotif3=いいえ引き出し注文数は無し
+StatusMotif3=No direct debit payment order
 StatusMotif4=顧客注文
 StatusMotif5=inexploitable RIB
 StatusMotif6=バランスせずにアカウント
@@ -61,28 +62,43 @@ NotifyCredit=撤退クレジット
 NumeroNationalEmetter=国立トランスミッタ数
 WithBankUsingRIB=RIBを使用した銀行口座
 WithBankUsingBANBIC=IBAN / BIC / SWIFTを使用した銀行口座
-BankToReceiveWithdraw=撤回を受け取るために銀行口座
+BankToReceiveWithdraw=Bank account to receive direct debit
 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 standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=銀行によって立っている順序%sの支払い
-InfoCreditMessage=立っている順序%sは、銀行によって支払われた<br>支払いのデータ:%s
-InfoTransSubject=銀行に立っている注文%sの送信
-InfoTransMessage=スタンディングオーダー%s %s %sは、銀行にtransmitedされています。 <br><br>
+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>
 InfoTransData=金額:%s <br> Metode:%s <br>日付:%s
-InfoRejectSubject=拒否したため、立ち
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=リアルモードのオプションが設定されていない、我々は、このシミュレーションの後に停止
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index 7dd421b9aca..08181e7227d 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=ワークフローモジュールのセットアップ
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index af313850ba1..9967530b1d2 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ka_GE/boxes.lang b/htdocs/langs/ka_GE/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/ka_GE/boxes.lang
+++ b/htdocs/langs/ka_GE/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/ka_GE/cashdesk.lang b/htdocs/langs/ka_GE/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/ka_GE/cashdesk.lang
+++ b/htdocs/langs/ka_GE/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/ka_GE/categories.lang b/htdocs/langs/ka_GE/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/ka_GE/categories.lang
+++ b/htdocs/langs/ka_GE/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ka_GE/compta.lang b/htdocs/langs/ka_GE/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/ka_GE/compta.lang
+++ b/htdocs/langs/ka_GE/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/ka_GE/interventions.lang b/htdocs/langs/ka_GE/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/ka_GE/interventions.lang
+++ b/htdocs/langs/ka_GE/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/ka_GE/ldap.lang b/htdocs/langs/ka_GE/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/ka_GE/ldap.lang
+++ b/htdocs/langs/ka_GE/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/ka_GE/mails.lang b/htdocs/langs/ka_GE/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/ka_GE/mails.lang
+++ b/htdocs/langs/ka_GE/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 18b0a7f14b8..040fe8d4e82 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/ka_GE/margins.lang b/htdocs/langs/ka_GE/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/ka_GE/margins.lang
+++ b/htdocs/langs/ka_GE/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/ka_GE/oauth.lang b/htdocs/langs/ka_GE/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/ka_GE/oauth.lang
+++ b/htdocs/langs/ka_GE/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ka_GE/printing.lang b/htdocs/langs/ka_GE/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/ka_GE/printing.lang
+++ b/htdocs/langs/ka_GE/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/ka_GE/supplier_proposal.lang b/htdocs/langs/ka_GE/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/ka_GE/supplier_proposal.lang
+++ b/htdocs/langs/ka_GE/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/ka_GE/users.lang b/htdocs/langs/ka_GE/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/ka_GE/users.lang
+++ b/htdocs/langs/ka_GE/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ka_GE/website.lang b/htdocs/langs/ka_GE/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/ka_GE/website.lang
+++ b/htdocs/langs/ka_GE/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ka_GE/withdrawals.lang b/htdocs/langs/ka_GE/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/ka_GE/withdrawals.lang
+++ b/htdocs/langs/ka_GE/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/ka_GE/workflow.lang b/htdocs/langs/ka_GE/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/ka_GE/workflow.lang
+++ b/htdocs/langs/ka_GE/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index af313850ba1..9967530b1d2 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/kn_IN/banks.lang b/htdocs/langs/kn_IN/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/kn_IN/banks.lang
+++ b/htdocs/langs/kn_IN/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/kn_IN/boxes.lang b/htdocs/langs/kn_IN/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/kn_IN/boxes.lang
+++ b/htdocs/langs/kn_IN/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/kn_IN/cashdesk.lang b/htdocs/langs/kn_IN/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/kn_IN/cashdesk.lang
+++ b/htdocs/langs/kn_IN/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/kn_IN/categories.lang b/htdocs/langs/kn_IN/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/kn_IN/categories.lang
+++ b/htdocs/langs/kn_IN/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 63a2f87a654..c0454593760 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=ಹೊಸ ಖಾಸಗಿ ವ್ಯಕ್ತಿ
 NewCompany=ಹೊಸ ಕಂಪನಿ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ)
 NewThirdParty=ಹೊಸ ತೃತೀಯ (ನಿರೀಕ್ಷಿತ, ಗ್ರಾಹಕ, ಪೂರೈಕೆದಾರ)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection ಪ್ರದೇಶ
 IdThirdParty=ತೃತೀಯ ಪಕ್ಷದ ಗುರುತು
 IdCompany=ಸಂಸ್ಥೆಯ ಗುರುತು
@@ -38,7 +40,7 @@ ThirdPartySuppliers=ಪೂರೈಕೆದಾರರು
 ThirdPartyType=ತೃತೀಯ ಮಾದರಿ
 Company/Fundation=ಕಂಪನಿ / ಫೌಂಡೇಶನ್
 Individual=ಖಾಸಗಿ ವ್ಯಕ್ತಿ
-ToCreateContactWithSameName=ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅದೇ ವಿವರಗಳನ್ನುಪಯೋಗಿಸಿಕೊಂಡು ಸಂಪರ್ಕವೊಂದನ್ನು ರಚಿಸುತ್ತದೆ
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=ಪೋಷಕ ಸಂಸ್ಥೆ
 Subsidiaries=ಅಂಗಸಂಸ್ಥೆಗಳು
 ReportByCustomers=ಗ್ರಾಹಕರ ವರದಿ
@@ -47,7 +49,7 @@ CivilityCode=ಸೌಜನ್ಯದ ಕೋಡ್
 RegisteredOffice=ನೋಂದಾಯಿತ ಕಚೇರಿ
 Lastname=ಕೊನೆಯ ಹೆಸರು
 Firstname=ಮೊದಲ ಹೆಸರು
-PostOrFunction=ಪೋಸ್ಟ್ / ಫಂಕ್ಷನ್
+PostOrFunction=Job position
 UserTitle=ಶೀರ್ಷಿಕೆ
 Address=ವಿಳಾಸ
 State=ರಾಜ್ಯ / ಪ್ರಾಂತ್ಯ
@@ -64,7 +66,7 @@ Chat=ಚಾಟ್
 PhonePro=ವೃತ್ತಿಪರ ದೂರವಾಣಿ
 PhonePerso=ವೈಯಿಕ್ತಿಕ ದೂರವಾಣಿ
 PhoneMobile=ಮೊಬೈಲ್ ಸಂಖ್ಯೆ
-No_Email=ಸಾಮೂಹಿಕ ಇ ರವಾನೆ ಕಳುಹಿಸಬೇಡಿ
+No_Email=Refuse mass e-mailings
 Fax=ಫ್ಯಾಕ್ಸ್
 Zip=ಪಿನ್ ಕೋಡ್
 Town=ನಗರ
@@ -73,7 +75,7 @@ Poste= ಸ್ಥಾನ
 DefaultLang=ಪೂರ್ವನಿಯೋಜಿತವಾದ ಭಾಷೆ
 VATIsUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುತ್ತದೆ
 VATIsNotUsed=ವ್ಯಾಟ್ ಬಳಸಲಾಗುವುದಿಲ್ಲ
-CopyAddressFromSoc=ಮೂರನೇ ಪಾರ್ಟಿ ವಿಲಾಸದೊಂದಿಗೆ ವಿಳಾಸವನ್ನು ತುಂಬಿರಿ
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ
 VATIntraShort=ಮೌಲ್ಯ ವರ್ಧಿತ ತೆರಿಗೆ (VAT) ಸಂಖ್ಯೆ
 VATIntraSyntaxIsValid=ಸಿಂಟ್ಯಾಕ್ಸ್ ಸರಿಯಿದ್ದಂತಿದೆ
-VATIntraValueIsValid=ಮೌಲ್ಯ ಸರಿಯಿದ್ದಂತಿದೆ
 ProspectCustomer=ನಿರೀಕ್ಷಿತ / ಗ್ರಾಹಕ
 Prospect=ನಿರೀಕ್ಷಿತ
 CustomerCard=ಗ್ರಾಹಕ ಕಾರ್ಡ್
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=ಸಂಪರ್ಕವನ್ನು ತಿದ್ದಿ
 EditContactAddress=ಸಂಪರ್ಕ / ವಿಳಾಸವನ್ನು ತಿದ್ದಿ
 Contact=ಸಂಪರ್ಕ
+ContactId=Contact id
 ContactsAddresses=ಸಂಪರ್ಕಗಳು / ವಿಳಾಸಗಳು
+FromContactName=Name:
 NoContactDefinedForThirdParty=ಈ ತೃತೀಯ ಪಾರ್ಟಿಗೆ ಯಾವುದೇ ಸಂಪರ್ಕ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿಲ್ಲ
 NoContactDefined=ಯಾವುದೇ ಸಂಪರ್ಕ ವ್ಯಾಖ್ಯಾನಿಸಲಾಗಿಲ್ಲ
 DefaultContact=ಡೀಫಾಲ್ಟ್ ಸಂಪರ್ಕ / ವಿಳಾಸ
@@ -284,7 +287,7 @@ CompanyDeleted="%s" ಸಂಸ್ಥೆಯನ್ನು ಡೇಟಾಬೇಸ್-
 ListOfContacts=ಸಂಪರ್ಕಗಳ / ವಿಳಾಸಗಳ ಪಟ್ಟಿ
 ListOfContactsAddresses=ಸಂಪರ್ಕಗಳ / ವಿಳಾಸಗಳ ಪಟ್ಟಿ
 ListOfThirdParties=ಮೂರನೇ ಪಕ್ಷಗಳ ಪಟ್ಟಿ
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=ಸಂಪರ್ಕವನ್ನು ತೋರಿಸಿ
 ContactsAllShort=ಎಲ್ಲಾ (ಸೋಸಿಲ್ಲದ)
 ContactType=ಸಂಪರ್ಕದ ಮಾದರಿ
@@ -294,6 +297,7 @@ ContactForProposals=ಪ್ರಸ್ತಾಪದ ಸಂಪರ್ಕ
 ContactForContracts=ಗುತ್ತಿಗೆಯ ಸಂಪರ್ಕ
 ContactForInvoices=ಸರಕುಪಟ್ಟಿ ಸಂಪರ್ಕ
 NoContactForAnyOrder=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಆರ್ಡರ್-ಗಾಗಿ ಅಲ್ಲ.
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ವಾಣಿಜ್ಯ ಪ್ರಸ್ತಾವನೆಗಾಗಿ ಅಲ್ಲ.
 NoContactForAnyContract=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಗುತ್ತಿಗೆಯಗಾಗಿ ಅಲ್ಲ.
 NoContactForAnyInvoice=ಈ ಸಂಪರ್ಕ ಯಾವುದೇ ಸರಕುಪಟ್ಟಿಗಾಗಿ ಅಲ್ಲ.
@@ -352,9 +356,9 @@ ExportCardToFormat=ಕಾರ್ಡನ್ನು ಸ್ವರೂಪಕ್ಕೆ 
 ContactNotLinkedToCompany=ಸಂಪರ್ಕವು ಯಾವುದೇ ಮೂರನೇ ಪಾರ್ಟಿಗೆ ಕೂಡಿಸಲ್ಪಟ್ಟಿಲ್ಲ.
 DolibarrLogin=ಲಾಗಿನ್ ಆಗಿ
 NoDolibarrAccess=ಪ್ರವೇಶವಿಲ್ಲ
-ExportDataset_company_1=ಮೂರನೇ ಪಕ್ಷಗಳು (ಸಂಸ್ಥೆಗಳು / ಫೌಂಡೇಶನ್ / ಜನರು) ಮತ್ತು ವಿವರಗಳು
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=ಸಂಪರ್ಕಗಳು ಮತ್ತು ವಿವರಗಳು
-ImportDataset_company_1=ಮೂರನೇ ಪಕ್ಷಗಳು (ಸಂಸ್ಥೆಗಳು / ಫೌಂಡೇಶನ್ / ಜನರು) ಮತ್ತು ವಿವರಗಳು
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=ಸಂಪರ್ಕಗಳು / ವಿಳಾಸಗಳು (ಮೂರನೇ ಪಾರ್ಟಿಗಳದ್ದಾಗಿರಬಹುದು, ಆಗಿಲ್ಲದಿರಬಹುದು) ಮತ್ತು ಲಕ್ಷಣಗಳು
 ImportDataset_company_3=ಬ್ಯಾಂಕ್ ವಿವರಗಳು
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/kn_IN/compta.lang b/htdocs/langs/kn_IN/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/kn_IN/compta.lang
+++ b/htdocs/langs/kn_IN/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/kn_IN/cron.lang b/htdocs/langs/kn_IN/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/kn_IN/cron.lang
+++ b/htdocs/langs/kn_IN/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/kn_IN/install.lang b/htdocs/langs/kn_IN/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/kn_IN/install.lang
+++ b/htdocs/langs/kn_IN/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/kn_IN/interventions.lang b/htdocs/langs/kn_IN/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/kn_IN/interventions.lang
+++ b/htdocs/langs/kn_IN/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/kn_IN/ldap.lang b/htdocs/langs/kn_IN/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/kn_IN/ldap.lang
+++ b/htdocs/langs/kn_IN/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/kn_IN/mails.lang b/htdocs/langs/kn_IN/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/kn_IN/mails.lang
+++ b/htdocs/langs/kn_IN/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 18b0a7f14b8..040fe8d4e82 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/kn_IN/margins.lang
+++ b/htdocs/langs/kn_IN/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/kn_IN/oauth.lang b/htdocs/langs/kn_IN/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/kn_IN/oauth.lang
+++ b/htdocs/langs/kn_IN/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/kn_IN/orders.lang b/htdocs/langs/kn_IN/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/kn_IN/orders.lang
+++ b/htdocs/langs/kn_IN/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/kn_IN/printing.lang b/htdocs/langs/kn_IN/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/kn_IN/printing.lang
+++ b/htdocs/langs/kn_IN/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/kn_IN/productbatch.lang b/htdocs/langs/kn_IN/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/kn_IN/productbatch.lang
+++ b/htdocs/langs/kn_IN/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/kn_IN/salaries.lang b/htdocs/langs/kn_IN/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/kn_IN/salaries.lang
+++ b/htdocs/langs/kn_IN/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/kn_IN/supplier_proposal.lang b/htdocs/langs/kn_IN/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/kn_IN/supplier_proposal.lang
+++ b/htdocs/langs/kn_IN/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/kn_IN/suppliers.lang b/htdocs/langs/kn_IN/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/kn_IN/suppliers.lang
+++ b/htdocs/langs/kn_IN/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/kn_IN/users.lang b/htdocs/langs/kn_IN/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/kn_IN/users.lang
+++ b/htdocs/langs/kn_IN/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/kn_IN/website.lang b/htdocs/langs/kn_IN/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/kn_IN/website.lang
+++ b/htdocs/langs/kn_IN/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/kn_IN/withdrawals.lang b/htdocs/langs/kn_IN/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/kn_IN/withdrawals.lang
+++ b/htdocs/langs/kn_IN/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/kn_IN/workflow.lang b/htdocs/langs/kn_IN/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/kn_IN/workflow.lang
+++ b/htdocs/langs/kn_IN/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 51c3ca83ff9..a4d39134329 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ko_KR/boxes.lang b/htdocs/langs/ko_KR/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/ko_KR/boxes.lang
+++ b/htdocs/langs/ko_KR/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/ko_KR/cashdesk.lang b/htdocs/langs/ko_KR/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/ko_KR/cashdesk.lang
+++ b/htdocs/langs/ko_KR/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/ko_KR/categories.lang b/htdocs/langs/ko_KR/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/ko_KR/categories.lang
+++ b/htdocs/langs/ko_KR/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ko_KR/compta.lang b/htdocs/langs/ko_KR/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/ko_KR/compta.lang
+++ b/htdocs/langs/ko_KR/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index 6266456a24c..0110a2c3588 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=이 PHP는 세션을 지원합니다.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/ko_KR/interventions.lang b/htdocs/langs/ko_KR/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/ko_KR/interventions.lang
+++ b/htdocs/langs/ko_KR/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/ko_KR/ldap.lang b/htdocs/langs/ko_KR/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/ko_KR/ldap.lang
+++ b/htdocs/langs/ko_KR/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/ko_KR/mails.lang b/htdocs/langs/ko_KR/mails.lang
index fb2db588b89..5eabbde0ba4 100644
--- a/htdocs/langs/ko_KR/mails.lang
+++ b/htdocs/langs/ko_KR/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index c9133c9cd30..e80f288ee94 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=또한 %s
 SeeHere=See here
 BackgroundColorByDefault=기본 배경
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=첨부할 파일을 선택했지만 바로 업로드할 수는 없습니다. 업로드하려면 "파일 첨부"를 클릭하십시오.
 NbOfEntries=엔트리 Nb
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=월요일
 Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/ko_KR/oauth.lang b/htdocs/langs/ko_KR/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/ko_KR/oauth.lang
+++ b/htdocs/langs/ko_KR/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ko_KR/printing.lang b/htdocs/langs/ko_KR/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/ko_KR/printing.lang
+++ b/htdocs/langs/ko_KR/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index cbfca427fc3..8521aae806a 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/ko_KR/supplier_proposal.lang b/htdocs/langs/ko_KR/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/ko_KR/supplier_proposal.lang
+++ b/htdocs/langs/ko_KR/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/ko_KR/users.lang b/htdocs/langs/ko_KR/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/ko_KR/users.lang
+++ b/htdocs/langs/ko_KR/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ko_KR/website.lang b/htdocs/langs/ko_KR/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/ko_KR/website.lang
+++ b/htdocs/langs/ko_KR/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ko_KR/withdrawals.lang b/htdocs/langs/ko_KR/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/ko_KR/withdrawals.lang
+++ b/htdocs/langs/ko_KR/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/ko_KR/workflow.lang b/htdocs/langs/ko_KR/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/ko_KR/workflow.lang
+++ b/htdocs/langs/ko_KR/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 3b0db483cb0..2c4e0df11c6 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=ບົດລາຍງານ
 NewAccount=New accounting account
 Create=ສ້າງ
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 3fe74658f4a..c0f0b616c3a 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index c14c6a7c3be..8904b8e04d5 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/lo_LA/boxes.lang b/htdocs/langs/lo_LA/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/lo_LA/boxes.lang
+++ b/htdocs/langs/lo_LA/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/lo_LA/categories.lang b/htdocs/langs/lo_LA/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/lo_LA/categories.lang
+++ b/htdocs/langs/lo_LA/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index c3a200a2456..5b5500c1bfe 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/lo_LA/cron.lang b/htdocs/langs/lo_LA/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/lo_LA/cron.lang
+++ b/htdocs/langs/lo_LA/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/lo_LA/interventions.lang b/htdocs/langs/lo_LA/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/lo_LA/interventions.lang
+++ b/htdocs/langs/lo_LA/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/lo_LA/ldap.lang b/htdocs/langs/lo_LA/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/lo_LA/ldap.lang
+++ b/htdocs/langs/lo_LA/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/lo_LA/mails.lang b/htdocs/langs/lo_LA/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/lo_LA/mails.lang
+++ b/htdocs/langs/lo_LA/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index e7f10e84613..7a76aa51f9b 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/lo_LA/margins.lang
+++ b/htdocs/langs/lo_LA/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/lo_LA/oauth.lang b/htdocs/langs/lo_LA/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/lo_LA/oauth.lang
+++ b/htdocs/langs/lo_LA/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/lo_LA/orders.lang b/htdocs/langs/lo_LA/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/lo_LA/orders.lang
+++ b/htdocs/langs/lo_LA/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/lo_LA/printing.lang b/htdocs/langs/lo_LA/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/lo_LA/printing.lang
+++ b/htdocs/langs/lo_LA/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/lo_LA/productbatch.lang b/htdocs/langs/lo_LA/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/lo_LA/productbatch.lang
+++ b/htdocs/langs/lo_LA/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 76e917aaa1a..f555ddb4b85 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index 6b6af7c469c..344134371cf 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/lo_LA/salaries.lang b/htdocs/langs/lo_LA/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/lo_LA/salaries.lang
+++ b/htdocs/langs/lo_LA/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/lo_LA/supplier_proposal.lang b/htdocs/langs/lo_LA/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/lo_LA/supplier_proposal.lang
+++ b/htdocs/langs/lo_LA/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/lo_LA/suppliers.lang b/htdocs/langs/lo_LA/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/lo_LA/suppliers.lang
+++ b/htdocs/langs/lo_LA/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index f3c593c44f5..f6b4e4160c0 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/lo_LA/website.lang b/htdocs/langs/lo_LA/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/lo_LA/website.lang
+++ b/htdocs/langs/lo_LA/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/lo_LA/withdrawals.lang b/htdocs/langs/lo_LA/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/lo_LA/withdrawals.lang
+++ b/htdocs/langs/lo_LA/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/lo_LA/workflow.lang b/htdocs/langs/lo_LA/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/lo_LA/workflow.lang
+++ b/htdocs/langs/lo_LA/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 03ec8780205..6405e1bc512 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Žurnalai
 JournalFinancial=Finansiniai žurnalai
 BackToChartofaccounts=Grįžti į sąskaitų planą
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Pasirinkite sąskaitų planą
 Addanaccount=Pridėti apskaitos sąskaitą
 AccountAccounting=Apskaitos sąskaita
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Schema
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Schemos klientai
-SuppliersVentilation=Schemos tiekėjai
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Ataskaitos
 NewAccount=Nauja apskaitos sąskaita
 Create=Sukurti
-CreateMvts=Create movement
-UpdateMvts=Judėjimo modifikavimas
-WriteBookKeeping=Įrašyti sąskaitas Didžiąją knygą
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Didžioji knyga
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Sąskaitos eilutės, kurios turi būti apsvarstytos
-InvoiceLinesDone=Svarstomos eilutės sąskaitoje-faktūroje
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Svarstyti
+Ventilate=Bind
 
 Processing=Apdorojimas
 EndProcessing=Apdorojimo pabaiga
-AnyLineVentilate=Bet kurios eilutės apsvarstymui
+AnyLineVentilate=Any lines to bind
 SelectedLines=Pasirinktos eilutės
 Lineofinvoice=Sąskaitos-faktūros eilutė
-VentilatedinAccount=Sėkmingai persvarstyta apskaitos sąskaitoje
-NotVentilatedinAccount=Nepersvarstyta apskaitos sąskaitoje
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Bendrųjų sąskaitų ilgis
-ACCOUNTING_LENGTH_AACCOUNT=Trečiųjų šalių sąskaitų ilgis
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Pardavimų žurnalas
 ACCOUNTING_PURCHASE_JOURNAL=Pirkimų žurnalas
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Žurnalas
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Panaikinti Didžiosios knygos įrašus
-
 DescSellsJournal=Pardavimų žurnalas
 DescPurchasesJournal=Pirkimų žurnalas
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Kliento sąskaitos-faktūros apmokėjimas
-
 ThirdPartyAccount=Trečios šalies sąskaita
-
-NewAccountingMvt=Naujas judėjimas
-NumMvts=Judėjimų skaičius
-ListeMvts=Judėjimų sąrašas
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debetas ir Kreditas negali turėti reikšmę tuo pačiu metu,
 
-ReportThirdParty=Trečios šalies sąskaitų sąrašas
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Apskaitos sąskaitų sąrašas
 
@@ -114,22 +134,29 @@ Pcgtype=Sąskaitų klasė
 Pcgsubtype=Sąskaitų poklasis
 Accountparent=Sąskaitos šaknys
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Iš viso pardavimų marža
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Patvirtinti automatiškai
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Suskirstymo kortelė
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 4b49ffdbcbc..ccdb90d234e 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Ekspermentinis
 VersionDevelopment=Plėtojimas
 VersionUnknown=Nežinomas
 VersionRecommanded=Rekomenduojamas
-FileCheck=Failų vientisumas
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Trūkstami failai
 FilesUpdated=Atnaujinti failai
-FileCheckDolibarr=Patikrinkite Dolibarr failų vientisumą
-XmlNotFound=Dolibarr vientisumo XML failas nerastas
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesijos ID
 SessionSaveHandler=Vedlys, sesijai išsaugoti
 SessionSavePath=Talpinimo sesijos lokalizavimas
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Klaida, tikslumas viršyjantis <b>%s</b> nėr
 DictionarySetup=Žodyno nustatymas
 Dictionary=Žodynai
 Chartofaccounts=Sąskaitų schema
-Fiscalyear=Fiskaliniai metai
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Vertės 'system' ir 'systemauto' yra rezervuotos šiam tipui. Galite naudoti 'user' vertę, jei norite įvesti savo įrašą
 ErrorCodeCantContainZero=Kode negali būti vertės 0
 DisableJavascript=Išjungti JavaScript ir Ajax funkcijas (Rekomenduojama aklam žmogui ar teksto naršyklėms)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Paieškai paleisti reikalingas simbolių skaičius: %s
 NotAvailableWhenAjaxDisabled=Neprieinamas, Ajax esant išjungtam
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript išjungtas
 UsePreviewTabs=Nautdoti apžiūros korteles
 ShowPreview=Rodyti apžiūrą
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Koduojami dvejetainiai duomenys į šešioliktainius
 IgnoreDuplicateRecords=Ignoruoti pasikartojančių įrašų klaidas (INSERT IGNORE)
 AutoDetectLang=Automatinis aptikimas (naršyklės kalba)
 FeatureDisabledInDemo=Funkcija išjungta demo versijoje
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Leidimai
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Rodomi tik elementai iš <a href="%s">leidžiami moduliai</a>.
-ModulesDesc=Dolibarr moduliai apibrėžia, kokios funkcijos yra įjungtos. Kai kurie moduliai reikalauja leidimų, kuriuos reikia suteikti vartotojams, įjungus modulį. Paspauskite mygtuką on/off skiltyje "Status", kad įjungti modulį/funkciją.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Daugiau modulių ...
 DoliStoreDesc=DoliStore, oficiali Dolibarr ERP / CRM išorinių modulių parduotuvė
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr dabartinė versija
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Atnaujinti serverį offline
 GenericMaskCodes=Galite įvesti bet kokį užmaskuotą numeravimą. Šiame maskavime naudojamos sekančios žymės:<br><b>{000000}</b> atitinka skaičių, kuris bus padidinamas vienetu kiekvienam%s. Įveskite nulių iki pageidaujamo skaitiklio ilgio. Skaitiklis bus užpildomas nuliais iš kairės iki pilno skaitiklio ilgio. <br><b>{000000+000}</b> toks kaip paskutinis, bet nuokrypis atitinkantis numerį dešinėje už + ženklo taikomas pradedant pirmu %s. <br><b>{000000@x}</b> toks pat kaip ankstesnis, bet skaitiklis apnulinamas, kai pasiekiamas mėnuo x (x tarp 1 ir 12, arba naudojamas 0 pirmaisiais fiskalinių metų mėnesiais kaip aprašyta konfigūracijoje, arba 99 apnulinimui kiekvieną mėnesį). Jei ši opcija yra naudojama ir x yra 2 ar didesnis, tada seka {yy}{mm} arba {yyyy}{mm} taip pat reikalinga. <br><b>{dd}</b> diena (nuo 01 iki 31). <br><b>{mm}</b> mėnuo (nuo 01 iki 12). <br><b>{yy}<b/>, <b>{yyyy}</b> arba <b>{y}</b> metai, 2, 4 arba 1 skaitmenys. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Visi kiti simboliai maskuotėje išliks nepakitę.<br>Tarpai neleidžiami.<br>
 GenericMaskCodes4a=<u>Trečios šalies pavyzdys apie 99-us %s. Įmonė įkurta 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Trečios šalies pavyzdys sukurtas 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=URL apsaugos parametrai
 SecurityTokenIsUnique=Kiekvienam URL naudokite unikalų apsaugos rakto parametrą
 EnterRefToBuildUrl=Įveskite nuorodą objektui %s
 GetSecuredUrl=Gauti apskaičiuotą URL
-ButtonHideUnauthorized=Paslėpti visai mygtukus vietoje to, kad rodyti išjungtus mygtukus ekrane
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Senas PVM tarifas
 NewVATRates=Naujas PVM tarifas
 PriceBaseTypeToChange=Modifikuoti kainas su apibrėžta bazinės vertės nuoroda
@@ -349,6 +356,7 @@ ExtrafieldMail = El. paštas
 ExtrafieldSelect = Pasirinkti sąrašą
 ExtrafieldSelectList = Pasirinkite iš lentelės
 ExtrafieldSeparator=Separatorius
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Žymimasis langelis ("paukščiukas")
 ExtrafieldRadio=Opcijų mygtukai
 ExtrafieldCheckBoxFromList= Žymės langelis iš lentelės
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Vartotojai ir grupės
@@ -428,8 +439,8 @@ Module55Name=Brūkšniniai kodai
 Module55Desc=Brūkšninių kodų valdymas
 Module56Name=Telefonija
 Module56Desc=Telefonijos integracija
-Module57Name=Pastovūs užsakymai
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial sistemos integracija (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Web kalendorius
 Module410Desc=Web kalendoriaus integracija
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Atlyginimai
-Module510Desc=Darbuotojų darbo užmokesčio ir išmokų valdymas
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Paskola
 Module520Desc=Paskolų valdymas
 Module600Name=Pranešimai
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Parama
 Module700Desc=Paramos valdymas
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Skaityti teikėjus
 Permission147=Skaityti statistinius duomenis
-Permission151=Skaityti pastovius užsakymus
-Permission152=Sukurti/pakeisti pastovių uždsakymų prašymus
-Permission153=Pastovių užsakymų pajamų perdavimas
-Permission154=Pastovių užsakymų pajamų kreditas/atmetimas
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Skaityti sutartis / pasirašymus
 Permission162=Sukurti / keisti sutartis / pasirašymus
 Permission163=Aktyvuoti sutarties aptarnavimą / pasirašymą
@@ -747,6 +758,7 @@ Permission1236=Eksportuoti tiekėjo sąskaitas-faktūras, atributus ir mokėjimu
 Permission1237=Eksportuoti tiekėjo užsakymus ir jų detales
 Permission1251=Pradėti masinį išorinių duomenų importą į duomenų bazę (duomenų užkrovimas)
 Permission1321=Eksportuoti klientų sąskaitas-faktūras, atributus ir mokėjimus
+Permission1322=Reopen a paid bill
 Permission1421=Eksportuoti klientų užsakymus ir atributus
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Sukurti/keisti apklausas
 Permission59001=Skaityti komercines maržas
 Permission59002=Apibrėžti komercines maržas
 Permission59003=Skaityti kiekvieną vartotojo maržą
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Perspektyvinio plano potencialo lygis
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etiketė naudojamas pagal nutylėjimą, jei kodui nerandamas
 LabelOnDocuments=Dokumentų etiketė
 NbOfDays=Dienų skaičius
 AtEndOfMonth=Mėnesio pabaigoje
+CurrentNext=Current/Next
 Offset=Nuokrypis
 AlwaysActive=Visada aktyvus
 Upgrade=Atnaujinti
@@ -950,7 +967,7 @@ LogEventDesc=Čia galite leisti prisijungimą prie Dolibarr saugumo įvykių. Ad
 AreaForAdminOnly=Šios funkcijos gali būti naudojamos tik <b>administrator users</b>.
 SystemInfoDesc=Sistemos informacija yra įvairi techninė informacija, kurią gausite tik skaitymo režimu, ir bus matoma tik sistemos administratoriams.
 SystemAreaForAdminOnly=Ši sritis yra skirta tik administratoriams. Nė vienas iš Dolibarr leidimų negali sumažinti šio apribojimo.
-CompanyFundationDesc=Šiame puslapyje galima redaguoti visą reikalingą informaciją apie Įmonę/Organizaciją (spausti mygtuką "Modify" puslapio apačioje).
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Čia galite rinktis ir keisti kiekvieną parametrą, susijusį su Dolibarr grafiniu vaizdu.
 AvailableModules=Galimi moduliai
 ToActivateModule=Norint įjungti modulius, reikia eiti į Nuostatų meniu (Pagrindinis-> Nuostatos-> Moduliai).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=ĮSPĖJIMAS, kai kuriose Linux sistemose, norint siųs
 PathToDocuments=Kelias prie dokumentų
 PathDirectory=Katalogas
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Vertimo konfigūracija
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jūs turite įjungti bent 1 modulį
 ClassNotFoundIntoPathWarning=Klasė %s nerasta į PHP kelią
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Naudoti TLS
 LDAPServerUseTLSExample=Jūsų LDAP serveris naudoja TLS
 LDAPServerDn=Serverio DN
 LDAPAdminDn=Administratoriaus DN
-LDAPAdminDnExample=Pilnas DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administratoriaus slaptažodis
 LDAPUserDn=Vartotojo DN
 LDAPUserDnExample=Pilnas DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Pavyzdys: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Pavyzdys: objectsid
 LDAPFieldEndLastSubscription=Prenumeratos pabaigos data
-LDAPFieldTitle=Pareigos/Funkcijos
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Pavyzdys: title
 LDAPSetupNotComplete=LDAP nuostatos nėra pilnos (eiti prie kitų laukelių)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nėra pateiktas administratorius arba slaptažodžis. LDAP prieiga bus anoniminė ir tik skaitymo režimu.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produktų ir paslaugų modulių nuostatos
 NumberOfProductShowInSelect=Maksimalus produktų skaičius grupiniuose pasirinkimo sąrašuose (0=neribojama)
 ViewProductDescInFormAbility=Produktų aprašymų vizualizavimas formose (kitu būdu per "iššokantį" langą)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Produktų aprašymų vizualizavimas trečios šalies kalba
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Naudokite paieškos formą norint pasirinkti produktą (o ne iškrentantį sąrašą).
 SetDefaultBarcodeTypeProducts=Brūkšninio kodo tipas produktams pagal nutylėjimą
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Vidinis variklis
 BarCodeNumberManager=Automatinio brūkšninių kodų numerių nustatymo valdiklis
 ##### Prelevements #####
-WithdrawalsSetup=Išėmimo (withdrawal) modulio nustatymas
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Išorinio RSS importo nuostatos
 NewRSS=Naujas RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Atidaryti fiskalinius metus
 CloseFiscalYear=Uždaryti fiskalinius metus
 DeleteFiscalYear=Panaikinti fiskalinius metus
 ConfirmDeleteFiscalYear=Ar tikrai panaikinti šiuos fiskalinius metus ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Visada gali būti redaguojama
 MAIN_APPLICATION_TITLE=Taikyti matomą aplikacijos vardą (įspėjimas: Jūsų nuosavo vardo nustatymas gali nutraukti automatinio prisijungimo funkciją naudojant DoliDroid mobiliąją aplikaciją)
 NbMajMin=Minimalus didžiųjų simbolių skaičius
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Fiksuotų pranešimų sąrašas
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Slenkstis
 BackupDumpWizard=Duomenų bazės atsarginės kopijos failo kūrimo vedlys
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 37d3b83b47a..0e43987f520 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -27,13 +27,9 @@ AllTime=Nuo pradžios
 Reconciliation=Suderinimas
 RIB=Banko sąskaitos numeris
 IBAN=IBAN numeris
-IbanValid=IBAN galiojantis
-IbanNotValid=IBAN negalioja
 BIC=BIC/SWIFT numeris
-SwiftValid=BIC / SWIFT galiojantis
-SwiftNotValid=BIC / SWIFT negalioja
-StandingOrders=Pastovūs užsakymai
-StandingOrder=Pastovus užsakymas
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Sąskaitos išrašas
 AccountStatementShort=Suvestinė
 AccountStatements=Sąskaitos suvestinės
@@ -78,6 +74,7 @@ AccountToCredit=Kredituoti sąskaitą
 AccountToDebit=Debetuoti sąskaitą
 DisableConciliation=Išjungti suderinimo funkciją šiai sąskaitai
 ConciliationDisabled=Suderinimo funkcija išjungta
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Atidaryta
 StatusAccountClosed=Uždaryta
 AccountIdShort=Skaičius
@@ -87,6 +84,8 @@ AddBankRecordLong=Pridėti operaciją/sandorį rankiniu būdu
 ConciliatedBy=Suderintas
 DateConciliating=Suderinimo data
 BankLineConciliated=Operacija/sandoris suderinta
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Kliento mokėjimas
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Išėmimo (withdrawal) mokėjimas
 SocialContributionPayment=Socialinio / fiskalinio mokesčio mokėjimas
 BankTransfer=Banko pervedimas
 BankTransfers=Banko pervedimai
-TransferDesc=Pervesti iš vienos sąskaitos į kitą, Dolibarr įrašys du įrašus (pirminę sąskaitą debetuos ir antrą sąskaitą kredituos ta pačia suma. Tas pats žymeklis ir ta pati data bus naudojama šios operacijos įrašams)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Iš
 TransferTo=Į
 TransferFromToDone=Pervedimas <b>%s</b> iš <b>%s</b> į <b>%s</b> užregistruotas.
@@ -129,7 +129,7 @@ FutureTransaction=Operacija ateityje. Negalima taikyti
 SelectChequeTransactionAndGenerate=Pasirinkti/filtruoti čekius, kad įtraukti į čekio depozito kvitą ir paspausti mygtuką "Sukurti".
 InputReceiptNumber=Pasirinkti banko ataskaitą, susijusią su taikymu. Naudokite rūšiuojamą skaitmeninę reikšmę: YYYYMM arba YYYYMMDD
 EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus
-ToConciliate=Taikyti ?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Tada patikrinkite linijas, esančias banko suvestinėje ir paspauskite
 DefaultRIB=BAN pagal nutylėjimą
 AllRIB=Visi BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Ar tikrai norite pažymėti šį čekį kaip atmestą ?
 RejectCheckDate=Čekio grąžinimo data
 CheckRejected=Čekis grąžintas
 CheckRejectedAndInvoicesReopened=Čekis grąžintas ir sąskaita iš naujo atidaryta
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index f0e6333a4c5..afaefaa12b8 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Klaida negalima atšaukti sąska
 BillFrom=Iš
 BillTo=Į
 ActionsOnBill=Veiksmai sąskaitoje-faktūroje
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Siūloma nuolaida (mokėjimas prieš terminą)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Pastovūs užsakymai
-StandingOrder=Pastovus užsakymas
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nėra sąskaitų-faktūrų projektų
 NoOtherDraftBills=Nėra kitų sąskaitų-faktūrų projektų
 NoDraftInvoices=Nėra sąskaitų-faktūrų projektų
@@ -351,8 +351,8 @@ VarAmount=Kintamas dydis (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Banko nurodymas
-PaymentTypeShortPRE=Banko pavedimas
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Grynieji pinigai
 PaymentTypeShortLIQ=Grynieji pinigai
 PaymentTypeCB=Kreditinė kortelė
@@ -381,6 +381,7 @@ ExtraInfos=Papildoma informacija
 RegulatedOn=Reguliuojama
 ChequeNumber=Čekio N°
 ChequeOrTransferNumber=Čekio/Pervedimo N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Čekio bankas
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Sumokėta šiuo mokėjimu
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Priskirtii "Apmokėta" visas pilnai grąžintas kreditines sąskaitas.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Visos sąskaitos-faktūros, neturinčios neapmokėto likučio bus automatiškai uždarytos ir perkeltos į "Apmokėta".
 ToMakePayment=Mokėti
 ToMakePaymentBack=Grąžinti
 ListOfYourUnpaidInvoices=Sąrašas neapmokėtų sąskaitų-faktūrų
 NoteListOfYourUnpaidInvoices=Pastaba: Šis sąrašas rodo tik sąskaitas trečiosioms šalims, su kuriom Jūs susijęs kaip prekybos atstovas.
 RevenueStamp=Įplaukų rūšis
-YouMustCreateInvoiceFromThird=Ši opcija galima tik tada, kai kuriama sąskaita-faktūra iš trečiosios šalies kortelės "Klientas"
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Sąskaitos-faktūros PDF šablonas Crabe. Pilnas sąskaitos-faktūros šablonas (rekomenduojamas Šablonas)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/lt_LT/boxes.lang b/htdocs/langs/lt_LT/boxes.lang
index 64cc0a334ab..bb68b139a68 100644
--- a/htdocs/langs/lt_LT/boxes.lang
+++ b/htdocs/langs/lt_LT/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Seniausios aktyvios pasibaigusios paslaugos
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Visuminė veikla (sąskaitos-faktūros, pasiūlymai, užsakymai)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Pasiūlymai per mėnesį
 NoTooLowStockProducts=Nėra produkto su minimalia ribine atsarga sandėlyje
 BoxProductDistribution=Produktų/paslaugų distribucija
 BoxProductDistributionFor=Distribucija: %s %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Klientų sąskaitos-faktūros
 ForCustomersOrders=Klientų užsakymai
 ForProposals=Pasiūlymai
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/lt_LT/cashdesk.lang b/htdocs/langs/lt_LT/cashdesk.lang
index 893b8d40844..6ea132b6b9e 100644
--- a/htdocs/langs/lt_LT/cashdesk.lang
+++ b/htdocs/langs/lt_LT/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=apie
 CashDeskThirdParty=Trečioji šalis
 ShoppingCart=Prekių krepšelis
 NewSell=Naujas pardavimas
-BackOffice=Galinis biuras (back office)
 AddThisArticle=Pridėti šį straipsnį
 RestartSelling=Eiti atgal į pardavimą
-SellFinished=Pardavimas baigtas
+SellFinished=Sale complete
 PrintTicket=Spausdinti bilietą
 NoProductFound=Straipsnio nerasta
 ProductFound=Produktas rastas
diff --git a/htdocs/langs/lt_LT/categories.lang b/htdocs/langs/lt_LT/categories.lang
index 548fc7a64f4..eeb53dede55 100644
--- a/htdocs/langs/lt_LT/categories.lang
+++ b/htdocs/langs/lt_LT/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subkategorijos
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Ši kategorija jau egzistuoja su šia nuoroda
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Ši kategorija neturi jokių produktų.
 ThisCategoryHasNoSupplier=Ši kategorija neturi jokių tiekėjų.
 ThisCategoryHasNoCustomer=Ši kategorija neturi jokių klientų.
 ThisCategoryHasNoMember=Ši kategorija neturi jokių narių.
 ThisCategoryHasNoContact=Ši kategorija neturi jokių adresatų
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Papildomi atributai
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index f6ed7265cff..17ca41743bc 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Naujas privatus asmuo
 NewCompany=Nauja įmonė (planas, klientas, tiekėjas)
 NewThirdParty=Naujas trečioji šalis (planas, klientas, tiekėjas)
 CreateDolibarrThirdPartySupplier=Sukurti trečiąją šalį (tiekėją)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Numatoma sritis
 IdThirdParty=Trečiosios šalies ID
 IdCompany=Įmonės ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Tiekėjai
 ThirdPartyType=Trečioji šalis tipas
 Company/Fundation=Įmonė/Organizacija
 Individual=Privatus asmuo
-ToCreateContactWithSameName=Sukurs automatiškai fizinį kontaktą su tokia pat informacija
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Motininė įmonė
 Subsidiaries=Dukterinės įmonės
 ReportByCustomers=Ataskaita pagal klientus
@@ -47,7 +49,7 @@ CivilityCode=Mandagumo kodeksas
 RegisteredOffice=Buveinės registracijos adresas
 Lastname=Pavardė
 Firstname=Vardas
-PostOrFunction=Pareigos/Funkcijos
+PostOrFunction=Job position
 UserTitle=Pavadinimas
 Address=Adresas
 State=Valstybė/Regionas
@@ -64,7 +66,7 @@ Chat=Kalbėtis
 PhonePro=Darbo telefonas
 PhonePerso=Asmeninis telefonas
 PhoneMobile=Mobilus telefonas
-No_Email=Nesiųsti masinių e-laiškų
+No_Email=Refuse mass e-mailings
 Fax=Faksas
 Zip=Pašto kodas
 Town=Miestas
@@ -73,7 +75,7 @@ Poste= Pozicija
 DefaultLang=Kalba pagal nutylėjimą
 VATIsUsed=PVM yra naudojamas
 VATIsNotUsed=PVM nenaudojamas
-CopyAddressFromSoc=Užpildykite trečiosios šalies adresą
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Naudokite antrą mokestį
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=PVM kodas
 VATIntraShort=PVM kodas
 VATIntraSyntaxIsValid=Sintaksė galioja
-VATIntraValueIsValid=Reikšmė galioja
 ProspectCustomer=Planas/Klientas
 Prospect=Planas
 CustomerCard=Kliento kortelė
@@ -261,7 +262,9 @@ AddContactAddress=Sukurti kontaktą / adresą
 EditContact=Redaguoti adresatą
 EditContactAddress=Redaguoti kontaktą/adresą
 Contact=Kontaktas
+ContactId=Contact id
 ContactsAddresses=Kontaktai/Adresai
+FromContactName=Name:
 NoContactDefinedForThirdParty=Trečiajai šaliai nenustatyta jokio kontakto
 NoContactDefined=Nėra nustatytų kontaktų
 DefaultContact=Kontaktas/adresas pagal nutylėjimą
@@ -284,7 +287,7 @@ CompanyDeleted=Įmonė "%s" ištrinta iš duomenų bazės.
 ListOfContacts=Kontaktų/adresų sąrašas
 ListOfContactsAddresses=Kontaktų/adresų sąrašas
 ListOfThirdParties=Trečiųjų šalių sąrašas
-ShowCompany=Rodyti trečią šalį
+ShowCompany=Show third party
 ShowContact=Rodyti kontaktus
 ContactsAllShort=Visi (nėra filtro)
 ContactType=Kontakto tipas
@@ -294,6 +297,7 @@ ContactForProposals=Pasiūlymo kontaktai
 ContactForContracts=Sutarties kontaktai
 ContactForInvoices=Sąskaitos-faktūros kontaktai
 NoContactForAnyOrder=Šis kontaktas nėra kontaktas bet kuriam užsakymui
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Šis kontaktas nėra kontaktas bet kuriam komerciniam pasiūlymui
 NoContactForAnyContract=Šis kontaktas nėra kontaktas bet kuriai sutarčiai
 NoContactForAnyInvoice=Šis kontaktas nėra kontaktas bet kuriai sąskaitai-faktūrai
@@ -352,9 +356,9 @@ ExportCardToFormat=Formuoti eksporto kortelę
 ContactNotLinkedToCompany=Kontaktas nėra susijęs su jokia trečiąja šalimi
 DolibarrLogin=Dolibarr prisijungimas
 NoDolibarrAccess=Nėra Dolibarr prieigos
-ExportDataset_company_1=Trečiosios šalys (Įmonės/fondai/fiziniai asmenys) ir jų rekvizitai
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontaktai ir rekvizitai
-ImportDataset_company_1=Trečiosios šalys (Įmonės/fondai/fiziniai asmenys) ir rekvizitai
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontaktai/Adresai (trečiosios šalies arba ne) ir atributai
 ImportDataset_company_3=Banko duomenys
 ImportDataset_company_4=Trečios šalys/Pardavimų atstovai (Liečia pardavimų atstovų naudotojus kompanijoms)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Trečiosios šalys buvo sujungtos
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lt_LT/compta.lang b/htdocs/langs/lt_LT/compta.lang
index 2717a6436ab..c689480461f 100644
--- a/htdocs/langs/lt_LT/compta.lang
+++ b/htdocs/langs/lt_LT/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Specialios išlaidos
 MenuTaxAndDividends=Mokesčiai ir dividendai
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 6ec111ebc16..059c4c09617 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Numatytos užduoties valdymo nustatymas
-URLToLaunchCronJobs=URL patikrinti ir pradėti cron darbą, jei reikės
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Arba patikrinti ir pradėti spec. darbą
 KeyForCronAccess=Apsaugos raktas URL pradėti cron darbus
 FileToLaunchCronJobs=Komandinė eilutė paleisti cron darbą
@@ -23,7 +23,7 @@ CronCommand=Komanda
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Darbas
@@ -39,7 +39,7 @@ CronMethod=Metodas
 CronModule=Modulis
 CronNoJobs=Nėra registruotų darbų
 CronPriority=Prioritetas
-CronLabel=Aprašymas
+CronLabel=Label
 CronNbRun=Pradėti skaičių
 CronMaxRun=Max nb. launch
 CronEach=Kiekvienas
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 1acb72a5063..6e820655833 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Klaida, Jūsų PHP turi turėti modulį <b>%s</b> įdiegtą 
 ErrorOpenIDSetupNotComplete=Nustatyti Dolibarr config failą, kad būtų leidžiama OpenID patvirtinimas, bet OpenID paslaugos URL nėra apibrėžtas kaip konstanta %s.
 ErrorWarehouseMustDiffers=Šaltinio ir paskirties sandėliai privalo skirtis
 ErrorBadFormat=Blogas formatas !
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Klaida, šis narys nėra susijęs su jokia trečiąja šalimi. Prijungti narį prie esamos trečiosios šalies arba sukurti naują trečiąją šalį prieš kuriant pasirašymą su sąskaita-faktūra.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index 704e73fe45b..81804d8bd5a 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Šis PHP palaiko sesijas.
 PHPSupportPOSTGETOk=Šis PHP palaiko kintamuosius POST ir GET.
 PHPSupportPOSTGETKo=Galimas dalykas Jūsų PHP nepalaiko kintamųjų POST ir/arba GET. Patikrinti savo parametrą <b>variables_order</b> php.ini.
 PHPSupportGD=Šis PHP palaiko GD grafikos funkcijas.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Šis PHP palaiko UTF8 funkcijos.
 PHPMemoryOK=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b>. To turėtų būti pakankamai.
 PHPMemoryTooLow=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b> baitų. Tai gali būti per mažai. Keisti savo <b>php.ini</b> ir nustatyti <b>memory_limit</b> parametrą mažiausiai į <b>%s</b> baitų.
 Recheck=Spauskite čia norėdami peržiūrėti daugiau reikšmingų bandymų
 ErrorPHPDoesNotSupportSessions=Jūsų įdiegta PHP nepalaiko sesijų. Ši funkcija reikalinga Dolibarr darbui. Patikrinkite savo PHP nustatymus.
 ErrorPHPDoesNotSupportGD=Jūsų įdiegta PHP nepalaiko grafinės GD funkcijos. Grafikai neprieinami.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Jūsų įdiegta PHP nepalaiko UTF8 funkcijos. Dolibarr negali tinkamai veikti. Išspręsti šią problemą prieš diegdami Dolibarr.
 ErrorDirDoesNotExists=Katalogas %s neegzistuoja.
 ErrorGoBackAndCorrectParameters=Eiti atgal ir ištaisyti klaidingus parametrus.
@@ -133,6 +135,10 @@ ActivateModule=Įjungti modulį %s
 ShowEditTechnicalParameters=Spauskite čia, kad galėtumete matyti/redaguoti išplėstinius parametrus (eksperto režime)
 WarningUpgrade=Įspėjimas:\nAr Jūs pasidarėte duomenų bazės atsarginę kopiją ?\nTai labai rekomenduotina: pavyzdžiui, dėl kai kurių klaidų duomenų bazės sistemoje (pvz. mysql versija 5.5.40/41/42/43), kai kurie duomenys ar lentelės gali būti prarasti šio proceso metu, todėl, prieš pradedant perkėlimą primygtinai rekomenduojama pasidaryti pilną savo duomenų bazės kopiją.\nSpauskite OK, kad pradėti perkėlimo procesą ...
 ErrorDatabaseVersionForbiddenForMigration=Jūsų duomenų bazės versija yra %s. Gali būti kritinė situacija su duomenų praradimu, jeigu pakeisite duomenų bazės struktūrą, kaip reikalaujama perkėlimo proceso metu. Šiuo tikslu perkėlimas nebus leidžiamas, kol nebus atliktas duomenų bazės programos atnaujinimas į aukštesnę versiją (žinomų klaidingų versijų sąrašas: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Atnaujinti veiksmų duomenis
 MigrationPaymentMode=Duomenų perkėlimas mokėjimo būdui
 MigrationCategorieAssociation=Kategorijų perkėlimas
 MigrationEvents=Įvykių migracija pridedant įvykio savininką į užduočių lentelę
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Perkrauti modulį %s
 ShowNotAvailableOptions=Parodyti negalimas opcijas
 HideNotAvailableOptions=Paslėpti negalimas opcijas
diff --git a/htdocs/langs/lt_LT/interventions.lang b/htdocs/langs/lt_LT/interventions.lang
index 602da5db756..45d0ac0ff65 100644
--- a/htdocs/langs/lt_LT/interventions.lang
+++ b/htdocs/langs/lt_LT/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Sekantis kiento kontaktas
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/lt_LT/ldap.lang b/htdocs/langs/lt_LT/ldap.lang
index 95356a8d849..d375a93de92 100644
--- a/htdocs/langs/lt_LT/ldap.lang
+++ b/htdocs/langs/lt_LT/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Pirma prenumeratos data
 LDAPFieldFirstSubscriptionAmount=Pirma prenumeratos suma
 LDAPFieldLastSubscriptionDate=Paskutinė prenumeratos data
 LDAPFieldLastSubscriptionAmount=Paskutinė prenumeratos suma
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Vartotojas sinchronizuotas
 GroupSynchronized=Grupė sinchronizuota
 MemberSynchronized=Narys sinchronizuotas
diff --git a/htdocs/langs/lt_LT/mails.lang b/htdocs/langs/lt_LT/mails.lang
index 007c686c8f7..153c088f106 100644
--- a/htdocs/langs/lt_LT/mails.lang
+++ b/htdocs/langs/lt_LT/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Skaityti
 YourMailUnsubcribeOK=E-paštas <b>%s</b> yra teisingai pašalintas iš adresatų sąrašo
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-laiškas išsiųstas %s gavėjams.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 0f182fcb138..5fa308daccd 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -67,6 +67,7 @@ SelectDate=Pasirinkti datą
 SeeAlso=Taip pat žiūrėkite %s
 SeeHere=Žiūrėkite čia
 BackgroundColorByDefault=Fono spalva pagal nutylėjimą
+FileRenamed=The file was successfully renamed
 FileUploaded=Failas buvo sėkmingai įkeltas
 FileWasNotUploaded=Failas prikabinimui pasirinktas, bet dar nebuvo įkeltas. Paspauskite tam "Pridėti failą".
 NbOfEntries=Įrašų skaičius
@@ -245,6 +246,10 @@ DateBuild=Ataskaitos sudarymo data
 DatePayment=Mokėjimo data
 DateApprove=Patvirtinimo data
 DateApprove2=Patvirtinimo data (antrasis patvirtinimas)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=metai
 DurationMonth=mėnuo
 DurationWeek=savaitė
@@ -256,6 +261,7 @@ DurationDays=dienos
 Year=Metai
 Month=Mėnuo
 Week=Savaitė
+WeekShort=Week
 Day=Diena
 Hour=Valanda
 Minute=Minutė
@@ -278,6 +284,7 @@ MonthOfDay=Dienos mėnuo
 HourShort=H
 MinuteShort=MN
 Rate=Norma
+CurrencyRate=Currency conversion rate
 UseLocalTax=Įtraukti mokestį
 Bytes=Baitų
 KiloBytes=Kilobaitų
@@ -565,8 +572,11 @@ BackToList=Atgal į sąrašą
 GoBack=Grįžti atgal
 CanBeModifiedIfOk=Gali būti keičiamas, jei yra galiojantis
 CanBeModifiedIfKo=Gali būti keičiamas, jei negaliojantis
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Įrašas sėkmingai pakeistas
 RecordsModified=%s įrašų pakeista
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatinis kodas
 FeatureDisabled=Funkcija išjungta
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Jūs neturite leidimo šiam veiksmui
 SessionName=Sesijos pavadinimas
 Method=Metodas
 Receive=Gauti
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Dalinis
 TotalWoman=Visas
 NeverReceived=Niekada negautas
@@ -598,6 +609,7 @@ DisabledModules=Išjungti moduliai
 For=Už
 ForCustomer=Klientui
 Signature=Parašas
+DateOfSignature=Date of signature
 HidePassword=Rodyti komandą su paslėptu slaptažodžiu
 UnHidePassword=Rodyti realią komandą su aiškiu slaptažodžiu
 Root=Pagrindinis (root)
@@ -641,6 +653,15 @@ NewAttribute=Naujas atributas
 AttributeCode=Atributo kodas
 URLPhoto=Nuotraukos/logotipo URL
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Sukurti projektą
 SetToDraft=Atgal į projektą
 ClickToEdit=Spausk redaguoti
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Pirmadienis
 Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
index 201e82180a6..94b4f9b1831 100644
--- a/htdocs/langs/lt_LT/margins.lang
+++ b/htdocs/langs/lt_LT/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/lt_LT/oauth.lang b/htdocs/langs/lt_LT/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/lt_LT/oauth.lang
+++ b/htdocs/langs/lt_LT/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index d5d5ae50dd2..3c6909e8117 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Jūsų užsakymai sukurti
 OrderFail=Kuriant užsakymus įvyko klaida
 CreateOrders=Sukurti užsakymus
 ToBillSeveralOrderSelectCustomer=Norėdami sukurti už kelis užsakymus sąskaitą faktūrą, spustelėkite pirma į klientą, tada pasirinkite "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/lt_LT/printing.lang b/htdocs/langs/lt_LT/printing.lang
index 9fe7600e05c..5c5decbb9e3 100644
--- a/htdocs/langs/lt_LT/printing.lang
+++ b/htdocs/langs/lt_LT/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 7e5d6656c05..912edc5b2bf 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Masinis PVM keitimas
 ProductVatMassChangeDesc=Šis puslapis gali būti naudojamas pakeisti PVM tarifą, apibrėžtą produktams ar paslaugoms nuo vienos reikšmės į kitą. Įspėjimas, šis pokytis yra atliekamas visai duomenų bazei.
 MassBarcodeInit=Masinė brūkšninio kodo inicializacija
 MassBarcodeInitDesc=Šis puslapis gali būti naudojamas inicijuoti brūkšninį kodą ant objektų, kurie neturi apibrėžto brūkšninio kodo. Patikrinti, ar modulio brūkšninio kodo nustatymai pilni.
-ProductAccountancyBuyCode=Apskaitos kodas (pirkti)
-ProductAccountancySellCode=Apskaitos kodas (parduoti)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produktas ar Paslauga
 ProductsAndServices=Produktai ir Paslaugos
 ProductsOrServices=Produktai ar Paslaugos
@@ -59,6 +59,8 @@ SellingPriceHT=Pardavimo kaina (atskaičius mokesčius)
 SellingPriceTTC=Pardavimo kaina (įskaitant mokesčius)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nauja kaina
 MinPrice=Minimali pardavimo kaina
 CantBeLessThanMinPrice=Pardavimo kaina negali būti mažesnė už minimalią leidžiamą šiam produktui (%s be mokesčių). Šis pranešimas taip pat gali pasirodyti, jei įvedate per labai didelę nuolaidą.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Spausdinti kelis lipdukus su vienu brūkšniniu kodu
 BuildPageToPrint=Sukurti puslapį spausdinimui
 FillBarCodeTypeAndValueManually=Užpildykite brūkšninio kodo tipą ir reikšmę rankiniu būdu.
 FillBarCodeTypeAndValueFromProduct=Užpildykite brūkšninio kodo tipą ir reikšmę nuo produkto brūkšninio kodo.
-FillBarCodeTypeAndValueFromThirdParty=Užpildykite brūkšninio kodo tipą ir reikšmę iš trečiosios šalies brūkšninio kodo.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Brūkšninio kodo tipo arba reikšmės apibrėžimas neužbaigtas produktui %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Brūkšninio kodo tipo arba reikšmės apibrėžimas nepilnas trečiąjai šaliai %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Produkto %s brūkšninio kodo informacija:
-BarCodeDataForThirdparty=Trečiosios šalies %s brūkšninio kodo informacija:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Nustatykite brūkšninio kodo reikšmę visiems įrašams (tai taip pat perkraus brūkšninio kodo reikšmę naujai apibrėžta reikšme)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index a1cd290d9aa..db3c177a3ee 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Komercinių pasiūlymų, susijusių su projektu, sąrašas
-ListOrdersAssociatedProject=Kliento užsakymų, susijusių su projektu, sąrašas
-ListInvoicesAssociatedProject=Kliento sąskaitų-faktūrų, susijusių su projektu, sąrašas
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Tiekėjo užsakymų, susijusių su projektu, sąrašas
-ListSupplierInvoicesAssociatedProject=Tiekėjo sąskaitų-faktūrų, susijusių su projektu, sąrašas
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas
 ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas
 ListExpenseReportsAssociatedProject=Išlaidų, susijusių su projektu, ataskaitų sąrašas.
@@ -123,6 +123,7 @@ ProjectReportDate=Pakeisti užduoties datą priklausomai nuo projekto pradžios
 ErrorShiftTaskDate=Neįmanoma perkelti užduoties datą į naujo projekto pradžios datą
 ProjectsAndTasksLines=Projektai ir užduotys
 ProjectCreatedInDolibarr=Projektas %s sukurtas
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Užduotis %s sukurta
 TaskModifiedInDolibarr=Užduotis %s modifikuota
 TaskDeletedInDolibarr=Užduotis %s ištrinta
@@ -153,7 +154,7 @@ PlannedWorkload=Planuojamas darbo krūvis
 PlannedWorkloadShort=Darbo krūvis
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projektas turi būti pirmiausia patvirtintas
-FirstAddRessourceToAllocateTime=Susieti išteklius laiko paskirstymui
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Įvesčių per dieną
 InputPerWeek=Įvesčių per savaitę
 InputPerAction=Įvesčių vienam veiksmui
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index 900126cb239..9f8ca851f05 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Naujas atlyginimo mokėjimas
 SalaryPayment=Atlyginimo mokėjimas
 SalariesPayments=Atlyginimų mokėjimai
 ShowSalaryPayment=Rodyti atlyginimo mokėjimą
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index cf8d0b5dbfb..a619780c9e4 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Ištrinti siuntimą
 Stock=Atsargos
 Stocks=Atsargos
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Judesiai
 ErrorWarehouseRefRequired=Sandėlio nuorodos pavadinimas yra būtinas
 ListOfWarehouses=Sandėlių sąrašas
@@ -43,6 +45,7 @@ PMPValue=Vidutinė svertinė kaina
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Sandėlių vertė
 UserWarehouseAutoCreate=Kuriant vartotoją, sandėlį sukurti automatiškai
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Kiekis išsiųstas
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/lt_LT/supplier_proposal.lang b/htdocs/langs/lt_LT/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/lt_LT/supplier_proposal.lang
+++ b/htdocs/langs/lt_LT/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index d0b4bf382b2..62b5d3186bb 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -7,13 +7,13 @@ History=Istorija
 ListOfSuppliers=Tiekėjų sąrašas
 ShowSupplier=Rodyti tiekėją
 OrderDate=Užsakymo data
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Kai kurie subproduktai neturi apibrėžtos kainos
-AddSupplierPrice=Pridėti tiekėjo kainą
-ChangeSupplierPrice=Pakeisti tiekėjo kainą
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šis nuorodytas tiekėjas jau yra susietas su nuoroda: %s
 NoRecordedSuppliers=Nėra įrašytų tiekėjų
 SupplierPayment=Tiekėjo mokėjimas
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Tiekėjo užsakymų sąrašas
 MenuOrdersSupplierToBill=Tiekėjo užsakymai sąskaitoms
 NbDaysToDelivery=Pristatymo vėlavimas dienomis
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/lt_LT/users.lang b/htdocs/langs/lt_LT/users.lang
index f7c1f7a4934..07346fcc22d 100644
--- a/htdocs/langs/lt_LT/users.lang
+++ b/htdocs/langs/lt_LT/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Savaitės valandos
 ColorUser=Vartotojo spalva
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/lt_LT/website.lang b/htdocs/langs/lt_LT/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/lt_LT/website.lang
+++ b/htdocs/langs/lt_LT/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/lt_LT/withdrawals.lang b/htdocs/langs/lt_LT/withdrawals.lang
index 52c3917f65c..d3b9e929eb2 100644
--- a/htdocs/langs/lt_LT/withdrawals.lang
+++ b/htdocs/langs/lt_LT/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Klientų pastovių užsakymų sritis
-StandingOrders=Pastovūs užsakymai
-StandingOrder=Pastovūs užsakymai
-NewStandingOrder=Naujas pastovus užsakymas
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Apdoroti
-WithdrawalsReceipts=Išėmimo kvitai
-WithdrawalReceipt=Išėmimo kvitas
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Atšaukimo eilutės
-RequestStandingOrderToTreat=Prašymas apdoroti laukiantį užsakymą
-RequestStandingOrderTreated=Prašymas apdorotiems užsakymams
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Dar negalima. Išėmimo būklė turi būti nustatyta "kredituota" prieš spec. eilučių atmetimo deklaravimą.
-NbOfInvoiceToWithdraw=Sąskaitos-faktūros su atsiėmimo prašymu numeris
-NbOfInvoiceToWithdrawWithInfo=Sąskaitos-faktūros su atsiėmimo prašymu numeris klentams, turintiems apibrėžtą banko sąskaitos informaciją
-InvoiceWaitingWithdraw=Sąskaita-faktūra laukia atsiėmimo
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Išėmimo suma
-WithdrawsRefused=Atmesti išėmimai
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nėra laukiančios kliento sąskaitos-faktūros mokėjimo režime "Išėmimas". Eiti į "Išėmimas" sąskaitos-faktūros kortelėje ir pateikti prašymą.
 ResponsibleUser=Atsakingas vartotojas
-WithdrawalsSetup=Išėmimo nustatymai
-WithdrawStatistics=Išėmimų statistika
-WithdrawRejectStatistics=Išėmimo atmetimo statistika
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Padaryti išėmimo prašymą
 ThirdPartyBankCode=Trečiosios šalies banko kodas
 NoInvoiceCouldBeWithdrawed=Nėra sėkmingai išimtų sąskaitų-faktūrų. Patikrinkite, ar sąskaitos-faktūros įmonėms, turinčioms galiojantį BAN.
@@ -46,7 +47,7 @@ StatusRefused=Atmesta
 StatusMotif0=Nenurodyta
 StatusMotif1=Nepakanka lėšų
 StatusMotif2=Prašymas ginčijamas
-StatusMotif3=Nėra išėmimo užsakymo
+StatusMotif3=No direct debit payment order
 StatusMotif4=Kliento užsakymas
 StatusMotif5=RIB netinkamas
 StatusMotif6=Sąskaita be balanso
@@ -61,28 +62,43 @@ 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=Banko sąskaita išėmimų gavimui
+BankToReceiveWithdraw=Bank account to receive direct debit
 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ą.
-DoStandingOrdersBeforePayments=Ši kortelė leidžia Jums prašyti laukiančio užsakymo. Įvykdžius jį eiti į meniu Bankas->Išėmimas ir valdyti užsakymą. Kada laukiantis užsakymas uždarytas, sąskaitos apmokėjimas automatiškai įrašomas ir sąskaita-faktūra uždaroma jei nėra priminimų apmokėti.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=Tai taip pat taikoma sąskaitų-faktūrų mokėjimams ir jų priskyrimui "Apmokėtos"
 StatisticsByLineStatus=Eilučių būklės statistika
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Periodinio užsakymo %s banko mokėjimas
-InfoCreditMessage=Periodinis užsakymas %s buvo banke<br> apmokėtas. Mokėjimo duomenys:%s
-InfoTransSubject=Periodinio užsakymo %s perdavimas bankui
-InfoTransMessage=Periodinis užsakymas %s buvo išsiųstas bankui nuo %s %s. br>br>
+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>
 InfoTransData=Suma:%s<br>Metodas:%s<br>Data:%s
-InfoRejectSubject=Periodinis užsakymas atmestas
-InfoRejectMessage=Sveiki, <br><br>periodinis užsakymas sąskaitos-faktūros %s, susijusios su įmone %s, suma %s, buvo banko atmestas.<br><br>-<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
 ModeWarning=Opcija realiam režimui nebuvo nustatyta, sustabdyta po šios simuliacijos
diff --git a/htdocs/langs/lt_LT/workflow.lang b/htdocs/langs/lt_LT/workflow.lang
index 9e61b4366f7..4b3bc9356eb 100644
--- a/htdocs/langs/lt_LT/workflow.lang
+++ b/htdocs/langs/lt_LT/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow modulio nustatymas
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Priskirti susijusį šaltinio pasiūlymą prie apmokestintų, kai kliento užsakymas nustatomas kaip apmokėtas
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Priskirti susijusį šaltinio kliento užsakymą (-us) prie apmokestinamų, kai kliento sąskaita-faktūra yra nustatoma kaip jau apmokėta
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Priskirti susijusį šaltinio kliento užsakymą (-us) prie apmokestinamų, kai kliento sąskaita-faktūra yra patvirtinama
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 8339bc42e19..e0e7925fcc7 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Žurnāli
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Konts
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Atskaites
 NewAccount=New accounting account
 Create=Izveidot
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Virsgrāmata
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Apstrādā
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Žurnāls
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Pārdošanas žurnāls
 DescPurchasesJournal=Pirkumu žurnāls
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Trešās personas konts
-
-NewAccountingMvt=Jauna pārvietošana
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Iespējas
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index b93c6b2b825..2db96ef380d 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Eksperimentāls
 VersionDevelopment=Attīstība
 VersionUnknown=Nezināms
 VersionRecommanded=Ieteicams
-FileCheck=Failu veselums
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Trūkstošie faili
 FilesUpdated=Atjaunotie faili
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesijas ID
 SessionSaveHandler=Handler, lai saglabātu sesijas
 SessionSavePath=Atmiņas sesija lokalizācija
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</
 DictionarySetup=Vārdnīcas iestatījumi
 Dictionary=Vārdnīcas
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiskālais gads
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu
 ErrorCodeCantContainZero=Kods nevar saturēt 0 vērtību
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Rakstzīmju skaits, lai iedarbinātu meklēšanu: %s
 NotAvailableWhenAjaxDisabled=Nav pieejama, kad Ajax ir bloķēts
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript bloķēts
 UsePreviewTabs=Izmantot priekšskatījuma cilnes
 ShowPreview=Rādīt priekšskatījumu
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Šifrēt bināro datu heksadecimālo
 IgnoreDuplicateRecords=Ignorēt dubulto ierakstu kļūdas (INSERT IGNORE)
 AutoDetectLang=Automātiski noteikt (pārlūka valoda)
 FeatureDisabledInDemo=Iespēja bloķēta demo versijā
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Atļaujas
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Tikai elementus no <a href="%s">iespējotu moduļi</a> tiek parādīts.
-ModulesDesc=Dolibarr moduļi noteikt, kura funkcionalitāte ir iespējots programmatūru. Daži moduļi pieprasa atļaujas, jums ir piešķirt lietotājiem, pēc tam ļaujot moduli. Noklikšķiniet uz pogas on / off ailē "Statuss", lai nodrošinātu moduli / funkciju.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Papildus moduļi ...
 DoliStoreDesc=DoliStore ir oficiālā mājaslapa Dolibarr ERP / CRM papildus moduļiem
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr pašreizējā versija
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Jaunākā stabilā versija
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Jūs varat ievadīt jebkuru numerācijas masku. Šajā maska, šādus tagus var izmantot: <br> <b>{000000}</b> atbilst skaitam, kas tiks palielināts par katru %s. Ievadīt tik daudz nullēm, kā vajadzīgajā garumā letes. Skaitītājs tiks pabeigts ar nullēm no kreisās puses, lai būtu tik daudz nullēm kā masku. <br> <b>{000000 000}</b> tāds pats kā iepriekšējais, bet kompensēt atbilst noteiktam skaitam pa labi uz + zīmi tiek piemērots, sākot ar pirmo %s. <br> <b>{000000 @ x}</b> tāds pats kā iepriekšējais, bet skaitītājs tiek atiestatīts uz nulli, kad mēnesī x ir sasniegts (x no 1 līdz 12, 0 vai izmantot agri no finanšu gada mēnešiem, kas noteiktas konfigurācijas, 99 vai atiestatīt uz nulli katru mēnesi ). Ja šis variants tiek izmantots, un x ir 2 vai vairāk, tad secība {gggg} {mm} vai {GGGG} {mm} ir arī nepieciešama. <br> <b>{Dd}</b> diena (no 01 līdz 31). <br> <b>{Mm}</b> mēnesi (no 01 līdz 12). <br> <b>{Yy}, {GGGG}</b> vai <b>{y}</b> gadu vairāk nekā 2, 4 vai 1 numuri. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Visas citas rakstzīmes masku paliks neskartas.<br>Atstarpes nav atļautas.<br>
 GenericMaskCodes4a=<u>Piemērs par 99. %s trešās puses Thecompany darīts 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Piemērs trešā persona veidota 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
 SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
 EnterRefToBuildUrl=Ievadiet atsauci objektam %s
 GetSecuredUrl=Saņemt aprēķināto URL
-ButtonHideUnauthorized=Slēpt pogas, kas nav pieejamas nevis rādīt tās pelēcīgas
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Vecā PVN likme
 NewVATRates=Jaunā PVN likme
 PriceBaseTypeToChange=Pārveidot par cenām ar bāzes atsauces vērtību, kas definēta tālāk
@@ -349,6 +356,7 @@ ExtrafieldMail = E-pasts
 ExtrafieldSelect = Izvēlēties sarakstu
 ExtrafieldSelectList = Izvēlieties kādu no tabulas
 ExtrafieldSeparator=Atdalītājs
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Rūtiņa
 ExtrafieldRadio=Radio poga
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Lietotāji un grupas
@@ -428,8 +439,8 @@ Module55Name=Svītrkodi
 Module55Desc=Svītrkodu vadība
 Module56Name=Telefonija
 Module56Desc=Telefonijas integrācija
-Module57Name=Regulārie maksājumi
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=NospiedLaiSavienotos
 Module58Desc=Integrācija ar ClickToDial sistēmas (zvaigznīte, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Vebkalendārs
 Module410Desc=Web kalendāra integrācija
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Atalgojums
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Paziņojumi
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Ziedojumi
 Module700Desc=Ziedojumu pārvaldība
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Lasīt sniedzējiem
 Permission147=Lasīt statistiku
-Permission151=Lasīt pastāvīgos pieprasījumus
-Permission152=Izveidot / mainīt pastāvīgu pasūtījumu pieprasījumu
-Permission153=Transmisijas regulārā maksājuma rīkojumu ieņēmumi
-Permission154=Kredītkartes / atteikties regulārā maksājuma rīkojumu ieņēmumiem
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Apskatīt līgumus/subscriptions
 Permission162=Izveidot/labot līgumus/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Eksporta piegādātāju rēķinus, atribūti un maksājumus
 Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas
 Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde)
 Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
+Permission1322=Reopen a paid bill
 Permission1421=Eksportēt klientu pasūtījumus un atribūtus
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Izveidot/labot aptaujas
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label izmantots pēc noklusējuma, ja nav tulkojuma var atras
 LabelOnDocuments=Dokumentu marķējums
 NbOfDays=dienu sk
 AtEndOfMonth=mēneša beigās
+CurrentNext=Current/Next
 Offset=Kompensācija
 AlwaysActive=Vienmēr aktīvs
 Upgrade=Atjaunināt
@@ -950,7 +967,7 @@ LogEventDesc=Jūs varat ļaut šeit reģistrēšanu Dolibarr drošības notikumi
 AreaForAdminOnly=Minētās funkcijas var izmantot <b>administratora lietotājiem.</b>
 SystemInfoDesc=Sistēmas informācija ir dažādi tehniskā informācija jums tikai lasīšanas režīmā un redzama tikai administratoriem.
 SystemAreaForAdminOnly=Šī joma ir pieejama administratora lietotājiem. Neviens no Dolibarr atļauju var samazināt šo robežu.
-CompanyFundationDesc=Labot šajā lapā visu zināmo informāciju par uzņēmuma vai nodibinājuma jums ir nepieciešams, lai pārvaldītu (Lai to izdarītu, noklikšķiniet uz "Labot" pogu lapas apakšā)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Jūs varat izvēlēties katru parametru, kas saistīts ar Dolibarr izskatu un justies šeit
 AvailableModules=Pieejamie moduļi
 ToActivateModule=Lai aktivizētu moduļus, dodieties uz iestatīšanas zonas (Home->Setup->Moduļi).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Brīdinājums, par dažiem Linux sistēmām, lai nosū
 PathToDocuments=Ceļš līdz dokumentiem
 PathDirectory=Katalogs
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Tulkojumu konfigurēšana
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jums ir jābūt ieslēgtam vismaz 1 modulim
 ClassNotFoundIntoPathWarning=Klase %s nav atrasta PHP norādītajā ceļā
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Izmantot TLS
 LDAPServerUseTLSExample=Jūsu LDAP serveris izmanto TLS
 LDAPServerDn=Servera DN
 LDAPAdminDn=Administratora DN
-LDAPAdminDnExample=Complete DN (ex: cn = admin, dc = piemēram, dc = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administratora parole
 LDAPUserDn=Lietotāju DN
 LDAPUserDnExample=Complete DN (ex: ou = lietotājiem, dc = piemēram, dc = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Piemērs: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Piemērs: objectsid
 LDAPFieldEndLastSubscription=Datums, kad parakstīšanās beigu
-LDAPFieldTitle=Post / Funkcija
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Piemērs: virsraksts
 LDAPSetupNotComplete=LDAP uzstādīšana nav pilnīga (doties uz citām cilnēm)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nav administrators vai parole sniegta. LDAP pieeja būs anonīmi un tikai lasīšanas režīmā.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produktu un pakalpojumu moduļu uzstādīšana
 NumberOfProductShowInSelect=Maksimālais skaits produktu kombinācijas izvēlētos sarakstus (0 = nav ierobežojumu)
 ViewProductDescInFormAbility=Vizualizācija produktu aprakstiem formām (citādi kā popup Tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Vizualizācija produktu aprakstiem thirdparty valodā
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Noklusējuma svītrkoda veids izmantojams produktiem
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Iekšējais dzinējs
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Izstāšanās modulis uzstādīšana
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Ārējā RSS importa iestatīšana
 NewRSS=Jauna RSS barotne
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Atvērt fiskālo gadu
 CloseFiscalYear=Aizvērt fiskālo gadu
 DeleteFiscalYear=Dzēst fiskālo gadu
 ConfirmDeleteFiscalYear=Vai tiešām vēlaties dzēst fiskālo gadu?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimālais lielo burtu skaits
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Lapas virsraksta krāsa
 LinkColor=Linku krāsa
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Fona krāsa
 TopMenuBackgroundColor=Fona krāsa augšējai izvēlnei
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Fona krāsa kreisajai izvēlnei
 BackgroundTableTitleColor=Fona krāsa tabulas virsraksta līnijai
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Jūs izmantojat pēdējo stabilo versiju
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index f1bf6f8c917..e2bf8be3a4b 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -27,13 +27,9 @@ AllTime=No sākuma
 Reconciliation=Samierināšanās
 RIB=Bankas konta numurs
 IBAN=IBAN numurs
-IbanValid=IBAN ir pareizs
-IbanNotValid=IBAN nav pareizs
 BIC=BIC / SWIFT numurs
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Regulārie pasūtījumi
-StandingOrder=Regulārais pasūtījums
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Konta izraksts
 AccountStatementShort=Paziņojums
 AccountStatements=Konta izraksti
@@ -78,6 +74,7 @@ AccountToCredit=Konts, lai kredītu
 AccountToDebit=Konta norakstīt
 DisableConciliation=Atslēgt izlīguma funkciju šim kontam
 ConciliationDisabled=Izlīgums līdzeklis invalīdiem
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Atvērt
 StatusAccountClosed=Slēgts
 AccountIdShort=Numurs
@@ -87,6 +84,8 @@ AddBankRecordLong=Pievienot darījumu manuāli
 ConciliatedBy=Jāsaskaņo ar
 DateConciliating=Izvērtējiet datumu
 BankLineConciliated=Darījuma saskaņot
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Klienta maksājums
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Izstāšanās maksājums
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bankas pārskaitījums
 BankTransfers=Bankas pārskaitījumi
-TransferDesc=Pārskaitījums no viena konta uz otru, Dolibarr būs rakstīt divus ierakstus (ar avota kontu debeta un arī mērķa konta kredīts, par tādu pašu summu. Pats marķējums un datums tiks izmantoti šo darījumu)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=No
 TransferTo=Kam
 TransferFromToDone=No <b>%s</b> nodošana <b>%s</b> par <b>%s</b> %s ir ierakstīta.
@@ -129,7 +129,7 @@ FutureTransaction=Darījumi ar Futur. Nav veids, kā samierināt.
 SelectChequeTransactionAndGenerate=Izvēlieties / filtru pārbaudes, lai iekļautu uz pārbaudes depozīta saņemšanas un noklikšķiniet uz &quot;Izveidot&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Galu galā, norādiet kategoriju, kurā klasificēt ierakstus
-ToConciliate=Samierināt?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Tad pārbaudiet līnijas, kas atrodas bankas izrakstā, un noklikšķiniet
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index e6c69e0128e..8e21b8d7013 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Kļūda, nevar atcelt rēķinu,
 BillFrom=No
 BillTo=Kam
 ActionsOnBill=Pasākumi attiecībā uz rēķinu
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Piedāvāta atlaide (maksājums pirms termiņa)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Regulārie maksājumi
-StandingOrder=Regulārais maksājums
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nav rēķinu sagataves
 NoOtherDraftBills=Nekādi citi projekti rēķini
 NoDraftInvoices=Nav projektu rēķini
@@ -351,8 +351,8 @@ VarAmount=Mainīgais apjoms (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bankas pārskaitījums
 PaymentTypeShortVIR=Bankas pārskaitījums
-PaymentTypePRE=Bankas rīkojums
-PaymentTypeShortPRE=Bankas pārskaitījums
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Skaidra nauda
 PaymentTypeShortLIQ=Skaidra nauda
 PaymentTypeCB=Kredītkarte
@@ -381,6 +381,7 @@ ExtraInfos=Papildu info
 RegulatedOn=Regulēta uz
 ChequeNumber=Pārbaudiet N °
 ChequeOrTransferNumber=Pārbaudiet / Transfer N °
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Čeka izsniegšanas banka
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Samaksāts ar šo maksājumu
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Visi rēķini, kas ir apmaksāti pilnībā automātiski tiks aizvērti ar statusu "Samaksāts".
 ToMakePayment=Maksāt
 ToMakePaymentBack=Atmaksāt
 ListOfYourUnpaidInvoices=Saraksts ar neapmaksātiem rēķiniem
 NoteListOfYourUnpaidInvoices=Piezīme: Šis saraksts satur tikai rēķinus par trešo pušu Jums ir saistīti ar kā pārdošanas pārstāvis.
 RevenueStamp=Ieņēmumi zīmogs
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Rēķina PDF  paraugs. Pilnākais rēķina paraugs (vēlamais paraugs)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index c83db04c926..a3bf17cc90b 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Vecākais aktīvais beidzies pakalpojums
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global darbība (pavadzīmes, priekšlikumi, rīkojumi)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Priekšlikumi pa mēnešiem
 NoTooLowStockProducts=Nav produktu ar zemu krājumu brīdinājumu
 BoxProductDistribution=Produkti / Pakalpojumi izplatīšana
 BoxProductDistributionFor=Izplatīšana %s par %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Klientu rēķini
 ForCustomersOrders=Klientu pasūtījumi
 ForProposals=Priekšlikumi
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index 1252f651537..db3d61905b1 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=uz
 CashDeskThirdParty=Trešās puses
 ShoppingCart=Iepirkumu grozs
 NewSell=Jauna pārdošana
-BackOffice=Back office
 AddThisArticle=Pievienot šo preci
 RestartSelling=Iet atpakaļ uz pārdošanu
-SellFinished=Pārdošana pabeigta
+SellFinished=Sale complete
 PrintTicket=Drukāt biļeti
 NoProductFound=Raksts nav atrasts
 ProductFound=Produkts atrasts
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index a529fccf29e..86c5169d83b 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Apakšsadaļas
 CatList=List of tags/categories
 NewCategory=Jauna etiķete/sadaļa
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Šī sadaļa jau pastāv ar šo ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Šī sadaļā nav produktu.
 ThisCategoryHasNoSupplier=Šajā sadaļā nav neviena piegādātāja.
 ThisCategoryHasNoCustomer=Šī sadaļa nesatur klientu.
 ThisCategoryHasNoMember=Šajā sadaļaā nav neviena dalībnieka.
 ThisCategoryHasNoContact=Šajā kategorijā nav nekādu kontaktu.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index fbad5215376..e2a1dd08222 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Jauna privātpersona
 NewCompany=Jauns uzņēmums (perspektīva, klients, piegādātājs)
 NewThirdParty=Jauna trešā persona (perspektīva, klients, piegādātājs)
 CreateDolibarrThirdPartySupplier=Izveidot trešo pusi (pegādātjs)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Apzināšanas lauks
 IdThirdParty=Trešās personas Id
 IdCompany=Uzņēmuma Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Piegādātāji
 ThirdPartyType=Trešās puses tips
 Company/Fundation=Kompānija / Nodibinājums
 Individual=Privātpersona
-ToCreateContactWithSameName=Izveidos automātiski kontaktu ar šo pašu informāciju
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Mātes uzņēmums
 Subsidiaries=Filiāles
 ReportByCustomers=Klientu ziņojums
@@ -47,7 +49,7 @@ CivilityCode=Pieklājība kods
 RegisteredOffice=Juridiskā adrese
 Lastname=Uzvārds
 Firstname=Vārds
-PostOrFunction=Post / Funkcija
+PostOrFunction=Job position
 UserTitle=Virsraksts
 Address=Adrese
 State=Valsts / province
@@ -64,7 +66,7 @@ Chat=Čats
 PhonePro=Darba tālrunis
 PhonePerso=Pers. telefons
 PhoneMobile=Mobilais
-No_Email=Nesūtīt masu e-pasta sūtījumus
+No_Email=Refuse mass e-mailings
 Fax=Fakss
 Zip=Pasta indekss
 Town=Pilsēta
@@ -73,7 +75,7 @@ Poste= Pozīcija
 DefaultLang=Valoda pēc noklusējuma
 VATIsUsed=PVN tiek izmantots
 VATIsNotUsed=PVN netiek izmantots
-CopyAddressFromSoc=Aizpildiet trešās puses adresi
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Pielietot otru nodokli
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=PVN numurs
 VATIntraShort=PVN numurs
 VATIntraSyntaxIsValid=Sintakse ir pareiza
-VATIntraValueIsValid=Vērtība ir pareizas
 ProspectCustomer=Prospect / Klients
 Prospect=Perspektīva
 CustomerCard=Klienta kartiņa
@@ -261,7 +262,9 @@ AddContactAddress=Izveidot kontaktu/adresi
 EditContact=Labot kontaktu
 EditContactAddress=Labot kontakta / adresi
 Contact=Kontakts
+ContactId=Contact id
 ContactsAddresses=Kontaktu / adreses
+FromContactName=Name:
 NoContactDefinedForThirdParty=Nav  definēta kontakta ar šo trešo personu
 NoContactDefined=Nav definēts kontakts
 DefaultContact=Noklsētais kontakts / adrese
@@ -284,7 +287,7 @@ CompanyDeleted=Kompānija "%s" dzēsta no datubāzes.
 ListOfContacts=Kontaktu / adrešu saraksts
 ListOfContactsAddresses=Kontaktu / adrešu saraksts
 ListOfThirdParties=Trešo personu saraksts
-ShowCompany=Rādīt trešās personas
+ShowCompany=Show third party
 ShowContact=Rādīt kontaktu
 ContactsAllShort=Visi (Bez filtra)
 ContactType=Kontakta veids
@@ -294,6 +297,7 @@ ContactForProposals=Piedāvājumu  kontakti
 ContactForContracts=Līgumu kontakti
 ContactForInvoices=Rēķinu kontakti
 NoContactForAnyOrder=Šis kontakts ir ne kontaktu, lai jebkurā secībā
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Šis kontakts ir ne kontaktu par jebkuru komerciālu priekšlikumu
 NoContactForAnyContract=Šis kontakts nav neviena līguma kontaktpersona
 NoContactForAnyInvoice=Šis kontakts nav neviena rēķina kontaktpersona
@@ -352,9 +356,9 @@ ExportCardToFormat=Eksporta karti formātā
 ContactNotLinkedToCompany=Kontakts nav saistīts ar trešajām personām
 DolibarrLogin=Dolibarr pieteikšanās
 NoDolibarrAccess=Nav Dolibarr piekļuve
-ExportDataset_company_1=Trešās puses (Kompānijas/dibinājums/fiziski cilvēki) un īpašumi
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti un rekvizīti
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakti/Adreses (trešo pušu vai arī nē)
 ImportDataset_company_3=Bankas rekvizīti
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index 8f5d9fc4325..7b222935533 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Īpašie izdevumi
 MenuTaxAndDividends=Nodokļi un dividendes
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index 6ec4da87d28..f00baec2691 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Plānotais darbu vadības iestatīšana
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Drošības atslēga URL uzsākt cron darbavietas
 FileToLaunchCronJobs=Komandrindas uzsākt cron darbavietas
@@ -23,7 +23,7 @@ CronCommand=Komanda
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Darbs
@@ -39,7 +39,7 @@ CronMethod=Metode
 CronModule=Modulis
 CronNoJobs=Nav reģistrētu darbu
 CronPriority=Prioritāte
-CronLabel=Apraksts
+CronLabel=Label
 CronNbRun=Nb. sākt
 CronMaxRun=Max nb. launch
 CronEach=Katru
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index eb63f35d899..b631b5069d2 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Kļūda, jūsu PHP ir jābūt moduli <b>%s</b> uzstādītas,
 ErrorOpenIDSetupNotComplete=Jūs uzstādīšana Dolibarr config failu, lai ļautu OpenID autentifikācijas, bet OpenID pakalpojuma URL nav definēts spēkā salīdzināmajās %s
 ErrorWarehouseMustDiffers=Avota un mērķa noliktavas jābūt atšķiras
 ErrorBadFormat=Nepareizs formāts
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 218282ed3ed..d369087cad1 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP atbalsta sesijas.
 PHPSupportPOSTGETOk=PHP atbalsta mainīgos POST un GET.
 PHPSupportPOSTGETKo=Iespējams, ka jūsu PHP neatbalsta mainīgos POST un / vai GET. Pārbaudiet parametrus <b>variables_order</b> failā php.ini.
 PHPSupportGD=PHP atbalsta GD grafiskās funkcijas.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=PHP atbalsta UTF8 funkcijas.
 PHPMemoryOK=Jūsu PHP maksimālā sesijas atmiņa ir iestatīts uz <b>%s.</b> Tas ir pietiekami.
 PHPMemoryTooLow=Jūsu PHP max sesijas atmiņa ir iestatīts uz <b>%s</b> baitu. Tas būtu pārāk mazs. Mainiet savu <b>php.ini</b> lai uzstādītu <b>memory_limit</b> parametrs vismaz <b>%s</b> baitos.
 Recheck=Klikšķiniet šeit, lai vairāk izceltu testu
 ErrorPHPDoesNotSupportSessions=PHP instalācija neatbalsta sesijas. Šī funkcija ir nepieciešama lai Dolibarr strādātu. Pārbaudiet savus PHP iestatījumus.
 ErrorPHPDoesNotSupportGD=PHP instalācija neatbalsta grafisko funkciju GD. Nebūs pieejami grafiki.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=PHP instalācija neatbalsta UTF8 funkciju. Dolibarr nevar strādāt pareizi. Atrisiniet šo pirms instalējat Dolibarr.
 ErrorDirDoesNotExists=Katalogs %s neeksistē.
 ErrorGoBackAndCorrectParameters=Atgriezieties un labojiet nepareizos parametrus.
@@ -133,6 +135,10 @@ ActivateModule=Aktivizēt moduli %s
 ShowEditTechnicalParameters=Noklikšķiniet šeit, lai parādītu / rediģēt papildu parametrus (ekspertu režīmā)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Atjaunināt informāciju par pasākumiem
 MigrationPaymentMode=Datu migrācija uz maksājumu režīmā
 MigrationCategorieAssociation=Kategoriju migrācija
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Rādīt nepieejamās iespējas
 HideNotAvailableOptions=Slēpt nepieejamās iespējas
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index 5c5395ed961..283b7ab1e69 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Šādi-up klientu kontaktu
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/lv_LV/ldap.lang b/htdocs/langs/lv_LV/ldap.lang
index 323edbe21b4..a13fa8a8c63 100644
--- a/htdocs/langs/lv_LV/ldap.lang
+++ b/htdocs/langs/lv_LV/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Pirmais abonēšanas datumu
 LDAPFieldFirstSubscriptionAmount=Pirmais parakstīšanās summu
 LDAPFieldLastSubscriptionDate=Pēdējā abonēšanas datums
 LDAPFieldLastSubscriptionAmount=Pēdējā parakstīšanās summu
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Lietotājs sinhronizēts
 GroupSynchronized=Grupa sinhronizēta
 MemberSynchronized=Biedrs sinhronizēti
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 06ee8e77f47..3ea85376508 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Lasīt
 YourMailUnsubcribeOK=E-pasts <b>%s</b> ir veiksmīgi izņemts no adresātu saraksta
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-pastu nosūtīja %s saņēmējiem.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index ab6f71a0264..b2feae4b4e1 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -67,6 +67,7 @@ SelectDate=Izvēlēties datumu
 SeeAlso=Skatīt arī %s
 SeeHere=See here
 BackgroundColorByDefault=Noklusējuma fona krāsu
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=Fails ir izvēlēts pielikumam,  bet vēl nav augšupielādēti. Noklikšķiniet uz &quot;Pievienot failu&quot;, lai to pievienotu.
 NbOfEntries=Ierakstu sk
@@ -245,6 +246,10 @@ DateBuild=Ziņojuma veidošanas datums
 DatePayment=Maksājuma datums
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=gads
 DurationMonth=mēnesis
 DurationWeek=nedēļa
@@ -256,6 +261,7 @@ DurationDays=dienas
 Year=Gads
 Month=Mēnesis
 Week=Nedēļa
+WeekShort=Week
 Day=Diena
 Hour=Stunda
 Minute=Minūte
@@ -278,6 +284,7 @@ MonthOfDay=Mēneša laikā no dienas
 HourShort=H
 MinuteShort=mn
 Rate=Likme
+CurrencyRate=Currency conversion rate
 UseLocalTax=Ar PVN
 Bytes=Baiti
 KiloBytes=Kilobaiti
@@ -565,8 +572,11 @@ BackToList=Atpakaļ uz sarakstu
 GoBack=Iet atpakaļ
 CanBeModifiedIfOk=Var mainīt ja ir pareizs
 CanBeModifiedIfKo=Var mainīt, ja nav derīgs
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=ieraksts modificēts veiksmīgi
 RecordsModified=%s ieraksti modificēti
+RecordsDeleted=%s records deleted
 AutomaticCode=Automātiskās kods
 FeatureDisabled=Funkcija bloķēta
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Jums nav atļauta šī darbība
 SessionName=Sesijas nosaukums
 Method=Metode
 Receive=Saņemt
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Daļējs
 TotalWoman=Kopsumma
 NeverReceived=Nekad nav saņemts
@@ -598,6 +609,7 @@ DisabledModules=Bloķētie moduļi
 For=Kam
 ForCustomer=Klientam
 Signature=Paraksts
+DateOfSignature=Date of signature
 HidePassword=Rādīt komandu ar slēptu paroli
 UnHidePassword=Parādīt komandu bez paroles
 Root=Sakne
@@ -641,6 +653,15 @@ NewAttribute=Jauns atribūts
 AttributeCode=Atribūts kods
 URLPhoto=Saite bildei/logo
 SetLinkToAnotherThirdParty=Saite uz citu trešo personu
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Izveidot melnrakstu
 SetToDraft=Atpakaļ uz melnrakstu
 ClickToEdit=Klikšķiniet, lai rediģētu
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Pirmdiena
 Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index 33a04894e1a..d4dd4c4092d 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/lv_LV/oauth.lang
+++ b/htdocs/langs/lv_LV/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index a664930eb4d..b16c72338b8 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Jūsu pasūtījumi ir radīti
 OrderFail=Kļūda notika laikā jūsu pasūtījumu radīšanu
 CreateOrders=Izveidot pasūtījumus
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/lv_LV/printing.lang b/htdocs/langs/lv_LV/printing.lang
index be532cb1682..2067ec0c08f 100644
--- a/htdocs/langs/lv_LV/printing.lang
+++ b/htdocs/langs/lv_LV/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Autentifikācija
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Nosaukums
 GCP_displayName=Nosaukums
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index 7c32220245f..f7bb945c183 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Partijas/sērijas numurs
 BatchNumberShort=Partija/Sērijas numurs
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Daudz.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index f2225a351a1..61dba81707a 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Masveida PVN maiņa
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Grāmatvedība kods (pirkt)
-ProductAccountancySellCode=Grāmatvedība kods (pārdot)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produkts vai pakalpojums
 ProductsAndServices=Produkti un pakalpojumi
 ProductsOrServices=Produkti vai pakalpojumi
@@ -59,6 +59,8 @@ SellingPriceHT=Pārdošanas cena (bez PVN)
 SellingPriceTTC=Pārdošanas cena (ar PVN)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Jaunā cena
 MinPrice=Min. pārdošanas cena
 CantBeLessThanMinPrice=Pārdošanas cena nevar būt zemāka par minimālo pieļaujamo šī produkta (%s bez PVN). Šis ziņojums var būt arī parādās, ja esat ievadījis pārāk lielu atlaidi.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Drukāt vairākas svītrkoda uzlīmes
 BuildPageToPrint=Ģenerēt lapu drukāšanai
 FillBarCodeTypeAndValueManually=Aizpildīt svītrukodu veidu un vērtību manuāli.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Aizpildīt svītrkodu veidu un vērtību no trešo pušu svītrkoda.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Svītrkoda produkta informācija %s :
-BarCodeDataForThirdparty=Svītrkoda informācija trešajām personām %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 4d94b989448..9d2653b7470 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Saraksts tirdzniecības priekšlikumiem saistībā ar projektu
-ListOrdersAssociatedProject=Saraksts klienta pasūtījumu saistīts ar projektu
-ListInvoicesAssociatedProject=Saraksts klienta rēķinu ar projektu saistītās
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Saraksts piegādātāja pasūtījumu saistīts ar projektu
-ListSupplierInvoicesAssociatedProject=Saraksts no piegādātāja rēķinus saistīts ar projekta
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Līgumu sarakstu kas saistīti ar projektu
 ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Mainīt uzdevumu datums atbilstoši projekta sākuma datumu
 ErrorShiftTaskDate=Nav iespējams novirzīt uzdevumu datumu saskaņā ar jaunu projektu uzsākšanas datuma
 ProjectsAndTasksLines=Projekti un uzdevumi
 ProjectCreatedInDolibarr=Projekta %s izveidots
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Uzdevums %s izveidots
 TaskModifiedInDolibarr=Uzdevums %s labots
 TaskDeletedInDolibarr=Uzdevums %s dzēsts
@@ -153,7 +154,7 @@ PlannedWorkload=Plānotais darba apjoms
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 9f6d30d35fa..0ff37140251 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Jauna algas izmaksa
 SalaryPayment=Algas maksājums
 SalariesPayments=Algu maksājumi
 ShowSalaryPayment=Rādīt algu maksājumus
-THM=Vidējā stundas cena
-TJM=Vidējā dienas cena
+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
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 76ff3fc46d8..f189501368d 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Dzēst nosūtot
 Stock=Krājums
 Stocks=Krājumi
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Kustības
 ErrorWarehouseRefRequired=Noliktava nosaukums ir obligāts
 ListOfWarehouses=Saraksts noliktavās
@@ -43,6 +45,7 @@ PMPValue=Vidējā svērtā cena
 PMPValueShort=VSC
 EnhancedValueOfWarehouses=Noliktavas vērtība
 UserWarehouseAutoCreate=Izveidot noliktavu automātiski, veidojot lietotāju
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Nosūtītais daudzums
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/lv_LV/supplier_proposal.lang b/htdocs/langs/lv_LV/supplier_proposal.lang
index b876e747e2a..7f56e3f0fdb 100644
--- a/htdocs/langs/lv_LV/supplier_proposal.lang
+++ b/htdocs/langs/lv_LV/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index fb0321611e5..19463a240a0 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -7,13 +7,13 @@ History=Vēsture
 ListOfSuppliers=Piegādātāju
 ShowSupplier=Rādīt piegādātāju
 OrderDate=Pasūtīt datumu
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Minimālā iepikšanas cena
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Dažiem apakšproduktiem nav norādītas cenas
-AddSupplierPrice=Pievienot piegādātāju cenu
-ChangeSupplierPrice=Mainīt piegādātāju cenu
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Šī atsauce piegādātājam jau ir saistīta ar atsauci: %s
 NoRecordedSuppliers=Nav reģistrētu piegādātāju
 SupplierPayment=Piegādātājs maksājums
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Piegādes kavēšanās dienās
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 2d673b5520f..86f8fd9af16 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Nedēļas stundas
 ColorUser=Lietotāja krāsa
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/lv_LV/website.lang b/htdocs/langs/lv_LV/website.lang
index a9f6f8a8fb4..c545706dcc6 100644
--- a/htdocs/langs/lv_LV/website.lang
+++ b/htdocs/langs/lv_LV/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Mājas lapa
+Webpage=Web page
 AddPage=Pievienot lapu
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index 679d5205ace..f5f0f1157ed 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Klientu pasūtījumu sadaļa
-StandingOrders=Regulārie maksājumi
-StandingOrder=Regulārie maksājumi
-NewStandingOrder=Jauns regulārais maksājums
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Jāapstrādā
-WithdrawalsReceipts=Abstinences ieņēmumi
-WithdrawalReceipt=Izstāšanās saņemšana
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Abstinences līnijas
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Rēķins gaida atsaukt
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Summa atsaukt
-WithdrawsRefused=Atsauc atteicās
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Neviens klients rēķins maksājuma režīmā, &quot;izņemt&quot; gaida. Iet uz &quot;atsaukt&quot; tab par rēķinu karti, lai padarītu pieprasījumu.
 ResponsibleUser=Atbildīgais lietotājs
-WithdrawalsSetup=Izstāšanās iestatīšana
-WithdrawStatistics=Paņemiet statistika
-WithdrawRejectStatistics=Atsaukt noraidīt statistika
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Padara atsaukt prasību
 ThirdPartyBankCode=Trešās puses bankas kods
 NoInvoiceCouldBeWithdrawed=Nevienu rēķinu withdrawed ar panākumiem. Pārbaudiet, ka rēķins ir par uzņēmumiem, ar derīgu BAN.
@@ -46,7 +47,7 @@ StatusRefused=Atteikts
 StatusMotif0=Nav zināms
 StatusMotif1=Nepietiekami līdzekļi
 StatusMotif2=Pieprasījumu apstrīdēja
-StatusMotif3=Nav Izstāšanās kārtība
+StatusMotif3=No direct debit payment order
 StatusMotif4=Klienta pasūtijums
 StatusMotif5=RIB nelietojams
 StatusMotif6=Konta bez atlikuma
@@ -61,28 +62,43 @@ 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 kontu, lai saņemtu atsauc
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Izstāšanās fails
 SetToStatusSent=Nomainīt uz statusu "Fails nosūtīts"
 ThisWillAlsoAddPaymentOnInvoice=This tab allows you to request a standing order. Once it is complete, you can type the payment to close the invoice.
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Maksājumu pastāvīgā rīkojuma %s banka
-InfoCreditMessage=Stāvot rīkojums %s ir samaksāta banka <br> Dati par maksājumu: %s
-InfoTransSubject=Nosūtīšana pastāvīgā rīkojuma %s uz banku
-InfoTransMessage=Regulārais maksājums %s ir nosūtītjis uz banku %s %s.<br><br>
+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>
 InfoTransData=Daudzums: %s<br>Metode: %s<br>Datums: %s
-InfoRejectSubject=Pastāvīgā lai atteicās
-InfoRejectMessage=Sveiki, <br><br> stāvot rīkojums faktūrā %s, kas saistīti ar uzņēmuma %s, ar summu %s ir atteikta banka. <br><br> - <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
 ModeWarning=Iespēja reālā režīmā nav noteikts, mēs pārtraucam pēc šīs simulācijas
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index 887ec7d9438..b99ba448f7e 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Darbplūsmu moduļa iestatīšana
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasificēt saistīta avota priekšlikumu Jāmaksā, ja klientu rīkojumu ir iestatīts uz apmaksātu
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasificēt saistīts avots klienta pasūtījumu (s) Jāmaksā, ja klients rēķins ir iestatīts uz apmaksātu
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasificēt saistīta avota klienta pasūtījumu (s) Jāmaksā, ja klients rēķins ir apstiprināts
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index af313850ba1..9967530b1d2 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/mk_MK/boxes.lang b/htdocs/langs/mk_MK/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/mk_MK/boxes.lang
+++ b/htdocs/langs/mk_MK/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/mk_MK/cashdesk.lang b/htdocs/langs/mk_MK/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/mk_MK/cashdesk.lang
+++ b/htdocs/langs/mk_MK/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/mk_MK/categories.lang b/htdocs/langs/mk_MK/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/mk_MK/categories.lang
+++ b/htdocs/langs/mk_MK/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/mk_MK/compta.lang b/htdocs/langs/mk_MK/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/mk_MK/compta.lang
+++ b/htdocs/langs/mk_MK/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/mk_MK/interventions.lang b/htdocs/langs/mk_MK/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/mk_MK/interventions.lang
+++ b/htdocs/langs/mk_MK/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/mk_MK/ldap.lang b/htdocs/langs/mk_MK/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/mk_MK/ldap.lang
+++ b/htdocs/langs/mk_MK/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/mk_MK/mails.lang b/htdocs/langs/mk_MK/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/mk_MK/mails.lang
+++ b/htdocs/langs/mk_MK/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 28bd992f7e6..321f4addbbb 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/mk_MK/margins.lang
+++ b/htdocs/langs/mk_MK/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/mk_MK/oauth.lang b/htdocs/langs/mk_MK/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/mk_MK/oauth.lang
+++ b/htdocs/langs/mk_MK/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/mk_MK/printing.lang b/htdocs/langs/mk_MK/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/mk_MK/printing.lang
+++ b/htdocs/langs/mk_MK/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/mk_MK/supplier_proposal.lang b/htdocs/langs/mk_MK/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/mk_MK/supplier_proposal.lang
+++ b/htdocs/langs/mk_MK/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/mk_MK/users.lang b/htdocs/langs/mk_MK/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/mk_MK/users.lang
+++ b/htdocs/langs/mk_MK/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/mk_MK/website.lang b/htdocs/langs/mk_MK/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/mk_MK/website.lang
+++ b/htdocs/langs/mk_MK/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/mk_MK/withdrawals.lang b/htdocs/langs/mk_MK/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/mk_MK/withdrawals.lang
+++ b/htdocs/langs/mk_MK/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/mk_MK/workflow.lang b/htdocs/langs/mk_MK/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/mk_MK/workflow.lang
+++ b/htdocs/langs/mk_MK/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/mn_MN/accountancy.lang b/htdocs/langs/mn_MN/accountancy.lang
index 83f281a9e02..edd10c4a043 100644
--- a/htdocs/langs/mn_MN/accountancy.lang
+++ b/htdocs/langs/mn_MN/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sales journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index f6a9f3010da..9967530b1d2 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1311,8 +1336,6 @@ SyslogFilename=File name and path
 YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in Dolibarr "documents" directory. You can set a different path to store this file.
 ErrorUnknownSyslogConstant=Constant %s is not a known Syslog constant
 OnlyWindowsLOG_USER=Windows only supports LOG_USER
-SyslogSentryDSN=Sentry DSN
-SyslogSentryFromProject=DSN from your Sentry project
 ##### Donations #####
 DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
@@ -1335,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1508,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1528,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1540,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1571,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1602,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/mn_MN/banks.lang b/htdocs/langs/mn_MN/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/mn_MN/banks.lang
+++ b/htdocs/langs/mn_MN/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/mn_MN/boxes.lang b/htdocs/langs/mn_MN/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/mn_MN/boxes.lang
+++ b/htdocs/langs/mn_MN/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/mn_MN/cashdesk.lang b/htdocs/langs/mn_MN/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/mn_MN/cashdesk.lang
+++ b/htdocs/langs/mn_MN/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/mn_MN/categories.lang b/htdocs/langs/mn_MN/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/mn_MN/categories.lang
+++ b/htdocs/langs/mn_MN/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/mn_MN/companies.lang b/htdocs/langs/mn_MN/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/mn_MN/companies.lang
+++ b/htdocs/langs/mn_MN/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/mn_MN/compta.lang b/htdocs/langs/mn_MN/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/mn_MN/compta.lang
+++ b/htdocs/langs/mn_MN/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/mn_MN/cron.lang b/htdocs/langs/mn_MN/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/mn_MN/cron.lang
+++ b/htdocs/langs/mn_MN/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/mn_MN/install.lang b/htdocs/langs/mn_MN/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/mn_MN/install.lang
+++ b/htdocs/langs/mn_MN/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/mn_MN/interventions.lang b/htdocs/langs/mn_MN/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/mn_MN/interventions.lang
+++ b/htdocs/langs/mn_MN/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/mn_MN/ldap.lang b/htdocs/langs/mn_MN/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/mn_MN/ldap.lang
+++ b/htdocs/langs/mn_MN/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/mn_MN/mails.lang b/htdocs/langs/mn_MN/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/mn_MN/mails.lang
+++ b/htdocs/langs/mn_MN/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/mn_MN/main.lang b/htdocs/langs/mn_MN/main.lang
index c0a58821f3d..a86806793bf 100644
--- a/htdocs/langs/mn_MN/main.lang
+++ b/htdocs/langs/mn_MN/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/mn_MN/margins.lang b/htdocs/langs/mn_MN/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/mn_MN/margins.lang
+++ b/htdocs/langs/mn_MN/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/mn_MN/oauth.lang b/htdocs/langs/mn_MN/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/mn_MN/oauth.lang
+++ b/htdocs/langs/mn_MN/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/mn_MN/orders.lang b/htdocs/langs/mn_MN/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/mn_MN/orders.lang
+++ b/htdocs/langs/mn_MN/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/mn_MN/printing.lang b/htdocs/langs/mn_MN/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/mn_MN/printing.lang
+++ b/htdocs/langs/mn_MN/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/mn_MN/productbatch.lang b/htdocs/langs/mn_MN/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/mn_MN/productbatch.lang
+++ b/htdocs/langs/mn_MN/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/mn_MN/salaries.lang b/htdocs/langs/mn_MN/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/mn_MN/salaries.lang
+++ b/htdocs/langs/mn_MN/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/mn_MN/stocks.lang b/htdocs/langs/mn_MN/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/mn_MN/stocks.lang
+++ b/htdocs/langs/mn_MN/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/mn_MN/supplier_proposal.lang b/htdocs/langs/mn_MN/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/mn_MN/supplier_proposal.lang
+++ b/htdocs/langs/mn_MN/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/mn_MN/suppliers.lang b/htdocs/langs/mn_MN/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/mn_MN/suppliers.lang
+++ b/htdocs/langs/mn_MN/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/mn_MN/users.lang b/htdocs/langs/mn_MN/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/mn_MN/users.lang
+++ b/htdocs/langs/mn_MN/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/mn_MN/website.lang b/htdocs/langs/mn_MN/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/mn_MN/website.lang
+++ b/htdocs/langs/mn_MN/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/mn_MN/withdrawals.lang b/htdocs/langs/mn_MN/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/mn_MN/withdrawals.lang
+++ b/htdocs/langs/mn_MN/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/mn_MN/workflow.lang b/htdocs/langs/mn_MN/workflow.lang
index ce3aa275c49..2c0c082c011 100644
--- a/htdocs/langs/mn_MN/workflow.lang
+++ b/htdocs/langs/mn_MN/workflow.lang
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 81347bee84f..f2d7ee2026e 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journaler
 JournalFinancial=Finasielle journaler
 BackToChartofaccounts=Returner kontotabell
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Velg kontotabell
 Addanaccount=Legg til regnskapskonto
 AccountAccounting=Regnskapskonto
 AccountAccountingShort=Konto
 AccountAccountingSuggest=Forslag til regnskapskonto
-Ventilation=Fordeling
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Regnskap
-CustomersVentilation=Fordeling Kunder
-SuppliersVentilation=Fordeling Leverandører
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Rapporter
 NewAccount=Ny regnskapskonto
 Create=Opprett
-CreateMvts=Opprett bevegelse
-UpdateMvts=Endring av bevegelse
-WriteBookKeeping=Kontoposter i hovedboken
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Hovedbok
 AccountBalance=Kontobalanse
 
 CAHTF=Totalt leverandørkjøp eks. MVA
-InvoiceLines=Fakturalinjer som skal ventileres
-InvoiceLinesDone=Ventilerte fakturalinjer
-IntoAccount=Ventiler regnskapskontoen
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventiler
+Ventilate=Bind
 
 Processing=Behandler
 EndProcessing=Behandling ferdig
-AnyLineVentilate=Ingen linjer å ventilere
+AnyLineVentilate=Any lines to bind
 SelectedLines=Valgte linjer
 Lineofinvoice=Fakturalinje
-VentilatedinAccount=Vellykket ventilering i regnskapskonto
-NotVentilatedinAccount=Ikke ventilert i regnskapskonto
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antall elementer for ventilering viset per side (maks anbefalt: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begynn sortering av ventilering "Må ventileres" etter de nyeste elementene
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av fordelingssidene "Fordeling" etter de nyeste elementene
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Lengde for visning av varer- og tjenesterbeskrivelser i lister (Anbefalt = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Lengde for visning av varer- og tjenesters kontobeskrivelser i lister (Anbefalt = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Lengde på generelle kontoer
-ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjeparts-kontoer
+ACCOUNTING_LENGTH_GACCOUNT=Lengde på hovedbokskontoer
+ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjepartskontoer
+ACCOUNTING_MANAGE_ZERO=Håndter nullen i slutten på en regnskapskonto. Trengs i noen land. Deaktivert som standard. Vær forsiktig med funksjonen "kontolengde".
+BANK_DISABLE_DIRECT_INPUT=Deaktiver fritekst på banktransaksjoner (Standard er aktivert for dennemodulen)
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
@@ -81,32 +102,31 @@ Sens=som betyr
 Codejournal=Journal
 NumPiece=Del nummer
 AccountingCategory=Regnskapskategori
-
-NotMatch=Not Set
-
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+NotMatch=Ikke valgt
+DeleteMvt=Slett linjer i hovedboken
+DelYear=År som skal slettes
+DelJournal=Journal som skal slettes
+ConfirmDeleteMvt=Dette vil slette alle linjer i hovedboken for et år eller fra en spesifikk journal
+ConfirmDeleteMvtPartial=Dette vil slette valgt linje(r) i hovedboken
 DelBookKeeping=Slett postene i hovedboken
-
 DescSellsJournal=Salgsjournal
 DescPurchasesJournal=Innkjøpsjournal
 FinanceJournal=Finansjournal
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Betaling av kundefaktura
-
 ThirdPartyAccount=Tredjepart-konto
-
-NewAccountingMvt=Ny bevegelse
-NumMvts=Antall bevegelser
+NewAccountingMvt=Ny transaksjon
+NumMvts=Transaksjonsnummer
 ListeMvts=Liste over bevegelser
 ErrorDebitCredit=Debet og kredit kan ikke ha en verdi samtidig
 
-ReportThirdParty=Liste over tredjeparts-kontoer
-DescThirdPartyReport=Liste over kunder og leverandører og deres regnskapskontoer
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Liste over regnskapskontoer
 
@@ -114,22 +134,29 @@ Pcgtype=Kontoklasse
 Pcgsubtype=Underklasse av konto
 Accountparent=Rot/base-kontoer
 
-DescVentilCustomer=Viser den årlige økonomiske fordelingen av kundefakturaer
 TotalVente=Total omsetning før skatt
 TotalMarge=Total salgsmargin
-DescVentilDoneCustomer=Liste over kundefakturalinjer og tilhørende regnskapskonto
-DescVentilTodoCustomer=Ventiler kundefakturalinjer med tildelt regnskapskonto
-ChangeAccount=Endre regnskapskonto for valgte linjer
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Kontroller årlig fordeling for leverandørfakturaer
-DescVentilDoneSupplier=Liste over leverandørfakturalinjer og tilhørende regnskapskonto
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Automatisk validering
+ValidateHistory=Bind automatisk
+AutomaticBindingDone=Automatisk binding utført
 
 ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
 MvtNotCorrectlyBalanced=Bevegelse er ikke korrekt balansert. Kredit=%s. Debet=%s
-FicheVentilation=Ventilasjonskort
+FicheVentilation=Binding-kort
 GeneralLedgerIsWritten=Transaksjonene ble registrert i hovedboken
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Masseinnlegging av kategorier
@@ -147,16 +174,18 @@ Modelcsv_bob50=Eksport til Sage BOB 50
 Modelcsv_ciel=Eksport til Sage Ciel Compta eller Compta Evolution
 Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksporter mot EBP
-Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_cogilog=Eksport mot Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Initier regnskap
-InitAccountancyDesc=Denne siden kan brukes til å initialisere en regnskapskonto for produkter og tjenester som ikke har regnskap konto definert for salg og kjøp. Sjekk først at oppsett av  regnskapsmodulen er komplett.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Innstillinger
 OptionModeProductSell=Salgsmodus
 OptionModeProductBuy=Innkjøpsmodus
 OptionModeProductSellDesc=Vis alle produkter for salg uten regnskapskonto
 OptionModeProductBuyDesc=Vis alle produkter for innkjøp uten regnskapskonto
+CleanFixHistory=Fjern regnskapskode fra linjer som ikke finnes i kontodiagram
+CleanHistory=Nullstill alle bindinger for valgt år
 
 ## Dictionary
 Range= Oversikt over regnskapskonto
@@ -166,4 +195,10 @@ Formula=Formel
 ## Error
 ErrorNoAccountingCategoryForThisCountry=Ingen regnskapskategori er tilgjengelig for dette landet
 ExportNotSupported=Eksportformatet som er satt  opp støttes ikke på denne siden
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+BookeppingLineAlreayExists=Linjene eksisterer allerede i bokføringen
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a2dc14f9c2c..e96a574c9d8 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Eksperimentell
 VersionDevelopment=Utviklingsversjon
 VersionUnknown=Ukjent
 VersionRecommanded=Anbefalt
-FileCheck=Filintegritet
+FileCheck=Filintegritetssjekker
+FileCheckDesc=Dette verktøyet tillater deg å kontrollere integriteten til filer i applikasjonen, og sammenligner hver fil med de offisielle filene. Du kan kan bruke verktøyet til å kontrollere om filene ble endret av f.eks en hacker.
+MakeIntegrityAnalysisFrom=Opprett integritetsanalyse av applikasjonsfiler fra
+LocalSignature=Innebygget lokal signatur (mindre pålitelig)
+RemoteSignature=Fjernsignatur (mer pålitelig)
 FilesMissing=Manglende filer
 FilesUpdated=Oppdaterte filer
-FileCheckDolibarr=Integritetssjekk av Dolibarrfiler
-XmlNotFound=Xml-fil for Dolibarr-integritet ikke funnet
+FileCheckDolibarr=Integritetssjekk av applikasjonsfilene
+AvailableOnlyOnPackagedVersions=Den lokale filen for integritetssjekk er kun tilgjengelig hvis applikasjonen er installert fra en sertifisert pakke
+XmlNotFound=Xml Integritetsfilen til applikasjonen ble ikke funnet
 SessionId=Økt-ID
 SessionSaveHandler=Håndterer for å lagre sesjoner
 SessionSavePath=Sted for lagring av økt 
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Vent med å trykke på noen taster før innholdet
 DelaiedFullListToSelectContact=Vent med å trykke på noen taster før innholdet i kontakt-kombilisten er lastet (Dette kan øke ytelsen hvis du har et stort antall tredjeparter)
 NumberOfKeyToSearch=Antall tegn for å starte søk: %s
 NotAvailableWhenAjaxDisabled=Ikke tilgjengelig når Ajax er slått av
-AllowToSelectProjectFromOtherCompany=På dokument fra en tredjepart, kan du velge et prosjekt knyttet til en annen tredjepart
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript er deaktivert
 UsePreviewTabs=Bruk faner for forhåndsvisning
 ShowPreview=Forhåndsvisning
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Binære data kodes hexadecimalt
 IgnoreDuplicateRecords=Ignorer duplikat-feil (INSERT IGNORE)
 AutoDetectLang=Auto-oppdag (nettleserspråk)
 FeatureDisabledInDemo=Funksjonen er slått av i demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Tillatelser
 BoxesDesc=Widgeter er komponenter som viser litt informasjon som du kan legge til for å tilpasse enkelte sider. Du kan velge mellom å vise widgeten eller ikke ved å velge målside og klikke på 'Aktiver', eller ved å klikke på søppelkassen for å deaktivere den.
 OnlyActiveElementsAreShown=Bare elementer fra <a href="%s">aktiverte moduler</a> vises.
-ModulesDesc=Dolibarrmodulene styrer hvilken funksjonalitet som er aktivert i programmet. Noen moduler krever at du tildeler brukerne tilgangsrettigheter etter at du har slått på modulen.
+ModulesDesc=Dolibarr-moduler definerer hvilke funksjonaliteter som er aktivert i programmet. Noen moduler krever tillatelser du må gi for brukerne, etter å ha aktivert modulen. Klikk på knappen på/av for å aktivere en modul/funksjon.
 ModulesMarketPlaceDesc=Du kan finne flere moduler for nedlasting på eksterne nettsteder.
 ModulesMarketPlaces=Flere moduler ...
 DoliStoreDesc=DoliStore, den offisielle markedsplassen for eksterne moduler til Dolibarr ERP/CRM 
@@ -240,7 +246,7 @@ MAIN_SMS_SENDMODE=Metode for å sende SMS
 MAIN_MAIL_SMS_FROM=Standard avsender telefonnummer for sending av SMS
 FeatureNotAvailableOnLinux=Funksjonen er ikke tilgjengelig på Unix/Linux. Test sendmail lokalt.
 SubmitTranslation=Hvis oversettelsen for dette språket ikke er fullstendig eller du finner feil, kan du rette opp dette ved å redigere filene i katalogen <b>langs/%s</b> og sende endrede filer til www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Hvis oversettelse for dette språket ikke er fullstendig eller du finner feil, kan du korrigere dette ved å redigere filer i katalogen <b>langs/%s</b> og sende endrede filer på dolibarr.org/forum eller for utviklere på github.com/Dolibarr/dolibarr.
 ModuleSetup=Modulinnstillinger
 ModulesSetup=Modulinnstillinger
 ModuleFamilyBase=System
@@ -273,9 +279,10 @@ YouCanSubmitFile=I dette trinnet kan du sende pakken med dette verktøyet: Velg
 CurrentVersion=Gjeldende versjon av Dolibarr 
 CallUpdatePage=Gå til siden som oppdaterer data og databasestruktur: %s.
 LastStableVersion=Siste stabile versjon
+LastActivationDate=Siste aktiveringsdato
 UpdateServerOffline=Oppdater serveren offline
 GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:<br><b>{000000}</b> tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde. <br><b>{000000+000}</b> samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s. <br><b>{000000@x}</b> samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også. <br><b>{dd}</b> dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{yy}</b>, <b>{yyyy}</b> eller <b>{y}</b> årstall over 2, 4 eller 1 siffer. <br> <b>{cccc000}</b> klientkoden på n tegn etterfulgt av en klientreferanse uten forskyvning og nullet med den globale telleren.<br><br>Alle andre tegn i malen vil forbli intakte.<br>Mellomrom er ikke tillatt.<br><br><u>Eksempel på den 99de %s av tredjeparten blir 31/01/2007:</u><br><b>ABC{yy}{mm}-{000000}</b> vil gi <b>ABC0701-000099</b><br><b>{0000+100}-ZZZ/{dd}/XXX</b> vil gi <b>0199-ZZZ/31/XXX</b><br>
-GenericMaskCodes2=<b>{cccc}</b> Klientkoden på n karakterer<br><b>{cccc000}</b> klientkoden på n karakterer etterfulgt av en teller dedikert for kunden. Telleren blir tilbakestilt samtidig med den globale telleren.<br><b>{tttt}</b> Koden for tredjepart på n karakterer (se i ordboken: Typer tredjepart).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Alle andre tegn i masken vil være intakt. <br> Mellomrom er ikke tillatt. <br>
 GenericMaskCodes4a=<u>Eksempel på 99. %s av tredjeparten TheCompany gjort 31.01.2007:</u><br>
 GenericMaskCodes4b=<u>Eksempel på tredjepart opprettet på 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametre for å sikre nettadresser
 SecurityTokenIsUnique=Bruk en unik securekey parameter for hver webadresse
 EnterRefToBuildUrl=Oppgi referanse for objekt %s
 GetSecuredUrl=Få beregnet URL
-ButtonHideUnauthorized=Skjul knapper for uautoriserte handlinger i stedet for å vise inaktive knapper
+ButtonHideUnauthorized=Skjul knapper for brukere uten administratorrettigheter i stedet for å vise dem som grå
 OldVATRates=Gammel MVA-sats
 NewVATRates=Ny MVA-sats
 PriceBaseTypeToChange=Endre på prisene med base referanseverdi definert på
@@ -349,6 +356,7 @@ ExtrafieldMail = E-post
 ExtrafieldSelect = Velg liste
 ExtrafieldSelectList = Velg fra tabell
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Passord
 ExtrafieldCheckBox=Avmerkingsboks
 ExtrafieldRadio=Radio-knapp
 ExtrafieldCheckBoxFromList= Avkrysningsboks fra tabell
@@ -383,11 +391,14 @@ EnableFileCache=Aktiver fil-cache
 ShowDetailsInPDFPageFoot=Legg til flere detaljer i bunnteksten av PDF-filer, som din firmaadresse eller leder (for å komplettere profesjonelle IDer, selskapskapital og MVA-nummer).
 NoDetails=Ingen flere detaljer i bunntekst
 DisplayCompanyInfo=Vis firmaadresse
-DisplayCompanyInfoAndManagers=Vis firma- og ledernavn
+DisplayCompanyManagers=Vis ledernavn
+DisplayCompanyInfoAndManagers=Vis firmaadresser og ledernavn
 EnableAndSetupModuleCron=Hvis du ønsker at gjentakende fakturaer skal genereres automatisk, må modulen *%s* være aktivert og riktig konfigurert. Ellers må generering av fakturaer gjøres manuelt fra denne malen med knapp *Lag*. Merk at selv om du har aktivert automatisk generering, kan du likevel trygt starte manuell generasjon. Generering av duplikater for samme periode er ikke mulig.
-ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
-ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+ModuleCompanyCodeAquarium=Velger en regnskapskode bygget av: <br>%s etterfulgt av tredjeparts leverandørkode for en leverandør-regnskap kode,<br>%s etterfulgt av tredjepart kundekode for en kunde- regnskapkode.
+ModuleCompanyCodePanicum=Velg en tom regnskapskode
+ModuleCompanyCodeDigitaria=Regnskapskode avhenger av tredjepartskode. Koden består av karakteren "C" i første posisjon, etterfulgt av de første 5 tegnene i tredjepartskoden.
+Use3StepsApproval=Som standard må innkjøpsordrer opprettes og godkjennes av 2 forskjellige brukere (ett skritt/bruker for å opprette og ett skritt/bruker for å godkjenne. Merk at hvis brukeren har både tillatelse til å opprette og godkjenne, vil ett skritt/bruker være nok) . Du kan spørre med dette alternativet for å innføre et tredje trinn/bruker-godkjenning, hvis beløpet er høyere enn en dedikert verdi (så 3 trinn vil være nødvendig: 1 = validering, 2 = første godkjenning og 3 = andre godkjenning dersom beløpet er høyt nok).<br> Sett denne tom hvis en godkjenning (2 trinn) er nok, sett den til en svært lav verdi (0,1) hvis det alltid kreves en annen godkjenning.
+UseDoubleApproval=Bruk 3-trinns godkjennelse når beløpet (eks. MVA) er høyere enn...
 
 # Modules
 Module0Name=Brukere & grupper
@@ -428,8 +439,8 @@ Module55Name=Strekkoder
 Module55Desc=Behandling av strekkoder
 Module56Name=Telefoni
 Module56Desc=Telefoniintegrasjon
-Module57Name=Faste ordre
-Module57Desc=Faste ordre og behandling av tilbaketrekking. Inkluderer også generering av SEPA-fil for europeiske land.
+Module57Name=Direktedebet betalingsordre
+Module57Desc=Håndtering av direktedebet betalingsordre. Inkluderer generering av SEPA-fil for europeiske land
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrasjon
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webkalender
 Module410Desc=Integrasjon med webkalender
 Module500Name=Spesielle utgifter
 Module500Desc=Behandling av spesielle utgifter (skatter og avgifter, utbytte mm)
-Module510Name=Lønn
-Module510Desc=Behandling av ansattes lønn og utbetalinger
+Module510Name=Arbeidskontrakter og lønn
+Module510Desc=Håndtering av arbeidskontrakter, lønn og utbetalinger
 Module520Name=Lån
 Module520Desc=Administrering av lån
 Module600Name=Varselmeldinger
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donasjoner
 Module700Desc=Behandling av donasjoner
 Module770Name=Utgiftsrapporter
@@ -515,8 +526,8 @@ Module5000Name=Multi-selskap
 Module5000Desc=Lar deg administrere flere selskaper
 Module6000Name=Arbeidsflyt
 Module6000Desc=Behandling av arbeidsflyt
-Module10000Name=Websites
-Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
+Module10000Name=Websider
+Module10000Desc=Opprett offentlige websider med en WYSIWYG-redigerer. Sett webserveren din til å peke mot mappen for å vise innholdet på internett
 Module20000Name=Administrasjon av ferieforespørsler
 Module20000Desc=Oppfølging av ansattes ferieforespørsler
 Module39000Name=Vare LOT
@@ -537,8 +548,8 @@ Module59000Name=Marginer
 Module59000Desc=Modul for å administrere marginer
 Module60000Name=Provisjoner
 Module60000Desc=Modul for å administrere provisjoner
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
+Module63000Name=Ressurser
+Module63000Desc=Håndter ressurser (skrivere, biler, rom,..). Etterpå kan du legge dem til hendelser
 Permission11=Vis kundefakturaer
 Permission12=Opprett/endre kundefakturaer
 Permission13=Ikke validerte kundefakturaer
@@ -606,10 +617,10 @@ Permission142=Opprett/endre alle prosjekter og oppgaver (også prosjekter jeg ik
 Permission144=Slett alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
 Permission146=Les tilbydere
 Permission147=Les statistikk
-Permission151=Vis faste ordre
-Permission152=Sett opp faste ordre
-Permission153=Send kvitteringer faste ordre
-Permission154=Kreditt/avslå kvitteringer fra faste ordre 
+Permission151=Les direktedebet betalingsordre
+Permission152=Opprett/endre direktedebet betalingsordre
+Permission153=Send/overfør direktedebet betalingsordre
+Permission154=Registrer kredit/avvisninger av direktedebet betalingsordre
 Permission161=Les kontrakter/abonnementer
 Permission162=Opprett/endre kontrakter/abonnementer
 Permission163=Aktiver en tjeneste/abonnement i en kontrakt
@@ -747,6 +758,7 @@ Permission1236=Eksportere leverandørordre, attributter og betalinger
 Permission1237=Eksporter leverandør-bestillinger og detaljer
 Permission1251=Kjør masseimport av eksterne data til database (datalast)
 Permission1321=Eksportere kundefakturaer, attributter og betalinger
+Permission1322=Reopen a paid bill
 Permission1421=Eksport kundeordre og attributter
 Permission20001=Les ferieforespørsler (dine og underordnedes)
 Permission20002=Opprett/endre ferieforespørsler
@@ -780,6 +792,10 @@ Permission55002=Opprett/endre meningsmålinger
 Permission59001=Les kommersielle marginer
 Permission59002=Definer kommersielle marginer
 Permission59003=Les alle brukermarginer
+Permission63001=Les ressurser
+Permission63002=Opprett/endre ressurser
+Permission63003=Slett ressurser
+Permission63004=Koble ressurser til agendahendelser
 DictionaryCompanyType=Type tredjeparter
 DictionaryCompanyJuridicalType=Juridisk status for tredjeparter
 DictionaryProspectLevel=Prospektpotensiale
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etiketten som brukes som standard hvis ingen oversettelse kan
 LabelOnDocuments=Etiketten på dokumenter
 NbOfDays=Antall dager
 AtEndOfMonth=Ved månedsslutt
+CurrentNext=Current/Next
 Offset=Forskyvning
 AlwaysActive=Alltid aktiv
 Upgrade=Oppgrader
@@ -950,7 +967,7 @@ LogEventDesc=Her kan du slå på loggen for sikkerhetshendelser i Dolibarr. Admi
 AreaForAdminOnly=Disse funksjonene kan bare brukes av <b>administratorer</b>.
 SystemInfoDesc=Systeminformasjon er diverse teknisk informasjon som kun vises i skrivebeskyttet modus, og som kun er synlig for administratorer.
 SystemAreaForAdminOnly=Dette området er bare tilgjengelig for administratorer. Ingen av tillatelsene i Dolibarr kan senke denne grensen.
-CompanyFundationDesc=Her oppgir du all tilgjengelig informasjon om bedriften eller organisasjonen som skal bruke Dolibarr
+CompanyFundationDesc=Her kan du legge inn informasjon om firmaet eller organisasjonen din (klikk på "Endre"- eller "Lagre"-knappen i bunnen av siden)
 DisplayDesc=Her kan du velge innstillinger som styrer Dolibarrs utseende og virkemåte
 AvailableModules=Tilgjengelige moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Advarsel, på noen Linux-systemer, for å sende fra di
 PathToDocuments=Bane til dokumenter
 PathDirectory=Mappe
 SendmailOptionMayHurtBuggedMTA=Funksjonen for å sende e-post ved hjelp av metoden "PHP mail direct" vil generere en melding som kanskje ikke oversatt riktig av enkelte e-postservere. Resultatet er at enkelte e-poster ikke kan leses av personer som mottar e-post gjennom disse serverene (f.eks Orange i Frankrike). Dette er ikke et Dolibarr-problem i, heller ikke PHP, men på mottakende e-postserver. Du kan imidlertid legge til alternativet MAIN_FIX_FOR_BUGGED_MTA til 1 i oppsettet, heller enn å endre Dolibarr for å unngå dette. Du kan oppleve problemer med andre servere som følger SMTP-standarden nøyaktig. Den andre løsningen (anbefales) er å bruke metoden "SMTP socket library" som ikke har noen ulemper.
-TranslationSetup=Konfigurasjon de la traduction
-TranslationDesc=Hvordan sette applikasjonsspråk<br>*Hele systemet: meny <strong> Hjem - Oppsett - Visning</strong><br>* Pr bruker: <strong> Bruker visningsoppsett</strong>fane i brukerkortet (klikk på brukernavn på toppen av skjermen).
-TranslationOverwriteDesc=Du kan også overstyre strenger ved å utfylle tabellen nedenfor. Velg språk fra "%s" nedtrekk, sett inn nøkkelenstrengen funnet i språkfilen (langs/xx_XX/somefile.lang) til "%s" og din nye oversettelse til "%s".
+TranslationSetup=Oppsett av oversettelse
+TranslationKeySearch=Søk etter oversettelsesnøkkel eller -streng
+TranslationOverwriteKey=Overskriv oversettelse
+TranslationDesc=Hvordan sette visningsspråk:<br>*Hele systemet: meny <strong>Hjem - Oppsett - Visning</strong><br>*Pr. bruker:<strong>Visning for bruker</strong>Fane for brukerkort (Klikk på brukernavn i toppen av skjermen).
+TranslationOverwriteDesc=Du kan også overstyre strenger ved å fylle ut tabellen nedenfor. Velg språk fra "%s" nedtrekkslisten, sett inn oversettelsesstrengen i "%s" og din nye oversettelse i "%s"
+TranslationOverwriteDesc2=Du kan bruke den andre fanen for å finne rett oversettelsesnøkkel
+TranslationString=Oversettelsesstreng
+CurrentTranslationString=Gjeldende oversettelsesstreng
+WarningAtLeastKeyOrTranslationRequired=Et søkekriterie er nødvendig for nøkkel eller oversettelsesstreng
+NewTranslationStringToShow=Ny oversettelsesstreng som skal vises
+OriginalValueWas=Den originale oversettelsen er overskrevet. Original verdi var:<br><br>%s
 TotalNumberOfActivatedModules=Totalt antall aktiverte moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
@@ -1070,10 +1095,10 @@ HRMSetup=Oppsett av HRM-modul
 CompanySetup=Firmamodul
 CompanyCodeChecker=Modul for tredjeparts kodegenerering og kontroll (kunde eller leverandør)
 AccountCodeManager=Module for regnskapskode-generering (kunde eller leverandør)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
-NotificationsDescUser=* per users, one user at time.
-NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
-NotificationsDescGlobal=* or by setting global target emails in module setup page.
+NotificationsDesc=Funksjonen E-postvarslinger lar deg automatisk sende stille e-poster for noen Dolibarrhendelser. Mål for meldinger kan defineres:
+NotificationsDescUser=* pr. bruker, en bruker om gangen
+NotificationsDescContact=*pr. tredjepartskontakt (kunde eller leverandør), en kontakt om gangen.
+NotificationsDescGlobal=* eller ved å sette global mål-e-post i modulen Oppsett
 ModelModules=Dokumentmaler
 DocumentModelOdt=Generer dokumenter fra OpenDocument-maler (.ODT eller .ODS fra OpenOffice, KOffice, TextEdit, mm)
 WatermarkOnDraft=Vannmerke på utkast
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Bruk TLS
 LDAPServerUseTLSExample=LDAP-serveren din bruker TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Komplett DN (eks: cn=admin,dc=eksempel,dc=com)
+LDAPAdminDnExample=Komplett DN (eks.: cn=admin, dc=eksempel, dc=com eller cn=Administrator, cn=Brukere, dc=eksempel, dc=com for aktiv mappe)
 LDAPPassword=Administrator passord
 LDAPUserDn=Brukeres DN
 LDAPUserDnExample=Komplett DN (eks: ou=brukere,dc=eksempel,dc=com)
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Oppsett av varer- og tjenester-modulen
 NumberOfProductShowInSelect=Maks. antall varer i utvalgslister (0=ingen grenser)
 ViewProductDescInFormAbility=Visualisering av varebeskrivelser i skjemaer (ellers som oppsprett-tips)
 MergePropalProductCard=I "Vedlagte filer"-fanen i "Varer og tjenester" kan du aktivere en opsjon for å flette PDF-varedokument til tilbud PDF-azur hvis varen/tjenesten er i tilbudet
-ViewProductDescInThirdpartyLanguageAbility=Visualisering av varebeskrivelser i tredjepartsspråk
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Hvis du har mange varer (>100 000), kan du øke hastigeten ved å sette konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Oppsett->Annet. Søket vil da begrenses til starten av søkestrengen
 UseSearchToSelectProduct=Bruk et søkeskjema for å velge vare (i stedet for en nedtrekksliste)
 SetDefaultBarcodeTypeProducts=Standard strekkodetype for varer
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Kommandolinje-verktøy for strekkodegenerering (brukt av prog
 BarcodeInternalEngine=Intern motor
 BarCodeNumberManager=Verktøy for å auto-definere strekkodenumre
 ##### Prelevements #####
-WithdrawalsSetup=Oppsett av tilbaketrekkingsmodulen
+WithdrawalsSetup=Oppsett av modulen Direktedebitering av betalingsordre
 ##### ExternalRSS #####
 ExternalRSSSetup=Oppsett av extern RSS-import
 NewRSS=Ny RSS-feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Åpne regnskapsår
 CloseFiscalYear=Lukk regnskapsår
 DeleteFiscalYear=Slett regnskapsår
 ConfirmDeleteFiscalYear=Er du sikker på at du vil slette dette regnskapsåret?
+ShowFiscalYear=Vis regnskapsår
 AlwaysEditable=Kan alltid endres
 MAIN_APPLICATION_TITLE=Tving synlig navn på program (advarsel: Å sette ditt eget navn her kan fjerne autofyll logginn-funksjonen når du bruker DoliDroid mobilapplikasjon)
 NbMajMin=Minste antall store bokstaver
@@ -1522,11 +1548,11 @@ ExpenseReportsSetup=Oppsett av utgiftsrapport-modulen
 TemplatePDFExpenseReports=Dokumentmaler for å generere utgiftsrapporter
 NoModueToManageStockIncrease=Ingen modul i stand til å håndtere automatisk lagerøkning er blitt aktivert. Lagerøkning kan bare gjøres manuelt.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finne alternativer for e-postmeldinger ved å aktivere og konfigurere modulen "Varslingen".
-ListOfNotificationsPerUser=List of notifications per user*
-ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
+ListOfNotificationsPerUser=Liste over varslinger pr. bruker*
+ListOfNotificationsPerUserOrContact=Liste over varslinger pr. bruker* eller pr. kontakt**
 ListOfFixedNotifications=Liste over faste varslinger
-GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Gå på fanen "Meldinger" hos en tredjeparts-kontakt for å legge til eller fjerne varsler for kontakter/adresser
+GoOntoUserCardToAddMore=Gå til fanen "Varslinger" hos en bruker for å legge til eller fjerne en varsling
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Terskel
 BackupDumpWizard=Veiviser for å bygge database-backup dumpfil
 SomethingMakeInstallFromWebNotPossible=Installasjon av ekstern modul er ikke mulig fra webgrensesnittet på grunn av:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Uthev fargen på linjen når musen føres over (holdes tom f
 TextTitleColor=Farge på sidetittel
 LinkColor=Farge på lenker
 PressF5AfterChangingThis=Trykk F5 etter å ha endret denne verdien for at endringene skal tre i kraft
-NotSupportedByAllThemes=Vil virke med Eldy-temaet men er ikke støttet av av alle temaer
+NotSupportedByAllThemes=Vil virke med kjernetemaer, vil kanskje ikke virke med eksterne temaer
 BackgroundColor=Bakgrunnsfarge
 TopMenuBackgroundColor=Bakgrunnsfarge for toppmeny
+TopMenuDisableImages=Skjul bilder i toppmeny
 LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
 BackgroundTableTitleColor=Bakgrunnsfarge for tittellinje i tabellen
 BackgroundTableLineOddColor=Bakgrunnsfarge for oddetalls-tabellinjer
@@ -1569,7 +1596,7 @@ MailToSendIntervention=For å sende intervensjon
 MailToSendSupplierRequestForQuotation=For å sende forespørsel til leverandør
 MailToSendSupplierOrder=For å sende leverandørordre
 MailToSendSupplierInvoice=For å sende leverandørfaktura
-MailToThirdparty=For å sende e-post fra tredjepart-side
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Vis som standard for liste
 YouUseLastStableVersion=Du bruker siste stabile verjon
 TitleExampleForMajorRelease=Eksempel på melding du kan bruke for å annonsere større oppdateringer (du kan bruke denne på dine websider)
@@ -1599,4 +1626,9 @@ DetectionNotPossible=Detektering ikke mulig
 UrlToGetKeyToUseAPIs=Url til å få nøkkel for å bruke API (når nøkkel er mottatt lagres den i databasens brukertabell  og vil bli sjekket ved hver fremtidig tilgang)
 ListOfAvailableAPIs=Liste over tilgjengelige API'er
 activateModuleDependNotSatisfied=Modul "%s" avhenger av modulen "%s", som mangler, slik at modulen "%1$s" kanskje ikke virker korrekt. Installer modulen "%2$s" eller deaktiver modulen "%1$s" hvis du vil unngå ubehagelige overraskelser
-CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+CommandIsNotInsideAllowedCommands=Kommandoen du prøver å kjøre er ikke i listen over tillatte kommandoer definert i parameter <strong>$dolibarr_main_restrict_os_commands</strong> i <strong>conf.php</strong> filen.
+LandingPage=Landingsside
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Modulen er blitt aktivert. Tillatelser for aktivert(e) modul(er) ble kun gitt til brukere med admin-rettigheter. Du kan gi utvidede rettigheter til andre brukere ved behov.
+UserHasNoPermissions=Denne brukeren har ingen tillatelser
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 2f55926e373..1a8e7fa607d 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -27,13 +27,9 @@ AllTime=Fra start
 Reconciliation=Bankavstemming
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
-IbanValid=IBAN er gyldig
-IbanNotValid=IBAN er ikke gyldig
 BIC=BIC/SWIFT-nummer
-SwiftValid=BIC/SWIFT er gyldig
-SwiftNotValid=BIC/SWIFT er ikke gyldig
-StandingOrders=Faste ordre
-StandingOrder=Faste ordre
+StandingOrders=Direktedebet-ordre
+StandingOrder=Direktedebet-ordre
 AccountStatement=Kontoutskrift
 AccountStatementShort=Utskrift
 AccountStatements=Kontoutskrifter
@@ -78,6 +74,7 @@ AccountToCredit=Konto å kreditere
 AccountToDebit=Konto å debitere
 DisableConciliation=Slå av avstemmingsfunksjon for denne kontoen
 ConciliationDisabled=Avstemmingsfunksjon slått av
+LinkedToAConciliatedTransaction=Koblet til en konsolidert transaksjon
 StatusAccountOpened=Åpne
 StatusAccountClosed=Lukket
 AccountIdShort=Nummer
@@ -87,14 +84,17 @@ AddBankRecordLong=Legg til transaksjon manuelt
 ConciliatedBy=Avstemt av
 DateConciliating=Avstemt den
 BankLineConciliated=Transaksjonen er avstemt
+Reconciled=Slått sammen
+NotReconciled=Ikke sammenslått
 CustomerInvoicePayment=Kundeinnbetaling
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
+SupplierInvoicePayment=Leverandørbetaling
+SubscriptionPayment=Abonnementsbetaling
 WithdrawalPayment=Uttaksbetaling
 SocialContributionPayment=Betaling av skatter og avgifter
 BankTransfer=Bankoverføring
 BankTransfers=Bankoverføringer
-TransferDesc=Overfør fra en konto til en annen. Dolibarr vil lage to poster med samme beløp (en debetføring i kildekontoen og en kreditføring i målkontoen). Samme nummer og dato vil bli brukt)
+MenuBankInternalTransfer=Intern overførsel
+TransferDesc=Ved overføring fra en konto til en annen, vil Dolibarr skrive to poster (en belastning i kildekonto og kreditt på målkontoen. Det samme beløpet (unntatt tegn), etiketten og dato brukes for denne transaksjonen)
 TransferFrom=Fra
 TransferTo=Til
 TransferFromToDone=En overføring fra <b>%s</b> til <b>%s</b> på <b>%s</b> %s er registrert.
@@ -129,7 +129,7 @@ FutureTransaction=Fremtidig transaksjon. Ingen måte å avstemme.
 SelectChequeTransactionAndGenerate=Velg/filter sjekker for å inkludere sjekkinnskuddskvitteringen og klikk på &quot;Create&quot;.
 InputReceiptNumber=Velg kontoutskriften som hører til avstemmingen. Bruke en sorterbar numerisk verdi: YYYYMM eller YYYYMMDD
 EventualyAddCategory=Til slutt, velg en kategori for å klassifisere postene
-ToConciliate=Avstem?
+ToConciliate=Slå sammen?
 ThenCheckLinesAndConciliate=Sjekk linjene i kontoutskriften og klikk
 DefaultRIB=Standard BAN
 AllRIB=Alle BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Er du sikker på at du vil merke denne sjekken som avvist?
 RejectCheckDate=Dato for returnert sjekk
 CheckRejected=Returnert sjekk
 CheckRejectedAndInvoicesReopened=Returnert sjekk og faktura gjenåpnet
+BankAccountModelModule=Dokumentmaler for bankkontoer
+DocumentModelSepaMandate=Mal for SEPA-mandat. Gjelder kun EU.
+DocumentModelBan=Mal for å skrive ut en side med BAN-informasjon
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 25088082d03..f34f3093fda 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -56,7 +56,7 @@ SupplierBill=Leverandørfaktura
 SupplierBills=Leverandørfakturaer
 Payment=Betaling
 PaymentBack=Tilbakebetaling
-CustomerInvoicePaymentBack=Payment back
+CustomerInvoicePaymentBack=Tilbakebetalinger
 Payments=Betalinger
 PaymentsBack=Tilbakebetaling
 paymentInInvoiceCurrency=i faktura-valuta
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en fak
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger på faktura
-RecurringInvoiceTemplate=Gjentagende faktura
+RecurringInvoiceTemplate=Mal/gjentakende faktura
 NoQualifiedRecurringInvoiceTemplateFound=Ingen gjentagende-fakturamal kvalifisert for generering
 FoundXQualifiedRecurringInvoiceTemplate=Fant %s gjentagende-fakturamal(er) kvalifisert for generering.
 NotARecurringInvoiceTemplate=Ikke en mal for gjentagende faktura
@@ -209,8 +209,8 @@ EscompteOffered=Rabatt innrømmet (betalt før forfall)
 EscompteOfferedShort=Rabatt
 SendBillRef=Innsendelse av faktura %s
 SendReminderBillRef=Innsendelse av faktura %s (påminnelse)
-StandingOrders=Faste ordre
-StandingOrder=Fast ordre
+StandingOrders=Direktedebiter ordre
+StandingOrder=Direktedebiter ordre
 NoDraftBills=Ingen fakturakladder
 NoOtherDraftBills=Ingen andre fakturakladder
 NoDraftInvoices=Ingen fakturakladder
@@ -312,7 +312,7 @@ LatestRelatedBill=Siste tilknyttede faktura
 WarningBillExist=Advarsel: en eller flere fakturaer finnes allerede
 MergingPDFTool=Verktøy for fletting av PDF 
 AmountPaymentDistributedOnInvoice=Beløp fordelt på faktura
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Tillat betaling av fakturaer for ulike tredjeparter under samme foreldre-firma
 PaymentNote=Betalingsnotat
 ListOfPreviousSituationInvoices=Liste over tidligere delfakturaer
 ListOfNextSituationInvoices=Liste over kommende delfakturaer
@@ -324,7 +324,7 @@ NextDateToExecution=Dato for neste fakturagenerering
 DateLastGeneration=Dato for siste generering
 MaxPeriodNumber=Maks ant for fakturagenerering
 NbOfGenerationDone=Ant. fakturaer som allerede er generert
-MaxGenerationReached=Maximum nb of generations reached
+MaxGenerationReached=Maksimum antall genereringer nådd
 InvoiceAutoValidate=Valider fakturaer automatisk
 GeneratedFromRecurringInvoice=Generert fra gjentagende-fakturamal %s
 DateIsNotEnough=Dato ikke nådd enda
@@ -351,8 +351,8 @@ VarAmount=Variabelt beløp
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
-PaymentTypePRE=Bankinnskudd
-PaymentTypeShortPRE=Bankinnskudd
+PaymentTypePRE=Direktedebiter betalingsordre
+PaymentTypeShortPRE=Debiter betalingsordre
 PaymentTypeLIQ=Kontant
 PaymentTypeShortLIQ=Kontant
 PaymentTypeCB=Kredittkort
@@ -381,6 +381,7 @@ ExtraInfos=Ekstra informasjon
 RegulatedOn=Regulert den
 ChequeNumber=Sjekk nummer
 ChequeOrTransferNumber=Sjekk/overføringsnummer
+ChequeBordereau=Sjekk timeplan
 ChequeMaker=Sjekk/overføring sender
 ChequeBank=Sjekkutsteders bank
 CheckBank=Sjekk
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Kan ikke fjerne avtalt beløp
 PayedByThisPayment=Betales av denne innbetalingen
 ClosePaidInvoicesAutomatically=Klassifiser alle fakturaer (alle typer) som betalt
 ClosePaidCreditNotesAutomatically=Klassifiser alle fakturaer som betalt
+ClosePaidContributionsAutomatically=Klassifiser alle fullt betalte sosial- og regnskapsbidrag som "betalt"
 AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten restbeløp vil bli automatisk satt til &quot;betalt&quot;.
 ToMakePayment=Betal
 ToMakePaymentBack=Tilbakebetal
 ListOfYourUnpaidInvoices=Liste over ubetalte fakturaer
 NoteListOfYourUnpaidInvoices=Denne listen inneholder kun fakturaer for tredjeparter du er koblet til som salgsrepresentant.
 RevenueStamp=Stempelmerke
-YouMustCreateInvoiceFromThird=Kun mulig når du lager faktura fra "kunde" i tredjeparter
+YouMustCreateInvoiceFromThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "kunde" under tredjepart
+YouMustCreateInvoiceFromSupplierThird=Dette alternativet er bare tilgjengelig når du oppretter faktura fra kategorien "leverandør" under tredjepart
 YouMustCreateStandardInvoiceFirstDesc=Du må først lage en standardfaktura og så konvertere den til "mal" for å lage en ny fakturamal
 PDFCrabeDescription=Fakturamal Crabe. En komplett mal (Støtter MVA, rabatter, betalingsbetingelser, logo, osv...)
 PDFCrevetteDescription=PDF fakturamal Crevette. En komplett mal for delfaktura
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Feil: oppdater pris på fakturalinje: %s
 ToCreateARecurringInvoice=For å opprette en gjentakende faktura for denne kontrakten må du først opprette en fakturakladd, og så gjøre den om til en fakturamal, for så å bestemme hvor ofte nye fakturaer skal opprettes
 ToCreateARecurringInvoiceGene=For å opprette fremtidige periodiske fakturaer manuelt, gå til meny <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Hvis du vil opprette slike fakturaer automatisk, ta kontakt med administrator for å aktivere og sette opp modulen <strong>%s</strong>. Husk at begge metoder (manuell og automatisk) kan bruke om hverandre uten fare for duplisering.
+DeleteRepeatableInvoice=Slett fakturamal
+ConfirmDeleteRepeatableInvoice=Er du sikker på at du vil slette fakturamalen?
 
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 9c1bf787680..b873318a00b 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Mine siste %s bokmerker
 BoxOldestExpiredServices=Eldste aktive utløpte tjenester
 BoxLastExpiredServices=Siste %s eldste kontakter med aktive, utgåtte tjenseter
 BoxTitleLastActionsToDo=Siste %s handlinger å utføre
-BoxTitleLastContracts=Siste %s kontrakter
+BoxTitleLastContracts=Siste %s endrede kontrakter
 BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
 BoxTitleLastModifiedExpenses=Siste %s endrede utgiftsrapporter
 BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Tilbud pr. mnd.
 NoTooLowStockProducts=Ingen varer med for lav beholdning
 BoxProductDistribution=Fordeling varer/tjenester
 BoxProductDistributionFor=Fordeling av %s for %s
+BoxTitleLastModifiedSupplierBills=Siste %s endrede leverandørfakturaer
+BoxTitleLatestModifiedSupplierOrders=Siste %s endrede leverandørordre
+BoxTitleLastModifiedCustomerBills=Siste %s endrede kundefakturaer
+BoxTitleLastModifiedCustomerOrders=Siste %s endrede kundeordre
+BoxTitleLastModifiedPropals=Siste %s endrede tilbud
 ForCustomersInvoices=Kundens fakturaer
 ForCustomersOrders=Kundeordrer
 ForProposals=Tilbud
 LastXMonthRolling=De siste %s måneders omsetning
-ChooseBoxToAdd=Legg widget til kontrollpanelet
+ChooseBoxToAdd=Legg widget til i kontrollpanelet
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 1be9d6c0828..ddea8c0f59d 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=på
 CashDeskThirdParty=Tredjepart
 ShoppingCart=Handlekurv
 NewSell=Nytt salg
-BackOffice=Administrasjonen
 AddThisArticle=Legg til denne artikkelen
 RestartSelling=Gå tilbake på salg
-SellFinished=Salg avsluttet
+SellFinished=Salg fullført
 PrintTicket=Skriv kvittering
 NoProductFound=Ingen artikler funnet
 ProductFound=vare funnet
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index e887a48c9b3..e87546d2ac7 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Område for kunde-merker/kategorier
 MembersCategoriesArea=Område for medlems-merker/kategorier
 ContactsCategoriesArea=Område for kontakters merker/kategorier
 AccountsCategoriesArea=Område for kontomerker/-kategorier
+ProjectsCategoriesArea=Prosjekters merker/kategori-område
 SubCats=Underkategorier
 CatList=Liste over merker/kategorier
 NewCategory=Nytt merke/kategori
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Denne tredjeparten er lenket til følgende levera
 MemberIsInCategories=Dette medlemmet er lenket til følgende medlems-merker/kategorier
 ContactIsInCategories=Denne kontakten er lenket til følgende kunde-merker/kategorier
 ProductHasNoCategory=Denne varen/tjenesten har ikke noen merker/kategorier
-CompanyHasNoCategory=Denne tredjepartenhar ikke noen merker/kategorier
+CompanyHasNoCategory=Denne tredjeparten er ikke i noen merker/kategorier
 MemberHasNoCategory=Dette medlemmet har ikke noen merker/kategorier
 ContactHasNoCategory=Denne kontakten har ingen merker/kategorier
+ProjectHasNoCategory=Dette prosjekter er ikke i noen merker/kategorier
 ClassifyInCategory=Legg til i merke/kategori
 NotCategorized=Uten merke/kategori
 CategoryExistsAtSameLevel=Denne kategorien finnes allerede med denne referansen
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Varenes merker/kategorier
 MembersCategoriesShort=Medlemmers merker/kategorier
 ContactCategoriesShort=Kontakters merker/kategorier
 AccountsCategoriesShort=Kontomerker/-kategorier
+ProjectsCategoriesShort=Prosjekter merker/kategorier
 ThisCategoryHasNoProduct=Denne kategorien inneholder ingen varer.
 ThisCategoryHasNoSupplier=Denne kategorien inneholder ingen leverandører.
 ThisCategoryHasNoCustomer=Denne kategorien inneholder ingen kunder.
 ThisCategoryHasNoMember=Denne kategorien inneholder ingen medlemmer.
 ThisCategoryHasNoContact=Denne kategorien inneholder ikke noen kontakt.
 ThisCategoryHasNoAccount=Denne kategorien inneholder ingen kontoer
+ThisCategoryHasNoProject=Denne kategorien er ikke brukt i noen prosjekter
 CategId=Merke/kategori-ID
 CatSupList=Liste over leverandør-merker/kategorier
 CatCusList=Liste over kunde/prospekt merker/kategorier
@@ -71,6 +75,7 @@ CatContactList=Liste over kontakt-merker/kategorier
 CatSupLinks=Lenker mellom leverandører og merker/kategorier
 CatCusLinks=Lenker mellom kunder/prospekter og merker/kategorier
 CatProdLinks=Lenker mellom varer/tjenester og merker/kategorier
+CatProJectLinks=Lenker mellom prosjekter og merker/kategorier
 DeleteFromCat=Fjern fra merker/kategorier
 ExtraFieldsCategories=Komplementære attributter
 CategoriesSetup=Oppsett av merker/kategorier
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index a16049c1f27..30e87002209 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Ny privatperson
 NewCompany=Ny bedrift (prospekt, kunde, leverandør)
 NewThirdParty=Ny tredjepart (prospekt, kunde, lever.)
 CreateDolibarrThirdPartySupplier=Lag en tredjepart (leverandør)
+CreateThirdPartyOnly=Opprett tredjepart
+CreateThirdPartyAndContact=Opprett en tredjepart med underkontakt
 ProspectionArea=Prospektområde
 IdThirdParty=Tredjepart-ID
 IdCompany=Firma-ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Leverandører
 ThirdPartyType=Type tredjepart
 Company/Fundation=Firma/Organisasjon
 Individual=Privatperson
-ToCreateContactWithSameName=Vil automatisk opprette en fysisk kontaktperson med samme informasjon
+ToCreateContactWithSameName=Vil opprette en kontakt/adresse med samme informasjon som tredjeparten, under tredjeparten, automatisk. I de fleste tilfeller, selv om tredjeparten er en privatperson, vil det være nok å opprette en tredjepart
 ParentCompany=Morselskap
 Subsidiaries=Datterselskaper
 ReportByCustomers=Rapporter pr kunde
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Tlf. arbeid
 PhonePerso=Tlf. privat
 PhoneMobile=Tlf. mobil
-No_Email=Ikke send masse-epost
+No_Email=Hindre masseutsendelser
 Fax=Faks
 Zip=Postnummer
 Town=Poststed
@@ -73,8 +75,8 @@ Poste= Posisjon
 DefaultLang=Standardspråk
 VATIsUsed=MVA skal beregnes
 VATIsNotUsed=MVA skal ikke beregnes
-CopyAddressFromSoc=Fyll adresse med tredjeparts adresse
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+CopyAddressFromSoc=Fyll inn adressen med tredjepartsadressen
+ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjeparts verken kunde eller leverandør, ingen tilgjengelige henvisende objekter
 ##### Local Taxes #####
 LocalTax1IsUsed=Bruk avgift 2
 LocalTax1IsUsedES= RE brukes
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Organisasjonsnummer
 VATIntraShort=Organisasjonsnummer
 VATIntraSyntaxIsValid=Gyldig syntaks
-VATIntraValueIsValid=Gyldig verdi
 ProspectCustomer=Prospekt/Kunde
 Prospect=Prospekt
 CustomerCard=Kundekort
@@ -261,7 +262,9 @@ AddContactAddress=Opprett kontakt/adresse
 EditContact=Endre kontakt
 EditContactAddress=Endre kontakt/adresse
 Contact=Kontaktperson
+ContactId=Kontakt ID
 ContactsAddresses=Kontakter / Adresser
+FromContactName=Navn:
 NoContactDefinedForThirdParty=Ingen kontakt definert for denne tredjepart
 NoContactDefined=Ingen kontaktpersoner definert
 DefaultContact=Standardkontakt
@@ -294,6 +297,7 @@ ContactForProposals=Tilbudskontakt
 ContactForContracts=Kontraktkontakt
 ContactForInvoices=Fakturakontakt
 NoContactForAnyOrder=Kontaktpersonen er ikke tilknyttet noen ordre
+NoContactForAnyOrderOrShipments=Denne kontakten er ikke kontakt for noen ordre eller forsendelser
 NoContactForAnyProposal=Kontaktpersonen er ikke tilknyttet noen tilbud
 NoContactForAnyContract=Kontaktpersonen er ikke tilknyttet noen kontrakt
 NoContactForAnyInvoice=Kontaktpersonen er ikke tilknyttet noen faktura
@@ -352,9 +356,9 @@ ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontaktpersonen er ikke lenket til noen tredjepart
 DolibarrLogin=Dolibarr innlogging
 NoDolibarrAccess=Ingen tilgang til Dolibarr
-ExportDataset_company_1=Tredjeparter (Selskaper/organisasjoner/fysiske personer) og egenskaper
+ExportDataset_company_1=Tredjeparter (Firmaer, organisasjoner, personer) og egenskaper
 ExportDataset_company_2=Kontaktpersoner og egenskaper
-ImportDataset_company_1=Tredjeparter (Selskaper/organisasjoner/fysiske personer) og egenskaper
+ImportDataset_company_1=Tredjeparter (Firmaer, organisasjoner, personer) og egenskaper
 ImportDataset_company_2=Kontakter/adresser (av tredjeparter eller ikke) og attributter
 ImportDataset_company_3=Bankopplysninger
 ImportDataset_company_4=Tredjeparter/Salgsrepresentanter (Påvirker firmaers salgsrepresentanter)
@@ -369,8 +373,8 @@ AllocateCommercial=Tildelt salgsrepresentant
 Organization=Organisasjon
 FiscalYearInformation=Informasjon om regnskapsåret
 FiscalMonthStart=Første måned i regnskapsåret
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Du må opprette e-postadresse for denne brukeren først for være i stand til å legge til e-postvarslinger for ham.
+YouMustCreateContactFirst=For å kunne legge til e-postvarsler, må du først definere kontakter med gyldige e-postadresser hos tredjepart
 ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over prospekter
 ListCustomersShort=Liste over kunder
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Tredjepartene er blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Fornavnet til salgsrepresentanten
 SaleRepresentativeLastname=Etternavnet til salgsrepresentanten
+ErrorThirdpartiesMerge=Det oppsto en feil ved sletting av tredjeparter. Vennligst sjekk loggen. Endringer er tilbakeført til opprinnelig stand.
+NewCustomerSupplierCodeProposed=Ny kunde eller leverandørkode foreslått med duplisert kode
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 5ba7d645731..44090845977 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Skatt eller avgift
 SocialContributions=Skatter eller avgifter
 SocialContributionsDeductibles=Fradragsberettigede avgifter
 SocialContributionsNondeductibles=Ikke fradragsberettigede avgifter
+LabelContrib=Etikett bidrag
+TypeContrib=Type bidrag
 MenuSpecialExpenses=Spesielle utgifter
 MenuTaxAndDividends=Skatter og utbytte
 MenuSocialContributions=Skatter/avgifter
@@ -77,9 +79,9 @@ LT1PaymentES=RE Betaling
 LT1PaymentsES=RE Betalinger
 LT2PaymentES=IRPF Betaling
 LT2PaymentsES=IRPF Betalinger
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATRefund=Sales tax refund Refund
+VATPayment=MVA.betaling
+VATPayments=MVA.betalinger
+VATRefund=MVA tilbakebetaling
 Refund=Refusjon
 SocialContributionsPayments=Skatter- og avgiftsbetalinger
 ShowVatPayment=Vis MVA betaling
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index e0b36898e9e..95e229547a2 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Slett planlagt jobb
 Permission23104 = Utfør planlagt jobb
 # Admin
 CronSetup= Administrasjon av planlagte oppgaver
-URLToLaunchCronJobs=URL til å sjekke og kjøre Cron jobber hvis nødvendig
+URLToLaunchCronJobs=URL for å sjekke og kjøre kvalifiserte cron-jobber
 OrToLaunchASpecificJob=eller for å sjekke og kjøre en spesifikk jobb
 KeyForCronAccess=Sikkerhetsnøkkel for URL for å starte cronjobber
 FileToLaunchCronJobs=Kommandolinje for å starte cronjobber
@@ -23,7 +23,7 @@ CronCommand=Kommando
 CronList=Planlagte jobber
 CronDelete=Slett planlagte jobber
 CronConfirmDelete=Er du sikker på at du vil slette disse planlagte jobbene?
-CronExecute=Start planlagte jobber
+CronExecute=Start planlagt jobb
 CronConfirmExecute=Er du sikker på at du vil kjøre disse planlagte jobbene nå?
 CronInfo=Planlagte jobber-modulen gir deg mulighet til å utføre jobber til ønsket tid
 CronTask=Jobb
@@ -39,7 +39,7 @@ CronMethod=Metode
 CronModule=Modul
 CronNoJobs=Ingen registrerte jobber
 CronPriority=Prioritet
-CronLabel=Beskrivelse
+CronLabel=Etikett
 CronNbRun=Antall starter
 CronMaxRun=Maks. ant. startes
 CronEach=Alle
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Gå til menyen "Hjem - Administrative verktøy -
 JobDisabled=Jobb deaktivert
 MakeLocalDatabaseDumpShort=Backup av lokal database
 MakeLocalDatabaseDump=Opprett lokal databasedump
+WarningCronDelayed=NB! Pga ytelseshensyn, kan aktive jobber utsettes maksimum %s timer før de kjøres, uavhengig av dato de er satt opp.
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 979487c26f0..e69a82d4afa 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Feil! Din PHP må ha modulen <b>%s</b> installert for  å kun
 ErrorOpenIDSetupNotComplete=Du satte opp Dolibarr config-filen til å tillate OpenID-autentisering, men url til OpenID-tjenesten er ikke definert i konstanten %s
 ErrorWarehouseMustDiffers=Kilde- og mållager må være ulike
 ErrorBadFormat=Feil format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Feil! Dette medlemmet er ennå ikke koblet til noen tredjepart. Koble medlemmet mot en eksisterende tredjepart eller opprett en ny tredjepart, før du oppretter et abonnement med faktura
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Feil, dette medlemmet er ennå ikke knyttet til noen tredjepart. Koble medlemmet til en eksisterende tredjepart eller opprett en ny tredjepart før du oppretter abonnement med faktura.
 ErrorThereIsSomeDeliveries=Feil! Det er noen leveringer knyttet til denne forsendelsen. Sletting nektet
 ErrorCantDeletePaymentReconciliated=Kan ikke slette en betaling som har generert en banktransaksjon, og som er blitt avstemt
 ErrorCantDeletePaymentSharedWithPayedInvoice=Kan ikke slette en betaling delt med minst en faktura med status Betalt
@@ -169,11 +169,13 @@ ErrorSavingChanges=En feil oppsto under lagring av endringer
 ErrorWarehouseRequiredIntoShipmentLine=Lager er obligatorisk for å kunne levere
 ErrorFileMustHaveFormat=Filen må ha formatet %s
 ErrorSupplierCountryIsNotDefined=Land for denne leverandøren er ikke valgt. Korriger dette først.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
-ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
-ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
-ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
-ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorsThirdpartyMerge=Klarte ikke å flette de to postene. Forespørsel ble avbrutt.
+ErrorStockIsNotEnoughToAddProductOnOrder=Ikke nok lagerbeholdning for varen %s til å legges til i en ny ordre.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Ikke nok lagerbeholdning for varen %s til å legges til i en ny faktura.
+ErrorStockIsNotEnoughToAddProductOnShipment=Ikke nok lagerbeholdning for varen %s til å legges til i en ny levering.
+ErrorStockIsNotEnoughToAddProductOnProposal=Ikke nok lagerbeholdning for varen %s til å legges til i et nytt tilbud.
+ErrorFailedToLoadLoginFileForMode=Kunne ikke finne innloggingsfil for modus '%s'.
+ErrorModuleNotFound=Modulfilen ble ikke funnet.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
@@ -192,5 +194,5 @@ WarningClickToDialUserSetupNotComplete=Oppsett av KlikkForÅRinge informasjon fo
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Egenskapen er deaktivert når visningsoppsettet er optimalisert for blinde personer eller tekstbaserte nettlesere.
 WarningPaymentDateLowerThanInvoiceDate=Betalingsdato (%s) er tidligere enn fakturadato (%s) for faktura %s.
 WarningTooManyDataPleaseUseMoreFilters=For mange data (mer enn %s linjer). Bruk flere filtre eller sett konstanten %s til en høyere grense.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by some users while their hourly rate was not defined. A value of 0 %s per hour was used but this may result in wrong valuation of time spent.
+WarningSomeLinesWithNullHourlyRate=Noen tider ble registrert av noen brukere mens deres timepris ikke var definert. En verdi på 0 %s pr. time ble brukt, men dette kan føre til feil verdivurdering av tidsbruk.
 WarningYourLoginWasModifiedPleaseLogin=Din innlogging er blitt endret. Av sikkerhetsgrunner må du logge inn på nytt før du kan gjøre noe.
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index 54341f91097..9a0b88e946f 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Siste %s endrede ferieforespørsler
 HolidaysMonthlyUpdate=Månedlig oppdatering
 ManualUpdate=Manuell oppdatering
 HolidaysCancelation=Kansellering av feriesøknader
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Ansatts etternavn
+EmployeeFirstname=Ansatts fornavn
 
 ## Configuration du Module ##
 LastUpdateCP=Siste automatiske oppdatering av ferietildeling
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 1b04d0f797b..fa59b2c60f7 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Denne PHP støtter sesjoner.
 PHPSupportPOSTGETOk=Dette PHP støtter variablene POST og GET.
 PHPSupportPOSTGETKo=Det er mulig at ditt PHP-oppsett ikke støtter variablene POST og/eller GET. Sjekk parametrene <b>variables_order</b> i php.ini.
 PHPSupportGD=Denne PHP støtter GD grafiske funksjoner.
+PHPSupportCurl=Denne PHP støtter Curl.
 PHPSupportUTF8=Denne PHP støtter UTF8 funksjoner.
 PHPMemoryOK=Din PHP økt-minne er satt til maks.<b>%s</b> bytes. Dette bør være nok.
 PHPMemoryTooLow=Din PHP max økten minnet er satt til <b>%s</b> bytes. Dette bør være for lav. Endre <b>php.ini</b> å sette <b>memory_limit</b> parameter til minst <b>%s</b> byte.
 Recheck=Klikk her for en mer significative test
 ErrorPHPDoesNotSupportSessions=Din PHP installasjon har ikke støtte for sesjoner. Denne funksjonen er nødvendig for at Dolibarr skal virke. Sjekk ditt PHP-oppsett.
 ErrorPHPDoesNotSupportGD=Din PHP installasjon har ikke støtte for GD-funksjon. Ingen grafer vil være tilgjengelig.
+ErrorPHPDoesNotSupportCurl=Din PHP-installasjon støtter ikke Curl.
 ErrorPHPDoesNotSupportUTF8=Din PHP installasjon har ikke støtte for UTF8-funksjoner. Dolibarr vil ikke fungere riktig. Løs dette før du installerer Dolibarr.
 ErrorDirDoesNotExists=Mappen %s finnes ikke.
 ErrorGoBackAndCorrectParameters=Gå tilbake for å korrigere feil parametre.
@@ -86,7 +88,7 @@ DirectoryRecommendation=Det er anbefalt å bruke en annen katalog enn den for we
 LoginAlreadyExists=Finnes allerede
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr administratorkonto '<b>%s</b>' finnes allerede.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Klarte ikke å opprette Dolibarr administratorkonto
 WarningRemoveInstallDir=Advarsel, av sikkerhetshensyn, når installasjonen eller oppgraderingen er fullført, bør du fjerne <b>mappen "install" eller endre navnet til install.lock for å unngå skadelig bruk.</b>
 FunctionNotAvailableInThisPHP=Ikke tilgjengelig på denne PHP
 ChoosedMigrateScript=Velg migrasjonscript
@@ -133,6 +135,10 @@ ActivateModule=Aktiver modulen %s
 ShowEditTechnicalParameters=Klikk her for å vise/endre avanserte parametre (expert mode)
 WarningUpgrade=Advarsel:\nHar du tatt en sikkerhetskopi av databasen først?\nDette er sterkt anbefalt, på grunn av feil i enkelte databasesystemer (for eksempel mysql versjon 5.5.40 / 41/42/43). Enkelte data eller tabeller kan gå tapt under denne prosessen, så det er sterkt anbefalt å ha en komplett dump av databasen din før du starter migrasjonen.\n\nKlikk OK for å starte migreringen ...
 ErrorDatabaseVersionForbiddenForMigration=Din databaseversjon er %s. Den har en kritisk feil som gjør at du mister data hvis du gjør strukturelle endringer i databasen, som vil skje ved migrasjonen. På grunn av dette vil du ikke kunne migrere før databasen er oppgradert til en høyere versjon. (liste over versjoner med bekreftede feil: %s)
+KeepDefaultValuesWamp=Du bruker Dolibarrs konfigureringsveiviser fra DoliWamp, så verdiene foreslått her, er allerede optimalisert. Endre dem bare hvis du vet hva du gjør.
+KeepDefaultValuesDeb=Du bruker Dolibarrs konfigureringsveiviser fra en Linux-pakke (Ubuntu, Debian, Fedora ...), så verdiene foreslått her, er allerede optimalisert. Bare passordet til databaseeieren må  fylles ut. Endre andre parametere bare hvis du vet hva du gjør.
+KeepDefaultValuesMamp=Du bruker Dolibarrs konfigureringsveiviser fra DoliMamp, så verdiene foreslått her, er allerede optimalisert. Endre dem bare hvis du vet hva du gjør.
+KeepDefaultValuesProxmox=Du bruker Dolibarrs konfigureringsveiviser fra en Proxmox virtual appliance, så verdiene foreslått her, er allerede optimalisert. Endre dem bare hvis du vet hva du gjør.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Oppdater data for handlinger
 MigrationPaymentMode=Datamigrering for betalingsmodus
 MigrationCategorieAssociation=Migrer kategorier
 MigrationEvents=Overføring av hendelser for å legge hendelseseier inn i oppdragstabellen
+MigrationRemiseEntity=Oppdater verdien i enhetsfeltet llx_societe_remise
+MigrationRemiseExceptEntity=Oppdater verdien i enhetsfeltet llx_societe_remise_except
 MigrationReloadModule=Last inn modulen %s på nytt
 ShowNotAvailableOptions=Vis utilgjengelige opsjoner
 HideNotAvailableOptions=Gjem utilgjengelige opsjoner
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index ca3f185c79e..5be37033a1f 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -14,12 +14,12 @@ DeleteIntervention=Slett intervensjon
 ValidateIntervention=Valider intervensjon
 ModifyIntervention=Endre intervensjon
 DeleteInterventionLine=Slett intervensjonslinje
-CloneIntervention=Clone intervention
+CloneIntervention=Klon intervensjon
 ConfirmDeleteIntervention=Er du sikker på at du vil slette denne intervensjonen?
 ConfirmValidateIntervention=Er du sikker på at du vil validere denne intervensjonen under navnet <b>%s</b>?
 ConfirmModifyIntervention=Er du sikker på at du vil endre denne intervensjonen?
 ConfirmDeleteInterventionLine=Er du sikker på at du vil slette denne intervensjonslinjen?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention ?
+ConfirmCloneIntervention=Er du sikker på at du vil klone denne intervensjonen?
 NameAndSignatureOfInternalContact=Kundebehandlers navn og signatur :
 NameAndSignatureOfExternalContact=Kundes navn og signatur :
 DocumentModelStandard=Standard dokumentet modell for intervensjoner
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Ansvarlig for kundeoppfølging
 # Modele numérotation
 PrintProductsOnFichinter=Skriv også ut linjer med type "produkt" (ikke bare tjenester) på intervensjonskort
 PrintProductsOnFichinterDetails=intervensjoner generert fra ordre
+UseServicesDurationOnFichinter=Bruk tjenestevarighet for intervensjoner som genereres fra bestillinger
 InterventionStatistics=Statistikk over intervensjoner
 NbOfinterventions=Antall intervensjonskort
 NumberOfInterventionsByMonth=Antall intervensjonskort etter måned (validasjonsdato)
diff --git a/htdocs/langs/nb_NO/ldap.lang b/htdocs/langs/nb_NO/ldap.lang
index e53fce18ca2..108947736d1 100644
--- a/htdocs/langs/nb_NO/ldap.lang
+++ b/htdocs/langs/nb_NO/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Første abonnementsdato
 LDAPFieldFirstSubscriptionAmount=Første abonnementsbeløp
 LDAPFieldLastSubscriptionDate=Siste abonnementsdato
 LDAPFieldLastSubscriptionAmount=Siste abonnementsbeløp
+LDAPFieldSkype=Skype ID
+LDAPFieldSkypeExample=Eksempel: skypeNavn
 UserSynchronized=Brukeren er synkronisert
 GroupSynchronized=Gruppe synkronisert
 MemberSynchronized=Medlem synkronisert
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index e073ed11edd..992d7cd010e 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Les
 YourMailUnsubcribeOK=E-postadressen <b>%s</b> er korrekt avmeldt fra mailinglisten
 ActivateCheckReadKey=Nøkkel for å kryptere URL'en brukt til "Les kvittering" og "Avslutt abonnement" egenskapen
 EMailSentToNRecipients=E-post sendt til %s mottakere.
+EMailSentForNElements=Epost sendt for %s elementer
 XTargetsAdded=<b>%s</b> mottakere lagt til i målliste
-OnlyPDFattachmentSupported=Hvis det allerede er opprettet et PDF dokument for fakturaen, vil det bli vedlagt eposten. Hvis ikke vil det ikke bli sendt noen epost. (NB! Kun PDF dokumenter kan legges ved i denne versjonen)
+OnlyPDFattachmentSupported=Hvis PDF-dokumentet allerede er generert for å sende objektet, vil det være knyttet til e-post. Hvis ikke, vil ingen e-post bli sendt (merk også at kun PDF-dokumenter støttes som vedlegg i masseutsendelse i denne versjonen).
 AllRecipientSelected=Alle valgte trdjeparter og hvis epost er definert.
 ResultOfMailSending=Resultat av masseutsendelse av epost
 NbSelected=Ant. valgt
@@ -102,8 +103,8 @@ YouCanUseCommaSeparatorForSeveralRecipients=Du kan bruke <b>komma</b> som skille
 TagCheckMail=Spor post åpning
 TagUnsubscribe=Avmeldingslink
 TagSignature=Signatur avsender
-EMailRecipient=Recipient EMail
-TagMailtoEmail=Recipient EMail (including html "mailto:" link)
+EMailRecipient=E-postmottaker
+TagMailtoEmail=E-postmottaker (inkluderer html "mailto:" lenke)
 NoEmailSentBadSenderOrRecipientEmail=Ingen e-post sendt. Feil på avsender eller mottaker. Verifiser brukerprofil
 # Module Notifications
 Notifications=Varsler
@@ -111,7 +112,7 @@ NoNotificationsWillBeSent=Ingen e-postvarsler er planlagt for denne hendelsen/fi
 ANotificationsWillBeSent=1 e-postvarsel vil bli sendt med e-post
 SomeNotificationsWillBeSent=%s e-postvarsler vil bli sendt med e-post
 AddNewNotification=Aktiver ny målgruppe for epost
-ListOfActiveNotifications=List all active targets for email notification
+ListOfActiveNotifications=List alle aktive mål for e-postnotifikajon
 ListOfNotificationsDone=List alle e-postmeldinger sendt
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maksimumsverdi
 AdvTgtSearchDtHelp=Bruk intervall for å velge datoverdi
 AdvTgtStartDt=Startdato
 AdvTgtEndDt=Sluttdato
-AdvTgtTypeOfIncudeHelp=Mål-epost av tredjepart og kontakt-epost med tredjeparten , eller bare tredjeparts e-post eller kontakt-epost
+AdvTgtTypeOfIncudeHelp=Mål-epost til tredjepart og epost til tredjepartens kontakt, bare tredjeparts e-post eller bare kontakts epost 
 AdvTgtTypeOfIncude=Type målrettet e-post
 AdvTgtContactHelp=Brukes bare hvis du sender kontakt til "Type målrettet e-post"
 AddAll=Legg til alle
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index c33a99100db..2a0dba8d18b 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -67,6 +67,7 @@ SelectDate=Velg en dato
 SeeAlso=Se også %s
 SeeHere=Se her
 BackgroundColorByDefault=Standard bakgrunnsfarge
+FileRenamed=Filen har fått nytt navn
 FileUploaded=Opplastningen var vellykket
 FileWasNotUploaded=En fil er valgt som vedlegg, men er ennå ikke lastet opp. Klikk på "Legg ved fil" for dette.
 NbOfEntries=Antall oppføringer
@@ -84,7 +85,7 @@ SeeAbove=Se ovenfor
 HomeArea=Hjemmeområde
 LastConnexion=Siste tilkobling
 PreviousConnexion=Forrige tilkobling
-PreviousValue=Previous value
+PreviousValue=Forrige verdi
 ConnectedOnMultiCompany=Tilkoblet miljø
 ConnectedSince=Innlogget siden
 AuthenticationMode=Autensiteringsmodus
@@ -178,7 +179,7 @@ Groups=Grupper
 NoUserGroupDefined=Ingen brukergrupper er definert
 Password=Passord
 PasswordRetype=Gjenta passord
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+NoteSomeFeaturesAreDisabled=Mange av egenskapene/modulene er deaktivert i denne demonstrasjonen.
 Name=Navn
 Person=Person
 Parameter=Parameter
@@ -245,6 +246,10 @@ DateBuild=Rapport byggedato
 DatePayment=Dato for betaling
 DateApprove=Godkjennelsesdato
 DateApprove2=Godkjennelsesdato (2. godkjennelse)
+UserCreation=Opprettelse av bruker
+UserModification=Endre bruker
+UserCreationShort=Oppr. bruker
+UserModificationShort=Endre bruker
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uke
@@ -256,6 +261,7 @@ DurationDays=dager
 Year=År
 Month=Måned
 Week=Uke
+WeekShort=Uke
 Day=Dag
 Hour=Time
 Minute=Minutt
@@ -278,6 +284,7 @@ MonthOfDay=Dag i måneden
 HourShort=T
 MinuteShort=mn
 Rate=Sats
+CurrencyRate=Valutakurs
 UseLocalTax=Inkl. MVA
 Bytes=Bytes
 KiloBytes=Kilobyte
@@ -565,8 +572,11 @@ BackToList=Tilbake til liste
 GoBack=Gå tilbake
 CanBeModifiedIfOk=Kan endres hvis gyldig
 CanBeModifiedIfKo=Kan endres hvis ugyldig
+ValueIsValid=Verdien er gyldig
+ValueIsNotValid=Verdien er ikke gyldig
 RecordModifiedSuccessfully=Posten er endret!
 RecordsModified=%s poster modifiserte
+RecordsDeleted=%s poster slettet
 AutomaticCode=Automatisk kode
 FeatureDisabled=Funksjonen er slått av
 MoveBox=Flytt widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Du har ikke tillatelse til å gjøre denne handlingen
 SessionName=Sesjonnavn
 Method=Metode
 Receive=Motta
+CompleteOrNoMoreReceptionExpected=Komplett eller ingenting mer forventet
 PartialWoman=Delvis
 TotalWoman=Total
 NeverReceived=Aldri mottatt
@@ -598,6 +609,7 @@ DisabledModules=Avslåtte moduler
 For=For
 ForCustomer=For kunde
 Signature=Signatur
+DateOfSignature=Signaturdato
 HidePassword=Vis kommando med skjult passord
 UnHidePassword=Vis virkelig kommando med synlig passord
 Root=Rot
@@ -641,6 +653,15 @@ NewAttribute=Ny attributt
 AttributeCode=Attributt-kode
 URLPhoto=Url til bilde/logo
 SetLinkToAnotherThirdParty=Link til en annen tredjepart
+LinkTo=Lenke til
+LinkToProposal=Lenke til tilbud
+LinkToOrder=Lenke til ordre
+LinkToInvoice=Lenke til faktura
+LinkToSupplierOrder=Lenke til leverandørordre
+LinkToSupplierProposal=Lenke til leverandørtilbud
+LinkToSupplierInvoice=Lenke til leverandørfaktura
+LinkToContract=Lenke til kontakt
+LinkToIntervention=Lenke til intervensjon
 CreateDraft=Lag utkast
 SetToDraft=Tilbake til kladd
 ClickToEdit=Klikk for å redigere
@@ -701,6 +722,9 @@ RelatedObjects=Relaterte objekter
 ClassifyBilled=Klassifisert fakturert
 Progress=Fremdrift
 ClickHere=Klikk her
+FrontOffice=Front office
+BackOffice=Back office
+View=Vis
 # Week day
 Monday=Mandag
 Tuesday=Tirsdag
@@ -745,7 +769,7 @@ SearchIntoMembers=Medlemmer
 SearchIntoUsers=Brukere
 SearchIntoProductsOrServices=Varer eller tjenester
 SearchIntoProjects=Prosjekter
-SearchIntoTasks=Tasks
+SearchIntoTasks=Oppgaver
 SearchIntoCustomerInvoices=Kundefakturaer
 SearchIntoSupplierInvoices=Leverandørfakturaer
 SearchIntoCustomerOrders=Kundeordre
@@ -756,4 +780,4 @@ SearchIntoInterventions=Intervensjoner
 SearchIntoContracts=Kontrakter
 SearchIntoCustomerShipments=Kundeforsendelser
 SearchIntoExpenseReports=Utgiftsrapporter
-SearchIntoLeaves=Leaves
+SearchIntoLeaves=Ferier
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index fc390680cf9..05155594ce1 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Sats må ha en numerisk verdi
 markRateShouldBeLesserThan100=Dekningsbidrag skal være lavere enn 100
 ShowMarginInfos=Vis info om marginer
 CheckMargins=Margindetaljer
+MarginPerSaleRepresentativeWarning=Rapporten margin pr. bruker: bruk lenken mellom tredjeparter og salgsrepresentanter til å beregne margin for hver bruker. Fordi noen tredjeparter ikke kan være knyttet til en eventuell salgsrepresentant og noen tredjeparter kan knyttes til flere brukere, kan det hende at noen marginer ikke vises i rapporten eller vises på flere forskjellige linjer.
diff --git a/htdocs/langs/nb_NO/oauth.lang b/htdocs/langs/nb_NO/oauth.lang
index af2ae7def66..68cb5024cae 100644
--- a/htdocs/langs/nb_NO/oauth.lang
+++ b/htdocs/langs/nb_NO/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Konfigurasjon
+OAuthServices=OAuth tjenester
+ManualTokenGeneration=Manuell nøkkelgenerering
 NoAccessToken=Ingen adgangsnøkkel lagret i lokal database
 HasAccessToken=En nøkkel ble generert og lagret i lokal database
 NewTokenStored=Nøkkel mottatt og lagret
@@ -9,7 +11,16 @@ RequestAccess=Klikk her for forespørsel/fornyet adgang og motta ny nøkkel
 DeleteAccess=Klikk her for å slette nøkkel
 UseTheFollowingUrlAsRedirectURI=Bruk følgende URL som redirect-URL når du lager din legitimasjon hos din OAuth tilbyder
 ListOfSupportedOauthProviders=Legg inn opplysninger fra din OAuth2-leverandør. Kun supporterte OAuth2-leverandører vises her. Dette oppsettet kan bli brukt av andre moduler som trenger OAuth2-autentisering
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Gå til <a href="https://console.developers.google.com/" target="_blank">denne siden</a> og opprett Oauth-legitimasjon
+TOKEN_ACCESS=
+TOKEN_REFRESH=Nøkkeloppfriskning tilstede
+TOKEN_EXPIRED=Nøkkel utgått
+TOKEN_EXPIRE_AT=Nøkkel utgår
+TOKEN_DELETE=Slett lagret nøkkel
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google ID
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Gå til <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">denne siden</a> velg"Credentials" for å opprette Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub ID
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Gå til <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">denne siden</a> velg "Register a new application" for å opprette Oauth credentials
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index b5f040ca169..6c0ae75abf9 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Din ordre har blitt opprettet
 OrderFail=En feil skjedde under opprettelse av din ordre 
 CreateOrders=Lag ordre
 ToBillSeveralOrderSelectCustomer=For å opprette en faktura for flere ordrer, klikk først på kunden, velg deretter "%s".
+CloseReceivedSupplierOrdersAutomatically=Lukk ordre til "%s" automatisk hvis alle varer er mottatt
diff --git a/htdocs/langs/nb_NO/printing.lang b/htdocs/langs/nb_NO/printing.lang
index 2a9ab1e2cec..0ede88ea5b1 100644
--- a/htdocs/langs/nb_NO/printing.lang
+++ b/htdocs/langs/nb_NO/printing.lang
@@ -18,10 +18,6 @@ UserConf=Oppsett pr. bruker
 PRINTGCP_INFO=Google OAuth API oppsett
 PRINTGCP_AUTHLINK=Autentisering
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Nøkkel
-PRINTGCP_TOKEN_REFRESH=Nøkkeloppdatering tilgjengelig
-PRINTGCP_TOKEN_EXPIRED=Nøkkel utgått
-PRINTGCP_TOKEN_EXPIRE_AT=Nøkkel utgår den
-PRINTGCP_DELETE_TOKEN=Slett lagret nøkkel
 PrintGCPDesc=Denne driveren gjør at du kan sende dokumenter direkte til skrivere tilknyttet Google Cloud Print.
 GCP_Name=Navn
 GCP_displayName=Visningsnavn
@@ -51,5 +47,5 @@ IPP_Supported=Mediatype
 DirectPrintingJobsDesc=Denne siden viser utskriftsjobber funnet for  tilgjengelige skrivere.
 GoogleAuthNotConfigured=Google OAuth oppsett ikke utført. Aktiver modulen OAuth og sett opp Google ID/Secret.
 GoogleAuthConfigured=Google OAuth legitimasjon funnet i oppsettet i modulen OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintingDriverDescprintgcp=Konfigurasjonsvariabler for drivere til Google Cloud Print.
+PrintTestDescprintgcp=Liste over skrivere for Google Cloud Print.
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 5457b45f06a..f5f4acdab3a 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/serienummer
 atleast1batchfield=Siste forbruksdato, siste salgsdato eller lot/serienummer
 batch_number=Lot/serienummer
 BatchNumberShort=Lot/serienummer
-l_eatby=Siste forbruksdato
-l_sellby=Siste salgsdato
+EatByDate=Siste forbruksdag
+SellByDate=Siste salgsdato
 DetailBatchNumber=Lot/serienummer-detaljer
 DetailBatchFormat=Lot/Serienummer: %s - Siste forbruksdato: %s - Siste salgsdato: %s (Ant: %d)
 printBatch=Lot/Serienummer: %s
@@ -19,3 +19,6 @@ printQty=Ant: %d
 AddDispatchBatchLine=Legg til en linje for holdbarhetsdato
 WhenProductBatchModuleOnOptionAreForced=Når Lot/serienummer-modulen er aktivert, vil øk/minsk lager være tvunget til siste valg, og kan ikke modifiseres. Alle andre opsjoner kan endres
 ProductDoesNotUseBatchSerial=Denne varen har ikke lot/serienummer
+ProductLotSetup=Oppsett av model Lot/serienmmer
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index b9a6b01119d..dab59758e53 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -18,7 +18,7 @@ ProductVatMassChange=Masse MVA-endring
 ProductVatMassChangeDesc=Denne siden kan brukes til å endre en MVA-sats på varer eller tjenester fra en verdi til en annen. Advarsel, er denne endringen gjort i alle databasene.
 MassBarcodeInit=Masse strekkode-endring
 MassBarcodeInitDesc=Denne siden kan brukes til å lage strekkoder for objekter som ikke har dette. Kontroller at oppsett av modulen Strekkoder er fullført.
-ProductAccountancyBuyCode=Regnskapskode (kjøp)
+ProductAccountancyBuyCode=Regnskapskode (innkjøp)
 ProductAccountancySellCode=Regnskapskode (salg)
 ProductOrService=Vare eller tjeneste
 ProductsAndServices=Varer og tjenester
@@ -32,8 +32,8 @@ ServicesOnSellAndOnBuy=Tjenester for kjøp og salg
 LastModifiedProductsAndServices=Siste %s endrede varer/tjenester
 LastRecordedProducts=Siste %s registrerte varer
 LastRecordedServices=Siste %s registrerte tjenester
-CardProduct0=Product card
-CardProduct1=Service card
+CardProduct0=Varekort
+CardProduct1=Tjenestekort
 Stock=Beholdning
 Stocks=Beholdninger
 Movements=Bevegelser
@@ -59,6 +59,8 @@ SellingPriceHT=Salgspris (eks. MVA)
 SellingPriceTTC=Salgspris (inkl. MVA)
 CostPriceDescription=Denne prisen (eks. MVA) kan brukes til å lagre det gjennomsnittlige beløpet dette produktet koster din bedrift. Det kan være en hvilken som helst pris du beregner selv, for eksempel fra gjennomsnittlig kjøpskurs pluss gjennomsnittlig produksjon og distribusjonkostnader.
 CostPriceUsage=I senere versjoner, kan denne verdien brukes til å kalkulere marginer.
+SoldAmount=Mengde solgt
+PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
 MinPrice=Minste utsalgspris
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
@@ -85,7 +87,7 @@ SetDefaultBarcodeType=Angi strekkodetype
 BarcodeValue=Strekkodeverdi
 NoteNotVisibleOnBill=Notat (vises ikke på fakturaer, tilbud...)
 ServiceLimitedDuration=Hvis varen er en tjeneste med begrenset varighet:
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Flere prissegmenter for hver vare/tjeneste (hver kunde er i et segment)
 MultiPricesNumPrices=Pris antall
 AssociatedProductsAbility=Aktiver komponentvare-egenskaper
 AssociatedProducts=Komponentvare
@@ -176,13 +178,13 @@ AlwaysUseNewPrice=Bruk alltid gjeldende pris på vare/tjeneste
 AlwaysUseFixedPrice=Bruk den faste prisen
 PriceByQuantity=Prisen varierer med mengde
 PriceByQuantityRange=Kvantumssatser
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
+MultipriceRules=Prissegment-regler
+UseMultipriceRules=Bruk prissegment-regler (definert i oppsettet i Varemodulen) for automatisk å kalkulere prisene til alle andre segmenter i forhold til første segment
 PercentVariationOver=%% variasjon over %s
 PercentDiscountOver=%% rabatt på %s
 ### composition fabrication
 Build=Produser
-ProductsMultiPrice=Products and prices for each price segment
+ProductsMultiPrice=Varer og priser for hvert prissegment
 ProductsOrServiceMultiPrice=Kundepriser (varer og tjenseter, multi-priser)
 ProductSellByQuarterHT=Kvartalsvis omsetning eks. MVA
 ServiceSellByQuarterHT=Kvartalsvis omsetning av tjenester eks. MVA
@@ -197,15 +199,15 @@ PrintsheetForOneBarCode=Skriv ut flere klistremerker for hver strekkode
 BuildPageToPrint=Generer side for utskrift
 FillBarCodeTypeAndValueManually=Fyll inn strekkode type og verdi manuelt
 FillBarCodeTypeAndValueFromProduct=Fyll inn strekkode type og verdi fra strekkoden på en vare.
-FillBarCodeTypeAndValueFromThirdParty=Fyll inn strekkode type og verdi fra strekkoden på en tredjepart
+FillBarCodeTypeAndValueFromThirdParty=Fyll inn strekkodetype og verdi fra strekkoden til en tredjepart
 DefinitionOfBarCodeForProductNotComplete=Definisjon av strekkode type eller verdi for varen %s er ikke komplett.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definering av strekkode type eller verdi for uferdig tredjepart %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definisjon av strekkodetype eller -verdi er ikke komplett for tredjepart %s.
 BarCodeDataForProduct=Strekkodeinformasjon for vare %s:
-BarCodeDataForThirdparty=Strekkodeinformasjon for tredjepart %s:
+BarCodeDataForThirdparty=Strekkodeinformasjon om tredjepart %s:
 ResetBarcodeForAllRecords=Lag strekkode-verdier for alle poster (dette vil overskrive strekkoder som allerede er definert)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
+PriceByCustomer=Ulike priser for hver kunde
+PriceCatalogue=En enkelt salgspris for hver vare/tjeneste
+PricingRule=Regler for salgspris
 AddCustomerPrice=Legg til pris for kunde
 ForceUpdateChildPriceSoc=Sett samme pris for kundens datterselskaper
 PriceByCustomerLog=Logg over tidligere kundepriser
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 5aeb4f1c77f..6e0ddf56957 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -11,10 +11,10 @@ SharedProject=Alle
 PrivateProject=Prosjektkontakter
 MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for (uansett type).
 ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=Her vises alle prosjektoppgaver du har lov til å se
 ProjectsPublicTaskDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
 ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gir deg tillatelse til å vise alt).
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
+TasksOnProjectsDesc=Her vises alle prosjektoppgaver (dine brukerrettigheter gir deg adgang til å vise alt).
 MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for (uansett type).
 OnlyOpenedProject=Kun åpne prosjekter er synlige (prosjektkladder og lukkede prosjekter er ikke synlige).
 ClosedProjectsAreHidden=Lukkede prosjekter er ikke synlige
@@ -70,11 +70,11 @@ ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GoToListOfTasks=Gå til oppgaveliste
 ListProposalsAssociatedProject=Oversikt over tilbud relatert til dette prosjektet
-ListOrdersAssociatedProject=Oversikt over ordre relatert til dette prosjektet
-ListInvoicesAssociatedProject=Oversikt over fakturaer relatert til dette prosjektet
-ListPredefinedInvoicesAssociatedProject=Liste over kunders fakturamaler tilknyttet prosjekt
-ListSupplierOrdersAssociatedProject=Liste over leverandørens ordre knyttet til prosjektet
-ListSupplierInvoicesAssociatedProject=Liste over leverandørens fakturaer knyttet til prosjektet
+ListOrdersAssociatedProject=Liste over kundeordre tilknyttet prosjektet
+ListInvoicesAssociatedProject=Liste over kundefakturaer tilknyttet prosjektet
+ListPredefinedInvoicesAssociatedProject=Liste over kundefaktura-maler tilknyttet prosjektet
+ListSupplierOrdersAssociatedProject=Liste over leverandørordre tilknyttet prosjektet
+ListSupplierInvoicesAssociatedProject=Liste over leverandørfakturaer tilknyttet prosjektet
 ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
 ListFichinterAssociatedProject=Liste over intervensjoner knyttet til prosjektet
 ListExpenseReportsAssociatedProject=Liste over utgiftsrapporter tilknyttet prosjektet
@@ -123,6 +123,7 @@ ProjectReportDate=Endre oppgave-dato til prosjekt-startdato
 ErrorShiftTaskDate=Kan ikke skifte oppgave-dato etter nytt prosjekt-startdato
 ProjectsAndTasksLines=Prosjekter og oppgaver
 ProjectCreatedInDolibarr=Prosjekt %s opprettet
+ProjectModifiedInDolibarr=Prosjekt %s er endret
 TaskCreatedInDolibarr=Oppgave %s opprettet
 TaskModifiedInDolibarr=Oppgave %s endret
 TaskDeletedInDolibarr=Oppgave %s slettet
@@ -132,9 +133,9 @@ OpportunityProbability=Mulighet - sannsynlighet
 OpportunityProbabilityShort=Mulig.sans.
 OpportunityAmount=Mulighet beløp
 OpportunityAmountShort=Tilbudsbeløp
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+OpportunityAmountAverageShort=Gj.snitt tilbudsbeløp
+OpportunityAmountWeigthedShort=Vektet tilbudsbeløp
+WonLostExcluded=Vunnet/tapt ekskludert
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Prosjektleder
 TypeContact_project_external_PROJECTLEADER=Prosjektleder
@@ -153,7 +154,7 @@ PlannedWorkload=Planlagt arbeidsmengde
 PlannedWorkloadShort=Arbeidsmengde
 ProjectReferers=Relaterte elementer
 ProjectMustBeValidatedFirst=Prosjektet må valideres først
-FirstAddRessourceToAllocateTime=Tilknytt ressurs til å sette av tid
+FirstAddRessourceToAllocateTime=Tilknytt brukerressurs til oppgave for å tildele tid
 InputPerDay=Tidsbruk pr. dag
 InputPerWeek=Tidsbruk pr. uke
 InputPerAction=Tidsbruk pr. aktivitet
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Åpne prosjekter etter mulighet-status
 ProjectsStatistics=Statistikk over muligheter
 TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
 IdTaskTime=Oppgave-tid ID
-YouCanCompleteRef=Hvis du ønsker å fullføre referansen med litt informasjon (for å bruke det som søkefiltre), er det anbefalt å legge til et - tegn for å skille den, så den automatiske nummereringen fortsatt vil fungere korrekt for neste prosjekt. For eksempel %s-ABC. Du kan også legge søkenøkler til etiketter.
+YouCanCompleteRef=Hvis du ønsker å tilføre referansen med litt informasjon (for å bruke det som søkefiltre ), er det anbefalt å legge til et - tegn for å skille den, så den automatiske nummereringen fortsatt fungerer korrekt for neste prosjekt. For eksempel %s-ABC. Du kan også foretrekke å legge søkenøkler til etiketten. Men beste praksis kan være å legge et dedikert felt, også kalt komplementære egenskaper.
 OpenedProjectsByThirdparties=Åpne prosjekter etter tredjeparter
 OnlyOpportunitiesShort=Kun muligheter
 OpenedOpportunitiesShort=Åpne muligheter
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index 4b53e095d20..4594d23333c 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -8,7 +8,7 @@ SalaryPayment=Lønnsutbetaling
 SalariesPayments=Lønnsutbetalinger
 ShowSalaryPayment=Vis lønnsutbetaling
 THM=Gjennomsnittlig timepris
-TJM=Gjennomsnittlig dagskost
+TJM=Gjennomsnittlig dagspris
 CurrentSalary=Nåværende lønn
 THMDescription=Denne verdien kan brukes til å kalkulere tidsforbruket på et prosjekt hvis prosjekt-modulen er i bruk
 TJMDescription=Dene verdien er foreløpig brukt til informasjon, og er ikke brukt i noen kalkulasjoner
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index f931b4cfdf1..f0b902825cc 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Slett levering
 Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
 StocksByLotSerial=Lager etter LOT/serienummer
+LotSerial=Lot/serienummer
+LotSerialList=Liste over lot/serienummer
 Movements=Bevegelser
 ErrorWarehouseRefRequired=Du må angi et navn på lageret
 ListOfWarehouses=Oversikt over lagre
@@ -43,6 +45,7 @@ PMPValue=Vektet gjennomsnittspris
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett lager automatisk når en bruker opprettes
+AllowAddLimitStockByWarehouse=Tillat å legge til nedre og ønsket vareholdning etter vare og lager
 IndependantSubProductStock=Varelager og sub-varelager er uavhengig av hverandre
 QtyDispatched=Antall sendt
 QtyDispatchedShort=Mengde utsendt
@@ -114,14 +117,14 @@ RecordMovement=Post overført
 ReceivingForSameOrder=Kvitteringer for denne ordren
 StockMovementRecorded=Registrerte varebevegelser
 RuleForStockAvailability=Regler og krav for lagerbeholdning
-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=Lagernivå må være høyt nok til å legge varen/tjenesten til faktura (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i fakturaen i forhold til hva som er regelen for automatisk lagerendring)
+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
 InventoryCode=Bevegelse eller varelager
 IsInPackage=Innhold i pakken
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
+WarehouseAllowNegativeTransfer=Lagerbeholdning kan ikke være negativ
+qtyToTranferIsNotEnough=Du har ikke nok beholdning på valgt lager
 ShowWarehouse=Vis lager
 MovementCorrectStock=Lagerkorreksjon for var %s
 MovementTransferStock=Lageroverførsel av vare %s til annet lager
@@ -132,3 +135,9 @@ OpenAll=Åpen for alle handlinger
 OpenInternal=Åpen for interne handlinger
 OpenShipping=Åpen for forsendelse
 OpenDispatch=Åpen for utsendelse
+UseDispatchStatus=Bruk utsendelses-status (godkjenn/avvis)
+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
+ProductStockWarehouseDeleted=Varsel for nedre og ønsket varebeholdning slettet
+AddNewProductStockWarehouse=Sett ny grense for nedre og ønsket varebeholdning 
diff --git a/htdocs/langs/nb_NO/supplier_proposal.lang b/htdocs/langs/nb_NO/supplier_proposal.lang
index d69cafe67d7..191c9b51737 100644
--- a/htdocs/langs/nb_NO/supplier_proposal.lang
+++ b/htdocs/langs/nb_NO/supplier_proposal.lang
@@ -12,7 +12,7 @@ RequestsOpened=Åpne prisforespørsler
 SupplierProposalArea=Område for leverandørtilbud
 SupplierProposalShort=Leverandørtilbud
 SupplierProposals=Leverandørtilbud
-SupplierProposalsShort=Supplier proposals
+SupplierProposalsShort=Leverandørtilbud
 NewAskPrice=Ny prisforspørsel
 ShowSupplierProposal=Vis prisforespørsel
 AddSupplierProposal=Opprett en prisforespørsel
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Standardmodell for opprettelse
 DefaultModelSupplierProposalToBill=Standardmal når prisforespørsel lukkes (akkseptert)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (avvist)
 ListOfSupplierProposal=Liste over prisforespørsler hos leverandører
+ListSupplierProposalsAssociatedProject=Liste over leverandørtilbud tilknyttet prosjekt
 SupplierProposalsToClose=Leverandørtilbud for lukking
 SupplierProposalsToProcess=Leverandørtilbud til gjennomføring
 LastSupplierProposals=Siste prisforespørsler
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 11240fb6404..b9dbd70c63b 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -7,13 +7,13 @@ History=Historikk
 ListOfSuppliers=Leverandøroversikt
 ShowSupplier=Vis leverandør
 OrderDate=Bestillingsdato
-BuyingPriceMin=Minste innkjøpspris
-BuyingPriceMinShort=Min innkjøpspris
-TotalBuyingPriceMinShort=Total innkjøpspris for underprodukter
-TotalSellingPriceMinShort=Total utsalgspris for underprodukter
+BuyingPriceMin=Beste innkjøpspris
+BuyingPriceMinShort=Beste innkjøpspris
+TotalBuyingPriceMinShort=Total over sub-varers innkjøpspriser
+TotalSellingPriceMinShort=Total over sub-varers utsalgsspriser
 SomeSubProductHaveNoPrices=Noen sub-varer har ingen pris definert
-AddSupplierPrice=Legg til leverandørpris
-ChangeSupplierPrice=Endre leverandørpris
+AddSupplierPrice=Legg til innkjøpspris
+ChangeSupplierPrice=Endre innkjøpspris
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denne leverandørreferansen er allerede tilknyttet en referanse: %s
 NoRecordedSuppliers=Ingen leverandører registrert
 SupplierPayment=Leverandørbetaling
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Liste over leverandørordre
 MenuOrdersSupplierToBill=Leverandørordre til faktura
 NbDaysToDelivery=Leveringsforsinkelse i dager
 DescNbDaysToDelivery=Største leveringsforsinkelse av varer fra denne ordren
-UseDoubleApproval=Bruk dobbel godkjenning når beløpet (eks. MVA) er høyere enn (2. godkjenning kan gjøres av alle brukere med riktig godkjennelse. Settes til 0 hvis  dobbel godkjenning ikke skal brukes)
 SupplierReputation=Leverandør-rykte
 DoNotOrderThisProductToThisSupplier=Ikke bestill
 NotTheGoodQualitySupplier=Feil kvalitet
 ReputationForThisProduct=Rykte
+BuyerName=Kjøpernavn
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index beb3cecc61c..4e3383d84df 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Uketimer
 ColorUser=Farge på bruker
 DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
 UserAccountancyCode=Regnskapskonto for bruker
+UserLogoff=Brukerutlogging
+UserLogged=Bruker innlogget
+DateEmployment=Ansettelsesdato
diff --git a/htdocs/langs/nb_NO/website.lang b/htdocs/langs/nb_NO/website.lang
index 2e3fdb3e1ce..aa3e3a60f61 100644
--- a/htdocs/langs/nb_NO/website.lang
+++ b/htdocs/langs/nb_NO/website.lang
@@ -12,6 +12,7 @@ EditMenu=Rediger meny
 EditPageMeta=Rediger Metadata
 EditPageContent=Rediger innhold
 Website=Webside
+Webpage=Webside
 AddPage=Legg til side
 PreviewOfSiteNotYetAvailable=Forhåndsvisning av websiden din <strong>%s</strong> er ikke tilgjengelig enda. Du må først legge til en side.
 RequestedPageHasNoContentYet=Forespurt side med id %s har ikke innhold ennå, eller cache fil .tpl.php ble fjernet. Rediger innholdet på siden for å løse dette.
@@ -21,5 +22,7 @@ ViewSiteInNewTab=Vis webside i ny fane
 ViewPageInNewTab=Vis side i ny fane
 SetAsHomePage=Sett som startside
 RealURL=Virkelig URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+ViewWebsiteInProduction=Vis webside ved hjelp av  hjemme-URL
+SetHereVirtualHost=Hvis du kan sette opp en dedikert virtuell vert med en rotkatalog på <strong>%s</strong> på webserveren din, kan du definere det virtuelle vertsnavnet her, slik at forhåndsvisningen også kan gjøres ved hjelp av denne direkte webserver-adgangen og ikke bare ved bruk av Dolibarr serveren.
+PreviewSiteServedByWebServer=Forhåndsvis %s i en ny fane. %s will bli håndtert av en ekstern webserver (som Apache, Nginx, IIS). Du må installere og sette opp denne serveren først.<br>URL'en til %s håndtert av ekstern server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Forhåndsvis %s i en ny fane. %s vil håndteres av Dolibarr-serveren slik at det ikke er behov for en ekstern webserver (som Apache, Nginx, IIS).<br>Det upraktiske er at URL til websider bruker banen til Dolibarr.<br> URL'en til %s håndtert av Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index a60ab609084..bade145d095 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Område for faste ordre
-StandingOrders=Faste ordre
-StandingOrder=Faste ordre
-NewStandingOrder=Ny fast ordre
+CustomersStandingOrdersArea=Område for direktedebetsordre
+SuppliersStandingOrdersArea=Område for direktekreditordre
+StandingOrders=Direktedebet betalingsordre
+StandingOrder=Direktedebet betalingsordre
+NewStandingOrder=Ny direktedebetsordre
 StandingOrderToProcess=Til behandling
-WithdrawalsReceipts=Kvitteringer på tilbakekallinger
-WithdrawalReceipt=Kvittering på tilbakekalling
-LastWithdrawalReceipts=Siste %s kvitteringer for tilbaketrekking
-WithdrawalsLines=Tilbakekallingslinjer
-RequestStandingOrderToTreat=Forespørsel om behandling av faste ordre
-RequestStandingOrderTreated=Forespørsel om behandlede faste ordre
+WithdrawalsReceipts=Direktedebetsordre
+WithdrawalReceipt=Direktedebiter ordre
+LastWithdrawalReceipts=Siste %s direktedebetslinjer
+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 fakturaer som er forespurt tilbaketrukket
-NbOfInvoiceToWithdrawWithInfo=Antall fakturaer med tilbaketrekkings-forespørsel for kunder som har definert bankkontoinformasjon
-InvoiceWaitingWithdraw=Faktura som venter på tilbakekalling
+NbOfInvoiceToWithdraw=Ant. fakturaer med direktedebiterte ordre
+NbOfInvoiceToWithdrawWithInfo=Antall kundefakturaer med direktedebetsordre som har definert bankkontoinformasjon
+InvoiceWaitingWithdraw=Faktura som venter på direktedebet
 AmountToWithdraw=Beløp å tilbakekalle
-WithdrawsRefused=Tilbakekalling avvist
+WithdrawsRefused=Direktedebet avvist
 NoInvoiceToWithdraw=Ingen kundefakturaer er i "Tilbakekallings"-modus. Gå til "Tilbakekallinger" på fakturakortet for å lage en forespørsel.
 ResponsibleUser=Ansvarlig bruker
-WithdrawalsSetup=Tilbakekallingsinnstillinger
-WithdrawStatistics=Statistikk ove tilbakekallinger
-WithdrawRejectStatistics=Statisikk over avviste tilbakekallinger
-LastWithdrawalReceipt=Siste %s kvitteringer for tilbaketrekking
+WithdrawalsSetup=Oppsett av direktedebetsbetalinger
+WithdrawStatistics=Statistikk over direktedebetsbetalinger
+WithdrawRejectStatistics=Statistikk over avviste direktedebetsbetalinger
+LastWithdrawalReceipt=Siste %s direktedebetskvitteringer
 MakeWithdrawRequest=Opprett en forespørsel om tilbakekalling
 ThirdPartyBankCode=Tredjepartens bankkonto
 NoInvoiceCouldBeWithdrawed=Ingen faktura tilbakekalt. Sjekk at faktura er på firmaer med gyldig BAN.
@@ -46,7 +47,7 @@ StatusRefused=Nektet
 StatusMotif0=Uspesifisert
 StatusMotif1=Ikke nok midler
 StatusMotif2=Forespørselen er bestridt
-StatusMotif3=Ingen tilbakekallingsbestilling
+StatusMotif3=Ikke en direktedebetsordre
 StatusMotif4=Kundeordre
 StatusMotif5=RIB ubrukelig
 StatusMotif6=Konto uten balanse
@@ -61,28 +62,43 @@ NotifyCredit=Kreditt tilbakekalling
 NumeroNationalEmetter=National Transmitter Number
 WithBankUsingRIB=For bankkontoer som bruker RIB
 WithBankUsingBANBIC=For bankkontoer som bruker IBAN/BIC/SWIFT
-BankToReceiveWithdraw=Bankkonto til å motta tilbakekallinger
+BankToReceiveWithdraw=Bankkonto for mottak av direktedebet
 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.
-DoStandingOrdersBeforePayments=Under denne fanen kan du be om en fast ordre. Når dette er gjort, kan du gå inn i menyen Bank> Uttak for å håndtere faste ordre. Når du faste ordre er lukket, vil betaling på fakturaen automatisk bli registrert, og fakturaen lukkes hvis restbeløpet er null.
+DoStandingOrdersBeforePayments=Under denne fanen kan du be om en direktedebet betalingsordre. Når dette er gjort, kan du gå inn i menyen Bank> Uttak for å styre direktedebet betalingsoppdraget . Når betalingsoppdrag er lukket, vil betaling på fakturaen automatisk bli registrert, og fakturaen lukkes hvis resten å betale er null.
 WithdrawalFile=Tilbaketrekkingsfil
 SetToStatusSent=Sett status til "Fil Sendt"
 ThisWillAlsoAddPaymentOnInvoice=Dette vil også gjelde fakturainnbetalinger og vil klassifisere dem som "Betalt"
 StatisticsByLineStatus=Statistikk etter linjestatus
-RUM=RUM
-RUMWillBeGenerated=RUM-nummer vil bli generert så snart bankkonto-info er lagret
-WithdrawMode=Tilbaketrekkingsmodus (FRST eller RECUR)
+RUM=UMR
+RUMLong=Unik Mandat Referanse
+RUMWillBeGenerated=UMR.nummer vil bli generert når bankkonto-informasjon er lagret
+WithdrawMode=Direktedebetsmodus (FRST eller RECUR)
 WithdrawRequestAmount=Beløp på tilbaketrekkingsforespørsel
 WithdrawRequestErrorNilAmount=Kan ikke lage tilbaketrekkingsforespørsel ved null-beløp
+SepaMandate=SEPA Direktedebet mandat
+SepaMandateShort=SEPA-Mandat
+PleaseReturnMandate=Vennligst returner dette mandatskjemaet via epost til %s eller med post til
+SEPALegalText=Ved å signere dette mandatskjemaet gir du (A) %s tillatelse til å sende instruksjoner til banken for å belaste kontoen din og (B) banken din til å belaste kontoen din i samsvar med instruksene fra %s. Som en del av dine rettigheter, har du rett til refusjon fra banken din i henhold til vilkårene og betingelsene i avtalen med banken din. En refusjon må kreves innen 8 uker fra og med datoen da kontoen ble belastet. Dine rettigheter vedrørende ovennevnte mandat er forklart i en uttalelse som du kan få fra banken din.
+CreditorIdentifier=Kreditor-identifikator
+CreditorName=Kreditornavn
+SEPAFillForm=(B) Vennligst fullfør alle felt merket med *
+SEPAFormYourName=Ditt navn
+SEPAFormYourBAN=Ditt bankontonavn (IBAN)
+SEPAFormYourBIC=Din banks identifikasjonskode (BIC)
+SEPAFrstOrRecur=Betalingstype
+ModeRECUR=Gjentagende betaling
+ModeFRST=Engangsbetaling
+PleaseCheckOne=Vennligs kryss av kun en
 
 ### Notifications
-InfoCreditSubject=Betaling av fast ordre %s av banken
-InfoCreditMessage=Den faste ordre %s er betalt av banken <br> Data om betaling: %s
-InfoTransSubject=Overføring av fast ordre %s til bank
-InfoTransMessage=Den faste ordren %s har blitt sendt til banken ved %s %s. <br><br>
+InfoCreditSubject=Betaling av direktedebets-betalingsordre %s utført av banken
+InfoCreditMessage=Direktedebet betalingsordre %s er blitt betalt av banken<br>Betalingsdata: %s
+InfoTransSubject=Overføring av direktedebet betalingsordre %s til bank
+InfoTransMessage=Direktedebet betalingsordre %s er blitt sendt til banken av %s %s.<br><br>
 InfoTransData=Beløp: %s <br> Metode: %s <br> Dato: %s
-InfoRejectSubject=Fast ordre avvist
-InfoRejectMessage=Hallo, <br><br> den faste ordren med faktura %s relatert til selskapet %s, med beløpet %s har blitt avvist av banken <br><br>--<br>%s
+InfoRejectSubject=Direktedebet betalingsordre avvist
+InfoRejectMessage=Hei,<br><br>direktedebet betalingsordre av faktura %s tilhørende firma %s, med beløpet %s er blitt avvist av banken.<br><br>--<br>%s
 ModeWarning=Opsjon for reell-modus ble ikke satt, så vi stopper etter denne simuleringen
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index 6f29bf5edb2..b059d4f2969 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Oppsett av Arbeidsflyt-modulen 
 WorkflowDesc=Denne modulen er laget for å sette opp automatiske hendelser i programmet. Som standard er arbeidsflyt-modulen åpen (du kan gjøre ting i de rekkefølgen du ønsker). Du kan aktivere de automatiske hendelsene du vil.
 ThereIsNoWorkflowToModify=Det er ingen arbeidsflyt-modifikasjoner tilgjengelig med aktiverte moduler.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Opprett automatisk en kundefaktura når en
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassifiser tilbud som fakturert når kundeordre er satt til betalt
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassifiser kundeordre(r) som fakturert når faktura er satt til betalt
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassifiser kundeordre(r) som fakturert når faktura er satt til validert
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Klassifiser lenket kildetilbud som fakturert når kundefaktura blir validert
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Klassifiser ordre som sendt dersom mengde som er sendt er det samme som i ordren
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 21a79ec613e..604986cae77 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -13,27 +13,13 @@ Selectchartofaccounts=Selecteer een kaart van accounts
 Addanaccount=Voeg een boekhouder account toe
 AccountAccounting=Boekhouder account
 AccountAccountingSuggest=Boekhouder account voorstel
-Ventilation=Uitsplitsing
-CustomersVentilation=Uitsplitsen klanten
-SuppliersVentilation=Uitsplitsen leveranciers
 Reports=Rapporten
-CreateMvts=Aanmaken verplaatsing
-UpdateMvts=Wijziging van een verplaatsing
-WriteBookKeeping=Noteren van accounts in het grootboek
 Bookkeeping=Grootboek
 CAHTF=Totaal leveranciersaankoop voor BTW
-InvoiceLines=Te controleren factuurlijnen
-InvoiceLinesDone=Gecontroleerde lijnen van de factuur
-IntoAccount=Gecontroleerd in de boekhouding account
-Ventilate=Controleren
 Processing=Verwerken
 EndProcessing=Einde van het verwerkingsprocess
-AnyLineVentilate=Nog lijnen te controleren
 SelectedLines=Geselecteerde lijnen
 Lineofinvoice=Factuur lijn
-VentilatedinAccount=Succesvol gecontroleerd in de boekhouding account
-NotVentilatedinAccount=Niet gecontroleerd in de boekhouding account
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nummer van uit te splitsen elementen om te tonen per pagina (maximum aanbevolen : 50)
 TotalVente=Totaal omzet voor belastingen
 Modelcsv=Model van een export
 OptionsDeactivatedForThisExportModel=Voor dit export model zijn de opties gedeactiveerd.
diff --git a/htdocs/langs/nl_BE/bills.lang b/htdocs/langs/nl_BE/bills.lang
index b0bd48bd31b..b93f2b15a82 100644
--- a/htdocs/langs/nl_BE/bills.lang
+++ b/htdocs/langs/nl_BE/bills.lang
@@ -1,13 +1,16 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomers=Klantenfacturen
+DisabledBecauseNotErasable=Niet mogelijk omdat het niet kan worden gewist
 IdPaymentMode=Betalingsmanier (id)
 LabelPaymentMode=Betalingsmanier (label)
 PaymentModeShort=Betalingsmanier
 CreateCreditNote=Aanmaak krediet nota
+StatusOfGeneratedInvoices=Lijst van genereerde facturen
 BillStatusDraft=Conceptfactuur (moet worden gevalideerd)
 BillShortStatusClosedUnpaid=Afgesloten
 CustomersDraftInvoices=Klantenconceptfacturen
 ShowInvoiceSituation=Toon situatie factuur
+EscompteOfferedShort=Korting
 RemainderToBill=Nog te factureren
 DateMaxPayment=Te betalen vóór
 RecurringInvoices=Terugkerende facturen
@@ -18,12 +21,31 @@ AmountPaymentDistributedOnInvoice=Te betalen bedrag verdeeld over de factuur
 PaymentNote=Betalingsnota
 ListOfPreviousSituationInvoices=Lijst van de vorige facturen
 ListOfNextSituationInvoices=Lijst van de volgende facturen
+FrequencyPer_d=Iedere %s dagen
+FrequencyPer_m=Iedere %s maanden
+FrequencyPer_y=Iedere %s jaren
+NextDateToExecution=Datum van volgende factuur generatie
+DateLastGeneration=Datum van laatste generatie
+MaxPeriodNumber=Max nr factuur generatie
+NbOfGenerationDone=Nr van reeds gedane factuur generatie's
+InvoiceAutoValidate=Valideer facturen automatisch
+DateIsNotEnough=Datum nog niet bereikt
+PaymentConditionShort30DENDMONTH=30 dagen einde maand
+PaymentCondition30DENDMONTH=Binnen 30 dagen volgend op einde maand
+PaymentConditionShort60DENDMONTH=60 dagen einde maand
+PaymentCondition60DENDMONTH=Binnen 60 dagen volgend op einde maand
+PaymentTypeVIR=Bank overboeking
+PaymentTypeShortVIR=Bank overboeking
+PaymentTypeTRA=Bank cheque
+PaymentTypeShortTRA=Ontwerp
+Residence=incasso
 ChequeMaker=Cheque / Transfer uitvoerder
 DepositId=Id storting
 ShowUnpaidAll=Bekijk alle onbetaalde facturen
 CantRemoveConciliatedPayment=Kan een gedane betaling niet verwijderen
 MarsNumRefModelDesc1=Geeft een getal terug in de vorm van %syymm-nnnn voor standaard facturen, %syymm-nnnn voor vervangingsfacturen, %syymm-nnnn voor betalingsfacturen en %syymm-nnnn voor kredietnota's waar yy is jaar, mm is maand en nnnn is een volgnummer zonder onderbreking en die niet terug op 0 komt.
 TypeContact_facture_external_BILLING=Klant contact
+NotLastInCycle=Deze factuur is niet de laatste in de rij en mag niet worden aangepast.
 PDFCrevetteSituationNumber=Situatie N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Situatie factuur - AANTAL
 PDFCrevetteSituationInvoiceTitle=Situatie factuur
diff --git a/htdocs/langs/nl_BE/bookmarks.lang b/htdocs/langs/nl_BE/bookmarks.lang
new file mode 100644
index 00000000000..edc9aedcf2e
--- /dev/null
+++ b/htdocs/langs/nl_BE/bookmarks.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Kies indien gekoppelde pagina moet worden geopend in een nieuw venster of niet
diff --git a/htdocs/langs/nl_BE/boxes.lang b/htdocs/langs/nl_BE/boxes.lang
deleted file mode 100644
index 320099acc6a..00000000000
--- a/htdocs/langs/nl_BE/boxes.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - boxes
-BoxTitleLastModifiedExpenses=Laatst %s aangepaste uitgaven rapporten
diff --git a/htdocs/langs/nl_BE/dict.lang b/htdocs/langs/nl_BE/dict.lang
new file mode 100644
index 00000000000..d636070a1a7
--- /dev/null
+++ b/htdocs/langs/nl_BE/dict.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryLT=Lithouwen
diff --git a/htdocs/langs/nl_BE/mails.lang b/htdocs/langs/nl_BE/mails.lang
index 114a40ca95f..20dd4bfc777 100644
--- a/htdocs/langs/nl_BE/mails.lang
+++ b/htdocs/langs/nl_BE/mails.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - mails
 MailCard=EMailings kaart
-OnlyPDFattachmentSupported=Indien het PDF document reeds was gegeneerd voor de factuur, dan zal het bijgevoegd worden aan de email. Indien niet, dan wordt er geen email verstuurd (Noteer ook, dat alleen PDF facturen zijn ondersteund als bijlage in massa versturen van emails in deze versie).
 AllRecipientSelected=Alle derde partijen geselecteerd en indien een email was actief.
 ResultOfMailSending=Resultaat van massa EMail versturen
 NbSelected=Nr geselecteerd
diff --git a/htdocs/langs/nl_BE/margins.lang b/htdocs/langs/nl_BE/margins.lang
index 9bccba586af..f4e94f8fb97 100644
--- a/htdocs/langs/nl_BE/margins.lang
+++ b/htdocs/langs/nl_BE/margins.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - margins
 ForceBuyingPriceIfNull=Gebruik de koop/kost prijs als verkoopsprijs indien niet gedefinieerd
 ForceBuyingPriceIfNullDetails=Indien koop/kost prijs niet gedefinieerd is, en deze optie is "ON", dan zal de marge nul zijn op deze lijn (koop/kost prijs = verkoopsprijs), anderzijds ("OFF"), marge zal gelijk zijn aan het gesuggereerde voorstel.
+MargeType3=Marge op kostprijs
 MarginTypeDesc=* Marge op de beste koop prijs = Verkoopsprijs - Beste gedefinieerde leveranciersprijs op productkaart<br>* Marge op de gewogen gemiddelde prijs (WAP) = Verkoopsprijs - Gewogen gemiddelde prijs van het product (WAP) of de beste leveranciersprijs indien WAP nog niet gedefinieerd werd<br>* Marge op kost prijs = Verkoopsprijs - kost prijs gedefinieerd op product kaart of WAP indien kost prijs niet gedefinieerd was, of beste leveranciersprijs indien WAP nog niet gedefinieerd is
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 8360a96bd85..d8b23985024 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Verkoopdagboek
 JournalFinancial=Financiëel dagboek
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index 3e628eef6e1..7e1264b519c 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimenteel
 VersionDevelopment=Ontwikkeling
 VersionUnknown=Onbekend
 VersionRecommanded=Aanbevolen
-FileCheck=Bestand Integriteit
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Ontbrekende bestanden
 FilesUpdated=Bijgewerkte bestanden
-FileCheckDolibarr=Controleer Dolibarr Bestanden Integriteit
-XmlNotFound=XML-bestand van Dolibarr Integriteit niet gevonden
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sessie-ID
 SessionSaveHandler=Wijze van sessieopslag
 SessionSavePath=Sessie opslaglocatie
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Fout, een nauwkeurigheid van meer dan <b>%s</
 DictionarySetup=Woordenboek setup
 Dictionary=Woordenboeken
 Chartofaccounts=Rekeningschema
-Fiscalyear=Boekjaren
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=De waarde 'system' en 'systemauto' als type zijn voorbehouden voor het systeem.  Je kan 'user' als waarde gebruiken om je eigen gegevens-record toe te voegen.
 ErrorCodeCantContainZero=Code mag geen 0 bevatten
 DisableJavascript=JavaScript en Ajax functies uitzetten (Aanbevolen voor blinden of tekst browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Aantal karakters om een zoekopdracht te initiëren: %s
 NotAvailableWhenAjaxDisabled=Niet beschikbaar wanneer AJAX functionaliteit uitgeschakeld is
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript uitgeschakeld
 UsePreviewTabs=Gebruik voorbeelweergavetabbladen
 ShowPreview=Toon voorbeelweergave
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Codeer binaire data in hexadecimalen
 IgnoreDuplicateRecords=Negeer fouten van dubbele tabelregels (INSERT negeren)
 AutoDetectLang=Automatisch detecteren (taal van de browser)
 FeatureDisabledInDemo=Functionaliteit uitgeschakeld in de demonstratie
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Rechten
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Alleen elementen van ingeschakelde <a href="%s">modules</a> worden getoond.
-ModulesDesc=Dolibarr modules bepalen welke functionaliteit is ingeschakeld in de software. Voor enkele modules is het noodzakelijk, zodra de module is ingeschakeld, rechten te verlenen aan de gebruikers. Klik op de knop uit / aan in de kolom "Status" om een module / functionaliteit in of uit te schakelen.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Meer modules
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=Voor deze stap, kan je het pakket versturen gebruikmakend van d
 CurrentVersion=Huidige versie van Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Updateserver offline
 GenericMaskCodes=U kunt elk gewenst maskernummer invoeren. In dit masker, kunnen de volgende tags worden gebruikt:<br><b>{000000}</b> correspondeert met een nummer welke vermeerderd zal worden op elke %s. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen vanaf links zodat er zoveel nullen zijn als in het masker.<br><b>{000000+000}</b> hetzelfde als voorgaand maar een offset corresponderend met het nummer aan de rechterkant van het + teken is toegevoegd startend op de eerste %s. <br><b>{000000@x}</b> hetzelfde als voorgaande maar de teller wordt gereset naar nul, wanneer maand x is bereikt (x tussen 1 en 12). Als deze optie is gebruikt en x is 2 of hoger, dan is de volgorde {yy}{mm} of {yyyy}{mm} ook vereist. <br><b>{dd}</b> dag (01 t/m 31).<br><b>{mm}</b> maand (01 t/m 12).<br><b>{yy}</b>, <b>{yyyy}</b> of <b>{y}</b> jaat over 2, 4 of 1 nummer(s). <br>
-GenericMaskCodes2=<b>{Cccc}</b> de klant code op n tekens <br> <b>{} Cccc000</b> de klant code op n tekens gevolgd door een teller speciaal voor de klant. Deze teller speciaal voor de klant wordt teruggezet op hetzelfde moment dan globale teller. <br> <b>{Tttt}</b> De code van relatie soort van n tekens (zie relatie contanten). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Alle andere karakters in het masker zullen intact blijven.<br>Spaties zijn niet toegestaan.<br>
 GenericMaskCodes4a=<u>Voorbeeld van de 99e %s van de Klant 'HetBedrijf' gedaan op 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Voorbeeld van een Klant gecreëerd op 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters om URL beveiligen
 SecurityTokenIsUnique=Gebruik een unieke securekey parameter voor elke URL
 EnterRefToBuildUrl=Geef referentie voor object %s
 GetSecuredUrl=Get berekend URL
-ButtonHideUnauthorized=Verberg de knoppen voor niet-toegestane akties in plaats van ze inaktief te maken
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Oud BTW tarief
 NewVATRates=Nieuw BTW tarief
 PriceBaseTypeToChange=Wijzig op prijzen waarop een base reference waarde gedefiniëerd is
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Keuze lijst
 ExtrafieldSelectList = Kies uit tabel
 ExtrafieldSeparator=Scheidingsteken
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Aanvink-vak
 ExtrafieldRadio=Radioknop
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Gebruikers & groepen
@@ -428,8 +439,8 @@ Module55Name=Streepjescodes
 Module55Desc=Streepjescodesbeheer
 Module56Name=Telefonie
 Module56Desc=Telefoniebeheer
-Module57Name=Tekenen
-Module57Desc=Beheer van permanente orders en opnames. Bevat ook de generatie van een SEPA bestand voor Europese landen.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integratie van een 'ClickToDial' systeem (Asterisk, etc)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webkalender
 Module410Desc=Integratie van een webkalender
 Module500Name=Speciale uitgaven
 Module500Desc=Beheer van bijzondere uitgaven (BTW, sociale of fiscale lasten, dividenden)
-Module510Name=Salarissen
-Module510Desc=Beheer van de werknemers salarissen en betalingen
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Lening
 Module520Desc=Het beheer van de leningen
 Module600Name=Kennisgevingen
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Giften
 Module700Desc=Donatiebeheer
 Module770Name=Onkostennota's 
@@ -606,10 +617,10 @@ Permission142=Aanmaak/wijzig alle projecten en taken (ook private projecten waar
 Permission144=Verwijder alle projecten en taken (ook de private projecten waarvoor ik geen contactpersoon ben)
 Permission146=Bekijk leveranciers
 Permission147=Bekijk statistieken
-Permission151=Bekijk doorlopende opdrachten
-Permission152=Creëer / bewerk een doorlopende opdracht verzoek
-Permission153=Bekijk doorlopende opdracht ontvangsten
-Permission154=Crediteren / afwijzen van uitstaande orderbonnen
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Lees contracten/abonnementen
 Permission162=Creëren/aanpassen contracten/abonnementen
 Permission163=Een dienst/abonnement van een contract activeren
@@ -747,6 +758,7 @@ Permission1236=Exporteer leveranciersfacturen, attributen en betalingen
 Permission1237=Exporteer Leverancier opdrachten en hun details
 Permission1251=Voer massale invoer van externe gegevens in de database uit (data load)
 Permission1321=Exporteer afnemersfacturen, attributen en betalingen
+Permission1322=Reopen a paid bill
 Permission1421=Exporteer afnemersfacturen en attributen
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Maak / wijzig polls
 Permission59001=Lees commerciële marges
 Permission59002=Definieer commerciële marges
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potentiële niveau
@@ -853,6 +869,7 @@ LabelUsedByDefault=Standaard te gebruiken label indien er geen vertaling kan wor
 LabelOnDocuments=Etiket op documenten
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
+CurrentNext=Current/Next
 Offset=Offset (afstand)
 AlwaysActive=Altijd actief
 Upgrade=Bijwerken
@@ -950,7 +967,7 @@ LogEventDesc=Hier kunt u de de gewenste veiligheidslogs in- of uitschakelen. Beh
 AreaForAdminOnly=Deze functies kunnen alleen worden gebruikt door <b>beheerders</b>
 SystemInfoDesc=Systeeminformatie is technische informatie welke u in alleen-lezen modus krijgt en alleen door beheerders is in te zien.
 SystemAreaForAdminOnly=Dit scherm is alleen beschikbaar voor de beheerders. Andere Dolibarr gebruikers kunnen hier niets wijzigen.
-CompanyFundationDesc=Beheerpagina bedrijf, vennootschap of stichting die u moet beheren
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=U kunt hier instellingen doen die het uiterlijk van Dolibarr instellen
 AvailableModules=Beschikbare modules
 ToActivateModule=Om modules te activeren, ga naar Home->Instellingen->Modules.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Waarschuwing, op sommige Linux-systemen, e-mail verzen
 PathToDocuments=Pad naar documenten
 PathDirectory=Map
 SendmailOptionMayHurtBuggedMTA=Feature om e-mails met behulp van methode "PHP mail direct" te sturen zal een e-mailbericht dat niet goed zou kunnen worden ontleed door sommige het ontvangen van e-mailservers. Resultaat is dat sommige mails niet kunnen worden gelezen door mensen gehost door thoose afgeluisterd platforms. Het is het geval voor sommige Internet providers (Ex: Orange in Frankrijk). Dit is geen probleem in Dolibarr noch in PHP, maar op het ontvangen van e-mailserver. U kunt de optie MAIN_FIX_FOR_BUGGED_MTA echter toe te voegen aan 1 in setup - andere om Dolibarr wijzigen om dit te voorkomen. Echter, kunnen er problemen met andere servers dat opzicht strikt de SMTP-standaard. De andere oplossing (aanbevolen) is het gebruik van de methode "SMTP-socket bibliotheek" dat er geen nadelen heeft.
-TranslationSetup=Instelling van de taal
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Je moet minstens 1 module aktiveren
 ClassNotFoundIntoPathWarning=Classe %s niet gevonden in PHP pad
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Gebruik TLS
 LDAPServerUseTLSExample=Uw LDAP-server gebruik TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (voorbeeld: cn=adminldap,dc=society,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Beheerderswachtwoord
 LDAPUserDn=Gebruikers DN
 LDAPUserDnExample=Complete DN (voorbeeld: ou=users,dc=society,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Voorbeeld: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Voorbeeld: objectsid
 LDAPFieldEndLastSubscription=Datum van abonnementseinde
-LDAPFieldTitle=Functie
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Voorbeeld: title
 LDAPSetupNotComplete=LDAP instellingen niet compleet (ga naar de andere tabbladen)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Geen beheerder of wachtwoord opgegeven. LDAP toegang zal anoniem zijn en in alleen-lezen modus.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Producten en Diensten modules setup
 NumberOfProductShowInSelect=Maximaal aantal producten in 'combo-lijsten' (0 = onbeperkt)
 ViewProductDescInFormAbility=Visualisatie van de productomschrijvingen in de formulieren (anders getoond als popup-tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualisatie van producten die beschrijvingen in de thirdparty taal
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Gebruik een zoekformulier om een ​​product te kiezen (in plaats van een drop-down lijst).
 SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen.
 ##### Prelevements #####
-WithdrawalsSetup=Terugnamemoduleinstellingen
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Externe RSS importeerinstellingen
 NewRSS=Nieuwe RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open het boekjaar
 CloseFiscalYear=Sluit boekjaar
 DeleteFiscalYear=Verwijder het boekjaar
 ConfirmDeleteFiscalYear=Weet u zeker dat u dit boekjaar wilt verwijderen?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Kan altijd worden bewerkt
 MAIN_APPLICATION_TITLE=Forceer zichtbare naam van de toepassing (waarschuwing: het instellen van uw eigen naam hier kan het automatisch aanvullen van de inlog functie breken wanneer gebruik wordt van de mobiele applicatie DoliDroid)
 NbMajMin=Minimum aantal hoofdletters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Lijst met vaste meldingen
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Ga naar het tabblad 'Meldingen' van een relatie contact om meldingen voor contacten/adressen toe te voegen of te verwijderen
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Drempel
 BackupDumpWizard=Wizard om database backup dump bestand op te bouwen
 SomethingMakeInstallFromWebNotPossible=Installatie van externe module is niet mogelijk via de webinterface om de volgende reden:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index d1ed60e8599..a4e3cfbf025 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -27,13 +27,9 @@ AllTime=Vanaf het begin
 Reconciliation=Overeenstemming
 RIB=Bankrekeningnummer
 IBAN=IBAN-nummer
-IbanValid=IBAN is geldig
-IbanNotValid=IBAN is niet geldig
 BIC=BIC- / SWIFT-nummer
-SwiftValid=BIC / SWIFT is geldig
-SwiftNotValid=BIC / SWIFT is niet geldig
-StandingOrders=Periodieke overboekingen
-StandingOrder=Periodieke overboeking
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Rekeningafschrift
 AccountStatementShort=Afschrift
 AccountStatements=Rekeningafschriften
@@ -78,6 +74,7 @@ AccountToCredit=Te crediteren rekening
 AccountToDebit=Te debiteren rekening
 DisableConciliation=Afstemming van deze rekening uitschakelen
 ConciliationDisabled=Afstemming voor deze rekening is uitgeschakeld
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Opgeheven
 AccountIdShort=Aantal
@@ -87,6 +84,8 @@ AddBankRecordLong=Handmatig een transactie toevoegen
 ConciliatedBy=Afgestemd door
 DateConciliating=Afgestemd op
 BankLineConciliated=Transactie afgestemd
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Afnemersbetaling
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Intrekking betaling
 SocialContributionPayment=Sociale/fiscale belastingbetaling
 BankTransfer=Bankoverboeking
 BankTransfers=Bankoverboeking
-TransferDesc=Overboeking van de ene rekening naar een andere, Dolibarr zal twee boekingen doen (een debitering in de bronrekening en een creditering in de doelrekening, met hetzelfde bedrag. Dezelfde omschrijving en datum zullen worden gebruikt voor deze overboeking)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Van
 TransferTo=Aan
 TransferFromToDone=Een overboeking van <b>%s</b> naar <b>%s</b> van <b>%s</b> is geregistreerd.
@@ -129,7 +129,7 @@ FutureTransaction=Overboeking in de toekomst. Geen manier mogelijk om af te stem
 SelectChequeTransactionAndGenerate=Select / filter controleert op te nemen in het controleren stortingsbewijs en op &quot;Create&quot; klikken.
 InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde: YYYYMM of YYYYMMDD
 EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
-ToConciliate=Te bemiddelen?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
 DefaultRIB=Standaard BAN
 AllRIB=Alle BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Weet u zeker dat u deze cheque wilt afkeuren?
 RejectCheckDate=Teruggave datum cheque
 CheckRejected=Teruggekeerde cheque
 CheckRejectedAndInvoicesReopened=Cheque teruggekeerd en facturen heropend
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 737118e9662..c05396a38a1 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan een factuur niet annul
 BillFrom=Van
 BillTo=Geadresseerd aan
 ActionsOnBill=Acties op factuur
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Korting aangeboden (betaling vóór termijn)
 EscompteOfferedShort=Discount
 SendBillRef=Stuur factuur %s
 SendReminderBillRef=Stuur factuur %s (herinnering)
-StandingOrders=Doorlopende opdrachten
-StandingOrder=Doorlopende opdracht
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Geen conceptfacturen
 NoOtherDraftBills=Geen andere conceptfacturen
 NoDraftInvoices=Geen facturen in aanmaak
@@ -351,8 +351,8 @@ VarAmount=Variabel bedrag  (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Automatische incasso
-PaymentTypeShortPRE=Automatische incasso
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Contant
 PaymentTypeShortLIQ=Contant
 PaymentTypeCB=CreditCard
@@ -381,6 +381,7 @@ ExtraInfos=Extra info
 RegulatedOn=Geregeld op
 ChequeNumber=Chequenummer
 ChequeOrTransferNumber=Cheque / Transfernummer
+ChequeBordereau=Check schedule
 ChequeMaker=Cheque / Transfer transmitter
 ChequeBank=Bank van cheque
 CheckBank=Controleer
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Betaald door deze betaling
 ClosePaidInvoicesAutomatically=Classeer standaard, situatie of vervang facturen naar status "Betaald".
 ClosePaidCreditNotesAutomatically=Classeer terugbetaalde creditnotas automatisch naar status &quot;Betaald&quot;.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Alle betaalde facturen zullen automatisch worden gesloten naar status &quot;Betaald&quot;.
 ToMakePayment=Betaal
 ToMakePaymentBack=Terugbetalen
 ListOfYourUnpaidInvoices=Lijst van onbetaalde facturen
 NoteListOfYourUnpaidInvoices=Nota: deze lijst bevat enkel facturen voor derde partijen waarvoor je als verkoopsvertegenwoordiger aangegeven bent.
 RevenueStamp=Taxzegel
-YouMustCreateInvoiceFromThird=Deze optie is alleen beschikbaar bij het maken van de factuur vanuit het tabblad "klant" van relaties.
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Model van complete factuur (Beheert de mogelijkheid van de BTW-heffingsbelasting, de keuze van de regels display, logo, etc)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/nl_NL/boxes.lang b/htdocs/langs/nl_NL/boxes.lang
index e84cb4c07da..c398a6cba50 100644
--- a/htdocs/langs/nl_NL/boxes.lang
+++ b/htdocs/langs/nl_NL/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oudste actief verlopen diensten
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Globale activiteit (facturen, offertes, bestellingen)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Offertes per maand
 NoTooLowStockProducts=Geen product onder laagste voorraadgrens
 BoxProductDistribution=Verdeling van producten/diensten
 BoxProductDistributionFor=Verdelinge van %s voor %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Afnemersfacturen
 ForCustomersOrders=Klantenbestellingen
 ForProposals=Zakelijke voorstellen / Offertes
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index eb3acbe29b8..9b0746b0a8c 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=op
 CashDeskThirdParty=Third party
 ShoppingCart=Winkelwagen
 NewSell=Nieuwe verkopen
-BackOffice=Back office
 AddThisArticle=Voeg dit artikel
 RestartSelling=Ga terug op de verkopen
-SellFinished=Verkoop klaar
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=Geen artikel gevonden
 ProductFound=product gevonden
diff --git a/htdocs/langs/nl_NL/categories.lang b/htdocs/langs/nl_NL/categories.lang
index 5b2349c4542..d79f996bda7 100644
--- a/htdocs/langs/nl_NL/categories.lang
+++ b/htdocs/langs/nl_NL/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Klanten tags / categorieën omgeving
 MembersCategoriesArea=Leden tags / categorieën omgeving
 ContactsCategoriesArea=Contacten tags / categorieën omgeving
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategorieën
 CatList=Lijst van tags / categorieën
 NewCategory=Nieuw tag / categorie
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=Dit product / dienst staat niet in tags / categorieën
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Dit lid staat in geen tags / categorieën
 ContactHasNoCategory=Dit contact staat in geen tags / categorieën
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Zonder tag / categorie
 CategoryExistsAtSameLevel=Deze categorie bestaat al op hetzelfde niveau
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Producten tags / categorieën
 MembersCategoriesShort=Leden tags / categorieën
 ContactCategoriesShort=Contacten tags / categorieën
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Deze categorie bevat geen producten.
 ThisCategoryHasNoSupplier=Deze categorie bevat geen enkele leverancier.
 ThisCategoryHasNoCustomer=Deze categorie bevat geen enkele afnemer.
 ThisCategoryHasNoMember=Deze categorie bevat geen enkel lid.
 ThisCategoryHasNoContact=Deze categorie bevat geen enkel contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag / categorie id
 CatSupList=Lijst van leverancier tags / categorieën
 CatCusList=Lijst van de klant/prospect tags/categorieën
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Koppelingen tussen leveranciers en tags / categorieën
 CatCusLinks=Koppelingen tussen klanten / prospects en tags / categorieën
 CatProdLinks=Koppelingen tussen producten / diensten en tags / categorieën
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Verwijderen uit tags / categorie
 ExtraFieldsCategories=Complementaire kenmerken
 CategoriesSetup=Tags / categorieën instelling
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 556b038beec..266a9942160 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nieuwe particulier
 NewCompany=Nieuwe bedrijf (prospect, afnemer, leverancier)
 NewThirdParty=Nieuwe Klant (prospect, afnemer, leverancier)
 CreateDolibarrThirdPartySupplier=Creëer een relatie (leverancier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospectenoverzicht
 IdThirdParty=ID Klant
 IdCompany=ID bedrijf
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Leveranciers
 ThirdPartyType=Type Klant
 Company/Fundation=Bedrijf / stichting
 Individual=Particulier
-ToCreateContactWithSameName=Maakt automatisch een contactpersoon met dezelfde informatie
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Moedermaatschappij
 Subsidiaries=Dochterondernemingen
 ReportByCustomers=Rapportage naar afnemers
@@ -47,7 +49,7 @@ CivilityCode=Aanspreekvorm
 RegisteredOffice=Statutaire zetel
 Lastname=Achternaam
 Firstname=Voornaam
-PostOrFunction=Functie
+PostOrFunction=Job position
 UserTitle=Titel
 Address=Adres
 State=Provincie
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Telefoonnummer zakelijk
 PhonePerso=Telefoonnummer privé
 PhoneMobile=Telefoonnummer mobiel
-No_Email=Geen globale e-mailings sturen
+No_Email=Refuse mass e-mailings
 Fax=Faxnummer
 Zip=Postcode
 Town=Plaats
@@ -73,7 +75,7 @@ Poste= Functie
 DefaultLang=Standaard taal
 VATIsUsed=BTW wordt gebruikt
 VATIsNotUsed=BTW wordt niet gebruikt
-CopyAddressFromSoc=Vul derde partij adres in
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Gebruik tweede belasting
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=BTW-nummer
 VATIntraShort=BTW-nummer
 VATIntraSyntaxIsValid=Syntax is geldig
-VATIntraValueIsValid=Prijs is geldig
 ProspectCustomer=Prospect / afnemer
 Prospect=Prospect
 CustomerCard=Afnemerskaart
@@ -261,7 +262,9 @@ AddContactAddress=Nieuw contact/adres
 EditContact=Bewerk contact / adres
 EditContactAddress=Wijzig contact/adres
 Contact=Contactpersoon
+ContactId=Contact id
 ContactsAddresses=Contacpersonen / adressen
+FromContactName=Name:
 NoContactDefinedForThirdParty=Geen contact opgegeven voor deze derde partij
 NoContactDefined=Geen contactpersoon ingesteld voor deze Klant
 DefaultContact=Standaard contactpersoon
@@ -284,7 +287,7 @@ CompanyDeleted=Bedrijf '%s' verwijderd uit de database.
 ListOfContacts=Contactpersonen- / adressenlijst
 ListOfContactsAddresses=Lijst van contacten/adressen
 ListOfThirdParties=Lijst van derde partijen
-ShowCompany=Toon third party
+ShowCompany=Show third party
 ShowContact=Toon contactpersoon
 ContactsAllShort=Alle (Geen filter)
 ContactType=Type contactpersoon
@@ -294,6 +297,7 @@ ContactForProposals=Offertecontactpersoon
 ContactForContracts=Contractencontactpersoon
 ContactForInvoices=Facturencontactpersoon
 NoContactForAnyOrder=Deze contactpersoon is geen contactpersoon voor enige opdracht
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Deze contactpersoon is geen contactpersoon voor enige offerte
 NoContactForAnyContract=Deze contactpersoon is geen contactpersoon voor enig contract
 NoContactForAnyInvoice=Deze contactpersoon is geen contactpersoon voor enige factuur
@@ -352,9 +356,9 @@ ExportCardToFormat=Export details naar formaat
 ContactNotLinkedToCompany=Contact niet gekoppeld aan enige Klant
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Geen Dolibarr toegang
-ExportDataset_company_1=Derde partijen (Bedrijf/stichting/fysieke personen) en eigenschappen
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contactpersonen en eigenschappen
-ImportDataset_company_1=Derde partijen (Bedrijven/stichtingen/fysieke mensen) en eigenschappen
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacten/adressen (al dan niet derde partijen) en eigenschappen
 ImportDataset_company_3=Bankgegevens
 ImportDataset_company_4=Third parties/Verkoopvertegenwoordiger (Beïnvloed verkoopvertegenwoordiging gebruikers naar bedrijven)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Third parties zijn samengevoegd
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index c0fbbcc0dd4..7cae1afe9dc 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Speciale uitgaven
 MenuTaxAndDividends=Belastingen en dividenden
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index f8f074b9ef2..1b9c86dd7fd 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Beheer taakplanning
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Commando regel om cron jobs uit te voeren
@@ -23,7 +23,7 @@ CronCommand=Commando
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Taak
@@ -39,7 +39,7 @@ CronMethod=Methode
 CronModule=Module
 CronNoJobs=Geen taken opgenomen
 CronPriority=Prioriteit
-CronLabel=Beschrijving
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Elke
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index ca78d77289a..75b063a0bf0 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Bron en doel magazijnen moeten verschillend zijn
 ErrorBadFormat=Verkeerd formaat!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Fout, er sommige leveringen gekoppeld met deze verzending. Schrapping geweigerd.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 93d6a0b1358..d8c095e8b59 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Deze PHP installatie ondersteund sessies.
 PHPSupportPOSTGETOk=Deze PHP installatie ondersteund POST en GET.
 PHPSupportPOSTGETKo=Mogelijk ondersteund uw PHP installatie geen POST en / of GET variabelen. Controleer deze instelling <b>variables_order</b> in php.ini.
 PHPSupportGD=Deze PHP installatie ondersteund GD grafische functies.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Deze PHP installatie ondersteund UTF8 functies.
 PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op <b>%s</b>. Dit zou genoeg moeten zijn.
 PHPMemoryTooLow=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op <b>%s</b> bytes. Dit zou te weinig kunnen zijn. Verander uw <b>php.ini</b> om de <b>memory_limit</b> instelling op minimaal <b>%s</b> bytes te zetten.
 Recheck=Klik hier voor een significantere test
 ErrorPHPDoesNotSupportSessions=Uw PHP installatie ondersteund geen sessies. Dit is vereist voor een goede werking van Dolibarr. Controleer uw PHP instellingen.
 ErrorPHPDoesNotSupportGD=Uw PHP installatie ondersteund geen grafische functies. Grafieken zullen niet beschikbaar zijn.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Uw PHP installatie ondersteund geen UTF8 functies. Dolibarr kan daardoor niet goed werken. Los dit op voordat u verder gaat met de installatie van Dolibarr.
 ErrorDirDoesNotExists=De map %s bestaat niet.
 ErrorGoBackAndCorrectParameters=Ga terug en corrigeer de foutief ingestelde waarden.
@@ -133,6 +135,10 @@ ActivateModule=Activeer module %s
 ShowEditTechnicalParameters=Klik hier om geavanceerde parameters te zien of te wijzigen. (expert instellingen)
 WarningUpgrade=Opgelet:\nHeb je eerst een database backup uitgevoerd?\nDit wordt ten zeerste aanbevolen: bijvoorbeeld in het geval er fouten in de database systemen zitten (voorbeeld mysql version 5.5.40/41/42/43), sommige data of tabellen kunnen verloren gaan tijdens dit proces,  daarom is het aanbevolen om een volledige dump van jou database te hebben voor je start met de migratie.\n\nDruk op OK om de migratie te starten....
 ErrorDatabaseVersionForbiddenForMigration=Uw database versie is %s en heeft een kritieke bug die gegevensverlies veroorzaakt als u structuur veranderingen uitvoert op uw database, welke gedaan worden door het migratieproces. Vanwege deze reden, zal de migratie niet worden toegestaan ​​totdat u uw database upgrade naar een hogere versie (lijst van gekende versies met bug: %s).
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Bijwerken van gegevens over acties
 MigrationPaymentMode=Data migratie voor de betaling mode
 MigrationCategorieAssociation=Migratie van categoriën
 MigrationEvents=Migratie van taken om taak eigenaar toe te voegen in toekennings tabel
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Herlaad module %s
 ShowNotAvailableOptions=Toon niet beschikbare opties
 HideNotAvailableOptions=Verberg niet beschikbare opties
diff --git a/htdocs/langs/nl_NL/interventions.lang b/htdocs/langs/nl_NL/interventions.lang
index fc3886279b4..a7bf7c67b8d 100644
--- a/htdocs/langs/nl_NL/interventions.lang
+++ b/htdocs/langs/nl_NL/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Nabehandeling afnemerscontact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Interventies gegenereerd op basis van bestellingen
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/nl_NL/ldap.lang b/htdocs/langs/nl_NL/ldap.lang
index f1a414c7653..7e584c3fceb 100644
--- a/htdocs/langs/nl_NL/ldap.lang
+++ b/htdocs/langs/nl_NL/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Eerste inschrijvingsdatum
 LDAPFieldFirstSubscriptionAmount=Eerste inschrijvingsbedrag
 LDAPFieldLastSubscriptionDate=Laatste inschrijvingsdatum
 LDAPFieldLastSubscriptionAmount=Laatste inschrijvingsbedrag
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Gebruiker gesynchroniseerd
 GroupSynchronized=Groep gesynchroniseerd
 MemberSynchronized=Lidmaatschap gesynchroniseerd
diff --git a/htdocs/langs/nl_NL/mails.lang b/htdocs/langs/nl_NL/mails.lang
index 4cb22219437..0d8421d10d1 100644
--- a/htdocs/langs/nl_NL/mails.lang
+++ b/htdocs/langs/nl_NL/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Lezen
 YourMailUnsubcribeOK=De e-mail<b>%s</b> is correct uitgeschreven uit de mailinglijst
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-mail verzonden naar %s ontvangers.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> ontvangers toegevoegd in bestemming-lijst
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index db24ad1cd49..389a17ef527 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -67,6 +67,7 @@ SelectDate=Selecteer een datum
 SeeAlso=Zie ook %s
 SeeHere=Zie hier
 BackgroundColorByDefault=Standaard achtergrondkleur
+FileRenamed=The file was successfully renamed
 FileUploaded=Het bestand is geüpload
 FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet geupload. Klik hiervoor op "Bevestig dit bestand".
 NbOfEntries=Aantal invoeringen
@@ -245,6 +246,10 @@ DateBuild=Datum van rapportgeneratie
 DatePayment=Datum van betaling
 DateApprove=Goedkeurings datum
 DateApprove2=Goedkeurings datum (tweede goedkeuring)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=jaar
 DurationMonth=maand
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=dagen
 Year=Jaar
 Month=Maand
 Week=Week
+WeekShort=Week
 Day=Dag
 Hour=Uur
 Minute=Minuut
@@ -278,6 +284,7 @@ MonthOfDay=Maand van de dag
 HourShort=U
 MinuteShort=mn
 Rate=Tarief
+CurrencyRate=Currency conversion rate
 UseLocalTax=Inclusief btw
 Bytes=Bytes
 KiloBytes=KiloBytes
@@ -565,8 +572,11 @@ BackToList=Terug naar het overzicht
 GoBack=Ga terug
 CanBeModifiedIfOk=Kan worden gewijzigd indien geldig
 CanBeModifiedIfKo=Kan worden gewijzigd indien ongeldig
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Tabelregel succesvol gewijzigd
 RecordsModified=%s records gewijzigd
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatische code
 FeatureDisabled=Functie uitgeschakeld
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=U heeft geen toestemming voor deze actie
 SessionName=Sessienaam
 Method=Methode
 Receive=Ontvangen
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Gedeeltelijke
 TotalWoman=Totaal
 NeverReceived=Nooit ontvangen
@@ -598,6 +609,7 @@ DisabledModules=Uitgeschakelde modules
 For=Voor
 ForCustomer=Voor de afnemer
 Signature=Handtekening
+DateOfSignature=Date of signature
 HidePassword=Toon opdracht met verborgen wachtwoord
 UnHidePassword=Toon opdracht met zichtbaar wachtwoord
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=Nieuwe attribuut
 AttributeCode=Attribuut code
 URLPhoto=Url van foto / logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Maak een ontwerp
 SetToDraft=Terug naar ontwerp
 ClickToEdit=Klik om te bewerken
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Maandag
 Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index 88082a4def3..cc9d0ce9432 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Tarief moet een numerieke waarde zijn
 markRateShouldBeLesserThan100=Markeer tarief moet lager zijn dan 100 zijn
 ShowMarginInfos=Toon marge info
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/nl_NL/oauth.lang b/htdocs/langs/nl_NL/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/nl_NL/oauth.lang
+++ b/htdocs/langs/nl_NL/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index cb0f6ec483f..9ca8f600ca3 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Je order is aangemaakt
 OrderFail=Fout tijdens aanmaken order
 CreateOrders=Maak orders
 ToBillSeveralOrderSelectCustomer=Om een factuur voor verscheidene orden te creëren, klikt eerste op klant, dan kies "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/nl_NL/printing.lang b/htdocs/langs/nl_NL/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/nl_NL/printing.lang
+++ b/htdocs/langs/nl_NL/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 315822521f4..892ce9f7a94 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot / Serienummer
 atleast1batchfield=Vervaldatum of uiterste verkoopdatum of Lot / Serienummer
 batch_number=Lot / Serienummer
 BatchNumberShort=Lot / Serienummer
-l_eatby=Vervaldatum
-l_sellby=Uiterste verkoop datum
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot / Serienummer informatie
 DetailBatchFormat=Lot / Ser: % s - Verval: %s - Verkoop: %s (Aantal: %d)
 printBatch=Lot / Ser: %s
@@ -19,3 +19,6 @@ printQty=Aantal: %d
 AddDispatchBatchLine=Voeg een regel toe voor houdbaarheids ontvangst
 WhenProductBatchModuleOnOptionAreForced=Als module Lot / Serienummer actief is, verhogen/verlagen voorraad modus wordt geforceerd en kan niet worden bewerkt. Andere opties kunnen worden gedefinieerd als u wilt.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 7525d738577..6277b1ae97a 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=BTW verandering in massa
 ProductVatMassChangeDesc=Deze pagina kan worden gebruikt om een ​​BTW-tarief gedefinieerd op producten of diensten van een waarde naar een ander te wijzigen. Waarschuwing, deze verandering gebeurt op alle database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Deze pagina kan worden gebruikt om een ​​streepjescode op objecten die geen streepjescode hebben gedefinieerd. Controleer voor dat setup van de module barcode is ingesteld.
-ProductAccountancyBuyCode=Inkoopcode
-ProductAccountancySellCode=Verkoopcode
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product of Dienst
 ProductsAndServices=Producten en Diensten
 ProductsOrServices=Producten of diensten
@@ -59,6 +59,8 @@ SellingPriceHT=Verkoopprijs (na aftrek belastingen)
 SellingPriceTTC=Verkoopprijs (inclusief belastingen)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nieuwe prijs
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=De verkoopprijs kan niet lager zijn dan de minimumprijs voor dit product ( %s zonder belasting)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Druk meer etiketten voor een barcode
 BuildPageToPrint=Maak de pagina om af te drukken
 FillBarCodeTypeAndValueManually=Vul het barcode type en de code zelf in
 FillBarCodeTypeAndValueFromProduct=Vul barcode type en code in van een product-barcode
-FillBarCodeTypeAndValueFromThirdParty=Vul barcode type en code in van een derde partij
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Onvolledige definitie van type of code van de barcode van product  %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Onvolledige definitie van het type of de code van de barcode voor derde partij  %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcodegegevens voor product %s :
-BarCodeDataForThirdparty=Barcodegegevens van derde partij %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definieer streepjescode waarde voor alle records (dit zal ook de streepjescode waarde al gedefinieerd resetten met nieuwe waarden)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index d984e09f177..3919bbfebe8 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lijst van aan het project verbonden offertes
-ListOrdersAssociatedProject=Lijst van aan het project verbonden afnemersopdrachten
-ListInvoicesAssociatedProject=Lijst van aan het project verbonden facturen
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Lijst van aan het project verbonden leveranciersopdrachten
-ListSupplierInvoicesAssociatedProject=Lijst van aan het project verbonden leveranciersfacturen
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lijst van aan het project verbonden contracten
 ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies
 ListExpenseReportsAssociatedProject=Lijst van onkostennota's in verband met het project
@@ -123,6 +123,7 @@ ProjectReportDate=Wijziging datum taak volgens startdatum van het project
 ErrorShiftTaskDate=Onmogelijk taak datum te verschuiven volgens de nieuwe startdatum van het project
 ProjectsAndTasksLines=Projecten en taken
 ProjectCreatedInDolibarr=Project %s gecreëerd
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Taak %s gecreëerd
 TaskModifiedInDolibarr=Taak %s gewijzigd
 TaskDeletedInDolibarr=Taak %s verwijderd
@@ -153,7 +154,7 @@ PlannedWorkload=Geplande workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project moet eerst worden gevalideerd
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per dag
 InputPerWeek=Input per week
 InputPerAction=Input per actie
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index 39ce1b5a1ff..b49166f5c35 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nieuwe salarisbetaling
 SalaryPayment=Salarisbetaling
 SalariesPayments=Salarissen betalingen
 ShowSalaryPayment=Toon salarisbetaling
-THM=Gemiddelde uurprijs
-TJM=Gemiddelde dagprijs
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=Huidige salaris
 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
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 81dc8150189..3336d51536a 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Mutaties
 ErrorWarehouseRefRequired=Magazijnreferentienaam is verplicht
 ListOfWarehouses=Magazijnenlijst
@@ -43,6 +45,7 @@ PMPValue=Waardering (PMP)
 PMPValueShort=Waarde
 EnhancedValueOfWarehouses=Voorraadwaardering
 UserWarehouseAutoCreate=Creëer automatisch een magazijn bij het aanmaken van een gebruiker
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product voorraad en subproduct voorraad zijn onafhankelijk
 QtyDispatched=Hoeveelheid verzonden
 QtyDispatchedShort=Aantal verzonden
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/nl_NL/supplier_proposal.lang b/htdocs/langs/nl_NL/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/nl_NL/supplier_proposal.lang
+++ b/htdocs/langs/nl_NL/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index 1c63c894686..0c969ce3fa3 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -7,13 +7,13 @@ History=Geschiedenis
 ListOfSuppliers=Leverancierslijst
 ShowSupplier=Toon leverancier
 OrderDate=Besteldatum
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Sommige sub-producten hebben geen prijs ingevuld
-AddSupplierPrice=Leveranciersprijs toevoegen
-ChangeSupplierPrice=Verander leveranciersprijs
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Deze leveranciersreferentie is al in verband met de referentie: %s
 NoRecordedSuppliers=Geen leveranciers geregistreerd
 SupplierPayment=Leveranciersbetaling
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Lijst van leverancier bestellingen
 MenuOrdersSupplierToBill=Leverancier bestellingen te factureren
 NbDaysToDelivery=Levering vertraging in de dagen
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index 59b7f1d8608..5348a1d5aaa 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Uren per week
 ColorUser=Kleur van de gebruiker
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/nl_NL/website.lang b/htdocs/langs/nl_NL/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/nl_NL/website.lang
+++ b/htdocs/langs/nl_NL/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/nl_NL/withdrawals.lang b/htdocs/langs/nl_NL/withdrawals.lang
index 2bba3b99be7..783b8754525 100644
--- a/htdocs/langs/nl_NL/withdrawals.lang
+++ b/htdocs/langs/nl_NL/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Periodieke afnemersoverboekingenoverzicht
-StandingOrders=Periodieke overboekingen
-StandingOrder=Periodieke overboeking
-NewStandingOrder=Nieuwe periodieke overboeking
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Te verwerken
-WithdrawalsReceipts=Terugname ontvangsten
-WithdrawalReceipt=Terugname ontvangst
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Ingetrokken regels
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Factuur wachtend op intrekking
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Bedrag in te trekken
-WithdrawsRefused=Intrekking geweigerd
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Geen afnemersfactuur in betalingsmodus "Intrekking" is wachtende. Ga naar het tabblad "Intrekking" op de factuurkaart om een verzoek te creëren.
 ResponsibleUser=Verantwoordelijke gebruiker
-WithdrawalsSetup=Intrekkingsinstellingen
-WithdrawStatistics=Intrekkingsstatistieken
-WithdrawRejectStatistics=Verworpen intrekkingsstatistieken
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Creëer een intrekkingsverzoek
 ThirdPartyBankCode=Bankcode van derde
 NoInvoiceCouldBeWithdrawed=Geen factuur met succes ingetrokken. Zorg ervoor dat de facturen op bedrijven staan met een geldig BAN (RIB).
@@ -46,7 +47,7 @@ StatusRefused=Geweigerd
 StatusMotif0=Niet gespecificeerd
 StatusMotif1=Ontoereikende voorziening
 StatusMotif2=Betwiste
-StatusMotif3=Geen intrekkingsverzoek
+StatusMotif3=No direct debit payment order
 StatusMotif4=Afnemersopdracht
 StatusMotif5=RIB onwerkbaar
 StatusMotif6=Rekening zonder balans
@@ -61,28 +62,43 @@ 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=Informatie over uw bankrekening waarop intrekkingen moeten worden ontvangen
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Betaling van periodieke overboeking %s door de bank
-InfoCreditMessage=De periodieke overboeking %s is betaald door de bank<br>Gegevens van de betaling: %s
-InfoTransSubject=Transmissie van de periodieke overboeking %s naar bank
-InfoTransMessage=De periodieke overboeking %s is vernzonden naar de bank door %s %s.<br><br>
+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>
 InfoTransData=Bedrag: %s<br>Wijze: %s<br>Datum: %s
-InfoRejectSubject=Periodieke overboeking geweigerd
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Optie voor echte modus was niet ingesteld, we stoppen na deze simulatie
diff --git a/htdocs/langs/nl_NL/workflow.lang b/htdocs/langs/nl_NL/workflow.lang
index 02f65b52041..3e954135a7b 100644
--- a/htdocs/langs/nl_NL/workflow.lang
+++ b/htdocs/langs/nl_NL/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificeer gekoppelde bron offerte om gefactureerd te worden wanneer bestelling van de klant is ingesteld op betaald
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bron klant bestelling(en) gefactureerd wanneer de klant factuur is ingesteld op betaald
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classificeer gekoppelde bron klantbestelling(en) gefactureerd wanneer de klantfactuur wordt gevalideerd
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index dc59c8a3aba..a7f610edfc3 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -1,61 +1,82 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Separatir kolumn dla exportowanego pliku
-ACCOUNTING_EXPORT_DATE=Format daty dla exportowanego pliku 
+ACCOUNTING_EXPORT_SEPARATORCSV=Separator kolumn dla eksportowanego pliku
+ACCOUNTING_EXPORT_DATE=Format daty dla eksportowanego pliku 
 ACCOUNTING_EXPORT_PIECE=Exportuj ilość sztuk
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=Eksportuj etykiety
+ACCOUNTING_EXPORT_AMOUNT=Eksportuj kwoty
+ACCOUNTING_EXPORT_DEVISE=Eksportuj waluty
 Selectformat=Wybierz format dla pliku
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
+ACCOUNTING_EXPORT_PREFIX_SPEC=Przedrostek w nazwie pliku
 
 ConfigAccountingExpert=Konfiguracja modułu eksperta księgowego
 Journaux=Dzienniki
 JournalFinancial=Dzienniki finansowe
 BackToChartofaccounts=Powrót planu kont
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Wybierz plan kont
 Addanaccount=Dodaj konto księgowe
 AccountAccounting=Konto księgowe
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Awaria
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Podział klientów
-SuppliersVentilation=Dostawcy Breakdown
+CustomersVentilation=Powiązania do faktury klienta
+SuppliersVentilation=Powiązania do faktury dostawcy
 Reports=Raporty
 NewAccount=Nowe konto księgowe
 Create=Utwórz
-CreateMvts=Utwórz przesunięcie
-UpdateMvts=Modyfikacja przesunięcia
-WriteBookKeeping=Konta rekord w księdze głównej
+CreateMvts=Utwórz nową transakcję
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Księga główna
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Linie faktury być wentylowane
-InvoiceLinesDone=Wentylowanych linie faktury
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Pozycje faktury do powiązania
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Wietrzyć
+Ventilate=Powiąż
 
 Processing=Przetwarzanie
 EndProcessing=Koniec przetwarzania
-AnyLineVentilate=Wszelkie linie do wentylacji
+AnyLineVentilate=Any lines to bind
 SelectedLines=Wybrane linie
 Lineofinvoice=Pozycja faktury
-VentilatedinAccount=Wentylowane z powodzeniem na koncie księgowym
-NotVentilatedinAccount=Nie wentylowane na koncie księgowym
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Ilość elementów jest podział przedstawiony przez strony (maksymalna zalecana: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Rozpocząć sortowanie stron rozpadu "Has to podział" przez ostatnich elementów
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie stron rozpadu "Breakdown" przez ostatnich elementów
+ACCOUNTING_LIMIT_LIST_VENTILATION=Liczba elementów do powiązania na stronie (rekomendowana maksymalna ilość: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Długość numerów głónych kont bankowych
-ACCOUNTING_LENGTH_AACCOUNT=Długośc nr kont bankowych kontahentów
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Dziennik sprzedaży
 ACCOUNTING_PURCHASE_JOURNAL=Dziennik zakupów
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Dziennik
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Usuń wpisy z księgi głównej
-
 DescSellsJournal=Dziennik sprzedarzy
 DescPurchasesJournal=Dziennik zakupów
 FinanceJournal=Dziennik finansów
 DescFinanceJournal=Dziennik finansów zawiera wszystkie typy płatności wykonane przez konto bankowe
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Zapłata faktury klienta
-
 ThirdPartyAccount=Konto kontrahenta
-
-NewAccountingMvt=Nowe przesunięcie
-NumMvts=Ilość przesunięć
-ListeMvts=Lista przesunięć
+NewAccountingMvt=Nowa transakcja
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debetowych i kredytowych nie może mieć wartość w tym samym czasie
 
-ReportThirdParty=Lista kont kontrahenta
-DescThirdPartyReport=Skonsultuj się tutaj listę thirdparty klientów i dostawców oraz ich kont księgowych
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Lista kont księgowych
 
@@ -114,22 +134,29 @@ Pcgtype=Klasa konta
 Pcgsubtype=W ramach klasy uwagę
 Accountparent=Korzeń konta
 
-DescVentilCustomer=Skonsultuj się tutaj rocznego rozliczenia przebicia faktur klientów
 TotalVente=Total turnover before tax
 TotalMarge=Całkowita marża sprzedaży
-DescVentilDoneCustomer=Skonsultuj się tutaj listę linii faktur klientów i ich rachunek rachunkowości
-DescVentilTodoCustomer=Wyraź swoje wiersze faktury klienta z kontem rachunkowości
-ChangeAccount=Zmienianie konta księgowego dla wierszy wybranych przez konto:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Skonsultuj się tutaj rocznego rozliczenia przebicia faktur dostawców
-DescVentilDoneSupplier=Skonsultuj się tutaj listę linii dostawcy faktur i ich koncie księgowym
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Weryfikacja Automatycznie
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąc tego konta księgowego, ponieważ jest w użyciu
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Karta Podział
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operacje zostały zapisane w głównej księdze
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 8b247add6c7..ac069e46aaf 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -2,17 +2,22 @@
 Foundation=Fundacja
 Version=Wersja
 VersionProgram=Wersja programu
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Zainstalowana początkowa wersja
+VersionLastUpgrade=Ostatnia zaktualizowana wersja
 VersionExperimental=Eksperymentalny
 VersionDevelopment=Rozwój
 VersionUnknown=Nieznany
 VersionRecommanded=Zalecana
-FileCheck=Pliki Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Brakujące pliki
 FilesUpdated=Aktualizacja plików
-FileCheckDolibarr=Sprawdź Dolibarr integralności plików
-XmlNotFound=Plik XML z Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID sesji
 SessionSaveHandler=Asystent zapisu sesji
 SessionSavePath=Lokalizacja sesji danych
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa <b>niż %s</b>
 DictionarySetup=Konfiguracja słownika
 Dictionary=Słowniki
 Chartofaccounts=Plan kont
-Fiscalyear=Lat podatkowych
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Wartość "System" i "systemauto" dla typu jest zarezerwowana. Możesz użyć "użytkownik" jako wartości, aby dodać swój własny rekord
 ErrorCodeCantContainZero=Kod nie może zawierać wartości "0"
 DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Poczekaj na naciśnięcie klawisza zanim załaduj
 DelaiedFullListToSelectContact=Poczekaj na naciśnięcie klawisza zanim załadujesz zawartość listy z kontaktami (może zwiększyć wydajność, gdy masz dużo kontaktów)
 NumberOfKeyToSearch=Liczba znaków do wyszukiwania: %s
 NotAvailableWhenAjaxDisabled=Niedostępne kiedy Ajax nie działa
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript wyłączony
 UsePreviewTabs=Użyj podgląd karty
 ShowPreview=Pokaż podgląd
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Kodowanie danych binarnych w postaci szesnastkowej
 IgnoreDuplicateRecords=Ignoruj błędy zduplikowanych rekordów (INSERT IGNORE)
 AutoDetectLang=Autodetekcja (język przeglądarki)
 FeatureDisabledInDemo=Funkcja niedostępna w wersji demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Uprawnienia
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Tylko elementy z <a href="%s">aktywnych modułów</a> są widoczne.
-ModulesDesc=Moduły Dolibarr określają które funkcje są aktywne w oprogramowaniu. Niektóre moduły wymagają uprawnień nadanych użytkownikom, po włączeniu modułu. Wybierz przycisk on/off w kolumnie "Status", aby włączyć moduł/funkcję.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Więcej modułów ...
 DoliStoreDesc=DoliStore, oficjalny kanał dystrybucji zewnętrznych modułów Dolibarr ERP / CRM
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Aktualna wersja Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Ostatnia stabilna wersja
+LastActivationDate=Last activation date
 UpdateServerOffline=Aktualizacja serwera nieaktywny
 GenericMaskCodes=Można wpisać dowolną maskę numeracji. W tej masce, może stosować następujące tagi: <br> <b>{000000}</b> odpowiada liczbie, która jest zwiększona w każdym% s. Wprowadzić dowolną liczbę zer jako żądaną długość licznika. Licznik zostaną zakończone zerami z lewej, aby mieć jak najwięcej zer jak maski. <br> <b>{000000 + 000}</b> sama jak poprzednia, ale przesunięciem odpowiadającym numerem, na prawo od znaku + odnosi się począwszy od pierwszego% s. <br> <b>{000000} @ x,</b> ale sama jak poprzednia licznik jest wyzerowany, gdy miesiąc osiągnięciu x (x od 1 do 12 lub ​​0 do korzystania pierwszych miesiącach roku podatkowego określone w konfiguracji, lub 99 do wyzerowany co miesiąc ). Jeśli opcja ta jest używana, a x jest 2 lub więcej, wymagana jest również to ciąg {rr} {mm} lub {rrrr} {mm}. <br> <b>{Dd}</b> dni (01 do 31). <br> <b>{Mm}</b> miesięcy (01 do 12). <br> <b>{Rr}, {rrrr}</b> lub <b>{r}</b> roku ponad 2, 4 lub 1 liczb. <br>
-GenericMaskCodes2=<b>Cccc} {kod</b> klienta na n znaków <br> <b>{Cccc000}</b>po kodzie klienta na n znaków występuje licznik dedykowany klientowi. Licznik poświęcony klientowi jest resetowany w tym samym czasie, co licznik globalny. <br> <b>{Tttt}</b> kod kontrahenta na n znaków (patrz słownik stron trzecich). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Wszystkie inne znaki w masce pozostaną nienaruszone. <br> Spacje są niedozwolone. <br>
 GenericMaskCodes4a=<u>Przykład na 99-cie %s strony trzeciej TheCompany utworzony 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Przykład kontrahenta utworzonego w dniu 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametry do zabezpiecznie adresu URL
 SecurityTokenIsUnique=Użyj unikalnego klucza zabezpieczeń dla każdego adresu
 EnterRefToBuildUrl=Wprowadź odwołanie do obiektu %s
 GetSecuredUrl=Pobierz obliczony adres URL
-ButtonHideUnauthorized=Ukryj przyciski wyłączone ze względu na brak autoryzacji
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Poprzednia stawka VAT
 NewVATRates=Nowa stawka VAT
 PriceBaseTypeToChange=Zmiana dla cen opartych na wartości referencyjnej ustalonej na
@@ -349,6 +356,7 @@ ExtrafieldMail = Adres e-mail
 ExtrafieldSelect = Wybierz listę
 ExtrafieldSelectList = Wybierz z tabeli
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Pole wyboru
 ExtrafieldRadio=Przełącznik
 ExtrafieldCheckBoxFromList= Pole z tabeli
@@ -383,11 +391,14 @@ EnableFileCache=Włącz cache plików
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Użytkownicy i grupy
@@ -428,8 +439,8 @@ Module55Name=Kody kreskowe
 Module55Desc=Kody kreskowe zarządzania
 Module56Name=Telefonia
 Module56Desc=Integracja telefonii
-Module57Name=Zlecenia stałe
-Module57Desc=Zarządzanie zleceniami stałymi oraz zleceniami wycofanymi. Obejmuje również generowanie pliku SEPA dla krajów europejskich.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integracja systemu ClickToDial (Asterisk,...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Integracja Webcalendar
 Module500Name=Special expenses
 Module500Desc=Zarządzanie kosztami specjalnymi (podatki, opłaty ZUS, dywidendy)
-Module510Name=Wynagrodzenia
-Module510Desc=Zarządzanie wynagrodzeniami i płatnościami pracowników
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Pożyczka
 Module520Desc=Zarządzanie kredytów
 Module600Name=Powiadomienia
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Darowizny
 Module700Desc=Zarządzanie darowiznami
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Czytaj dostawców
 Permission147=Czytaj statystyki
-Permission151=Czytaj zlecenia stałe
-Permission152=Tworzenie / modyfikacja żądań stałych zleceń
-Permission153=Przenoszenie wpływów zleceń stałych
-Permission154=Uznaj / odrzuć wpływy zleceń stałych
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Czytaj umowy / subskrypcje
 Permission162=Tworzenie / modyfikacja umowy / subskrypcji
 Permission163=Aktywacja usługi / subskrypcji umowy
@@ -747,6 +758,7 @@ Permission1236=Eksport faktur dostawcy, atrybutów i płatności
 Permission1237=Eksport zamówień dostawcy oraz ich szczegółów
 Permission1251=Uruchom masowy import danych zewnętrznych do bazy danych (wgrywanie danych)
 Permission1321=Eksport faktur klienta, atrybutów oraz płatności
+Permission1322=Reopen a paid bill
 Permission1421=Eksport zamówień oraz atrybutów klienta
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Tworzenie / modyfikacja ankiet
 Permission59001=Czytaj marż handlowych
 Permission59002=Zdefiniuj marż handlowych
 Permission59003=Przeczytaj co margines użytkownika
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Typy kontrahentów
 DictionaryCompanyJuridicalType=Formy prawne kontrahentów
 DictionaryProspectLevel=Potencjalny poziom możliwości
@@ -853,6 +869,7 @@ LabelUsedByDefault=Wytwórnia używany domyślnie, jeśli nie można znaleźć t
 LabelOnDocuments=Etykieta na dokumenty
 NbOfDays=Nb dni
 AtEndOfMonth=Na koniec miesiąca
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Zawsze aktywne
 Upgrade=Uaktualnij
@@ -950,7 +967,7 @@ LogEventDesc=Można włączyć dziennik Dolibarr bezpieczeństwa imprez tutaj. A
 AreaForAdminOnly=Cechy te mogą być używane tylko przez <b>użytkowników na prawach administratora</b>.
 SystemInfoDesc=System informacji jest różne informacje techniczne można uzyskać w trybie tylko do odczytu i widoczne tylko dla administratorów.
 SystemAreaForAdminOnly=Obszar ten jest dostępny tylko dla użytkowników na prawach administratora. Żadne z uprawnień Dolibarr nie zniesie tego ograniczenia.
-CompanyFundationDesc=Na tej stronie edytuj wszystkie znane Ci informacje o firmie lub fundacji (Aby tego dokonać, kliknij na przycisk "Modyfikuj" na dole strony)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Możesz wybrać każdego z parametrów związanych z wyglądem i Dolibarr tutaj
 AvailableModules=Dostępne moduły
 ToActivateModule=Aby uaktywnić modules, przejdź na konfigurację Powierzchnia.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Uwaga, w niektórych systemach Linux, aby wysłać e-m
 PathToDocuments=Ścieżka do dokumentów
 PathDirectory=Katalog
 SendmailOptionMayHurtBuggedMTA=Funkcja wysłać maile za pomocą metody "PHP poczty bezpośredniej" wygeneruje wiadomości, że może nie być prawidłowo przeanalizowany przez niektórych otrzymujących serwerów pocztowych. Powoduje to, że niektóre maile nie mogą być odczytywane przez ludzi obsługiwanych przez te platformy podsłuchu. To przypadku niektórych dostawców internetowych (Ex: Pomarańczowy we Francji). To nie jest problem w Dolibarr, ani w PHP, ale na otrzymywanie serwera poczty. Możesz jednak dodać opcję MAIN_FIX_FOR_BUGGED_MTA do 1 w konfiguracji - inne zmodyfikować Dolibarr, aby tego uniknąć. Jednakże, mogą wystąpić problemy z innymi serwerami, które przestrzegają ściśle standardu SMTP. Inne rozwiązanie (zalecane) jest użycie metody "gniazdo SMTP biblioteki", który nie ma wad.
-TranslationSetup=Konfiguracja de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musisz przynajmniej umożliwić 1 moduł
 ClassNotFoundIntoPathWarning=Klasa% s nie znaleziono na drodze PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Użyj TLS
 LDAPServerUseTLSExample=Twoja użyć serwera LDAP TLS
 LDAPServerDn=Serwer DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=Kompletny DN (dawniej: cn= adminldap, dc= społeczeństwa, dc= com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Hasło administratora
 LDAPUserDn=Użytkowników DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Kompletny DN (dawniej: ou= users, dc= społeczeństwa, dc= com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Przykład: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Przykład: objectSid
 LDAPFieldEndLastSubscription=Data zakończenia subskrypcji
-LDAPFieldTitle=Post / Funkcja
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Przykład: tytuł
 LDAPSetupNotComplete=LDAP konfiguracji nie są kompletne (przejdź na innych kartach)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr hasło administratora lub przewidziane. LDAP dostęp będą anonimowe i w trybie tylko do odczytu.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produkty i usługi moduły konfiguracyjne
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=Maksymalna liczba produktów combo wybrać list (0= bez limitu)
 ViewProductDescInFormAbility=Wizualizacja opisy produktów w formach (inaczej jak popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Wizualizacja produktów opisów w thirdparty języku
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Także jeśli masz dużą ilość produktu (> 100 000), można zwiększyć prędkość przez ustawienie stałej PRODUCT_DONOTSEARCH_ANYWHERE do 1 w Setup-> Inne. Szukaj zostaną ograniczone do początku łańcucha.
 UseSearchToSelectProduct=Użyj wyszukiwarki aby wybrać produkt (zamiast listy rozwijanej).
 SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar generowanie kodu narzędzie wiersza polecenia (używany p
 BarcodeInternalEngine=Silnik wewnętrznego
 BarCodeNumberManager=Manager auto zdefiniować numery kodów kreskowych
 ##### Prelevements #####
-WithdrawalsSetup=Wycofanie konfiguracji modułu
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Zewnętrzne RSS przywóz konfiguracji
 NewRSS=Nowy kanał RSS
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Otwórz rok obrotowy
 CloseFiscalYear=Blisko rok obrotowy
 DeleteFiscalYear=Usuń rok obrotowy
 ConfirmDeleteFiscalYear=Czy na pewno usunąć ten rok podatkowy?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Zawsze może być edytowany
 MAIN_APPLICATION_TITLE=Wymusza widoczną nazwę aplikacji (ostrzeżenie: ustawienie własnej nazwy tutaj może złamać Autouzupełnianie funkcji logowania przy użyciu DoliDroid aplikację mobilną)
 NbMajMin=Minimalna liczba wielkich liter
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Lista stałych powiadomień
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Przejdź na zakładkę "Powiadomienia" o thirdparty kontaktu, aby dodać lub usunąć powiadomienia dla kontaktów / adresów
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Próg
 BackupDumpWizard=Konfigurator wykonywania kopii zapasowej bazy danych
 SomethingMakeInstallFromWebNotPossible=Instalacja zewnętrznych modułów za pomocą interfejsu sieciowego nie jest możliwa z powodu następujących przyczyn:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Kolor podświetlenia linii przy najechaniu na nią myszą (p
 TextTitleColor=Kolor tytułu strony
 LinkColor=Kolor odnośników
 PressF5AfterChangingThis=Naciśnij F5 po zmianie tej wartości, a zmiana przyniosła efekt
-NotSupportedByAllThemes=Działa ze skórką eldy, ale nie jest wspierany przez wszystkie skórki
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Kolor tła
 TopMenuBackgroundColor=Kolor tła górnego menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Kolor tła bocznego menu
 BackgroundTableTitleColor=Kolor tła nagłówka tabeli
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Pokaż domyślnie w widoku listy
 YouUseLastStableVersion=Używasz ostatniej stabilej wersji
 TitleExampleForMajorRelease=Przykład wiadomości można użyć, aby ogłosić to główne wydanie (prosimy używać go na swoich stronach internetowych)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 237bf0bd2ed..229eeea9927 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -27,13 +27,9 @@ AllTime=Od początku
 Reconciliation=Rekoncyliacja - uzgadanie stanów kont bankowych
 RIB=Numer konta bankowego
 IBAN=Numer IBAN
-IbanValid=IBAN jest poprawny
-IbanNotValid=IBAN jest niepoprawny
 BIC=Numer BIC / SWIFT
-SwiftValid=BIC/SWIFT jest poprawny
-SwiftNotValid=BIC/SWIFT jest niepoprawny
-StandingOrders=Zlecenia stałe
-StandingOrder=Zlecenie stałe
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Wyciąg z konta
 AccountStatementShort=Wyciąg
 AccountStatements=Wyciągi z konta
@@ -78,6 +74,7 @@ AccountToCredit=Konto do kredytów
 AccountToDebit=Konto do obciążania
 DisableConciliation=Wyłącz funkcję rekoncyliacji dla tego konta
 ConciliationDisabled=Funkcja rekoncyliacji wyłączona
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Otwórz
 StatusAccountClosed=Zamknięte
 AccountIdShort=Liczba
@@ -87,6 +84,8 @@ AddBankRecordLong=Dodaj transakcję ręcznie
 ConciliatedBy=Rekoncyliowany przez
 DateConciliating=Data rekoncyliacji
 BankLineConciliated=Transakcja rekoncyliowana
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Płatności klienta
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Wycofana płatność
 SocialContributionPayment=Płatność za ZUS/podatek
 BankTransfer=Przelew bankowy
 BankTransfers=Przelewy bankowe
-TransferDesc=Przy przelewie z jednego konta do drugiego, Dolibarr napisze dwa rekordy (ujemne dla konta źródłowego i kredytu na rachunku docelowym, o tej samej kwocie. Te same etykiety i daty będą stosowane w odniesieniu do tej transakcji)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Do
 TransferFromToDone=Transfer z <b>%s</b> do <b>%s</b> <b>%s</b> %s został zapisany.
@@ -129,7 +129,7 @@ FutureTransaction=Transakcja w przyszłości. Nie da się pogodzić.
 SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk &quot;Utwórz&quot;.
 InputReceiptNumber=Wybierz wyciąg bankowy związany z postępowania pojednawczego. Użyj schematu: RRRRMM lub RRRRMMDD
 EventualyAddCategory=Ostatecznie, określić kategorię, w której sklasyfikować rekordy
-ToConciliate=Do rekoncyliacji?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Następnie sprawdź linie obecne w wyciągu bankowym i kliknij
 DefaultRIB=Domyślnie BAN
 AllRIB=Wszystko BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Czy jesteś pewny, że chcesz oznaczyć ten czek jako odrzuco
 RejectCheckDate=Data wrócił kontrola
 CheckRejected=Czek zwrócony
 CheckRejectedAndInvoicesReopened=Czek zwrócony i faktura ponownie otwarta
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 34d2503626b..ceea4f30754 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Błąd, nie można anulować fak
 BillFrom=Od
 BillTo=Do
 ActionsOnBill=Działania na fakturze
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Rabat oferowane (płatność przed kadencji)
 EscompteOfferedShort=Discount
 SendBillRef=Złożenie faktury% s
 SendReminderBillRef=Złożenie faktury% s (przypomnienie)
-StandingOrders=Zlecenia stałe
-StandingOrder=Zlecenie stałe
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Brak szkiców faktur
 NoOtherDraftBills=Brak innych szkiców faktur
 NoDraftInvoices=Brak szkicu dla faktur
@@ -351,8 +351,8 @@ VarAmount=Zmienna ilość (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Przekaz bankowy
-PaymentTypeShortPRE=Przekaz bankowy
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Gotówka
 PaymentTypeShortLIQ=Gotówka
 PaymentTypeCB=Karta kredytowa
@@ -381,6 +381,7 @@ ExtraInfos=Dodatkowe informacje
 RegulatedOn=Regulowane
 ChequeNumber=Czek N
 ChequeOrTransferNumber=Cheque / Transferu N
+ChequeBordereau=Check schedule
 ChequeMaker=Sprawdź nadajnik / transferu
 ChequeBank=Bank czek
 CheckBank=Sprawdź
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Wypłacana przez płatność
 ClosePaidInvoicesAutomatically=Sklasyfikować jako "Zapłacone" wszystkie  standardowe faktury lub duplikaty faktur wpłacone w całości.
 ClosePaidCreditNotesAutomatically=Klasyfikująsubstancje "Paid" wszystkie noty kredytowe w całości zwrócona.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Wszystkie faktury bez kwoty do zapłaty zostaną automatycznie zamknięte i oznaczone statusem "Zapłacono"
 ToMakePayment=Płacić
 ToMakePaymentBack=Spłacać
 ListOfYourUnpaidInvoices=Lista niezapłaconych faktur
 NoteListOfYourUnpaidInvoices=Uwaga: Ta lista zawiera tylko faktury dla osób trzecich jesteś powiązanych jako przedstawiciel sprzedaży.
 RevenueStamp=Znaczek skarbowy
-YouMustCreateInvoiceFromThird=Ta opcja jest dostępna tylko podczas tworzenia faktury z zakładki "klienta" z thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Faktura Crabe modelu. Pełna faktura modelu (VAT Wsparcie opcji, rabaty, warunki płatności, logo, itp. ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/pl_PL/boxes.lang b/htdocs/langs/pl_PL/boxes.lang
index 2d2223b4256..dc0df3c6450 100644
--- a/htdocs/langs/pl_PL/boxes.lang
+++ b/htdocs/langs/pl_PL/boxes.lang
@@ -1,51 +1,51 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=Informacje Rss
-BoxLastProducts=Latest %s products/services
+BoxLastProducts=Ostatnie %s produktów/usług
 BoxProductsAlertStock=Stock alerts for products
 BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest supplier invoices
-BoxLastCustomerBills=Latest customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
+BoxLastSupplierBills=Ostatnie faktury dostawców
+BoxLastCustomerBills=Ostatnie faktury klientów
+BoxOldestUnpaidCustomerBills=Najstarsze niezapłacone faktury klientów
+BoxOldestUnpaidSupplierBills=Najstarsze niezapłacone faktury dostawców
 BoxLastProposals=Latest commercial proposals
 BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest customer orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
+BoxLastCustomers=Ostatni modyfikowani klienci
+BoxLastSuppliers=Ostatni modyfikowani dostawcy
+BoxLastCustomerOrders=Ostatnie zamówienia klienta
+BoxLastActions=Ostatnie zdarzenia
+BoxLastContracts=Ostatnie kontrakty
+BoxLastContacts=Ostatnie kontakty/adresy
+BoxLastMembers=Ostatni członkowie
+BoxFicheInter=Ostatnie interwencje
 BoxCurrentAccounts=Otwórz bilans konta
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Latest %s modified products/services
+BoxTitleLastRssInfos=Ostatnie %s wiadomości z %s
+BoxTitleLastProducts=Ostatnie %s modyfikowanych produktów/usług
 BoxTitleProductsAlertStock=Produkty w alercie magazynowym
 BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
-BoxTitleLastModifiedCustomers=Latest %s modified customers
+BoxTitleLastModifiedSuppliers=Ostatnie %s modyfikowanych dostawców
+BoxTitleLastModifiedCustomers=Ostatnie %s modyfikowanych klientów
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
+BoxTitleLastCustomerBills=Ostatnie %s faktur klientów
+BoxTitleLastSupplierBills=Ostatnie %s faktur dostawców
 BoxTitleLastModifiedProspects=Latest %s modified prospects
-BoxTitleLastModifiedMembers=Latest %s members
+BoxTitleLastModifiedMembers=Ostatnich %s członków
 BoxTitleLastFicheInter=Latest %s modified interventions
 BoxTitleOldestUnpaidCustomerBills=Najstarszych %s niezapłaconych faktur klienta
 BoxTitleOldestUnpaidSupplierBills=Najstarszych %s niezapłaconych faktur dostawcy
 BoxTitleCurrentAccounts=Bilans otwartych kont
-BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
+BoxTitleLastModifiedContacts=Ostatnie %s zmodyfikowanych kontaktów/adresów
 BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Najstarsze aktywne przeterminowane usługi
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxLastExpiredServices=Ostanich %s najstarszych kontaktów z aktywnymi upływającymi usługami
+BoxTitleLastActionsToDo=Ostatnich %s zadań do zrobienia
+BoxTitleLastContracts=Ostatnich %s zmodyfikowanych kontaktów
+BoxTitleLastModifiedDonations=Ostatnich %s zmodyfikowanych dotacji
+BoxTitleLastModifiedExpenses=Ostatnich %s zmodyfikowanych raportów kosztów
 BoxGlobalActivity=Globalna aktywność (faktury, wnioski, zamówienia)
 BoxGoodCustomers=Good customers
 BoxTitleGoodCustomers=%s Good customers
 FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
-LastRefreshDate=Latest refresh date
+LastRefreshDate=Data ostatniego odświeżenia
 NoRecordedBookmarks=Brak zdefiniowanych zakładek
 ClickToAdd=Kliknij tutaj, aby dodać.
 NoRecordedCustomers=Brak zarejestrowanych klientów
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Ofert na miesiąc
 NoTooLowStockProducts=Brak produktów z niską ilością w magazynie
 BoxProductDistribution=Produkty / Usługi 
 BoxProductDistributionFor=Dystrybucja z %s dla %s
+BoxTitleLastModifiedSupplierBills=Ostatnie %s zmodyfikowanych rachunków dostawców
+BoxTitleLatestModifiedSupplierOrders=Ostatnie %s zmodyfikowanych zamówień dostawców
+BoxTitleLastModifiedCustomerBills=Ostatnie %s zmodyfikowanych rachunków klientów
+BoxTitleLastModifiedCustomerOrders=Ostatnie %s zmodyfikowanych zamówień klientów
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Faktury Klientów
 ForCustomersOrders=Zamówienia klientów
 ForProposals=Oferty
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Dodaj widget do swojej tablicy
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 4df07701349..a107092d1ff 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=na
 CashDeskThirdParty=Kontrahent
 ShoppingCart=Koszyk
 NewSell=Nowa tranzakcja
-BackOffice=Powrót do biura
 AddThisArticle=Dodaj ten artykuł
 RestartSelling=Wróć na sprzedaż
-SellFinished=Sprzedaż zakończona
+SellFinished=Sale complete
 PrintTicket=Bilet do druku
 NoProductFound=Artykuł nie znaleziony
 ProductFound=Znaleziono produkt
diff --git a/htdocs/langs/pl_PL/categories.lang b/htdocs/langs/pl_PL/categories.lang
index 5adb3d3f2bd..997071f8495 100644
--- a/htdocs/langs/pl_PL/categories.lang
+++ b/htdocs/langs/pl_PL/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Klienci tagi / obszar kategorie
 MembersCategoriesArea=Użytkownicy tagi / obszar kategorie
 ContactsCategoriesArea=Kontakt tagi / obszar kategorie
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Podkategorie
 CatList=Lista tagów / kategorii
 NewCategory=Nowy tag / kategoria
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Ten kontahent jest skojarzony z następującymi t
 MemberIsInCategories=Ten członek jest skojarzony z następującymi tagami/kategoriami członków
 ContactIsInCategories=ten kontakt odnosi się do następujących tagów/kategorii kontaktów
 ProductHasNoCategory=Ten produkt/usługa nie jest w żadnym tagu/kategorii
-CompanyHasNoCategory=Ten kontrahent nie ma przypisanego żadnego taga/kategorii
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Ten członek nie jest w żadnym tagu/kategorii
 ContactHasNoCategory=Ten kontakt nie jest w żadnym z tagów / kategorii
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Dodaj do tagu/kategorii
 NotCategorized=Bez znaczników / kategorii
 CategoryExistsAtSameLevel=Ta kategoria już istnieje w tym samym miejscu
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Tagi/kategorie produktów
 MembersCategoriesShort=Użytkownicy tagów / kategorii
 ContactCategoriesShort=Kontakt tagów / kategorii
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Ta kategoria nie zawiera żadnych produktów.
 ThisCategoryHasNoSupplier=Ta kategoria nie zawiera żadnego dostawcy.
 ThisCategoryHasNoCustomer=Ta kategoria nie zawiera żadnych klientów.
 ThisCategoryHasNoMember=Ta kategoria nie zawiera żadnych członków.
 ThisCategoryHasNoContact=Ta kategoria nie zawiera żadnego kontaktu.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag / ID kategorii
 CatSupList=Lista tagów/kategorii dostawcy
 CatCusList=Lista klientów / perspektywa tagów / kategorii
@@ -71,6 +75,7 @@ CatContactList=Lista tagów/kategorii kontaktu
 CatSupLinks=Powiązania między dostawcami i tagów / kategorii
 CatCusLinks=Powiązania między klientami / perspektyw i tagów / kategorii
 CatProdLinks=Powiązania między produktów / usług oraz tagów / kategorii
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Usuń z tagów/kategorii
 ExtraFieldsCategories=Atrybuty uzupełniające
 CategoriesSetup=Tagi / kategorie Konfiguracja
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index b908864b36d..68e14f8b145 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nowa osoba prywatna
 NewCompany=Nowa firma (potencjalny klient, klient, dostawca)
 NewThirdParty=Nowy kontrahent (potencjalny klient, klient, dostawca)
 CreateDolibarrThirdPartySupplier=Wprowadź podmiot zewnętrzny (dostawca)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Obszar potencjalnych klientów
 IdThirdParty=ID kontrahenta
 IdCompany=ID Firmy
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Dostawcy
 ThirdPartyType=Typ kontrahenta
 Company/Fundation=Firma / Fundacja
 Individual=Osoba prywatna
-ToCreateContactWithSameName=Stworzy automatycznie kontakt osoby z tymi samymi informacjami
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Firma macierzysta
 Subsidiaries=Oddziały
 ReportByCustomers=Raport wg klientów
@@ -47,7 +49,7 @@ CivilityCode=Zwrot grzecznościowy
 RegisteredOffice=Siedziba
 Lastname=Nazwisko
 Firstname=Imię
-PostOrFunction=Stanowisko / Funkcja
+PostOrFunction=Job position
 UserTitle=Tytuł
 Address=Adres
 State=Województwo
@@ -64,7 +66,7 @@ Chat=Czat
 PhonePro=Telefonu służbowy
 PhonePerso=Telefon prywatny
 PhoneMobile=Telefon komórkowy
-No_Email=Nie wysyłać masowej korespondencji
+No_Email=Refuse mass e-mailings
 Fax=Faks
 Zip=Kod pocztowy
 Town=Miasto
@@ -73,7 +75,7 @@ Poste= Stanowisko
 DefaultLang=Domyślny język
 VATIsUsed=Jest płatnikiem VAT
 VATIsNotUsed=Nie jest płatnikiem VAT
-CopyAddressFromSoc=Wypełnij danymi adresowymi kontrahenta
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Użyj drugiego podatku
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=NIP
 VATIntraShort=NIP
 VATIntraSyntaxIsValid=Składnia jest poprawna
-VATIntraValueIsValid=Wartość jest poprawna
 ProspectCustomer=Perspektywa/Klient
 Prospect=Perspektywa
 CustomerCard=Karta Klienta
@@ -261,7 +262,9 @@ AddContactAddress=Stwórz kontakt/adres
 EditContact=Edytuj kontakt
 EditContactAddress=Edytuj kontakt / adres
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakty / Adresy
+FromContactName=Name:
 NoContactDefinedForThirdParty=Brak zdefiniowanych kontaktów dla tego kontrahenta
 NoContactDefined=Brak zdefinowanych kontaktów
 DefaultContact=Domyślny kontakt/adres
@@ -284,7 +287,7 @@ CompanyDeleted=Firma " %s" usunięta z bazy danych.
 ListOfContacts=Lista kontaktów/adresów
 ListOfContactsAddresses=Lista kontaktów/adresów
 ListOfThirdParties=Lista kontrahentów
-ShowCompany=Pokaż kontrahentów
+ShowCompany=Show third party
 ShowContact=Pokaż kontakt
 ContactsAllShort=Wszystkie (bez filtra)
 ContactType=Typ kontaktu
@@ -294,6 +297,7 @@ ContactForProposals=Kontakt dla oferty
 ContactForContracts=Kontakt dla kontraktu
 ContactForInvoices=Kontakt dla faktury
 NoContactForAnyOrder=Ten kontakt nie jest kontaktem dla żadnego zamówienia
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ten kontakt nie jest kontaktem dla żadnej oferty handlowej
 NoContactForAnyContract=Ten kontakt nie jest kontaktem dla żadnego kontraktu
 NoContactForAnyInvoice=Ten kontakt nie jest kontaktem dla żadnej faktury
@@ -352,9 +356,9 @@ ExportCardToFormat=Eksport karty do formatu
 ContactNotLinkedToCompany=Kontakt nie połączony z żadnym kontrahentem
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Brak dostępu do Dolibarr
-ExportDataset_company_1=Kontrahenci (Firmy/Fundacje/Osoby fizyczne) oraz nieruchomości
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakty i właściwości
-ImportDataset_company_1=Kontrahenci (Firmy/Fundacje/Osoby fizyczne) oraz nieruchomości
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakty/Adresy (Kontrahentów lub nie) i atrybuty
 ImportDataset_company_3=Szczegóły banku
 ImportDataset_company_4=Efektywność sprzedaży przedstawicieli Handlowych ds. Kontrahentów.
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Kontrahenci zostali scaleni
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index 9db0876bbf6..e2f5cbb3f52 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Opłata ZUS lub podatek
 SocialContributions=Opłaty ZUS lub podatki
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Koszty specjalne
 MenuTaxAndDividends=Podatki i dywidendy
 MenuSocialContributions=ZUS/podatek
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index bda3d68b3a6..d9e9270d4bd 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -5,13 +5,13 @@ AllContracts=Wszystkie umowy
 ContractCard=Zamówienie karty
 ContractStatusNotRunning=Nie działa
 ContractStatusDraft=Szkic
-ContractStatusValidated=Zatwierdzona
+ContractStatusValidated=Zatwierdzone
 ContractStatusClosed=Zamknięte
 ServiceStatusInitial=Nie działa
-ServiceStatusRunning=Uruchamianie
-ServiceStatusNotLate=Running, nie minął
-ServiceStatusNotLateShort=Nie minął
-ServiceStatusLate=Running, minął
+ServiceStatusRunning=Działa
+ServiceStatusNotLate=Działa, nie wygasł
+ServiceStatusNotLateShort=Nie wygasł
+ServiceStatusLate=Działa, wygasł
 ServiceStatusLateShort=Minął
 ServiceStatusClosed=Zamknięte
 ShowContractOfService=Show contract of service
@@ -20,38 +20,38 @@ ContractsSubscriptions=Umowy/Subskrypcje
 ContractsAndLine=Kontrakty i pozycje kontraktów
 Contract=Kontrakt
 ContractLine=Pozycja kontraktu
-Closing=Zamknięcie
+Closing=Zamknięte
 NoContracts=Nr umowy
 MenuServices=Usługi
 MenuInactiveServices=Nieaktywne usługi
 MenuRunningServices=Uruchomione usługi
-MenuExpiredServices=Minął usług
-MenuClosedServices=Zamknięte usług
+MenuExpiredServices=Wygasłe usługi
+MenuClosedServices=Zamknięte usługi
 NewContract=Nowy kontrakt
 NewContractSubscription=Nowa umowa/subskrypcja
 AddContract=Stwórz kontrakt
 DeleteAContract=Usuń kontrakt
 CloseAContract=Zamknij kontrakt
 ConfirmDeleteAContract=Czy na pewno chcesz usunąć ten kontrakt i wszystkie jego usługi?
-ConfirmValidateContract=Czy na pewno chcesz, aby potwierdzić tę umowę?
+ConfirmValidateContract=Czy na pewno chcesz potwierdzić tą umowę pod nazwą <b>%s</b>?
 ConfirmCloseContract=Spowoduje to zamknięcie wszystkich usług (aktywnych lub nie). Czy na pewno chcesz zamknąć ten kontrakt?
-ConfirmCloseService=Czy na pewno chcesz zamknąć tej usługi wraz z <b>datą %s?</b>
-ValidateAContract=Sprawdź umowę
+ConfirmCloseService=Czy na pewno chcesz zamknąć tą usługę z datą <b>%s?</b>
+ValidateAContract=Potwierdź kontrakt
 ActivateService=Aktywacja usługi
-ConfirmActivateService=Czy na pewno chcesz, aby uaktywnić tę usługę z <b>dnia %s?</b>
+ConfirmActivateService=Czy na pewno chcesz, aby uaktywnić tę usługę z datą <b>%s</b>?
 RefContract=Numer umowy
 DateContract=Data kontraktu
 DateServiceActivate=Data aktywacji usługi
 ShowContract=Pokaż umowę
 ListOfServices=Lista usług
 ListOfInactiveServices=Lista nie aktywnych usług
-ListOfExpiredServices=Lista minął aktywnych usług
+ListOfExpiredServices=Lista wygasłych aktywnych usług
 ListOfClosedServices=Lista zamkniętych usług
 ListOfRunningServices=Lista uruchomionych usług
 NotActivatedServices=Nie aktywacji usług (wśród zatwierdzonych umów)
 BoardNotActivatedServices=Usługi uaktywnić wśród zatwierdzonych umów
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+LastContracts=Ostatnie %s kontaktów
+LastModifiedServices=Ostatnie %s zmodyfikowanych usług
 ContractStartDate=Data rozpoczęcia
 ContractEndDate=Data zakończenia
 DateStartPlanned=Planowana data rozpoczęcia
@@ -63,7 +63,7 @@ DateStartRealShort=Rzeczywista data rozpoczęcia
 DateEndReal=Rzeczywista data zakończenia
 DateEndRealShort=Rzeczywista data zakończenia
 CloseService=Zamknij usługi
-BoardRunningServices=Minął prowadzenie usług
+BoardRunningServices=Wygasłe działające usługi
 ServiceStatus=Status usługi
 DraftContracts=Szkice kontaktów
 CloseRefusedBecauseOneServiceActive=Umowa nie może zostać zamknięty, gdyż istnieje co najmniej jeden serwis otwarty na nim
@@ -75,10 +75,10 @@ ConfirmMoveToAnotherContract=Wybrałem nowy kontrakt docelowy  i potwierdzam ch
 ConfirmMoveToAnotherContractQuestion=Wybierz, w którym istniejące umowy (na tej stronie), które chcesz przenieść tę usługę?
 PaymentRenewContractId=Odnowienie umowy linii (liczba %s)
 ExpiredSince=Data ważności
-NoExpiredServices=Nie minął aktywne usługi
+NoExpiredServices=Bark wygasłych aktywnych usług
 ListOfServicesToExpireWithDuration=Lista usług wygasających w ciągu %s dni
 ListOfServicesToExpireWithDurationNeg=Lista usług wygasły z więcej niż% s dni
-ListOfServicesToExpire=Lista Usług wygaśnie
+ListOfServicesToExpire=Lista usług do wygaśnięcia
 NoteListOfYourExpiredServices=Ta lista zawiera tylko usługi umów na rzecz osób trzecich jesteś związanych jako przedstawiciel sprzedaży.
 StandardContractsTemplate=Szablon standardowych kontraktów
 ContactNameAndSignature=Dla% s, nazwisko i podpis:
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index 7013d0a15bf..d2bc42c37f6 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Usuń zaplanowane zadanie
 Permission23104 = Wykonaj zaplanowane zadanie
 # Admin
 CronSetup= Konfiguracja zarządzania zaplanowanymi zadaniami
-URLToLaunchCronJobs=Adres URL, aby sprawdzić i uruchomić wymagane cron, jeśli
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Albo sprawdzić i uruchomić określonej pracy
 KeyForCronAccess=Klucz zabezpieczeń dla URL, aby uruchomić cron
 FileToLaunchCronJobs=Linia poleceń do uruchamiania zadań crona
@@ -23,7 +23,7 @@ CronCommand=Komenda
 CronList=Zaplanowane zadania
 CronDelete=Usuwanie zaplanowanych zadań
 CronConfirmDelete=Czy jesteś pewny, że chcesz usunąć te zaplanowane zadania?
-CronExecute=Uruchom zaplanowane zadania
+CronExecute=Launch scheduled job
 CronConfirmExecute=Jesteś pewny, że chcesz teraz wykonać te zaplanowane zadania?
 CronInfo=Moduł zaplanowanych zadań pozwala na uruchamianie zadań, ktore były zaplanowane
 CronTask=Zadanie
@@ -39,9 +39,9 @@ CronMethod=Metoda
 CronModule=Moduł
 CronNoJobs=Brak zarejestrowanych zadań
 CronPriority=Priorytet
-CronLabel=Opis
+CronLabel=Etykieta
 CronNbRun=Ilość uruchomień
-CronMaxRun=Max nb. launch
+CronMaxRun=Maksymalna liczba uruchomień
 CronEach=Każdy
 JobFinished=Zadania uruchomione i zakończone
 #Page card
@@ -49,7 +49,7 @@ CronAdd= Dodaj zadanie
 CronEvery=Wykonaj każde zadanie
 CronObject=Instancja/Obiekt do utworzenia
 CronArgs=Parametry
-CronSaveSucess=Save successfully
+CronSaveSucess=Zapisano pomyślnie
 CronNote=Komentarz
 CronFieldMandatory=Pole %s jest obowiązkowe
 CronErrEndDateStartDt=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
@@ -73,6 +73,7 @@ CronType_method=Wywołanie metody z klasy Dolibarr
 CronType_command=Polecenie powłoki
 CronCannotLoadClass=Nie można załadować klasy s% lub obiektu %s
 UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
+JobDisabled=Zadanie wyłączone
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/pl_PL/deliveries.lang b/htdocs/langs/pl_PL/deliveries.lang
index 554f3913344..d414d0ec28c 100644
--- a/htdocs/langs/pl_PL/deliveries.lang
+++ b/htdocs/langs/pl_PL/deliveries.lang
@@ -24,7 +24,7 @@ GoodStatusDeclaration=Otrzymano towary w dobrym stanie,
 Deliverer=Dostawca:
 Sender=Nadawca
 Recipient=Odbiorca
-ErrorStockIsNotEnough=Nie wystarczająco w magazynie
+ErrorStockIsNotEnough=Brak wystarczającego zapasu w magazynie
 Shippable=Możliwa wysyłka
 NonShippable=Nie do wysyłki
 ShowReceiving=Show delivery receipt
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index b861dbf458a..4995f3c7dee 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Błąd, PHP musi mieć zainstalowany moduł <b>%s</b>, aby ko
 ErrorOpenIDSetupNotComplete=Ty konfiguracji Dolibarr plik konfiguracyjny, aby umożliwić uwierzytelnianie OpenID, ale adres URL usługi OpenID nie jest zdefiniowany w stałej% s
 ErrorWarehouseMustDiffers=magazyn źródłowy i docelowy musi być różny
 ErrorBadFormat=Zły format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Błąd, członek ten nie jest jeszcze związana z żadnymi thirdparty. Członkiem Link do istniejącej strony trzeciej lub utworzyć nowy thirdparty przed utworzeniem subskrypcji z faktury.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Błąd, występuje kilka dostaw związanych z tą przesyłką. Usunięcie odrzucone.
 ErrorCantDeletePaymentReconciliated=Nie można usunąć płatności, które generowane transakcji w banku, który został pojednaniem
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nie można usunąć płatności udostępnionej przez co najmniej jednego stanu zapłaci faktury z
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Zapas dla artykułu %s jest niewystarcz
 ErrorStockIsNotEnoughToAddProductOnInvoice=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowej faktury
 ErrorStockIsNotEnoughToAddProductOnShipment=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowej dostawy
 ErrorStockIsNotEnoughToAddProductOnProposal=Zapas dla artykułu %s jest niewystarczający, aby dodać go do nowej propozycji handlowej
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Hasło zostało ustawione dla tego użytkownika. Jednakże nie Konto użytkownika zostało utworzone. Więc to hasło jest przechowywane, ale nie mogą być używane do logowania do Dolibarr. Może być stosowany przez zewnętrzny moduł / interfejsu, ale jeśli nie trzeba definiować dowolną logowania ani hasła do członka, można wyłączyć opcję "Zarządzaj login dla każdego członka" od konfiguracji modułu użytkownika. Jeśli potrzebujesz zarządzać logowanie, ale nie wymagają hasła, możesz zachować to pole puste, aby uniknąć tego ostrzeżenia. Uwaga: E może być również stosowany jako login, jeśli element jest połączony do użytkownika.
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 03693b86ed4..0eeb7e67eb6 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -20,7 +20,7 @@ ReviewedByCP=Zostanie rozpatrzony przez
 DescCP=Opis
 SendRequestCP=Tworzenie wniosku urlopowego
 DelayToRequestCP=Zostawić wnioski muszą być wykonane co <b>​​najmniej% s dzień (dni)</b> przed nimi.
-MenuConfCP=Balance of leaves
+MenuConfCP=Bilans urlopów
 SoldeCPUser=Liście saldo <b>jest% s</b> dni.
 ErrorEndDateCP=Musisz wybrać datę zakończenia większą niż data rozpoczęcia.
 ErrorSQLCreateCP=Wystąpił błąd SQL podczas tworzenia:
@@ -72,12 +72,12 @@ NewSoldeCP=New Balance
 alreadyCPexist=Wniosek urlopowy na ten okres czasu został już zrobiony.
 FirstDayOfHoliday=Pierwszy dzień wakacji
 LastDayOfHoliday=Ostatni dzień wakacji
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=Ostatnie %s modyfikowanych wniosków urlopowych
 HolidaysMonthlyUpdate=Miesięczna aktualizacja
 ManualUpdate=Ręczna aktualizacja
 HolidaysCancelation=Anulowanie wniosku urlopowego
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Nazwisko pracownika
+EmployeeFirstname=Imię pracownika
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang
index a69aaebc3d5..d1f43fa807c 100644
--- a/htdocs/langs/pl_PL/hrm.lang
+++ b/htdocs/langs/pl_PL/hrm.lang
@@ -13,5 +13,5 @@ DictionaryDepartment=HR - Lisa departamentów
 DictionaryFunction=HR - lista funkcji
 # Module
 Employees=Zatrudnionych
-Employee=Zatrudnieni
-NewEmployee=Nowe zatrudnienie
+Employee=Pracownik
+NewEmployee=Nowy pracownik
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 12cd5391941..a443f374709 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP obsługuje sesje.
 PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
 PHPSupportPOSTGETKo=Możliwe, że PHP nie obsługuje zmiennych POST i/lub GET. Sprawdź parametr <b>variables_order</b> w php.ini.
 PHPSupportGD=PHP obsługuje graficzne funkcje GD.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Ta wersja PHP oferuje wsparcie funkcji UTF8.
 PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na <b>%s</b>. Powinno wystarczyć.
 PHPMemoryTooLow=Maksymalna ilość pamięci sesji PHP <b>%s</b> bajtów. To może nie wystarczyć. Zmień w <b>php.ini</b> parametr <b>memory_limit</b> na przynajmniej <b>%s</b> bajtów.
-Recheck=Potwierdz w celu dokładniejszego testu
+Recheck=Potwierdź w celu dokładniejszego testu
 ErrorPHPDoesNotSupportSessions=Instalacja PHP nie obsługuje sesji. Taka funkcjonalność jest wymagana do działania Dolibarra. Sprawdź swoje ustawienia PHP.
 ErrorPHPDoesNotSupportGD=Twoja instalacji PHP nie obsługuje funkcji graficznych GD. wykresy nie będą dostępne.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Twoja instalacji PHP nie obsługuje funkcji UTF8. Dolibarr może nie działać poprawnie. Rozwiązać ten problem przed instalacją Dolibarr'a.
 ErrorDirDoesNotExists=Katalog %s nie istnieje.
 ErrorGoBackAndCorrectParameters=Cofnij się i popraw złe parametry.
@@ -133,6 +135,10 @@ ActivateModule=Aktywuj moduł %s
 ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
 WarningUpgrade=Ostrzeżenie:\nCzy utworzyłeś kopię zapasową bazy danych?\nJest to wysoce zalecane: przykładowo, z powodu kilku błędów w systemie baz danych (dla przykładu wersje 5.5.40/41/42/43), niektóre dane lub tabele mogą zostać utracone podczas tego procesu, w związku z tym jest wysoce zalecane posiadanie pełnej kopii zapasowej swojej bazy danych przed uruchomieniem migracji.\n\nKliknij OK w celu rozpoczęcia procesu migracji...
 ErrorDatabaseVersionForbiddenForMigration=Twoja wersja bazy danych to %s. Ma krytyczną lukę utraty danych jeśli się zmieni struktury na bazie danych, tak jak jest to wymagane podczas procesu migracji. Z tego powodu migracje nie zostaną dopuszczone dopóki nie ulepszysz bazy danych do wyższej wersji  (lista znanych wersji z lukami: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Aktualizacja danych na temat działań
 MigrationPaymentMode=Migracji danych w trybie płatności
 MigrationCategorieAssociation=Migracja kategorii
 MigrationEvents=Przenieś wydarzenie by dodać nowego właściciela do przypisanej tabeli.
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Odśwież moduł %s
 ShowNotAvailableOptions=Pokaż niedostępne opcje.
 HideNotAvailableOptions=Ukryj niedostępne opcje.
diff --git a/htdocs/langs/pl_PL/interventions.lang b/htdocs/langs/pl_PL/interventions.lang
index 38fad7eb219..850d0f64169 100644
--- a/htdocs/langs/pl_PL/interventions.lang
+++ b/htdocs/langs/pl_PL/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=W ślad za kontakt z klientem
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Interwencje generowane z zamówień
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/pl_PL/ldap.lang b/htdocs/langs/pl_PL/ldap.lang
index 1630de59dc8..044c8e8c414 100644
--- a/htdocs/langs/pl_PL/ldap.lang
+++ b/htdocs/langs/pl_PL/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Pierwsze subskrypcji daty
 LDAPFieldFirstSubscriptionAmount=Pierwsza subskrypcja kwoty
 LDAPFieldLastSubscriptionDate=Ostatnia data subskrypcji
 LDAPFieldLastSubscriptionAmount=Ostatnia kwota subskrypcji
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Użytkownik zsynchronizowany
 GroupSynchronized=Grupa zsynchronizowana
 MemberSynchronized=Państwa zsynchronizowane
diff --git a/htdocs/langs/pl_PL/mails.lang b/htdocs/langs/pl_PL/mails.lang
index 2373d9b34c2..bd419cb9d99 100644
--- a/htdocs/langs/pl_PL/mails.lang
+++ b/htdocs/langs/pl_PL/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Czytać
 YourMailUnsubcribeOK=Mail <b>%s</b> poprawnie wypisano z listy mailingowej
 ActivateCheckReadKey=Klucz użyty do szyfrowania URL używany do "potwierdzenia odczytu", a funkcja "Unsubcribe"
 EMailSentToNRecipients=Mail wysłany do %s odbiorców.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>% s</b> dodany do listy odbiorców docelowych
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=Wybrane Wszystkie thirdparties i jeśli e-mail jest ustawiony.
 ResultOfMailSending=Wynik masowego wysyłania EMail
 NbSelected=Wybrane nb
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 1c8c184f0e2..9eb2334392d 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -67,6 +67,7 @@ SelectDate=Wybierz datę
 SeeAlso=Zobacz także %s
 SeeHere=Zobacz tutaj
 BackgroundColorByDefault=domyślny kolor tła
+FileRenamed=The file was successfully renamed
 FileUploaded=Plik został pomyślnie przesłany
 FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym celu wybierz opcję "dołącz plik".
 NbOfEntries=Liczba wejść
@@ -134,7 +135,7 @@ RemoveLink=Usuń link
 AddToDraft=Add to draft
 Update=Uaktualnić
 Close=Zamknij
-CloseBox=Remove widget from your dashboard
+CloseBox=Usuń widget ze swojej tablicy
 Confirm=Potwierdź
 ConfirmSendCardByMail=Czy na pewno chcesz wysłać tą treść mailem do <b>%s</b>?
 Delete=Skasować
@@ -245,6 +246,10 @@ DateBuild=Raport stworzenia daty
 DatePayment=Data płatności
 DateApprove=Data zatwierdzania
 DateApprove2=Termin zatwierdzania (drugie zatwierdzenie)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=rok
 DurationMonth=miesiąc
 DurationWeek=tydzień
@@ -256,6 +261,7 @@ DurationDays=dni
 Year=Rok
 Month=Miesiąc
 Week=Tydzień
+WeekShort=Week
 Day=Dzień
 Hour=Godzina
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Dzień miesiąca
 HourShort=H
 MinuteShort=mn
 Rate=Stawka
+CurrencyRate=Currency conversion rate
 UseLocalTax=Zawiera podatek
 Bytes=Bajty
 KiloBytes=Kilobajtów
@@ -442,7 +449,7 @@ Photo=Obraz
 Photos=Obrazy
 AddPhoto=Dodaj obraz
 DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
+ConfirmDeletePicture=Potwierdzić usunięcie obrazka?
 Login=Login
 CurrentLogin=Aktualny login
 January=Styczeń
@@ -565,8 +572,11 @@ BackToList=Powrót do listy
 GoBack=Wróć
 CanBeModifiedIfOk=Mogą być zmienione  jeśli ważne
 CanBeModifiedIfKo=Mogą być zmienione, jeśli nie ważne
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie
 RecordsModified=%s zmodyfikowanych rekordów 
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatyczny kod
 FeatureDisabled=Funkcja wyłączona
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Nie masz uprawnień do tego działania
 SessionName=Nazwa sesji
 Method=Metoda
 Receive=Odbiór
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Część
 TotalWoman=Razem
 NeverReceived=Nigdy nie otrzymała
@@ -598,6 +609,7 @@ DisabledModules=Nieaktywnych modułów
 For=Dla
 ForCustomer=Dla klienta
 Signature=Podpis
+DateOfSignature=Date of signature
 HidePassword=Pokaż polecenie z ukrytym hasłem
 UnHidePassword=Pokaż prawdziwe polecenie z otwartym hasłem
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=Nowy atrybut
 AttributeCode=Kod atrybut
 URLPhoto=Url ze zdjęciem / logo
 SetLinkToAnotherThirdParty=Link do innego kontrahenta
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Utwórz Szic
 SetToDraft=Wróć do szkicu
 ClickToEdit=Kliknij by edytować
@@ -655,13 +676,13 @@ ByDay=Według dnia
 BySalesRepresentative=Według przedstawiciela handlowego
 LinkedToSpecificUsers=Podpięty do kontaktu współużytkownika
 NoResults=Brak wyników
-AdminTools=Admin tools
+AdminTools=Narzędzia administracyjne
 SystemTools=Narzędzia systemowe
 ModulesSystemTools=Narzędzia modułów
 Test=Test
 Element=Element
 NoPhotoYet=Brak obrazów
-Dashboard=Dashboard
+Dashboard=Tablica
 Deductible=Odliczenie
 from=od
 toward=kierunek
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Poniedziałek
 Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index c154d695e8f..3ccf8d1e0cb 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -30,8 +30,8 @@ MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Określa, czy globalne rabatu jest traktowan
 MARGIN_TYPE=Cena zakupu/cena fabryczna jest sugerowana jako domyślna do obliczenia marży
 MargeType1=Marża na najlepszej cenie dostawcy
 MargeType2=Marża na średniej cenie ważonej
-MargeType3=Margin on Cost Price
-MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
+MargeType3=Marża na cenie fabrycznej
+MarginTypeDesc=* Marża na najlepszej cenie zakupu = Cena sprzedaży - Najlepsza cena dostawcy zdefiniowana na karcie produktu<br>* Marża na średnio ważonej cenie (WAP) = Cena sprzedaży - Średnio ważona cena (WAP) lub najlepsza cena dostawcy jeżeli WAP nie jest zdefiniowana<br>* Marża na cenie fabrycznej = Cena sprzedaży -  Cena fabryczna zdefiniowana na karcie produktu lub WAP jeżeli cena fabryczna nie jest zdefiniowana, lub najlepsza cena dostawcy jeżeli WAP nie jest jeszcze zdefiniowana
 CostPrice=Cena fabryczna
 UnitCharges=Koszty jednostkowe
 Charges=Opłaty
@@ -40,4 +40,5 @@ AgentContactTypeDetails=Zdefiniować, jaki rodzaj (związane na fakturach) konta
 rateMustBeNumeric=Stawka musi być wartością liczbową
 markRateShouldBeLesserThan100=Stopa znak powinien być niższy niż 100
 ShowMarginInfos=Pokaż informacje o marżę
-CheckMargins=Margins detail
+CheckMargins=Szczegóły marż
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/pl_PL/oauth.lang b/htdocs/langs/pl_PL/oauth.lang
index 585e6ff763b..af64b116f7a 100644
--- a/htdocs/langs/pl_PL/oauth.lang
+++ b/htdocs/langs/pl_PL/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Konfiguracja Oauth
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=Brak tokenu zapisanego w lokalnej bazie danych
 HasAccessToken=Token wygenerowano i zapisano w lokalnej bazie danych
 NewTokenStored=Token odebrano i zapisano
@@ -9,7 +11,16 @@ RequestAccess=Kliknij tutaj w celu wysłania zapotrzebowania/odnowienia dostępu
 DeleteAccess=Kliknuj tutaj, aby usunąć token
 UseTheFollowingUrlAsRedirectURI=Użyj następującego adresu URL jako Przekierowanie URI podczas tworzenia poświadczeń dostawcy OAuth:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=API Google
-OAUTH_GOOGLE_ID=ID API Google
-OAUTH_GOOGLE_SECRET=ID API Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 181b9951149..29587194ce4 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Twoje zamówienia zostały utworzone
 OrderFail=Błąd podczas tworzenia się zamówień
 CreateOrders=Tworzenie zamówień
 ToBillSeveralOrderSelectCustomer=Aby utworzyć fakturę za kilka rzędów, kliknij pierwszy na klienta, a następnie wybrać "% s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/pl_PL/printing.lang b/htdocs/langs/pl_PL/printing.lang
index 12721a1481f..3aeccf5d1ef 100644
--- a/htdocs/langs/pl_PL/printing.lang
+++ b/htdocs/langs/pl_PL/printing.lang
@@ -18,10 +18,6 @@ UserConf=Konfiguracja per użytkownik
 PRINTGCP_INFO=Konfiguracja API Google OAuth
 PRINTGCP_AUTHLINK=Poświadczenie
 PRINTGCP_TOKEN_ACCESS=Token Cloud Print OAuth
-PRINTGCP_TOKEN_REFRESH=Reklamowe Odśwież Present
-PRINTGCP_TOKEN_EXPIRED=Token wygasł
-PRINTGCP_TOKEN_EXPIRE_AT=Token wygaśnie za
-PRINTGCP_DELETE_TOKEN=Usuń zachowany token
 PrintGCPDesc=Sterownik ten pozwala na wysyłanie dokumentów bezpośrednio do drukarki z Google Cloud Print.
 GCP_Name=Nazwa
 GCP_displayName=Nazwa wyświetlana
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 4dc8b296087..7854b552f9d 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Data wykorzystania lub data sprzedaży lub Lot / Numer seryjny
 batch_number=Lot/ Numer seryjny
 BatchNumberShort=Lot/ Nr. Seryjny
-l_eatby=Wykorzystaj - po dacie
-l_sellby=Sprzedaj - po dacie
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial detale
 DetailBatchFormat=Lot/Serial: %s - Wykorzystano: %s - Sprzedano: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Ilość: %d
 AddDispatchBatchLine=Dodaj linię dla przedłużenia wysyłki
 WhenProductBatchModuleOnOptionAreForced=Gdy moduł lot / numer seryjny jest aktywny, zwiększenie / zmniejszenie Tryb magazynowy jest wymuszony do ostatniego wyboru i nie może być edytowany. Inne opcje można określić, jak chcesz.
 ProductDoesNotUseBatchSerial=Ten produkt nie używa lotu/numeru seryjnego
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 849ae796686..3a1819fd7cd 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Masowa zmiana VAT
 ProductVatMassChangeDesc=Strona ta może być wykorzystana do modyfikacji zdefiniowanego stawkę VAT na produkty i usługi z wartością do drugiego. Uwaga, zmiana ta jest wykonywana na całej bazy danych.
 MassBarcodeInit=Masowa inicjalizacja kodów kreskowych
 MassBarcodeInitDesc=Strona ta może być używana do zainicjowania kod kreskowy na obiekty, które nie mają kodów kreskowych zdefiniowane. Sprawdź wcześniej, że konfiguracja modułu kodu kreskowego jest kompletna.
-ProductAccountancyBuyCode=Kod księgowy (zakup)
-ProductAccountancySellCode=Kod księgowy (sprzedaż)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produkt lub usługa
 ProductsAndServices=Produkty i usługi
 ProductsOrServices=Produkty lub Usługi
@@ -59,6 +59,8 @@ SellingPriceHT=Cena sprzedaży (bez podatku)
 SellingPriceTTC=Cena sprzedaży (z podatkiem)
 CostPriceDescription=Cena ta (po odliczeniu podatku) może być używany do przechowywania średniej kwoty koszt ten produkt do swojej firmy. Może to być dowolny cena obliczyć samodzielnie, na przykład od średniej ceny zakupu powiększonej średniego kosztu produkcji i dystrybucji.
 CostPriceUsage=W przyszłej wersji, ta wartość może posłużyć do obliczenia marży.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nowa cena
 MinPrice=Minimalna cena sprzedaży
 CantBeLessThanMinPrice=Cena sprzedaży nie może być niższa niż minimalna dopuszczalna dla tego produktu (%s bez podatku). Ten komunikat może się również pojawić po wpisaniu zbyt wysokiego rabatu.
@@ -169,8 +171,8 @@ m2=m²
 m3=m³
 liter=litr
 l=l
-ProductCodeModel=Szablon sędzią wyrobów
-ServiceCodeModel=Serwis szablon sędzią
+ProductCodeModel=Szablon numeru referencyjnego dla produktu
+ServiceCodeModel=Szablon numeru referencyjnego dla usługi
 CurrentProductPrice=Aktualna cena
 AlwaysUseNewPrice=Zawsze używaj aktualnej ceny produktu / usługi
 AlwaysUseFixedPrice=Zastosuj stałą cenę
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Wydrukuj kilka naklejek na jednym kodzie kreskowym
 BuildPageToPrint=Generowanie strony do druku
 FillBarCodeTypeAndValueManually=Wypełnij typ kodu kreskowego i wartość ręcznie.
 FillBarCodeTypeAndValueFromProduct=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego produktu.
-FillBarCodeTypeAndValueFromThirdParty=Wypełnij typ kodu kreskowego i wartości z kodu kreskowego z thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Określenie rodzaju i wartości kodu kreskowego nie kompletnego o produkt% s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Określenie rodzaju i wartości kodu kreskowego nie wyczerpujący thirdparty% s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Informacje o kod kreskowy produktu% s:
-BarCodeDataForThirdparty=Informacje o kod kreskowy z thirdparty% s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definiowanie wartości kodów kreskowych dla wszystkich rekordów (to również zresetować wartości kodów kreskowych już zdefiniowane z nowymi wartościami)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 328b9fc008e..fc2e3c101e8 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista ofert handlowcych związanych z projektem
-ListOrdersAssociatedProject=Lista zamówień klienta związanych z projektem
-ListInvoicesAssociatedProject=Lista faktur klienta związanych z projektem
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Lista zamówień dostawców związanych z projektem
-ListSupplierInvoicesAssociatedProject=Lista faktur dostawców związanych z projektem
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Wykaz umów związanych z projektem
 ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem
 ListExpenseReportsAssociatedProject=Lista raportów o wydatkach związanych z projektem
@@ -123,6 +123,7 @@ ProjectReportDate=Zmień datę zadana nawiązując do daty rozpoczęcia projektu
 ErrorShiftTaskDate=Niemożliwe do przesunięcia daty zadania według nowej daty rozpoczęcia projektu
 ProjectsAndTasksLines=Projekty i zadania
 ProjectCreatedInDolibarr=Projekt %s utworzony
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Zadanie %s utworzono
 TaskModifiedInDolibarr=Zadań %s zmodyfikowano
 TaskDeletedInDolibarr=Zadań %s usunięto
@@ -153,7 +154,7 @@ PlannedWorkload=Planowany nakład pracy
 PlannedWorkloadShort=Nakład pracy
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony
-FirstAddRessourceToAllocateTime=Skojarzyć zasób przeznaczyć czas
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Wejścia na dzień
 InputPerWeek=Wejścia w tygodniu
 InputPerAction=Wejścia na działanie
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statystyki dotyczące projektów / przewodów
 TaskAssignedToEnterTime=Zadanie przypisanie. Wprowadzenie czasu na zadanie powinno być możliwe.
 IdTaskTime=Id razem zadaniem
-YouCanCompleteRef=Jeśli chcesz, aby zakończyć ref z niektórych informacji (do wykorzystania go jako filtrów wyszukiwania), jest zaleciły, aby dodać - znak go oddzielić, więc automatyczne numerowanie będzie nadal działać poprawnie dla kolejnych projektów. Na przykład% s-ABC. Możesz też wolą, aby dodać klucze wyszukiwania na etykiecie.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
index 8fbbc749940..46e470ec682 100644
--- a/htdocs/langs/pl_PL/resource.lang
+++ b/htdocs/langs/pl_PL/resource.lang
@@ -2,7 +2,7 @@
 MenuResourceIndex=Zasoby
 MenuResourceAdd=Nowe zasoby
 DeleteResource=Usuń zasoby
-ConfirmDeleteResourceElement=Potwierdz usunięcie zasobów dla tego elementu
+ConfirmDeleteResourceElement=Potwierdź usunięcie zasobów dla tego elementu
 NoResourceInDatabase=Brak zasobów w bazie danych
 NoResourceLinked=Brak podliknowanych zasobów
 
@@ -24,7 +24,7 @@ RessourceLineSuccessfullyDeleted=Linia zasobów poprawnie usunięta
 RessourceLineSuccessfullyUpdated=Linia zasobów poprawnie uaktualniona
 ResourceLinkedWithSuccess=Zasoby podlinkowane poprawnie
 
-ConfirmDeleteResource=Potwierdz by usunąc te zasoby
+ConfirmDeleteResource=Potwierdź by usunąć te zasoby
 RessourceSuccessfullyDeleted=Zasoby usunięte poprawnie
 DictionaryResourceType=Typ zasobów
 
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index 423c49250e9..ba85a71d279 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nowa wypłata
 SalaryPayment=Wypłata wynagrodzenia
 SalariesPayments=Wypłaty wynagordzeń
 ShowSalaryPayment=Pokaż wypłaty wynagrodzeń
-THM=Średnia cena za godzine
-TJM=Średnia cena za dzień
+THM=Average hourly rate
+TJM=Average daily rate
 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ń
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index b03fc0a4a6d..721b58e1e80 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Usuń wysyłanie
 Stock=Stan
 Stocks=Stany
 StocksByLotSerial=Zapasy wg. lotu/nr seryjnego
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Ruchy
 ErrorWarehouseRefRequired=Nazwa referencyjna magazynu wymagana
 ListOfWarehouses=Lista magazynów
@@ -43,6 +45,7 @@ PMPValue=Wartość
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Magazyny wartości
 UserWarehouseAutoCreate=Twórz automatycznie magazyn gdy stworzysz użytkownika
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Produkt akcji i subproduct akcji są niezależne
 QtyDispatched=Ilość wysyłanych
 QtyDispatchedShort=Ilość wysyłanych
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/pl_PL/supplier_proposal.lang b/htdocs/langs/pl_PL/supplier_proposal.lang
index 070367487b2..380b7cea345 100644
--- a/htdocs/langs/pl_PL/supplier_proposal.lang
+++ b/htdocs/langs/pl_PL/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Stworzenie modelu Domyślnie
 DefaultModelSupplierProposalToBill=Domyślny szablon podczas zamykania wniosek cenowej (przyjęte)
 DefaultModelSupplierProposalClosed=Domyślny szablon podczas zamykania wniosek cenowej (odmówił)
 ListOfSupplierProposal=Lista wniosków wniosku dostawca
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index f6e3b8b27d2..7256633e8ae 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -7,13 +7,13 @@ History=Historia
 ListOfSuppliers=Lista dostawców
 ShowSupplier=Pokaż dostawcę
 OrderDate=Data zamówienia
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Niektóre podprodukty nie mają zdefiniowanych cen
-AddSupplierPrice=Dodaj cenę dostawcy
-ChangeSupplierPrice=Zmień cenę dostawcy
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ten dostawca jest już powiązany z referencją: %s
 NoRecordedSuppliers=Nie zapisano żadnych dostawców
 SupplierPayment=Płatność dostawcy
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Lista zleceń dostawca
 MenuOrdersSupplierToBill=Zamówienia dostawca do faktury
 NbDaysToDelivery=Opóźnienie dostawy w dniach
 DescNbDaysToDelivery=Największe opóźnienie dostawy wśród produktów z tego zamówienia
-UseDoubleApproval=Użyj podwójnej akceptacji gdy cena (bez podatku) jest wyższa niż (Druga akceptacja może być wykonana przez każdego użytkownika  zodpowiednimi uprawnieniami. Ustaw 0 aby wyłączyć drugą akceptację)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index af375ebc52f..7272ccf825d 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -66,7 +66,7 @@ InternalUser=Wewnętrzny użytkownik
 ExportDataset_user_1=Dolibarr Użytkownicy i właściwości
 DomainUser=Domena użytkownika %s
 Reactivate=Przywraca
-CreateInternalUserDesc=Ta forma pozwala na stworzenie użytkownikowi wewnętrznego do firmy / fundacji. Aby utworzyć użytkownika zewnętrznego (klientami, dostawcami, ...), użyj przycisku "Utwórz Dolibarr użytkownika" z karty kontaktu osoby trzeciej.
+CreateInternalUserDesc=Ten formularz pozwala na stworzenie użytkownika wewnętrznego dla twojej firmy/fundacji. Aby utworzyć użytkownika zewnętrznego (klient, dostawca itp.) użyj opcji "Utwórz użytkownika Dolibarr" z karty "Kontrahent"
 InternalExternalDesc=<b>Wewnętrzny</b> użytkownik jest użytkownikiem, który jest częścią Twojej firmy / fundacji. <br> <b>Zewnętrzny</b> użytkownik jest klientem, dostawcą lub innym kontrahentem. <br><br> W obu przypadkach uprawnienia określają prawa dostępu do Dolibarr; także zewnętrzny użytkownik może mieć inne menu niż użytkownik wewnętrzny (patrz Strona Główna - Konfiguracja - Wyświetlanie)
 PermissionInheritedFromAGroup=Zezwolenie udzielone ponieważ odziedziczył od jednego z użytkowników grupy.
 Inherited=Odziedziczone
@@ -100,3 +100,6 @@ WeeklyHours=Tygodniowy czas
 ColorUser=Kolor użytkownik
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/pl_PL/website.lang b/htdocs/langs/pl_PL/website.lang
index eb8794cfbab..0c5d53db69f 100644
--- a/htdocs/langs/pl_PL/website.lang
+++ b/htdocs/langs/pl_PL/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edytuj Menu
 EditPageMeta=Edytuj koniec
 EditPageContent=Edytuj zawartość
 Website=Strona WWW
+Webpage=Web page
 AddPage=Dodaj stronę
 PreviewOfSiteNotYetAvailable=Podgląd twojej strony <strong>%s</strong> nie jest jeszcze dostępny. Musisz najpierw dodać stronę.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/pl_PL/withdrawals.lang b/htdocs/langs/pl_PL/withdrawals.lang
index 4534b4a5f33..7fb8564583a 100644
--- a/htdocs/langs/pl_PL/withdrawals.lang
+++ b/htdocs/langs/pl_PL/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Klienci stałych zleceń obszarze
-StandingOrders=Zlecenia stałe
-StandingOrder=Zlecenia stałe
-NewStandingOrder=Nowe zlecenie stałe
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Do procesu
-WithdrawalsReceipts=Wycofania wpływy
-WithdrawalReceipt=Wycofanie otrzymania
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Wycofania linie
-RequestStandingOrderToTreat=Wniosek o stałych zleceń do przetwarzania
-RequestStandingOrderTreated=Wniosek o stałych zleceń przetworzonych
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Jeszcze nie możliwe. Wycofaj stan musi być ustawiony na "dobro", zanim uzna odrzucić na konkretnych liniach.
-NbOfInvoiceToWithdraw=Nb. z faktury z wycofania wniosku
-NbOfInvoiceToWithdrawWithInfo=Nb. z faktury z wycofać wniosek o klientów posiadających zdefiniowane dane konta bankowego
-InvoiceWaitingWithdraw=Faktura czeka na wycofać
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Kwota do wycofania
-WithdrawsRefused=Wycofuje odmówił
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nr klienta zapłaty faktury w trybie "wycofania" czeka. Idź na "Wypłata" kartę na fakturze kartę do złożenia wniosku.
 ResponsibleUser=Odpowiedzialny użytkownika
-WithdrawalsSetup=Wycofanie konfiguracji
-WithdrawStatistics=Wycofuje statystyk
-WithdrawRejectStatistics=Wypłaty odrzuca "statystyki
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Zrób wycofać wniosek
 ThirdPartyBankCode=Kod banku kontrahenta
 NoInvoiceCouldBeWithdrawed=Nr faktury withdrawed sukces. Sprawdź, czy faktura jest na spółki z ważnych BAN.
@@ -46,7 +47,7 @@ StatusRefused=Odmówił
 StatusMotif0=Nieokreślone
 StatusMotif1=Przepis insuffisante
 StatusMotif2=conteste liqueur
-StatusMotif3=Wycofanie zamówienia nie
+StatusMotif3=No direct debit payment order
 StatusMotif4=Zamówienia klientów
 StatusMotif5=RIB inexploitable
 StatusMotif6=Salda rachunku bez
@@ -61,28 +62,43 @@ 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=Konto bankowe do odbioru odstępuje
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=Zakładka ta pozwala na żądanie zlecenia stałego. Gdy to zrobisz, przejdź do menu bankowości> Wycofanie zarządzać zlecenia stałego. Gdy zlecenia stałego jest zamknięty, płatność na fakturze będą automatycznie zapisywane, a faktura zamknięte, jeśli pozostała do zapłaty jest null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=Odnosi się to także płatności faktur i będzie je sklasyfikować jako "Paid"
 StatisticsByLineStatus=Statystyki według stanu linii
-RUM=RUM
-RUMWillBeGenerated=Numer RUM będą generowane raz Dane konta bankowego są zapisywane
-WithdrawMode=Tryb (FRST ani powracać) wycofują
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Wycofać żądania kwoty:
 WithdrawRequestErrorNilAmount=Nie można utworzyć wycofać wniosek o kwocie zerowej.
+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
 
 ### Notifications
-InfoCreditSubject=Płatność z %s zamówienia stojących przez bank
-InfoCreditMessage=Stojąc %s zamówienie zostało wypłacone przez bank <br> Data płatności: %s
-InfoTransSubject=Przekazywanie %s rzędu stojących na brzegu
-InfoTransMessage=Stojąc %s zamówienie zostało przesłanych do banku przez %s %s. <br><br>
+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>
 InfoTransData=Kwota: %s <br> Metode: %s <br> Data: %s
-InfoRejectSubject=Zlecenie stałe odmówił
-InfoRejectMessage=Witaj, <br><br> zlecenie stałe z faktury% s związany z firmą% s, z kwoty% s zostało odrzucone przez bank. <br><br> - <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
 ModeWarning=Opcja dla trybu rzeczywistego nie był ustawiony, zatrzymujemy po tej symulacji
diff --git a/htdocs/langs/pl_PL/workflow.lang b/htdocs/langs/pl_PL/workflow.lang
index 15b2e826620..68504b831b8 100644
--- a/htdocs/langs/pl_PL/workflow.lang
+++ b/htdocs/langs/pl_PL/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Konfiguracja modułu przepływu pracy
 WorkflowDesc=Moduł ten jest przeznaczony do zmiany zachowania automatycznych działań na język aplikacji. Domyślnie pracy jest otwarty (można robić rzeczy w określonej kolejności). Możesz włączyć automatyczne czynności, które są zainteresowane.
 ThereIsNoWorkflowToModify=Nie ma zmiany workflow dostępne z aktywnych modułów.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatycznie twórz fakturę dla klienta
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klasyfikowania związany propozycję źródłowego zapowiadane gdy zamówienie klienta jest ustawiony na płatne
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klasyfikowania związane Źródło (-a), gdy klienta do faktury klienta naliczana jest ustawiony wypłacane
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klasyfikowania związany zamówienie klienta źródłowego (s) do grubodzioby, gdy faktura klient jest weryfikowany
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 10141084751..3a58776058d 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -1,37 +1,32 @@
 # Dolibarr language file - Source file is en_US - accountancy
-ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para arquivo de exportação
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para o arquivo de exportação
 ACCOUNTING_EXPORT_DATE=Formato de data para arquivo de exportação
-ConfigAccountingExpert=Configuração do módulo específico em contabilidade
+ACCOUNTING_EXPORT_PIECE=Exportar a quantidade
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportação com conta global?
+ACCOUNTING_EXPORT_LABEL=Exportar a Descrição?
+ACCOUNTING_EXPORT_AMOUNT=Exportar o montante?
+ACCOUNTING_EXPORT_DEVISE=Exportar Moedas
+Selectformat=Selecione o formato do arquivo
+ACCOUNTING_EXPORT_PREFIX_SPEC=Especifique o prefixo do nome do arquivo
+ConfigAccountingExpert=Configuração do módulo específico de contabilidade
 Journaux=Diários
 JournalFinancial=Diários financeiros
 Selectchartofaccounts=Selecionar um gráfico de contas
 Addanaccount=Adicionar uma conta contábil
 AccountAccounting=Conta contábil
 AccountAccountingShort=Conta
-Ventilation=Parar - Cancelar
+AccountAccountingSuggest=Sugerir Conta de Contabilidade
 MenuAccountancy=Contabilidade
-CustomersVentilation=Cancelar cliente
-SuppliersVentilation=Cancelar fornecedor
-CreateMvts=Criar movimento
-UpdateMvts=Modificação de um movimento
-WriteBookKeeping=Registo das contas em contabilidade geral
 Bookkeeping=Livro razão
 AccountBalance=Saldo da conta
-InvoiceLines=Linhas de fatura para discutir
-InvoiceLinesDone=Linhas de fatura discutidas
-Ventilate=Descutir/debater
+CAHTF=Total de Compras em fornecedores sem Impostos
 EndProcessing=Final de processamento
-AnyLineVentilate=Todas as linhas discutidas
 SelectedLines=Linhas selecionadas
-VentilatedinAccount=Discutido com êxito na conta contábil
-NotVentilatedinAccount=Não discutida na conta contábil
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a ser mostrado por quebra de página (máxima recomendada: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a classificação das quebras de páginas  "separadas" por elementos mais recentes
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a classificação das quebras de páginas  "separar" por elementos mais recentes
+Lineofinvoice=Linha da fatura
 ACCOUNTING_LENGTH_DESCRIPTION=Comprimento para a exibição de produtos e serviços descritos em listas (Melhor = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Comprimento para a exibição de produtos e serviços conta de formulário descritos em listas (Melhor = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Tamanho das contas gerais
-ACCOUNTING_LENGTH_AACCOUNT=Tamanho das contas de terceiros
+ACCOUNTING_SELL_JOURNAL=Resumo diário das Vendas
+ACCOUNTING_PURCHASE_JOURNAL=Resumo diário das Compras
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário diversos
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatórios de despesas
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta de transferência
@@ -46,30 +41,24 @@ Code_tiers=Terceiro
 Labelcompte=Conta rótulo
 Sens=Significado
 AccountingCategory=Categoria contábil
+DelYear=Ano a ser deletado
+DelJournal=Resumo a ser deletado
 DelBookKeeping=Excluir os registros do livro razão
 FinanceJournal=Diário financeiro
 DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
 ThirdPartyAccount=Conta de terceiro
-NewAccountingMvt=Nova movimentação
-NumMvts=Número de movimento
-ListeMvts=Listagem de movimento
 ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo tempo
-DescThirdPartyReport=Consulte aqui a lista dos clientes de terceiros e os fornecedores e as suas contas contábeis
 ListAccounts=Lista das contas contábeis
 Pcgtype=Classes de conta
 Pcgsubtype=Sob classe de conta
-DescVentilCustomer=Consulte aqui a contabilização repartição anual dos seus clientes faturas
+TotalVente=Volume total negociado sem Impostos
 TotalMarge=Margem de vendas totais
-DescVentilDoneCustomer=Consultar aqui a lista das linhas das faturas de clientes e sua conta na contabilidade
-DescVentilTodoCustomer=Linhas de faturas de clientes com contas contábeis discutidas
-DescVentilSupplier=Consulte aqui a contabilização anual canceladas de suas faturas de fornecedores
-DescVentilDoneSupplier=Consulte aqui a lista das linhas de faturas de fornecedores e sua conta de contabilidade
-ValidateHistory=Validar automáticamente
 ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
-FicheVentilation=Cancelamento de cartão
+GeneralLedgerIsWritten=Operações estão escritos no livro razão geral
 OptionsDeactivatedForThisExportModel=Para este modelo de exportação, as opções são desativadas
 Selectmodelcsv=Escolha um modelo de exportação
 Modelcsv_normal=Exportação clássica
+InitAccountancy=Contabilidade Inicial
 Options=Opções
 Calculated=Calculado
 Formula=Fórmula
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 2b58d946b27..5921791c3d3 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-Foundation=Associação
 VersionProgram=Versão Programa
 VersionLastInstall=Versão de instalação inicial
 VersionLastUpgrade=Atualização versão mais recente
@@ -7,11 +6,8 @@ VersionExperimental=Versão Experimental
 VersionDevelopment=Versão de Desenvolvimento
 VersionUnknown=Versão Desconhecida
 VersionRecommanded=Versão Recomendada
-FileCheck=Integridade de arquivos
 FilesMissing=Arquivos ausentes
 FilesUpdated=Arquivos atualizados
-FileCheckDolibarr=Verificar a integridade dos arquivos Dolibarr
-XmlNotFound=Arquivo XML de Integridade Dolibarr não encontrado
 SessionId=ID da sessão
 SessionSaveHandler=Manipulador para salvar sessão
 SessionSavePath=Caminho para salvar sessão
@@ -45,7 +41,6 @@ ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou su
 ErrorDecimalLargerThanAreForbidden=Erro, número maior que <b>%s</b> e não é suportada pelo dolibarr.
 DictionarySetup=Configuração Dicionário
 Chartofaccounts=Plano de contas
-Fiscalyear=Exercícios Fiscais
 ErrorReservedTypeSystemSystemAuto=A Variável 'system' e 'systemauto' é reservada. Você pode usar 'user' como variável para adicionar sua própria gravação
 ErrorCodeCantContainZero=A variável não pode conter valor "0" (zero)
 DisableJavascript=Desativar as funções Javascript e Ajax
@@ -98,12 +93,15 @@ CurrentSessionTimeOut=A sessão expirou
 YouCanEditPHPTZ=Para trocar diferente PHP 'timezone' (não requerido), você pode tentar adicionando um arquivo .htacces com uma linha tipo essa "SetEnv TZ Europe/Paris"
 MaxNbOfLinesForBoxes=Número máximo de linahs para os widgets
 PositionByDefault=Posição Padrão(default)
+MenusDesc=O Gerenciador de Menu, define o conteúdo das barras de menu (Horizontal e Vertical).
+MenusEditorDesc=O Editor de menu permite definir entradas personalizadas ao menu.<br />Use-o com cuidado para evitar instabilidades e que os menus fiquem totalmente inacessiveis.<br />Alguns módulos adicionam entradas do menu ( no menu <b>Geral</b> principalmente). Se você remover algumas destas entradas por engano, você poderá restaurá-las desabilitando e habilitando o módulo novamente.
 MenuForUsers=Menu para os Usuários
 LangFile=Arquivo .lang
 SystemInfo=Informações de Sistema
 SystemToolsArea=Área de Ferramentas do sistema
 SystemToolsAreaDesc=Essa area dispoe de funções administrativa. Use esse menu para escolher as funções que você está procurando.
 Purge=Purgar(apagar tudo)
+PurgeAreaDesc=Esta página te permite deletar todos os arquivos gerador e armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recusro é fornecido como uma solução alteranativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
 PurgeDeleteLogFile=Excluir arquivo de log <b>%s</b> definido pelo módulo Syslog (sem risco de perca de dados)
 PurgeDeleteTemporaryFiles=Excluir todos os arquivos temporários (sem risco de perca de dados)
 PurgeDeleteTemporaryFilesShort=Excluir arquivos temporários
@@ -146,10 +144,13 @@ IgnoreDuplicateRecords=Ignorar erros de dupla gravação (INSERT IGNORE)
 AutoDetectLang=Autodetecção de idioma pelo navegador
 FeatureDisabledInDemo=Algumas funções desabilitada no Demo
 OnlyActiveElementsAreShown=Somente elementos de <a href="%s">módulos ativos</a> são mostrado.
-ModulesDesc=Os módulos do Dolibarr são interfaces que permite ativar novas funções para o sistema. Alguns módulos requerem permissões dos usuários, depois do módulo ser ativado. Clique no botão Ligar/Desligar na coluna "Status" para ativar o módulo.
+ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ...
 ModulesMarketPlaces=Mais módulos...
 DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
+WebSiteDesc=Sites de referência para encontrar mais módulos ...
 URL=Site
+BoxesAvailable=Widgets disponíveis
+BoxesActivated=Widgets ativados
 ActivateOn=Ativar
 ActiveOn=Ativa
 SourceFile=Arquivo Fonte
@@ -182,6 +183,8 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Por default em php.ini: <b>%s</b>)
 MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Não definido em PHP nos sistemas tipo Unix)
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Não definido em PHP nos sistemas tipo Unix)
 MAIN_MAIL_EMAIL_FROM=E-Mail de envio para envios automáticos (Por default em php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Remetente do e-mail usado para o erro retorna e-mails enviados
+MAIN_MAIL_AUTOCOPY_TO=Enviar sistematicamente uma cópia carbono oculta de todos os e-mails enviados para
 MAIN_DISABLE_ALL_MAILS=Desabilita o envido de todos os E-Mails (Para testes ou demo)
 MAIN_MAIL_SENDMODE=Método usado para envio de E-Mails
 MAIN_MAIL_SMTPS_ID=SMTP ID se requerer autentificação
@@ -218,9 +221,9 @@ InfDirAlt=Desde a versão 3 é possivel definir um diretório raiz alternativo.
 InfDirExample=<br>Então declara o arquivo conf.php<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*Linhas com "#" são comentários, para descomentar somente remova os "#".
 YouCanSubmitFile=Selecione o módulo:
 CurrentVersion=Versão atual do Dolibarr
+CallUpdatePage=Vá para a página que atualiza a estrutura de banco de dados e os dados:% s.
 UpdateServerOffline=Atualização de servidor off-line
 GenericMaskCodes=Você pode criar suas próprias mascaras para gerar as referências automáticas.<br> Como exemplo inicial a mascara <b>'CLI{000}'</b> vai gerar a ref. <b>CLI001</b>,<b>CLI002</b>,<b>...</b> as mascaras são:<br>Mascara de contagem <b>{0000}</b>, essa mascara vai contar para cada nova ref. ex:<b>0001</b>,<b>0002</b>,<b>0003</b>,<b>...</b><br>Mascara de número inicial ex:<b>{000+100}</b> -> <b>101</b>,<b>102</b>,<b>103</b>,<b>...</b> ex2:<b>{0000+123}</b> -> <b>0124</b>,<b>0125</b>,<b>...</b><br>Mascara da data <b>{dd}</b> dias (01 a 31), <b>{mm}</b> mês (01 a 12), <b>{yy} {yyyy}</b> para anos ex:<b>{dd}/{mm}/{yy}</b> -> <b>28/07/15</b><br>
-GenericMaskCodes2=Mascara para cópiar ref de client<b>{cccc}</b> ex:<b>{cccccc}.{000}</b> -> <b>CLI001.001</b>.<br>
 GenericMaskCodes3=Não é permitido espaços. <br>Mascara fixa, basta colocar uma letra ou número sem <b>{}</b> ex:<b>CLI</b>,<b>FOR</b></b><br>
 GenericMaskCodes4a=Ex: <b>TESTE{000+100}.{mm}.{yy}</b> -> <b>TESTE101.07.15</b>,<b>TESTE102.07.15</b><br>
 GenericMaskCodes4b=Ex: CLI{dd}{mm}{yy}.{000} -> <b>CLI280715.001</b><br>
@@ -265,11 +268,12 @@ PDFAddressForging=Regras para forjar caixas de endereços
 HideAnyVATInformationOnPDF=Esconder todas as informações relacionadas com ICMS na geração de PDF
 HideDescOnPDF=Esconder todas as descrições de produto na geração de PDF
 HideRefOnPDF=Esconder ref. dos produtos na geração de PDF
+HideDetailsOnPDF=Esconder a linha de detalhes dos produtos na geração de PDF
 UrlGenerationParameters=Parâmetros para URLs de segurança
 SecurityTokenIsUnique=Usar um único parâmetro na chave de segurança para cada URL
 EnterRefToBuildUrl=Entre com a referência do objeto %s
 GetSecuredUrl=Conseguir URL calculada
-ButtonHideUnauthorized=Esconder botões não autorizados ao invés de mostralos desabilitados
+ButtonHideUnauthorized=Esconder botões não autorizados ao invés de mostra-los cinza e desabilitados
 OldVATRates=Velha taxa de ICMS
 NewVATRates=Nova taxa de ICMS
 PriceBaseTypeToChange=Modificar os preços com base no valor de referência defino em
@@ -332,8 +336,7 @@ Module55Name=Códigos de Barra
 Module55Desc=Gestor de Códigos de Barra
 Module56Name=Telefonia
 Module56Desc=Integração Telefônica
-Module57Name=Débitos Automáticos
-Module57Desc=Gestor de Débitos Automáticos e Retiradas
+Module57Name=Ordens de pagamento bancárias diretas
 Module58Name=CliqueParaDiscarl
 Module58Desc=Integração do Sistema CliqueParaDiscar
 Module59Desc=Adicione uma função para gerar uma conta Bookmark4u de uma conta Dolibarr
@@ -354,13 +357,13 @@ Module250Desc=Ferramenta para importar dados para o Dolibarr (com assistentes)
 Module310Desc=Gestor de Associação de Membros
 Module320Desc=Adiciona um RSS feed dentro das páginas de tela do Dolibarr
 Module330Name=Marcadores de Página
+Module330Desc=Gerenciamento de agendamentos
 Module400Name=Projetos
 Module400Desc=Gestor de Projetos dentro de outros módulos
 Module410Name=WebCalendário
 Module410Desc=Integração do WebCalendário
 Module500Name=Taxas, Contribuições Sociais e Dividendos
 Module500Desc=Gestor Taxas, Contribuições Sociais e Dividentos
-Module510Desc=Gestão de funcionários salários e pagamentos
 Module520Desc=Gestão dos empréstimos
 Module700Name=Doações
 Module700Desc=Gestor de Doações
@@ -465,10 +468,6 @@ Permission142=Criar/Modificar Projetos (Projetos Compartilhados e Projetos que e
 Permission144=Deletar Projetos (Projetos Compartilhados e Projetos que eu contratei para)
 Permission146=Ler Provedores
 Permission147=Ler Estatísticas
-Permission151=Ler Pagamentos Regulares
-Permission152=Criar/Modificar Pagamentos Regulares
-Permission153=Transmitir Recibos para Pagamentos Regulares
-Permission154=Creditar/Recusar Recibos para Pagamentos Regulares
 Permission161=Ler Contratos
 Permission162=Criar/Modificar Contratos
 Permission163=Ativar Serviço de um Contrato
@@ -746,7 +745,6 @@ LogEventDesc=Você pode habilitar aqui os logging para os eventos de segurança
 AreaForAdminOnly=Essas funções podem ser usadas somente por <b>Usuários Administrativos</b>.
 SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores.
 SystemAreaForAdminOnly=Essa área é dísponivel apenas para administradores. Ninguém do Dolibarr pode diminuir essas permissões.
-CompanyFundationDesc=Editar nesta página todas as informações da empresa que você necessita para gerencia-la. (Para isso, clique no no botão "Modifique")
 DisplayDesc=Você pode escolher cada parâmetro relacionado com a aparência do Dolibarr e testar aqui
 AvailableModules=Módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá à área de configuração (Home->Configuração->Módulo).
@@ -813,7 +811,6 @@ SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar email par
 PathToDocuments=Caminho para documentos
 PathDirectory=Diretório
 SendmailOptionMayHurtBuggedMTA=Função para envios de correspondência usando o método "PHP mail direct" irá gerar uma mensagem na correspondência que pode não estar corretamente analisada por algum servidor de recepção de correspondência. Resultando que essa correspondência não pode ser lida pela pessoa hostiada por essa plataforma bugada. É caso de alguns provedores de internet (Ex: Orange na França). Isso não é um problema para o Dolibarr nem dentro PHP mas para servidor receptor de correspondência. Você pode contudo adicionar a opção MAIN_FIX_FOR_BUGGED_MTA para 1 dentro da configuração, outra modificação do Dolibarr para evitar isso. Contudo você pode sofrer problemas com outros servidores que respeitão estritamente os padrões SMTP. A outra solução (RECOMENDADA) é usar o método "SMTP socket library" que não tem desvantagens.
-TranslationSetup=Configurações de tradução
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não achado dentro o caminho PHP
 YesInSummer=Sim em verão
@@ -906,7 +903,6 @@ LDAPServerUseTLS=Usuário TLS
 LDAPServerUseTLSExample=Seu servidor LDAP usa TLS
 LDAPServerDn=Servidor DN
 LDAPAdminDn=Administrador DN
-LDAPAdminDnExample=DN completo (ex: cn=admin,dc=exemplo,dc=com)
 LDAPPassword=senha do administrador
 LDAPUserDn=DN dos Usuário
 LDAPUserDnExample=DN completo (ex: ou=usuários,dc=exemplo,dc=com)
@@ -996,7 +992,6 @@ ServiceSetup=Configurações do módulo de serviços
 ProductServiceSetup=Configurações dos módulos de produtos e serviços
 NumberOfProductShowInSelect=Max número de produtos na lista selecionada (0=sem limite)
 ViewProductDescInFormAbility=Visualização das descrições do produto nos formulários (caso contrário como popup tooltip)
-ViewProductDescInThirdpartyLanguageAbility=Visualização das descrições de produtos na linguagem de terceiros
 UseSearchToSelectProductTooltip=Além disso, se você tem um grande número de produtos (> 100 000), você pode aumentar a velocidade, definindo PRODUCT_DONOTSEARCH_ANYWHERE constante a 1 em Setup Outro. Busca, então, ser limitada até o início da string.
 UseSearchToSelectProduct=Usar um formulário de pesquisa para escolher um produto (ao invés de listá-los).<br> Também se tiver um grande número de produtos (> 100 000), você pode aumentar a velocidade alterando a constante PRODUCT_DONOTSEARCH_ANYWHERE para 1 no Configuração->Outros. A pesquisa será limitada para o começo da string.
 SetDefaultBarcodeTypeProducts=Tipo de código de barras default para usar nós produtos
@@ -1029,7 +1024,6 @@ BarcodeDescQRCODE=Código de barras do tipo QR code
 GenbarcodeLocation=Ferramenta em linha de comando para geração de código de barras (usado pelo mecanismo interno para alguns tipos de código de barras)
 BarcodeInternalEngine=Mecanismo interno
 BarCodeNumberManager=Gerente de auto definir números de código de barras
-WithdrawalsSetup=Configurações de módulo de retirada
 ExternalRSSSetup=Configurações importantes de RSS externo
 NewRSS=Novo RSS Feed
 RSSUrl=URL de RSS
@@ -1169,7 +1163,6 @@ IncludePath=Incluir caminho (definido na variável %s)
 TemplatePDFExpenseReports=Modelos de documentos para gerar despesa documento de relatório
 YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por email por habilitar e configurar o módulo "Notificação".
 ListOfFixedNotifications=Lista de notificações fixas
-GoOntoContactCardToAddMore=Vá na guia "Notificações" de um contato thirdparty para adicionar ou remover notificações para contatos / endereços
 Threshold=Limite
 BackupDumpWizard=Assistente para construir arquivo de despejo de backup do banco de dados
 SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
@@ -1178,7 +1171,6 @@ HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre
 TextTitleColor=Cor do título da página
 LinkColor=Cor dos linques
 PressF5AfterChangingThis=Pressione F5 no teclado depois de mudar este valor para tê-lo eficaz
-NotSupportedByAllThemes=Funcionara com o tema eldy porem nao e suportado em todos os temas.
 TopMenuBackgroundColor=Cor de fundo para o menu de topo
 LeftMenuBackgroundColor=A cor do fundo para o menu esquerdo
 BackgroundTableLineOddColor=A cor do fundo para as linhas ímpares da tabela
@@ -1200,6 +1192,5 @@ MailToSendIntervention=Para enviar intervenção
 MailToSendSupplierRequestForQuotation=Para enviar a solicitação de cotação para fornecedor
 MailToSendSupplierOrder=Para enviar ordem fornecedor
 MailToSendSupplierInvoice=Para enviar fatura do fornecedor
-MailToThirdparty=Para enviar e-mail a partir da página thirdparty
 YouUseLastStableVersion=Você está usando a última versão estável
 UrlToGetKeyToUseAPIs=URL para obter um token para usar a API (uma vez que o token tenha sido recebido ele é salvo na tabela de usuário no banco de dados e será conferido em cada acesso futuro)
diff --git a/htdocs/langs/pt_BR/agenda.lang b/htdocs/langs/pt_BR/agenda.lang
index 22e32075d50..b8ff19862dd 100644
--- a/htdocs/langs/pt_BR/agenda.lang
+++ b/htdocs/langs/pt_BR/agenda.lang
@@ -1,23 +1,25 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID do Evento
 Actions=Eventos
 LocalAgenda=Calendário local
 ActionsOwnedBy=Evento de propriedade do
+ActionsOwnedByShort=Proprietário
 Event=Evento
+ListOfActions=Lista de eventos
+ToUserOfGroup=Para qualquer usuário no grupo
 EventOnFullDay=Evento no(s) dia(s) todo
 MenuToDoActions=Todos os eventos incompletos
 MenuToDoMyActions=Meus eventos incompletos
 MenuDoneMyActions=Meus eventos terminados
 ListOfEvents=Lista de eventos Dolibarr
 ActionsAskedBy=Eventos relatados pelo
-ActionsToDoBy=Eventos atribuídos para
 ActionsDoneBy=Eventos feito por
 ActionAssignedTo=Evento atribuído a
 ViewCal=Ver Mês
 ViewDay=Ver dia
 ViewWeek=ver semana
 ViewPerUser=Visão do usuário
-AgendaAutoActionDesc=Defina aqui os eventos que deseja que o Dolibarr crie automáticamente em eventos na agenda. Se nada for marcado (por default), somente ações manuias serão inclusas na agenda.
+ViewPerType=Por visualização de tipo
+AgendaAutoActionDesc=Defina aqui eventos para os quais você queira que o Dolibarr crie automaticamente uma evento na agenda. Se nada for confirmado, apenas ações manuais terão registro e visibilidade inclusos na agenda. O rastreamento automático de ações de negócio realizadas sobre objetos (validação, alteração de estado) não serão salvos.
 AgendaSetupOtherDesc=Essa página fornece a opção de exportar seus eventos Dolibarr para um calendário externo (thunderbird, google, ...)
 AgendaExtSitesDesc=Essa página permite declarar calendários externos para serem visto nos eventos da agenda Dolibarr.
 ActionsEvents=Eventos no qual Dolibarr cria uma ação na agenda automáticamente.
@@ -41,7 +43,10 @@ SupplierInvoiceSentByEMail=Fatura de fornecedor %s enviado por e-mail
 ShippingSentByEMail=Frete %s enviado por e-mail
 ShippingValidated=Envio %s validado
 InterventionSentByEMail=Intervenção %s enviado por e-mail
-NewCompanyToDolibarr=Terceiro Criado
+ProposalDeleted=Proposta excluída
+OrderDeleted=Pedido excluído
+InvoiceDeleted=Fatura excluída
+NewCompanyToDolibarr=Terceiro criado
 DateActionStart=Data de início
 DateActionEnd=Data de término
 AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros nos filtros de saída:
@@ -49,13 +54,12 @@ AgendaUrlOptions2=<b>login=%s</b> para restringir a saída para ações criada p
 AgendaUrlOptions3=<b>logina=%s</b> para restringir a saída para ações criada pelo usuário <b>%s</b>.
 AgendaUrlOptions4=<b>logint=%s</b> para restringir a saída para ações atribuídas para o usuário <b>%s</b>.
 AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> para restringir a saida de açoes associadas ao projeto <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Mostrar Aniversariantes dos Contatos
-AgendaHideBirthdayEvents=Esconder Aniversariantes dos Contatos
+AgendaShowBirthdayEvents=Mostrar datas de nascimento dos contatos
+AgendaHideBirthdayEvents=Ocultar datas de nascimento dos contatos
 ExportDataset_event1=Lista dos eventos da agenda
 DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6)
 DefaultWorkingHours=Padrão horas de trabalho em dia (Exemplo: 9-18)
 ExtSitesEnableThisTool=Mostrar calendários externos na agenda
-ExtSitesNbOfAgenda=Número de calendarios
 AgendaExtNb=Calendário núm %s
 ExtSiteUrlAgenda=URL para acessar arquivos .ical
 ExtSiteNoLabel=Sem descrição
@@ -63,7 +67,6 @@ VisibleTimeRange=Intervalo de tempo visível
 VisibleDaysRange=Intervalo de dias visíveis
 AddEvent=Criar evento
 MyAvailability=Minha disponibilidade
-ActionType=Tipo de Evento
 DateActionBegin=Iniciar a data do evento
 CloneAction=Evento Clone
 ConfirmCloneEvent=Tem certeza de que deseja clonar o <b>evento %s?</b>
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 22ab06adbb2..14db1ba6a7b 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -20,10 +20,6 @@ ShowAllTimeBalance=Mostrar saldo desde o início
 AllTime=Desde o início
 Reconciliation=Reconciliação
 RIB=Número da conta bancária
-IbanValid=IBAN válido
-IbanNotValid=IBAN inválido
-SwiftValid=BIC/SWIFT válido
-SwiftNotValid=BIC/SWIFT inválido
 AccountStatement=Extrato da conta
 AccountStatementShort=Extrato
 AccountStatements=Extratos da conta
@@ -67,6 +63,7 @@ AccountToCredit=Conta para crédito
 AccountToDebit=Conta para débito
 DisableConciliation=Desativar função de reconciliação dessa conta
 ConciliationDisabled=Função de reconciliação desativada
+LinkedToAConciliatedTransaction=Vinculado a uma transação conciliada
 StatusAccountOpened=Ativa
 StatusAccountClosed=Inativa
 LineRecord=Transação
@@ -75,9 +72,11 @@ AddBankRecordLong=Adicionar manualmente uma transação
 ConciliatedBy=Reconciliado por
 DateConciliating=Data da reconciliação
 BankLineConciliated=Transação reconciliada
+SupplierInvoicePayment=Pagamento a fornecedores
 SocialContributionPayment=Pagamento de contribuição social
 BankTransfers=Transferências bancárias
-TransferDesc=Transferência de uma conta a outra, Dolibarr irá escrever dois registro (uma de débito na conta fonte e outra de crédito na conta alvo, do mesmo montante. A mesma etiqueta e data será usada nesta transação)
+MenuBankInternalTransfer=Transferência interna
+TransferDesc=Transferir de uma conta para outra, Dolibarr vai escrever dois registros (um débito na conta de origem e um crédito na conta de destino. O mesmo montante (exceto sinal), rótulo e data serão utilizados para esta operação)
 TransferFromToDone=Uma transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi registrado.
 ValidateCheckReceipt=Validar esse recibo de cheque?
 ConfirmValidateCheckReceipt=Você tem certeza que deseja validar esse recibo de cheque? (não será possível desvalidar depois dessa confirmação)
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index de5098ed525..aa4ebbb6412 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -188,8 +188,6 @@ ExcessReceived=Excesso recebido
 EscompteOffered=Desconto oferecido (pagamento antes do prazo)
 SendBillRef=Enviar fatura %s
 SendReminderBillRef=Enviar fatura %s (restante)
-StandingOrders=Débitos direto
-StandingOrder=Débito direto
 NoDraftBills=Nenhum rascunho de faturas
 NoOtherDraftBills=Nenhum outro rascunho de faturas
 NoDraftInvoices=Nenhum rascunho de faturas
@@ -273,6 +271,7 @@ RelatedSupplierInvoices=Faturas de fornecedores relacionados
 LatestRelatedBill=Últimas fatura correspondente
 WarningBillExist=Atenção, um ou mais fatura já existem
 MergingPDFTool=Mesclando ferramenta PDF
+PaymentNote=Nota de pagamento
 PaymentConditionShortRECEP=Imediato
 PaymentConditionRECEP=Imediato
 PaymentCondition30D=30 dias
@@ -284,8 +283,6 @@ FixAmount=Corrigir valor
 VarAmount=Variavel valor (%% total)
 PaymentTypeVIR=Transferência bancária
 PaymentTypeShortVIR=Transferência bancária
-PaymentTypePRE=Boleto bancário
-PaymentTypeShortPRE=Boleto
 PaymentTypeLIQ=Dinheiro
 PaymentTypeShortLIQ=Dinheiro
 PaymentTypeCB=Cartão de crédito
@@ -351,7 +348,6 @@ AllCompletelyPayedInvoiceWillBeClosed=Todas faturas sem permanencia para pagar s
 ToMakePaymentBack=Pagar de volta
 NoteListOfYourUnpaidInvoices=Nota: Essa lista contém faturas de terceiros que você está a ligado como representante de vendas.
 RevenueStamp=Selo de receita
-YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar fatura de terceiros
 PDFCrabeDescription=Template PDF de fatura Caranguejo. Um completo template de fatura (template recomendado)
 TerreNumRefModelDesc1=Retorna número com formato %syymm-nnnn para padrão de faturas e %syymm-nnnn para notas de crédito onde yy é ano, mm é mês e nnnn é uma sequência numérica sem quebra e sem retorno para 0
 MarsNumRefModelDesc1=Retorna número com formato %syymm-nnnn para padrão de faturas, %syymm-nnnn para faturas substituidas, %syymm-nnnn para crédito de notas e %syymm-nnnn para notas de créditos onde yy é ano, mm é mês e nnnn é uma sequência sem quebra e sem retorno a 0
diff --git a/htdocs/langs/pt_BR/bookmarks.lang b/htdocs/langs/pt_BR/bookmarks.lang
index 93fe9abb078..1ad92390b9c 100644
--- a/htdocs/langs/pt_BR/bookmarks.lang
+++ b/htdocs/langs/pt_BR/bookmarks.lang
@@ -12,5 +12,5 @@ BehaviourOnClick=Comportamento quando a URL é clicada
 CreateBookmark=Criar marcador
 SetHereATitleForLink=Colocar título para o marcador
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Usar uma URL externa ou uma URL do Dolibarr
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolher se a página aberta pelo link  tem que aparecer na janela atual ou uma nova janela
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolha se página vinculada deve abrir em uma nova janela ou não
 BookmarksManagement=Gestor de marcadores
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index be86c4c75c6..27fd46195bd 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -1,43 +1,46 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxProductsAlertStock=Alerta de produtos em estoque
-BoxLastSupplierBills=Últimas faturas de fornecedores
-BoxOldestUnpaidCustomerBills=Mais antigas faturas de clientes não pagos
-BoxOldestUnpaidSupplierBills=Mais antigas faturas de fornecedores não pagos
-BoxLastProposals=Últimos orçamentos
-BoxLastProspects=Últimas modificações de possíveis clientes
-BoxLastCustomers=Últimas modificações de clientes
-BoxLastSuppliers=Últimas modificações de fornecedores
+BoxLastProducts=Últimos %s produtos/serviços
+BoxProductsAlertStock=Alertas de estoque para produtos
+BoxLastProductsInContract=Últimos %s produtos/serviços contratados
+BoxLastSupplierBills=Últimas faturas de fornecedor
+BoxLastCustomerBills=Últimas faturas a clientes
+BoxOldestUnpaidCustomerBills=Faturas a clientes não pagas mais antigas
+BoxOldestUnpaidSupplierBills=Faturas de fornecedor não pagas mais antigas
+BoxLastProposals=Últimas propostas comerciais
+BoxLastProspects=Últimos prospectos de cliente modificados
+BoxLastCustomers=Últimos clientes modificados
+BoxLastSuppliers=Últimos fornecedores modificados
 BoxLastCustomerOrders=Últimos pedidos de clientes
 BoxLastActions=Últimas ações
 BoxLastContracts=Últimos contratos
 BoxLastContacts=Últimos contatos/endereços
-BoxCurrentAccounts=Atual saldo de contas
-BoxTitleLastRssInfos=Últimas %s notícias de %s
-BoxTitleLastProducts=Últimas %s modificações de produtos/serviços
+BoxLastMembers=Últimos membros
+BoxFicheInter=Últimas intervenções
+BoxCurrentAccounts=Saldo das contas ativas
+BoxTitleLastRssInfos=Últimas %s novidades de %s
+BoxTitleLastProducts=Últimos %s produtos/serviços modificados
 BoxTitleProductsAlertStock=Alerta nos produtos em estoque
-BoxTitleLastSuppliers=Últimos %s registros de fornecedores
-BoxTitleLastModifiedSuppliers=Últimos %s modificações de fornecedores
-BoxTitleLastModifiedCustomers=Últimas %s modificações de clientes
-BoxTitleLastCustomersOrProspects=Últimos %s modificações de clientes ou possíveis clientes
-BoxTitleLastCustomerBills=Últimas %s faturas de clientes
-BoxTitleLastSupplierBills=Últimas %s faturas de fornecedores
-BoxTitleLastModifiedProspects=Últimos %s modificações de possíveis clientes
-BoxTitleLastModifiedMembers=Últimas %s modificações de membros
-BoxTitleLastFicheInter=Últimas %s modificações de intervenções
+BoxTitleLastSuppliers=Últimos %s fornecedores registrados
+BoxTitleLastModifiedSuppliers=Últimos %s fornecedores modificados
+BoxTitleLastModifiedCustomers=Últimos %s clientes modificados
+BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospectos de cliente
+BoxTitleLastCustomerBills=Últimas %s faturas de cliente
+BoxTitleLastSupplierBills=Últimas %s faturas de fornecedor
+BoxTitleLastModifiedProspects=Últimos %s prospectos de cliente modificados
+BoxTitleLastModifiedMembers=Últimos %s membros
+BoxTitleLastFicheInter=Últimas %s intervenções modificadas
 BoxTitleOldestUnpaidCustomerBills=Mais antigas %s faturas de clientes não pagos
 BoxTitleOldestUnpaidSupplierBills=Mais antigas %s faturas de fornecedores não pagos
-BoxTitleCurrentAccounts=Saldo atual das contas
-BoxTitleLastModifiedContacts=Últimas %s modificações de contatos/endereços
+BoxTitleCurrentAccounts=Saldos das contas ativas
+BoxTitleLastModifiedContacts=Últimos %s contatos/endereços modificados
 BoxMyLastBookmarks=Meus últimos %s marcadores
 BoxOldestExpiredServices=Mais antigos serviços ativos expirados
-BoxLastExpiredServices=Últimos %s contatos mais antigos com serviços ativos expirados
-BoxTitleLastActionsToDo=Últimas %s ações para fazer
-BoxTitleLastContracts=Últimos %s contratos
-BoxTitleLastModifiedDonations=Últimas %s modificações de doações
-BoxTitleLastModifiedExpenses=Últimas %s modificações de despesas
-BoxGlobalActivity=Atividade global (faturas, orçamentos, pedidos)
-FailedToRefreshDataInfoNotUpToDate=Falha em atualizar o fluxo RSS. Última atualização com sucesso foi na data: %s
-LastRefreshDate=Última data de atualização
+BoxTitleLastActionsToDo=Últimas %s ações a fazer
+BoxTitleLastModifiedDonations=Últimas %s doações modificadas
+BoxTitleLastModifiedExpenses=Últimos %s relatórios de despesas modificados
+BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
+BoxGoodCustomers=Bons clientes
+BoxTitleGoodCustomers=%s bons clientes
 NoRecordedBookmarks=Nenhum marcador definido.
 NoRecordedContacts=Nenhum contato registrado
 NoActionsToDo=Nenhuma ação para fazer
@@ -61,4 +64,3 @@ BoxProposalsPerMonth=Orçamentos por mês
 NoTooLowStockProducts=Nenhum produto abaixo do estoque mínimo
 ForCustomersInvoices=Faturas de clientes
 ForCustomersOrders=Pedidos de clientes
-LastXMonthRolling=O último mês de rolamento %s
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index 3a255f043a4..bd4e10ee538 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -3,16 +3,14 @@ CashdeskShowServices=Serviços de venda
 CashDeskStock=Estoque
 CashDeskOn=ligar
 NewSell=Nova venda
-BackOffice=Voltar ao escritório
 AddThisArticle=Adicionar esse artigo
 RestartSelling=Voltar na venda
-SellFinished=Venda terminada
-PrintTicket=Imprimir ticket
-TotalTicket=Total do ticket
+PrintTicket=Imprimir tíquete
+TotalTicket=Total do tíquite
 NoVAT=Nenhum ICMS para essa venda
 Change=Excesso recebido
 BankToPay=Cobrar conta
-ShowCompany=Mostar Empresa
+ShowCompany=Mostar empresa
 DeleteArticle=Clique para remover esse artigo
 FilterRefOrLabelOrBC=Procurar (Ref/Rótulo)
 UserNeedPermissionToEditStockToUsePos=Você tentou retirar do estoque com a emissão da fatura, mas o usuário precisa ter permissão para editar estoque.
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 1b92549a02c..d6bcecf3a4d 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -1,8 +1,8 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag / Categoria
-Rubriques=Tags / Categorias
-categories=tags / categorias
-NoCategoryYet=Nenhuma tag / categoria deste tipo criado
+Rubrique=Tag/Categoria
+Rubriques=Tags/Categorias
+categories=tags/categorias
+NoCategoryYet=Nenhuma tag/categoria deste tipo foi criada
 In=Em
 CategoriesArea=Área Tags / Categorias
 ProductsCategoriesArea=Área tags / categorias de Produtos / Serviços
@@ -10,15 +10,17 @@ SuppliersCategoriesArea=Área tags / categorias de Fornecedores
 CustomersCategoriesArea=Área tags / categorias de Clientes
 MembersCategoriesArea=Área tags / categorias de Membros
 ContactsCategoriesArea=Área tags / categorias de Contatos
-CatList=Lista de tags / categorias
-NewCategory=Nova tag / categoria
-ModifCat=Modificar tag / categoria
-CatCreated=Tag / categoria criada
-CreateCat=Criar tag / categoria
-CreateThisCat=Criar esta tag / categoria
-NoSubCat=Esta categoria não contém Nenhuma subcategoria.
+AccountsCategoriesArea=Tags/categorias da área de Contas
+SubCats=Subcategorias
+CatList=Lista de tags/categorias
+NewCategory=Nova tag/categoria
+ModifCat=Modificar tag/categoria
+CatCreated=Tag/categoria criada
+CreateCat=Criar tag/categoria
+CreateThisCat=Criar esta tag/categoria
+NoSubCat=Nenhuma subcategoria.
 FoundCats=Encontrada tags / categorias
-ImpossibleAddCat=Impossível adicionar a tag / categoria
+ImpossibleAddCat=Impossível associar a tag/categoria %s
 ObjectAlreadyLinkedToCategory=Elemento já está ligada a esta tag / categoria.
 ProductIsInCategories=Produto / serviço está ligada à seguintes tags / categorias
 CompanyIsInCustomersCategories=Este Terceiro está vinculado às seguintes tags/categorias de Clientes/Prospects
@@ -26,7 +28,6 @@ CompanyIsInSuppliersCategories=Este Terceiro está vinculado às seguintes tags/
 MemberIsInCategories=Esse membro está vinculado a seguintes membros tags / categorias
 ContactIsInCategories=Este contato é ligado à sequência de contatos tags / categorias
 ProductHasNoCategory=Este produto / serviço não está em nenhuma tags / categorias
-CompanyHasNoCategory=Este Cliente / Fornecedor não tem nenhuma tag / categorias
 MemberHasNoCategory=Este membro não está em nenhum tags / categorias
 ContactHasNoCategory=Este contato não está em nenhum tags / categorias
 ClassifyInCategory=Adicionar para tag / categoria
@@ -42,14 +43,17 @@ ProductsCategoryShort=Produtos tag / categoria
 MembersCategoryShort=Membros tag / categoria
 SuppliersCategoriesShort=Fornecedores tags / categorias
 CustomersCategoriesShort=Clientes tags / categorias
+ProspectsCategoriesShort=Tag/categoria Prospecção
 ProductsCategoriesShort=Produtos tags / categorias
 MembersCategoriesShort=Tag / categorias de Membros
 ContactCategoriesShort=Contatos tags / categorias
+AccountsCategoriesShort=Tags/categorias Contas
 ThisCategoryHasNoProduct=Esta categoria não contém nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contém a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contém a nenhum cliente.
 ThisCategoryHasNoMember=Esta categoria nao contem nenhum membro.
 ThisCategoryHasNoContact=Esta categoria nao contem nenhum contato.
+ThisCategoryHasNoAccount=Esta categoria não contém nenhuma conta.
 CategId=ID Tag / categoria
 CatSupList=Lista de fornecedores tags / categorias
 CatCusList=Lista de cliente / perspectivas de tags / categorias
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 63f8c13a99a..a17a7fc34b2 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -11,7 +11,7 @@ MenuNewSupplier=Novo fornecedor
 MenuNewPrivateIndividual=Novo particular
 NewCompany=Nova empresa (prospecto de cliente, cliente, fornecedor)
 NewThirdParty=Novo terceiro (prospecto de cliente, cliente, fornecedor)
-CreateDolibarrThirdPartySupplier=Criar um fornecedor
+CreateDolibarrThirdPartySupplier=Criar um terceiro (fornecedor)
 ProspectionArea=Área de prospecção
 IdThirdParty=ID do terceiro
 IdCompany=ID da empresa
@@ -29,19 +29,17 @@ ThirdPartyCustomersWithIdProf12=Clientes com %s ou %s
 ThirdPartyType=Tipo de terceiro
 Company/Fundation=Pessoa jurídica
 Individual=Pessoa física
-ToCreateContactWithSameName=Um contato pessoal com as mesmas informações será automaticamente criado
 ParentCompany=Matriz
 Subsidiaries=Filiais
 ReportByCustomers=Relatório pelos clientes
 ReportByQuarter=Relatório pela taxa
-CivilityCode=Código civil
+CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
 Lastname=Sobrenome
 Firstname=Primeiro nome
-PostOrFunction=Cargo/Função
 Address=Endereço
 State=Estado/Província
-StateShort=Estado
+StateShort=Status do Cadastro
 CountryCode=Código do país
 CountryId=ID do país
 PhoneShort=Telefone
@@ -49,14 +47,12 @@ Call=Chamar
 PhonePro=Tel. comercial
 PhonePerso=Tel. particular
 PhoneMobile=Celular
-No_Email=Não enviar e-mails em massa
 Zip=CEP
 Town=Município
 Web=Website
 DefaultLang=Idioma ordinário
 VATIsUsed=Sujeito a ICMS
 VATIsNotUsed=Não sujeito a ICMS
-CopyAddressFromSoc=Preencher endereço com o endereço do terceiro
 LocalTax1IsUsed=Utilizar segundo imposto
 LocalTax1IsUsedES=É usado RE
 LocalTax1IsNotUsedES=Não é usado RE
@@ -99,9 +95,8 @@ ProfId5MA=ID prof. 5 (C.I.C.E.)
 VATIntra=Número ICMS
 VATIntraShort=Núm ICMS
 VATIntraSyntaxIsValid=Sintaxe é válida
-VATIntraValueIsValid=Valor é válido
 ProspectCustomer=Possível cliente / Cliente
-Prospect=Possível cliente
+Prospect=Prospecto de cliente
 CustomerCard=Ficha do cliente
 CustomerRelativeDiscount=Desconto relativo do cliente
 CustomerRelativeDiscountShort=Desconto relativo
@@ -120,11 +115,11 @@ EditContact=Editar contato
 EditContactAddress=Editar contato/endereço
 Contact=Contato
 ContactsAddresses=Contatos/Endereços
-NoContactDefinedForThirdParty=Nenhum contato esta definido para esse terceiro
-NoContactDefined=Nenhum contato esta definido
+NoContactDefinedForThirdParty=Nenhum contato foi definido para esse terceiro
+NoContactDefined=Sem contato definido
 DefaultContact=Contato/endereço padrão
 AddThirdParty=Adicionar terceiro
-DeleteACompany=Deletar empresa
+DeleteACompany=Excluir empresa
 PersonalInformations=Dados pessoais
 CustomerCode=Código de cliente
 SupplierCode=Código de fornecedor
@@ -136,8 +131,8 @@ RequiredIfCustomer=Necessário se o terceiro for um cliente ou um possível clie
 RequiredIfSupplier=Necessário se o terceiro for um fornecedor
 ValidityControledByModule=Validação controlada pelo módulo
 ThisIsModuleRules=Esta é a regra é para esse módulo
-ProspectToContact=Possível cliente para contatar
-CompanyDeleted=Empresa "%s" foi deletada do banco de dados.
+ProspectToContact=Prospecto de cliente a contactar
+CompanyDeleted=A empresa "%s" foi excluída do banco de dados.
 ListOfContacts=Lista de contatos/endereços
 ListOfContactsAddresses=Lista de Contatos/Endereços
 ListOfThirdParties=Lista de terceiros
@@ -177,7 +172,7 @@ TE_GROUP=Empresa de grande porte
 TE_MEDIUM=Empresa de médio porte
 TE_ADMIN=Governo
 TE_SMALL=Empresa de pequeno porte
-TE_RETAIL=Varejista
+TE_RETAIL=Revendedor/Varejista
 TE_WHOLE=Atacadista
 TE_PRIVATE=Autônomo
 StatusProspect-1=Não contactar
@@ -190,21 +185,19 @@ ChangeNeverContacted=Trocar status para 'Nunca entrar em contato'
 ChangeToContact=Alterar status para 'A contactar'
 ChangeContactInProcess=Trocar status para 'Contato em andamento'
 ChangeContactDone=Trocar status para 'Contato feito'
-ProspectsByStatus=Possível cliente pelo status
+ProspectsByStatus=Prospectos por status
 ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro
 NoDolibarrAccess=Sem acesso ao Dolibarr
-ExportDataset_company_1=Terceiros (Empresas/Associações/Particulares) e propriedades
 ExportDataset_company_2=Contatos e propriedades
-ImportDataset_company_1=Terceiros (Empresas/Associações/Particulares) e propriedades
 ImportDataset_company_2=Contatos/Endereços (terceiros ou não) e atributos
 ImportDataset_company_3=Detalhes bancários
 ImportDataset_company_4=Terceiros/Representantes (Afeta os usuários representantes comerciais da empresa)
-PriceLevel=Nível de preço
+PriceLevel=Faixa de preço
 DeliveryAddress=Endereço de entrega
 AddAddress=Adicionar endereço
 SupplierCategory=Categoria de fornecedor
 JuridicalStatus200=Independente
-DeleteFile=Deletar arquivo
+DeleteFile=Excluir arquivo
 ConfirmDeleteFile=Você tem certeza que deseja deletar esse arquivo?
 AllocateCommercial=Designado para representante comercial
 Organization=Organização
diff --git a/htdocs/langs/pt_BR/contracts.lang b/htdocs/langs/pt_BR/contracts.lang
index f167a34720b..58afe2a6c32 100644
--- a/htdocs/langs/pt_BR/contracts.lang
+++ b/htdocs/langs/pt_BR/contracts.lang
@@ -11,6 +11,7 @@ ServiceStatusNotLateShort=Não vencido
 ServiceStatusLate=Em vigência, vencido
 ServiceStatusLateShort=Vencido
 ServiceStatusClosed=Encerrado
+ShowContractOfService=Mostrar contrato de serviço
 Contracts=Contratos
 ContractsSubscriptions=Contratos
 ContractLine=Linha contrato
diff --git a/htdocs/langs/pt_BR/cron.lang b/htdocs/langs/pt_BR/cron.lang
index 80f4991eb6c..0ad015b2e58 100644
--- a/htdocs/langs/pt_BR/cron.lang
+++ b/htdocs/langs/pt_BR/cron.lang
@@ -4,53 +4,57 @@ Permission23102 =Criar / atualização de tarefa agendada
 Permission23103 =Excluir trabalho agendado
 Permission23104 =Executar trabalho agendado
 CronSetup=Configuração do gerenciamento de trabalho agendado
-URLToLaunchCronJobs=URL para checar e iniciar os cron se necessario
 OrToLaunchASpecificJob=Ou checkar e iniciar um specifico trabalho
 KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
 FileToLaunchCronJobs=Linha de comando para iniciar tarefas agendadas
 CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos
 CronExplainHowToRunWin=Em ambiente Microsoft (tm)  Windows,  Você PODE USAR Ferramentas de Tarefa agendada Para executar a Linha de Comando de Cada 5 Minutos
-CronLastOutput=Saida do ultimo acionamento
-CronLastResult=Codigo do ultimo resultado
+CronMethodDoesNotExists=A classe %s não contém método %s algum
+EnabledAndDisabled=Ativado e desativado
+CronLastOutput=Saída do último acionamento
+CronLastResult=Código do último resultado
 CronList=As tarefas agendadas
-CronDelete=Excluir trabalhos agendados
+CronDelete=Excluir tarefas agendadas
 CronConfirmDelete=Tem certeza de que deseja apagar estes trabalhos agendados?
-CronExecute=Iniciar trabalhos agendadas
-CronConfirmExecute=Tem certeza de que deseja executar essas tarefas programadas agora?
+CronExecute=Lançar Tarefas agendadas
+CronConfirmExecute=Quer mesmo executar estas tarefas agendadas agora?
 CronInfo=Módulo de tarefas agendadas permitem executar trabalho que foram planejadas
-CronTask=Trabalho
 CronNone=Nenhum
-CronDtNextLaunch=Proxima execuçao
-CronFrequency=Freqüência
+CronDtStart=Não antes
+CronDtEnd=Não depois
+CronDtNextLaunch=Próxima execução
+CronDtLastLaunch=Data de início da última execução
+CronDtLastResult=Data final da última execução
+CronFrequency=Frequência
 CronClass=Classe
-CronMethod=Metodo
-CronModule=Modulo
-CronNoJobs=Nenhum trabalho registrado
-CronLabel=Descriçao
+CronNoJobs=Nenhuma tarefa registrada
+CronLabel=Etiqueta
 CronNbRun=Nr. execuçao
+CronMaxRun=Max nr. execução
 CronEach=Cada
 JobFinished=Trabalho iniciado e terminado
-CronAdd=Adicionar trabalho
-CronEvery=Executar cada trabalho
-CronObject=Instancia/Objeto a se criar
-CronArgs=Parametros
-CronSaveSucess=Salvo corretamente
-CronNote=Comentario
-CronFieldMandatory=Campos %s sao obrigatorios
-CronErrEndDateStartDt=Data fim nao pode ser antes da data do inicio
+CronAdd=Adicionar tarefa
+CronEvery=Executar cada tarefa
+CronObject=Instância/Objeto a se criar
+CronSaveSucess=Salvo com sucesso
+CronFieldMandatory=O campo %s é obrigatório
+CronErrEndDateStartDt=A data final não pode ser anterior a data de início
 CronStatusActiveBtn=Ativar
 CronStatusInactiveBtn=Desativar
-CronTaskInactive=Este trabalho foi desativado
-CronClassFile=Classe (nomearquivo.class.php)
+CronTaskInactive=Está tarefa está desativada
+CronClassFile=Classes (nomedoarquivo.class.php)
 CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalha com módulo Dolibarr externo). Por exemplo para buscar método do objeto Dolibarr Product /htdocs/<u>produto</u>/class/product.class.php, o valor do módulo é o <i>produto</i>
 CronClassFileHelp=O nome do arquivo a ser carregado.<BR>Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/classe/<u>product.class.php</u>, o valor do nome do arquivo de classe é <i>product.class.php</i>
 CronObjectHelp=O nome do objeto a ser carregado. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do nome do arquivo da classe é <i>Produtos</i>
 CronMethodHelp=O método de objeto para o lançamento. Por exemplo para buscar método do objeto Dolibarr Product /htdocs/produtos/class/product.class.php, o valor do método é <i>fecth</i>
 CronArgsHelp=Os argumentos do método. Por exemplo para buscar método do objeto Product do Dolibarr /htdocs/produto/class/product.class.php, o valor de paramtetros pode ser <i>0, ProductRef</i>
-CronCommandHelp=A linha de comando do sistema a se executar.
-CronCreateJob=Criar novo trabalho agendado
-CronType=Tipo de emprego
+CronCommandHelp=A linha de comando de sistema que deve ser executada.
+CronCreateJob=Criar uma nova Tarefa agendada
+CronType=Tipo de tarefa
 CronType_method=Chamar metodo da classe Dolibarr
 CronType_command=Comando Shell
 CronCannotLoadClass=Nao e possivel carregar a classe %s ou o objeto %s
-UseMenuModuleToolsToAddCronJobs=Vá ao menu "Principal - Módulo de ferramentas - Lista de trabalhos" para ver e editar a programação dos trabalhos.
+UseMenuModuleToolsToAddCronJobs=Vá até o menu "Home >> Ferramentas administrativas >> Tarefas agendadas" para visualizar e editar as tarefas agendadas.
+JobDisabled=Tarefa desativada
+MakeLocalDatabaseDumpShort=Backup do banco de dados local
+MakeLocalDatabaseDump=Criar um dump do banco de dados local
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 7f4a7bc39bb..063fc7cea55 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -117,7 +117,6 @@ ErrorPHPNeedModule=Erro, o PHP deve ter <b>módulo% s</b> instalado para usar es
 ErrorOpenIDSetupNotComplete=Você arquivo de configuração Dolibarr configuração para permitir a autenticação OpenID, mas a URL de serviço OpenID não está definido em constante% s
 ErrorWarehouseMustDiffers=A conta origem e destino devem ser diferentes
 ErrorBadFormat=Formato ruim!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, esse membro ainda não está vinculado a qualquer fornecedor. Fazer a ligação membro a um terceiro existente ou criar uma novo fornecedor antes de criar assinatura com nota fiscal.
 ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou.
 ErrorCantDeletePaymentReconciliated=Não posso deletar o pagamento que gerou uma transação bancaria conciliada.
 ErrorCantDeletePaymentSharedWithPayedInvoice=Não e possivel cancelar o pagamento condiviso para pelo menos uma fatura com estado Pago
diff --git a/htdocs/langs/pt_BR/exports.lang b/htdocs/langs/pt_BR/exports.lang
index 8fbf6a39d68..2a9bfebfc3c 100644
--- a/htdocs/langs/pt_BR/exports.lang
+++ b/htdocs/langs/pt_BR/exports.lang
@@ -1,6 +1,10 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Área Exportações
-ImportableDatas=Conjunto de dados importaveis
+ExportsArea=Área de exportações
+ImportArea=Área de importação
+NewExport=Nova exportação
+NewImport=Nova importação
+ExportableDatas=Conjunto de dados que podem ser exportados
+ImportableDatas=Conjunto de dados que podem ser importados
 SelectExportDataSet=Escolha um conjunto predefinido de dados que deseja exportar...
 SelectImportDataSet=Escolha um conjunto predefinido de dados que deseja importar...
 SelectImportFields=Escolha campos de arquivo de fonte que você deseja importar e seu campo de destino no banco de dados, movendo-os para cima e para baixo com a seta, ou selecione um perfil de importação pré-definido:
@@ -10,12 +14,15 @@ ImportModelName=Nome do perfil de importação
 ImportModelSaved=Perfil de importação guardado com o nome de <b>%s</b>.
 DatasetToImport=Conjunto de dados a importar
 NowClickToGenerateToBuildExportFile=Agora, faça click em "Gerar" para gerar o arquivo exportação...
-LibraryUsed=Bibliotéca Utilizada
+AvailableFormats=Formatos disponíveis
+LibraryUsed=Biblioteca usada
+FormatedImport=Assistente de importação
 FormatedImportDesc2=O primeiro passo consiste em escolher o tipo de dado que deve importar, logo o arquivo e a continuação escolher os campos que deseja importar.
+FormatedExport=Assistente de exportação
 FormatedExportDesc2=O primeiro passo consiste em escolher um dos conjuntos de dados predefinidos, a continuação escolher os campos que quer exportar para o arquivo e em que ordem.
 FormatedExportDesc3=Uma vez selecionados os dados, é possível escolher o formato do arquivo de exportação gerado.
 NoImportableData=Não existe tipo de dados importavel (não existe nenhum módulo com definições de dados importavel ativado)
-FileSuccessfullyBuilt=Arquivo de exportação gerado
+FileSuccessfullyBuilt=Arquivo gerado
 SQLUsedForExport=Pedido de SQL usado para construir exportação de arquivo
 LineId=Id da Linha
 LineLabel=Rótulo de linha
@@ -50,6 +57,7 @@ SelectAtLeastOneField=Mude pelo menos um campo de origem na coluna de campos par
 SelectFormat=Escolha este formato de arquivo de importação
 RunImportFile=Arquivo de importação de lançamento
 NowClickToRunTheImport=Verifique o resultado da simulação de importação. Se tudo estiver ok, inicie a importação definitiva.
+DataLoadedWithId=Todos os dados serão carregados com o seguinte id de importação: <b>%s</b>
 ErrorMissingMandatoryValue=Dados obrigatórios esta vazio no arquivo de origem para o campo.
 TooMuchErrors=Há ainda outras linhas de origem com erros mas a produção tem sido limitado.
 TooMuchWarnings=Há ainda outras linhas de origem com avisos, mas a produção tem sido limitado.
@@ -79,6 +87,10 @@ SpecialCode=Código especial
 ExportStringFilter=Permite substituir um ou mais caracteres no texto
 ExportDateFilter=AAAA, AAAAMM, AAAAMMDD : filtros por um ano / mês / dia<br>AAAA+AAAA, AAAAMM+AAAAMM, AAAAMMDD+AAAAMMDD : filtros mais de uma gama de ano / mês / dia inicial<br> > AAAA, > AAAAMM, > AAAAMMDD : filtros em todos seguindo anos / meses / dias<br> < AAAA, < AAAAMM, < AAAAMMDD : filtros em todos os anos / meses / dias anteriores
 ExportNumericFilter=filtros "NNNNN" por um valor <br> filtros "NNNNN + NNNNN 'mais de uma faixa de valores <br> '> NNNNN' filtros por valores mais baixos <br> '> NNNNN' filtros por valores mais elevados
+ImportFromLine=Importar iniciando da linha número
+EndAtLineNb=Terminar na linha número
+SetThisValueTo2ToExcludeFirstLine=Por exemplo, coloque 3 para este valor para excluir as 2 primeiras linhas
+KeepEmptyToGoToEndOfFile=Manter este campo em branco para ir até o fim do arquivo
 SelectFilterFields=Se você deseja filtrar alguns valores, apenas os valores de entrada aqui.
 FilteredFields=Campos filtrados
 FilteredFieldsValues=Valor para o filtro
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index 4c8e3138bca..a201f268953 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -19,11 +19,11 @@ ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial.
 ErrorIDFicheCP=Ocorreu um erro, a solicitação de licença não existe.
 ReturnCP=Retorne à página anterior
 ErrorUserViewCP=Você não está autorizado a ler este pedido de licença.
-InfosWorkflowCP=Fluxo de Trabalho de Informação
+InfosWorkflowCP=Workflow da informação
 RequestByCP=Solicitada por
 TitreRequestCP=Solicitação de licença
 NbUseDaysCP=Número de dias de folga consumidos
-DeleteCP=Eliminar
+DeleteCP=Excluir
 TitleDeleteCP=Excluir a solicitação de licença
 ConfirmDeleteCP=Confirmar a eliminação da solicitação de licença?
 ErrorCantDeleteCP=Erro: você não tem o direito de excluir esta solicitação de licença.
@@ -45,8 +45,7 @@ DetailRefusCP=Motivo da recusa
 DateRefusCP=Data da recusa
 DateCancelCP=Data do cancelamento
 DefineEventUserCP=Atribuir uma licença excepcional para um usuário
-addEventToUserCP=atribuir férias
-MotifCP=Razão
+addEventToUserCP=Conceder licença
 UserCP=Usuário
 ErrorAddEventToUserCP=Ocorreu um erro ao adicionar a licença excepcional.
 AddEventToUserOkCP=A adição da licença excepcional foi completada.
@@ -63,6 +62,8 @@ BoxTitleLastLeaveRequests=Últimas %s solicitações de licença modificadas
 HolidaysMonthlyUpdate=Atualização mensal
 ManualUpdate=Atualização manual
 HolidaysCancelation=Cancelamento da solicitação de licença
+EmployeeLastname=Sobrenome do funcionário
+EmployeeFirstname=Nome do funcionário
 LastUpdateCP=Última atualização automática de fixação de licenças
 MonthOfLastMonthlyUpdate=Mês da última atualização automática de fixação de licenças
 UpdateConfCPOK=Atualizado com sucesso.
diff --git a/htdocs/langs/pt_BR/incoterm.lang b/htdocs/langs/pt_BR/incoterm.lang
index abf67456e34..8aa2070c3e8 100644
--- a/htdocs/langs/pt_BR/incoterm.lang
+++ b/htdocs/langs/pt_BR/incoterm.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - incoterm
-Module62000Desc=Adicione recursos para gerenciar Incoterm
-IncotermLabel=Incotermos
+Module62000Desc=Adicionar recursos para gerenciar Incoterm
diff --git a/htdocs/langs/pt_BR/interventions.lang b/htdocs/langs/pt_BR/interventions.lang
index 3487f78f35b..37a78cdef7e 100644
--- a/htdocs/langs/pt_BR/interventions.lang
+++ b/htdocs/langs/pt_BR/interventions.lang
@@ -4,10 +4,12 @@ ActionsOnFicheInter=Açoes na intervençao
 LastInterventions=Últimas %s intervenções
 InterventionContact=Contato Intervenção
 ModifyIntervention=Modificar intervençao
+CloneIntervention=Clonar intervenção
 ConfirmDeleteIntervention=Tem certeza que quer eliminar esta intervenção?
 ConfirmValidateIntervention=Tem certeza que quer Confirmar esta intervenção?
 ConfirmModifyIntervention=Tem certeza que quer modificar esta intervenção?
 ConfirmDeleteInterventionLine=Tem certeza que quer eliminar esta linha?
+ConfirmCloneIntervention=Tem certeza que quer clonar esta intervenção?
 InterventionClassifyBilled=Classificar "Faturado"
 InterventionClassifyUnBilled=Classificar "à faturar"
 StatusInterInvoiced=Faturado
@@ -26,6 +28,7 @@ LastModifiedInterventions=Últimas %s intervenções modificadas
 TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção
 PrintProductsOnFichinter=Imprima também linhas do tipo "produto" (e não apenas serviços) na ficha de intervenção
 PrintProductsOnFichinterDetails=intervenções gerados a partir de ordens
+UseServicesDurationOnFichinter=duração de uso de serviços para intervenções geradas a partir de ordens
 InterventionStatistics=Estatística de intervenções
 NbOfinterventions=Nº de fichas de intervenção
 NumberOfInterventionsByMonth=Nº de fichas de intervenção por mês (data de validação)
diff --git a/htdocs/langs/pt_BR/ldap.lang b/htdocs/langs/pt_BR/ldap.lang
index 98c0a31973c..3f290642a4b 100644
--- a/htdocs/langs/pt_BR/ldap.lang
+++ b/htdocs/langs/pt_BR/ldap.lang
@@ -8,5 +8,6 @@ LDAPUsers=Usuário na base de dados LDAP
 LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão
 LDAPFieldLastSubscriptionDate=Data da Última Adesão
 LDAPFieldLastSubscriptionAmount=Valor Última Adesão
+LDAPFieldSkypeExample=Exemplo : nomeskype
 UserSynchronized=Usuário Sincronizado
 ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário.
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index 68cfc61914e..b622fb4ecaa 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -235,7 +235,6 @@ SupplierPreview=Historico Fornecedor
 ShowCustomerPreview=Ver Historico Cliente
 ShowSupplierPreview=Ver Historico Fornecedor
 SendByMail=Enviado por e-mail
-SendAcknowledgementByMail=Enviar email de confirmação
 NoMobilePhone=Sem celular
 Owner=Proprietário
 Refresh=Atualizar
diff --git a/htdocs/langs/pt_BR/margins.lang b/htdocs/langs/pt_BR/margins.lang
index 3fffdce2f31..a3d74fa8b54 100644
--- a/htdocs/langs/pt_BR/margins.lang
+++ b/htdocs/langs/pt_BR/margins.lang
@@ -1,32 +1,29 @@
 # Dolibarr language file - Source file is en_US - margins
-Margins=Margems
-TotalMargin=Total margem
-MarkRate=Taxa de marca
-DisplayMarginRates=Visualizar taxas de margem
-DisplayMarkRates=Visualizar taxas de aumento
-InputPrice=Preço entrada
+MarginRate=Relação margem-preço de compra
+MarkRate=Relação margem-preço de venda
+DisplayMarginRates=Exibir relações margem-preço de compra
+DisplayMarkRates=Exibir relações margem-preço de venda
+InputPrice=Preço de entrada
 margin=Gestão de margens de lucro
 margesSetup=Configuração das margens de lucro
-MarginDetails=Detalhes de margem
-ProductMargins=Margem de produtos
+ProductMargins=Margens de produtos
 CustomerMargins=Margems de clientes
 SalesRepresentativeMargins=Tolerância aos representante de vendas
-UserMargins=Margens do Usuário
+UserMargins=Margens do usuário
 ProductService=Produto ou serviço
 ForceBuyingPriceIfNull=Compra Força preço / custo para o preço de venda se não definido
 ForceBuyingPriceIfNullDetails=Se o preço de compra / custo não definido, e essa opção "ON", a margem será zero em linha (compra / preço = custo preço de venda), caso contrário ("OFF"), marge será igual ao padrão sugerido.
 MARGIN_METHODE_FOR_DISCOUNT=Metodologia de margem para descontos globais
-UseDiscountAsProduct=Como o produto
-UseDiscountAsService=Como serviço
-UseDiscountOnTotal=Em sub-total
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem.
 MARGIN_TYPE=Compra / Preço de custo sugerido por padrão para cálculo da margem de
 MargeType1=Margem de melhor preço com fornecedor
-MargeType2=Margem de Preço Médio Ponderado (WAP)
-UnitCharges=Taxas unitárias
-Charges=Despesas
+MargeType2=Margem sobre o Preço Médio Ponderado (PMP)
+MargeType3=Margem sobre o preço de custo
+MarginTypeDesc=* Margem de melhor preço de compra = Preço de venda - o melhor preço com fornecedor definido na ficha de produto <br> * margem sobre o preço médio ponderado (WAP) = Preço de VENDA - produto Preço Médio Ponderado (WAP) ou melhor preço de fornecedor se WAP ainda não definido <br> * Margem sobre o preço de custo = preço de VENDA - preço de custo definido na ficha de produto ou WAP se o preço de custo não definido, ou melhor preço fornecedor, se ainda não WAP definido
 AgentContactType=Tipo contato do agente comercial
 AgentContactTypeDetails=Defina o tipo de contato (conectado coma as faturas) sera usado para o relatorio de margem dos representantes
 rateMustBeNumeric=Rata deve ser um valor numerico
 markRateShouldBeLesserThan100=Rata marcada teria que ser menor do que 100
-ShowMarginInfos=Mostrar informações de margems
+ShowMarginInfos=Mostrar informações sobre margens
+CheckMargins=Detalhes das margens
+MarginPerSaleRepresentativeWarning=O relatório de margem por usuário utilizar a ligação entre terceiros e representantes de venda para calcular a margem de cada usuário. Porque alguns terceiros não pode ser ligado a qualquer representante venda e alguns terceiros pode estar ligado a vários usuários, algumas margens podem não aparecer nestes relatório ou pode aparecer em várias linhas diferentes.
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index c5118f76507..46d4ec63f4e 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -56,7 +56,9 @@ BlankSubscriptionForm=Formulário de inscrição
 BlankSubscriptionFormDesc=Dolibarr pode fornecer uma URL pública para permitir que os visitantes externos de pedir para se inscrever para a fundação. Se um módulo de pagamento on-line estiver ativado, uma forma de pagamento também será fornecido automaticamente.
 EnablePublicSubscriptionForm=Habilite a forma pública auto-assinatura
 ExportDataset_member_1=Membros e Filiações
-LastSubscriptionsModified=Assinaturas Últimas modificadas
+LastMembersModified=Últimos %s membros modificados
+LastSubscriptionsModified=Últimas %s subscrições modificadas
+SubscriptionNotRecorded=Subscrição não registrada
 AddSubscription=Criar subscripção
 DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Assunto do email em caso de inscrição automática
 DescADHERENT_AUTOREGISTER_MAIL=Email a enviar em caso de convite para inscrição automática
@@ -97,5 +99,5 @@ MembersByNature=Esta tela mostrará estatísticas por natureza de usuários.
 MembersByRegion=Esta tela mostrará estatísticas sobre usuários por região.
 VATToUseForSubscriptions=Taxa de VAT para utilizar as assinaturas
 NoVatOnSubscription=Não TVA para assinaturas
-MEMBER_PAYONLINE_SENDEMAIL=E-mail para avisar quando Dolibarr receber uma confirmação de um pagamento validados para subscrição
+MEMBER_PAYONLINE_SENDEMAIL=E-mail para usar para alerta e-mail quando Dolibarr receber uma confirmação de um pagamento validado por uma assinatura (Exemplo: paymentdone@example.com)
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produto utilizado para a linha de assinatura em nota fiscal: %s
diff --git a/htdocs/langs/pt_BR/oauth.lang b/htdocs/langs/pt_BR/oauth.lang
index e5381d67a01..512d5c586ba 100644
--- a/htdocs/langs/pt_BR/oauth.lang
+++ b/htdocs/langs/pt_BR/oauth.lang
@@ -8,3 +8,4 @@ TokenDeleted=Token excluído
 RequestAccess=Clique aqui para solicitar/renovar o acesso e receber um novo token para salvar
 DeleteAccess=Clique aqui para apagar o token
 UseTheFollowingUrlAsRedirectURI=Utilize o seguinte URL como o URI de redirecionamento ao criar a sua credencial de seu provedor de OAuth:
+ListOfSupportedOauthProviders=Forneça aqui a credencial fornecida pelo seu provedor OAuth2. Apenas provedores OAuth2 suportados estão visíveis aqui. Esta configuração talvez seja usada por outros módulos que necessitem de autenticação OAuth2.
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index a496f7d956e..b6030f31e22 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -2,21 +2,24 @@
 OrdersArea=Área de Pedidos de Clientes
 OrderId=ID Pedido
 OrderLine=Linha de Comando
-OrderToProcess=Pedido a se processar
+OrderDateShort=Data do pedido
+OrderToProcess=Pedido a processar
 CustomerOrder=Pedido de Cliente
 CustomersOrders=Pedidos de clientes
 CustomersOrdersRunning=Pedidos dos clientes atuais
 CustomersOrdersAndOrdersLines=Pedidos de clientes e linhas de pedidos
 OrdersToBill=Pedidos dos clientes entregue
-OrdersInProcess=Pedidos de clientes em processo
-OrdersToProcess=Pedidos de clientes para processar
-SuppliersOrdersToProcess=Fornecedor ordens para processar
+OrdersInProcess=Pedidos de cliente em processo
+OrdersToProcess=Pedidos de cliente a processar
+SuppliersOrdersToProcess=Pedidos a fornecedor a processar
 StatusOrderSentShort=Em processo
-StatusOrderSent=Envio em processo
+StatusOrderSent=Entrega encaminhada
 StatusOrderOnProcessShort=Pedido
 StatusOrderDelivered=Entregue
+StatusOrderDeliveredShort=Entregue
 StatusOrderToBillShort=Entregue
 StatusOrderBilledShort=Faturado
+StatusOrderToProcessShort=A processar
 StatusOrderOnProcess=Pedido - Aguardando Recebimento
 StatusOrderOnProcessWithValidation=Ordenada - recepção Standby ou validação
 StatusOrderToBill=A Faturar
@@ -32,12 +35,14 @@ UnvalidateOrder=Desaprovar pedido
 OrderReopened=Pedido %s Reaberto
 AddOrder=Criar ordem
 AddToDraftOrders=Adicionar a projeto de pedido
-OrdersOpened=Pedidos para processar
+OrdersOpened=Pedidos a processar
 NoDraftOrders=Não há projetos de pedidos
+NoOrder=Sem pedidos
 NoSupplierOrder=Sem pedido de suprimento
-LastOrders=Pedidos de clientes Última %s
-LastCustomerOrders=Pedidos de clientes Última %s
-LastSupplierOrders=Pedidos a fornecedores Última %s
+LastOrders=Últimos %s pedidos de cliente
+LastCustomerOrders=Últimos %s pedidos de cliente
+LastSupplierOrders=Últimos %s pedidos a fornecedores
+LastModifiedOrders=Últimos %s pedidos modificados
 AmountOfOrdersByMonthHT=Numero de pedidos por mes (sem impostos)
 ConfirmCloseOrder=Tem certeza de que deseja fechar este pedido? Quando um pedido é fechado, ele só pode ser cobrado.
 ConfirmDeleteOrder=Tem certeza que quer eliminar este pedido?
@@ -48,6 +53,8 @@ ConfirmMakeOrder=Tem certeza que quer confirmar este pedido em data de<b>%s</b>
 GenerateBill=Faturar
 ClassifyShipped=Clasificar entregue
 DraftSuppliersOrders=Rascunho de pedidos para fornecedor
+RefCustomerOrder=Ref. pedido por cliente
+RefOrderSupplier=Ref. ordem por fonecedor
 ActionsOnOrder=Ações sobre o pedido
 NoArticleOfTypeProduct=Não existe artigos de tipo 'produto' e por tanto expedidos neste pedido
 UserWithApproveOrderGrant=Usuários autorizados a aprovar os pedidos.
@@ -56,6 +63,9 @@ ConfirmCloneOrder=Tem certeza de que deseja clonar este<b>%s</b> ?
 DispatchSupplierOrder=Receber pedido de fornecedor %s
 FirstApprovalAlreadyDone=A primeira aprovação já feito
 SecondApprovalAlreadyDone=Segundo aprovação já feito
+SupplierOrderReceivedInDolibarr=Pedido a fornecedor %s recebido %s
+SupplierOrderSubmitedInDolibarr=Pedido a fornecedor %s submetido
+SupplierOrderClassifiedBilled=Pedido a fornecedor %s conjunto faturado
 TypeContact_commande_internal_SALESREPFOLL=Responsável do seguimento do pedido do cliente
 TypeContact_commande_internal_SHIPPING=Representante seguindo o envio
 TypeContact_commande_external_BILLING=Contato fatura cliente
@@ -74,7 +84,7 @@ PDFProformaDescription=A proforma fatura completa (logomarca...)
 OrderByEMail=E-mail
 CreateInvoiceForThisCustomer=Faturar pedidos
 NoOrdersToInvoice=Nenhum pedido faturavel
-CloseProcessedOrdersAutomatically=Clasificar "processados" os pedidos selecionados.
+CloseProcessedOrdersAutomatically=Classificar como "processados" todos os pedidos selecionados.
 OrderCreation=Criação de pedidos
 Ordered=Pedido
 OrderCreated=Seus pedidos foram criados
diff --git a/htdocs/langs/pt_BR/printing.lang b/htdocs/langs/pt_BR/printing.lang
index 17e51c17512..bd46819e35b 100644
--- a/htdocs/langs/pt_BR/printing.lang
+++ b/htdocs/langs/pt_BR/printing.lang
@@ -15,10 +15,6 @@ TargetedPrinter=Impressora em questão
 UserConf=Configuração por usuário
 PRINTGCP_INFO=Configuração API do Google OAuth
 PRINTGCP_AUTHLINK=Autenticação
-PRINTGCP_TOKEN_REFRESH=Token Atualizar Presente
-PRINTGCP_TOKEN_EXPIRED=Token expirado
-PRINTGCP_TOKEN_EXPIRE_AT=Token expirar no
-PRINTGCP_DELETE_TOKEN=Excluir token salvo
 PrintGCPDesc=Este driver permite enviar documentos diretamente para uma impressora com o Google Cloud Print.
 GCP_displayName=Nome De Exibição
 GCP_Id=ID da impressora
@@ -39,3 +35,5 @@ IPP_Supported=Tipo de mídia
 DirectPrintingJobsDesc=Esta página lista os trabalhos de impressão encontrado para impressoras disponíveis.
 GoogleAuthNotConfigured=Configuração do Google OAuth não feito. Ativar módulo OAuth e definir um GoogleID/Secret.
 GoogleAuthConfigured=Credenciais Google OAuth encontrado na configuração do módulo OAuth.
+PrintingDriverDescprintgcp=Configuração das variáveis para o driver de impressão do Google Cloud Print.
+PrintTestDescprintgcp=Lista de Impressoras para Google Cloud Print.
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 5fe41cd166d..97d4d66132c 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -6,8 +6,8 @@ Batch=Lote / Serial
 atleast1batchfield=Compra prazo de validade ou data de venda ou Lote / Número de série
 batch_number=Lote / Número de série
 BatchNumberShort=Lote / Serial
-l_eatby=Compra-por data
-l_sellby=Data de venda
+EatByDate=Compra-por data
+SellByDate=Data de venda
 DetailBatchNumber=Detalhes Lote / Serial
 DetailBatchFormat=Lote / Serial: %s - Compra-por: %s - Venda por: %s (Qtde: %d)
 printBatch=Lote / Serial: %s
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index 592c7bd3fd3..75d6dad4aff 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -14,7 +14,7 @@ ProductVatMassChangeDesc=Esta página pode ser utilizado para modificar uma taxa
 MassBarcodeInit=Inicialização de código de barras.
 MassBarcodeInitDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique antes que a instalação do módulo de código de barras é completa.
 ProductAccountancyBuyCode=Código contábil (para compras)
-ProductAccountancySellCode=Código contábil (para vendas)
+ProductAccountancySellCode=Código contábil (venda)
 ProductsOnSell=Produto para venda ou para compra
 ProductsNotOnSell=Produto que não se vende nem se compra
 ProductsOnSellAndOnBuy=Produtos para venda e para compra
@@ -24,6 +24,8 @@ ServicesOnSellAndOnBuy=Serviços para venda e compra
 LastModifiedProductsAndServices=Últimos %s produtos/serviços modificados
 LastRecordedProducts=Últimos %s produtos gravados
 LastRecordedServices=Últimos %s serviços gravados
+CardProduct0=Ficha do Produto
+CardProduct1=Ficha do Serviço
 OnSell=Vende-se
 OnBuy=Para compra
 NotOnSell=Não se vende
@@ -42,6 +44,8 @@ SellingPriceHT=Preço de venda (sem taxas)
 SellingPriceTTC=Preço de venda (incl. taxas)
 CostPriceDescription=Este preço ( livre de impostos) pode ser usado para armazenar a quantidade média do custo do produto para sua empresa. Pode ser qualquer preço a se calcular, por exemplo, a partir do preço médio de compra mais o custo médio de produção e distribuição.
 CostPriceUsage=Numa futura versão, este valor não poderá ser usado para cálculo de margem.
+SoldAmount=Total vendido
+PurchasedAmount=Total comprado
 MinPrice=Preço de venda min.
 CantBeLessThanMinPrice=O preço de venda não deve ser inferior ao mínimo para este produto (%s ICMS)
 ContractStatusClosed=Encerrado
@@ -51,6 +55,7 @@ ErrorPriceCantBeLowerThanMinPrice=Erro, o preço não pode ser inferior ao preç
 PriceForEachProduct=Produtos com preços específicos
 SupplierCard=Ficha do fornecedor
 NoteNotVisibleOnBill=Nota (não visivel em faturas, orçamentos etc.)
+MultiPricesAbility=Varias faixas de preços de produtos/serviços por segmento (cada cliente está em um segmento)
 MultiPricesNumPrices=Número de preços
 AssociatedProductsAbility=Ative o recurso pacote
 AssociatedProducts=Pacote produto
@@ -107,9 +112,12 @@ AlwaysUseNewPrice=Usar sempre preço atual do produto/serviço
 AlwaysUseFixedPrice=Usar preço fixo
 PriceByQuantity=Diferentes preços por quantidade
 PriceByQuantityRange=Intervalo de quantidade
+MultipriceRules=Regras de preços por segmento
+UseMultipriceRules=Usar regras de preços do segmento (definido na configuração do módulos produto) para calcular automaticamente o preço de todos os segmentos de acordo com o primeiro segmento
 PercentVariationOver=%% variação sobre %s
 PercentDiscountOver=%% disconto sobre %s
 Build=Produzir
+ProductsMultiPrice=Produtos e preços de cada segmento
 ProductsOrServiceMultiPrice=Preços de Clientes (de produtos ou serviços, multi-preços)
 ProductSellByQuarterHT=Volume de negócios trimestral antes de impostos os produtos
 ServiceSellByQuarterHT=Volume de negócios Serviços trimestral antes de impostos
@@ -124,12 +132,12 @@ PrintsheetForOneBarCode=Imprimir varias etiquetas para um codigo de barras
 BuildPageToPrint=Gerar pagina a se imprimir
 FillBarCodeTypeAndValueManually=Preencher codigo de barras e valor manualmente.
 FillBarCodeTypeAndValueFromProduct=Preencha o código de barras e valor a partir do código de barras de um produto.
-FillBarCodeTypeAndValueFromThirdParty=Preencha o código de barras e valor a partir do código de barras de um fornecedor.
 DefinitionOfBarCodeForProductNotComplete=Definição do código ou valor do código de barras não completar para o produto% s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definição do código ou valor do código não completa para fornecedor% s.
 BarCodeDataForProduct=Informações de código de barras do produto% s:
-BarCodeDataForThirdparty=Informações de código de barras do fornecedor:
 ResetBarcodeForAllRecords=Definir o valor de código de barras para todos os registros (isto também irá repor valor de código de barras já definido com novos valores)
+PriceByCustomer=Preços diferenteas para cada cliente
+PriceCatalogue=Um único preço de venda por produto/serviço
+PricingRule=Regras para preços de venda
 AddCustomerPrice=Adicionar preço por cliente
 ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
 PriceByCustomerLog=Registros de preços de cliente anteriores
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 65e11e26631..36c423ad44a 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -2,14 +2,16 @@
 ProjectRef=Ref projeto.
 ProjectId=Id do projeto
 ProjectLabel=Etiqueta projeto
-ProjectStatus=Status Projeto
+ProjectsArea=Setor de projetos
 SharedProject=A todos
+PrivateProject=Contatos do projeto
 MyProjectsDesc=Exibe apenas os projetos que você for um contato (independente do tipo).
 ProjectsPublicDesc=Exibe todos os projetos que você esta autorizado a ver.
 ProjectsPublicTaskDesc=Essa visão apresenta todos os projetos e tarefas que estão autorizados a ler.
 ProjectsDesc=Exibi todos os projetos (sua permissão de usuário lhe permite ver todos).
 MyTasksDesc=Esta exibição é limitado a projetos ou tarefas que você é um contato (seja qual for o tipo).
 OnlyOpenedProject=Só os projetos abertos são visíveis (projetos em fase de projeto ou o estado fechado não são visíveis).
+ClosedProjectsAreHidden=Projetos encerrados não são visíveis.
 TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
 TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
 OnlyYourTaskAreVisible=Apenas as tarefas que estão atribuídas a você são visíveis. Atribuir tarefa para você, se você deseja inserir tempo com isso.
@@ -17,29 +19,31 @@ NewProject=Novo projeto
 AddProject=Criar projeto
 DeleteAProject=Excluir um projeto
 DeleteATask=Excluir uma tarefa
-ConfirmDeleteAProject=Tem certeza que quer eliminar este projeto?
-ConfirmDeleteATask=Tem certeza que quer eliminar esta tarefa?
+ConfirmDeleteAProject=Quer mesmo excluir este projeto?
+ConfirmDeleteATask=Quer mesmo excluir esta tarefa?
+OpenedProjects=Projetos em andamento
+OpenedTasks=Tarefas em andamento
 ShowProject=Mostrar projeto
 NoProject=Nenhum Projeto Definido
-NbOfProjects=No de Projetos
-TimeSpent=Tempo Dedicado
+NbOfProjects=Nº de projetos
+TimeSpent=Dispêndio de tempo
 TimeSpentByYou=Tempo gasto por você
 TimeSpentByUser=Tempo gasto por usuário
-TimesSpent=Tempo gasto
-RefTask=Ref. Tarefa
-TaskTimeSpent=O tempo gasto nas tarefas
+TimesSpent=Dispêndio de tempo
+RefTask=Ref. da tarefa
+TaskTimeSpent=Dispêndio de tempo com tarefas
 TaskTimeUser=Usuário
 TasksOnOpenedProject=Tarefas em projetos abertos
-NewTimeSpent=Novo Tempo Dedicado
-MyTimeSpent=Meu tempo gasto
+NewTimeSpent=Novo dispêndio de tempo
+MyTimeSpent=Meu dispêndio de tempo
 TaskDateEnd=Data final da tarefa
 NewTask=Nova tarefa
 AddTask=Criar tarefa
+Activities=Tarefas/atividades
 MyActivities=Minhas Tarefas/Atividades
 ProgressDeclared=o progresso declarado
 ProgressCalculated=calculado do progresso
-ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto
-ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto
+GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
 ListExpenseReportsAssociatedProject=Lista de relatórios de despesas associadas ao projeto
 ListDonationsAssociatedProject=Lista de doações associados ao projeto
 ListTaskTimeUserProject=Lista de tempo consumido nas tarefas de projecto
@@ -48,28 +52,28 @@ ActivityOnProjectYesterday=Atividade de ontem no projeto
 ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana
 ActivityOnProjectThisMonth=Atividade ao Projeto este Mês
 ActivityOnProjectThisYear=Atividade ao Projeto este Ano
-ChildOfTask=Link da Tarefa
+ChildOfTask=Link do projeto/tarefa
 NotOwnerOfProject=Não é responsável deste projeto privado
 CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por muito objetos (facturas, pedidos e outros). ver a lista no separador referencias.
 ValidateProject=Validar projeto
 ConfirmValidateProject=Você tem certeza que deseja validar esse projeto?
+CloseAProject=Finalizar projeto
 ConfirmCloseAProject=Tem certeza de que quer encerrar esse projeto?
 ReOpenAProject=Abrir projeto
 ConfirmReOpenAProject=Tem certeza de que quer voltar a abrir este projeto?
 ProjectContact=Contatos do projeto
-ActionsOnProject=Eventos do projeto
+ActionsOnProject=Eventos relacionados ao projeto
 YouAreNotContactOfProject=Você não é um contato deste projeto privado
-ConfirmDeleteATimeSpent=Tem certeza de que deseja excluir este tempo?
+DeleteATimeSpent=Excluir dispêndio de tempo
+ConfirmDeleteATimeSpent=Quer mesmo excluir este dispêndio de tempo?
 DoNotShowMyTasksOnly=Ver tambem tarefas não associadas comigo
-ShowMyTasksOnly=Ver so minhas tarefas
+ShowMyTasksOnly=Visualizar apenas tarefas incumbidas a mim
 NoTasks=Não há tarefas para este projeto
 LinkedToAnotherCompany=Ligado a outros terceiros
-TaskIsNotAffectedToYou=Tarefas não associadas a voce
-ErrorTimeSpentIsEmpty=Tempo gasto está vazio
+TaskIsNotAffectedToYou=Tarefas não incumbidas a você
+ErrorTimeSpentIsEmpty=O dispêndio de tempo está em branco
 ThisWillAlsoRemoveTasks=Esta ação também vai apagar todas as tarefas do projeto <b>(tarefas% s</b> no momento) e todas as entradas de tempo gasto.
 IfNeedToUseOhterObjectKeepEmpty=Se alguns objetos (nota fiscal, ordem, ...), pertencentes a um terceiro, deve estar vinculado ao projeto de criar, manter este vazio para que o projeto de vários fornecedores.
-CloneProject=Copiar projeto
-CloneTasks=Copiar tarefas
 CloneContacts=Copiar contatos
 CloneNotes=Copiar notas
 CloneProjectFiles=Copiar arquivos do projetos
@@ -80,6 +84,8 @@ ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de
 TaskCreatedInDolibarr=Tarefa %s criada
 TaskModifiedInDolibarr=Tarefa %s alterada
 TaskDeletedInDolibarr=Tarefa %s excluída
+OpportunityStatus=Estado da oportunidade
+OpportunityStatusShort=Est. da oprtnd.
 TypeContact_project_internal_PROJECTLEADER=Chefe de projeto
 TypeContact_project_external_PROJECTLEADER=Chefe de projeto
 TypeContact_project_task_internal_TASKEXECUTIVE=Tarefa executada
@@ -90,8 +96,8 @@ DocumentModelBeluga=Modelo de projeto para visão geral objetos ligados
 DocumentModelBaleine=Modelo de relatório do Projeto para tarefas
 PlannedWorkload=carga horária planejada
 PlannedWorkloadShort=Carga de trabalho
+ProjectReferers=Itens relacionados
 ProjectMustBeValidatedFirst=O projeto tem que primeiramente ser validado
-FirstAddRessourceToAllocateTime=Associar um recurso para alocar tempo
 InputPerDay=Entrada por dia
 InputPerWeek=Entrada por semana
 InputPerAction=Entrada por ação
@@ -100,10 +106,13 @@ ProjectsWithThisUserAsContact=Projetos com este usuário como contato
 TasksWithThisUserAsContact=As tarefas atribuídas a esse usuário
 ResourceNotAssignedToProject=Não atribuído ao projeto
 AssignTaskToMe=Atribuir tarefa para mim
-ProjectOverview=Visão Geral
+ProjectOverview=Visão geral
 ManageTasks=Use projetos para acompanhar tarefas e tempo
 ManageOpportunitiesStatus=Use projetos para acompanhar leads / opportinuties
 ProjectNbProjectByMonth=N ° de projetos criados por mês
 ProjectsStatistics=As estatísticas sobre projetos / leads
 TaskAssignedToEnterTime=Tarefa atribuída. Entrando tempo nesta tarefa deve ser possível.
+OpenedProjectsByThirdparties=Projetos em andamento por terceiros
+OnlyOpportunitiesShort=Somente oportunidades
+OpenedOpportunitiesShort=Oportunidades em andamento
 OppStatusPROSP=Prospecção
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 034b5410186..ed247b8490d 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -4,8 +4,9 @@ ProposalCard=Cartao de proposta
 AddProp=Criar proposta
 ConfirmDeleteProp=Tem certeza que quer eliminar este orçamento?
 ConfirmValidateProp=Tem certeza que quer Confirmar este orçamento?
-LastPropals=Os %s últimos Orçamentos
-LastModifiedProposals=As últimas %s propostas modificadas
+LastPropals=Últimas %s propostas
+LastModifiedProposals=Últimas %s propostas modificadas
+NoProposal=Sem propostas
 AmountOfProposalsByMonthHT=Valor por Mês (sem ICMS)
 PropalsOpened=Aberto
 PropalStatusSigned=Assinado (A Faturar)
@@ -18,6 +19,8 @@ PropalsToBill=Orçamentos Assinados a Faturar
 ActionsOnPropal=Ações sobre o Orçamento
 DatePropal=Data da Proposta
 ValidityDuration=Validade da proposta
+CloseAs=Configurar status para
+SetAcceptedRefused=Configurar aceito/recusado
 AddToDraftProposals=Adicionar a projeto de proposta
 NoDraftProposals=Não há projetos de propostas
 CreateEmptyPropal=Criar orçamento a partir da Lista de produtos predefinidos
@@ -39,3 +42,4 @@ DefaultModelPropalCreate=Criaçao modelo padrao
 DefaultModelPropalToBill=Modelo padrao no fechamento da proposta comercial ( a se faturar)
 DefaultModelPropalClosed=Modelo padrao no fechamento da proposta comercial (nao faturada)
 ProposalCustomerSignature=Aceite por escrito, carimbo da empresa, data e assinatura
+ProposalsStatisticsSuppliers=Estatísticas de Propostas a Fornecedor
diff --git a/htdocs/langs/pt_BR/salaries.lang b/htdocs/langs/pt_BR/salaries.lang
index 18ed2f95463..b2e10c616e5 100644
--- a/htdocs/langs/pt_BR/salaries.lang
+++ b/htdocs/langs/pt_BR/salaries.lang
@@ -4,7 +4,7 @@ SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codigo contabilidade para despesas financeira
 NewSalaryPayment=Novo pagamento de salário
 SalaryPayment=Pagamento de salário
 SalariesPayments=Pagamentos de salários
-THM=Preço medio por hora
-TJM=Preço medio por diaria
+THM=Taxa média horária
+TJM=Taxa média diária
 THMDescription=Este valor pode ser usado para calcular o custo do tempo consumido em um projeto inserido por usuários se o módulo de projetos é utilizado
 TJMDescription=Este valor é atualmente apenas como informação e não é utilizado para o cálculo
diff --git a/htdocs/langs/pt_BR/sms.lang b/htdocs/langs/pt_BR/sms.lang
index fe0e300bf2b..c6bcac6b6b9 100644
--- a/htdocs/langs/pt_BR/sms.lang
+++ b/htdocs/langs/pt_BR/sms.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - sms
-SmsSetup=Configuraçao sms
+Sms=SMS
+SmsSetup=Configuração do SMS
 SmsDesc=Esta pagina permite definir as opçoes globais para os SMS
-SmsCard=Cartao SMS
+SmsCard=Chip SMS
 AllSms=Todas as campnhas SMS
 SmsTargets=Alvos
 SmsRecipients=Alvos
-SmsTitle=Descriçao
 SmsTopic=Topico do SMS
 ShowSms=Mostrar SMS
 ListOfSms=Listar campanhas SMS
@@ -31,3 +31,4 @@ NbOfSms=Numero de numeros telefonicos
 ThisIsATestMessage=Isto e uma mensagem de teste
 SmsInfoCharRemain=Nr de caracteres restantes
 SmsInfoNumero=(formato internacional ex: +33899701761)
+SmsNoPossibleSenderFound=Nenhum expedidor disponível. Verifique a configuração do seu provedor de SMS.
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 3ebb768ac46..08fd250dc4c 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -1,37 +1,41 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Ficha Armazém
+WarehouseCard=Ficha do armazém
 Warehouse=Armazém
-Warehouses=Armazens
-NewWarehouse=Novo Armazém ou Zona de Armazenagem
-WarehouseEdit=modificar armazém
-MenuNewWarehouse=Novo Armazém
-WarehouseSource=Armazém Origem
-WarehouseSourceNotDefined=Sem armazém definido,
-WarehouseTarget=Destino do armazenamento
-ValidateSending=Confirmar Envio
-CancelSending=Cancelar Envio
-DeleteSending=Eliminar Envio
+NewWarehouse=Novo armazém / setor de armazenagem
+MenuNewWarehouse=Novo armazém
+WarehouseSource=Armazém de origem
+WarehouseSourceNotDefined=Nenhum armazém definido,
+WarehouseTarget=Armazém de destino
+ValidateSending=Apagar envio
+CancelSending=Cancelar envio
+DeleteSending=Apagar envio
 Stock=Estoque
 Stocks=Estoques
-StocksByLotSerial=Estoque por Lote/Serial
-ErrorWarehouseRefRequired=Nome de referência do armazenamento é necessária
-ListOfWarehouses=Lista de armazenamento
-StocksArea=Area de estoque
+StocksByLotSerial=Estoques por lote/nº de série
+Movements=Movimentações
+ErrorWarehouseRefRequired=A referência do armazém é necessária
+ListOfWarehouses=Lista de armazéns
+ListOfStockMovements=Lista de movimentações de estoque
+StocksArea=Setor de armazenagem
 NumberOfDifferentProducts=Número de produtos diferentes
-StockCorrection=Correção estoque
+NumberOfProducts=Número total de produtos
+LastMovement=Última movimentação
+LastMovements=Últimas movimentações
+StockCorrection=Corrigir estoque
 StockTransfer=Tranferencia de Estoque
-MassStockTransferShort=Transferencia de estoque em massa
+MassStockTransferShort=Transferência de estoque em massa
 StockMovement=Movimento de estoque
-StockMovements=Movimentos de estoque
-LabelMovement=Etiqueta Movimento
-UnitPurchaseValue=Preço de compra da unidade
-StockTooLow=Estoque insuficiente
-StockLowerThanLimit=Da ação inferior limite de alerta
+StockMovements=Movimentações de estoque
+LabelMovement=Rótulo para a movimentação
+UnitPurchaseValue=Preço unitário de compra
+StockTooLow=Estoque muito baixo
+StockLowerThanLimit=Estoque mais baixo do que o limite de alerta
 EnhancedValueOfWarehouses=Valor de estoques
 UserWarehouseAutoCreate=Criar existencias automaticamente na criação de um usuário
 IndependantSubProductStock=Estoque de produtos e estoque subproduto são independentes
-QtyDispatchedShort=Qtde despachou
-QtyToDispatchShort=Qtde de expedição
+QtyDispatched=Quantidade despachada
+QtyDispatchedShort=Qtde despachada
+QtyToDispatchShort=Qtde a despachar
 OrderDispatch=Recepção de estoques
 RuleForStockManagementDecrease=Regra para baixa automática de estoque ( baixa manual é sempre possível, independente se existe regra de baixa automática ativada)
 RuleForStockManagementIncrease=Regra para entrada automática de estoque ( entrada manual é sempre possível, independente se existe regra de entrada automática ativada)
@@ -45,30 +49,30 @@ ReStockOnDispatchOrder=Aumentar os estoques reais no envio manual para armazenam
 OrderStatusNotReadyToDispatch=Não tem ordem  ainda não ou nato tem um status que permite envio de produtos em para armazenamento.
 StockDiffPhysicTeoric=Explicação para a diferença entre o estoque físico e teórico
 NoPredefinedProductToDispatch=Não há produtos pré-definidos para este objeto. Portanto, não envio em estoque é necessária.
+DispatchVerb=Despachar
 StockLimitShort=Limite para alerta
 StockLimit=Limite de estoque para alerta
 PhysicalStock=Estoque físico
 RealStock=Estoque real
 VirtualStock=Estoque virtual
 IdWarehouse=Id. armazenamento
-DescWareHouse=Descrição do armazenamento
+DescWareHouse=Descrição do armazém
 LieuWareHouse=Localização do armazenamento
 WarehousesAndProducts=Armazenamento de produtos
 WarehousesAndProductsBatchDetail=Armazéns e produtos (com detalhe por lote / série)
 AverageUnitPricePMPShort=Preço médio de entrada
 AverageUnitPricePMP=Preço médio de entrada
 SellPriceMin=Venda Preço unitário
-EstimatedStockValueSellShort=Valor para Venda
-EstimatedStockValueSell=Valor para Venda
+EstimatedStockValueSellShort=Valor para venda
+EstimatedStockValueSell=Valor para venda
 EstimatedStockValueShort=O valor das ações de entrada
 EstimatedStockValue=O valor das ações de entrada
-DeleteAWarehouse=Excluir um arquivo
-ConfirmDeleteWarehouse=Tem certeza de que deseja apagar o arquivo
+ConfirmDeleteWarehouse=Quer mesmo excluir o armazém <b>%s</b>?
 PersonalStock=Estoque Pessoal
 ThisWarehouseIsPersonalStock=Este armazenamento representa estoque pessoal de:
 SelectWarehouseForStockDecrease=Escolha arquivo para usar a redução estoque
 SelectWarehouseForStockIncrease=Escolha arquivo para usar no aumento de estoque
-NoStockAction=Nenhuma estoque
+NoStockAction=Nenhuma ação de estocagem
 DesiredStock=Estoque ideal desejado
 DesiredStockDesc=Esta quantidade será usada para determinar o estoque a ser reposto.
 StockToBuy=Para encomendar
@@ -76,13 +80,14 @@ Replenishment=Reposição
 ReplenishmentOrders=Pedidos de reposição
 VirtualDiffersFromPhysical=De acordo com as opções de estoque ele poderá aumentar/diminuir. Estoque físico e estoque virtual (+ físicas pedidos atuais) podem diferir
 UseVirtualStockByDefault=Usar o estoque virtual por padrão, ao invés do estoque físico, como política de estoque
-UseVirtualStock=Use estoque virtuais
-UsePhysicalStock=Use estoque físico
+UseVirtualStock=Usar estoque virtual
+UsePhysicalStock=Usar estoque físico
 CurentSelectionMode=Modo de seleção atual
 CurentlyUsingVirtualStock=Estoque virtual
 CurentlyUsingPhysicalStock=Estoque físico
 RuleForStockReplenishment=Regra para a reposição de estoques
 SelectProductWithNotNullQty=Selecione pelo menos um produto com um qty não nulo e um fornecedor
+AlertOnly=Alertas apenas
 WarehouseForStockDecrease=Os arquivos serão utilizados para redução estoque
 WarehouseForStockIncrease=O arquivos serão utilizados para aumento de
 ForThisWarehouse=Para este armazenamento
@@ -91,21 +96,23 @@ ReplenishmentOrdersDesc=Esta é a lista de todas as  Ordens de Compras abertas,
 Replenishments=Reabastecimentos
 NbOfProductBeforePeriod=Quantidade de produtos em estoque antes do período selecionado
 NbOfProductAfterPeriod=Quantidade de produtos em estoque período selecionado depois
-MassMovement=Movimento de massas
+MassMovement=Movimentações em massa
 SelectProductInAndOutWareHouse=Selecione um produto, uma quantidade, um armazém de origem e um armazém de destino e clique em "% s". Uma vez feito isso para todos os movimentos necessários, clique em "% s".
 RecordMovement=Gravar a transferência
 ReceivingForSameOrder=Recibos para este fim
-StockMovementRecorded=Movimentos de estoque gravados
+StockMovementRecorded=Movimentações de estoque registradas
 RuleForStockAvailability=Regras sobre os requisitos de ações
-MovementLabel=Rótulo de Movimento
-InventoryCode=Código de movimento ou de inventário
+MovementLabel=Rótulo de movimentação
+InventoryCode=Código da movimentação ou do inventário
 IsInPackage=Contido em pacote
+WarehouseAllowNegativeTransfer=O estoque pode ser negativo
+qtyToTranferIsNotEnough=Não há estoque suficiente no armazém de origem
 MovementCorrectStock=Da correção para o produto %s
 MovementTransferStock=Da transferência de produto %s em um outro armazém
-InventoryCodeShort=Inv. / Mov. código
+InventoryCodeShort=Código mov./inv.
 NoPendingReceptionOnSupplierOrder=Sem recepção pendente devido a abrir ordem fornecedor
 ThisSerialAlreadyExistWithDifferentDate=Este lote / número de série (<strong>(%s)</strong>) já existe, mas com diferente entradas/saídas (encontrado <strong>%s,</strong> mas você <strong>confirma% s).</strong>
 OpenAll=Aberto para todas as ações
 OpenInternal=Aberto para ações internas
 OpenShipping=Aberto para embarques
-OpenDispatch=Aberto para Despachos
+OpenDispatch=Aberto para despachos
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index 9adee728bc1..d903440132a 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SuppliersInvoice=Faturas do Fornecedor
-BuyingPriceMin=Preco de compra minimo
-BuyingPriceMinShort=Preco de compra min
+ShowSupplierInvoice=Mostrar Fatura de Suprimentos
 SomeSubProductHaveNoPrices=Algums dos sub-produtos nao tem um preco definido
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Esta referencia de fornecedor ja esta asociada com a referenca: %s
 Availability=Entrega
@@ -18,4 +17,8 @@ ListOfSupplierOrders=Lista de pedidos do fornecedor
 MenuOrdersSupplierToBill=Pedidos a se faturar do foprnecedor
 NbDaysToDelivery=Atraso de entrega em dias
 DescNbDaysToDelivery=O maior atraso de entregar os produtos a partir deste fim
-UseDoubleApproval=Use dupla aprovação quando quantidade (sem impostos) é superior (A segunda aprovação pode ser feito por qualquer usuário com a permissão dedicado. Defina para 0 para não aprovação de casal)
+SupplierReputation=Reputação do fornecedor
+DoNotOrderThisProductToThisSupplier=Não pedir
+NotTheGoodQualitySupplier=Qualidade inadequada
+ReputationForThisProduct=Reputação
+BuyerName=Nome do comprador
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index dc0cf4c35b7..9ffed8eede2 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - users
 HRMArea=área de gestão de recursos humanos
-UserCard=Ficha de Usuário
+UserCard=Ficha de usuário
+GroupCard=Ficha de grupo
 EditPassword=Alterar senha
 SendNewPassword=Enviar nova senha
 ReinitPassword=Gerar nova senha
@@ -32,6 +33,7 @@ AdministratorDesc=Administrador
 DefaultRights=Permissões por Padrao
 DefaultRightsDesc=Defina aqui <u>padrão</u> permissões que são concedidas automaticamente para um <u>novo usuário criado</u> (Vá em fichas de usuário para alterar as permissões de um usuário existente).
 DolibarrUsers=Usuário Dolibarr
+LastName=Sobrenome
 FirstName=Primeiro nome
 ListOfGroups=Lista de grupos
 NewGroup=Novo grupo
@@ -40,7 +42,8 @@ RemoveFromGroup=Remover do grupo
 PasswordChangedAndSentTo=Senha alterada e enviada a <b>%s</b>.
 PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
 MenuUsersAndGroups=Usuários e Grupos
-LastUsersCreated=Os %s últimos usuários criados
+LastGroupsCreated=Últimos %s grupos criados
+LastUsersCreated=Últimos %s usuários criados
 ShowGroup=Visualizar grupo
 ShowUser=Visualizar usuário
 NonAffectedUsers=Usuários não atribuídos
@@ -85,3 +88,7 @@ UseTypeFieldToChange=Use campo Tipo para mudar
 OpenIDURL=URL do OpenID
 LoginUsingOpenID=Usar o OpenID para efetuar o login
 ColorUser=Cor do usuario
+DisabledInMonoUserMode=Desativado no modo de manutenção
+UserAccountancyCode=Código de contabilidade do usuário
+UserLogoff=Usuário desconetado
+UserLogged=Usuário Conectado
diff --git a/htdocs/langs/pt_BR/website.lang b/htdocs/langs/pt_BR/website.lang
index 71e3dc22d83..1cf7c0b8673 100644
--- a/htdocs/langs/pt_BR/website.lang
+++ b/htdocs/langs/pt_BR/website.lang
@@ -16,3 +16,4 @@ ViewSiteInNewTab=Visualizar site numa nova aba
 ViewPageInNewTab=Visualizar página numa nova aba
 SetAsHomePage=Definir com Página Inicial
 RealURL=URL real
+ViewWebsiteInProduction=Visualizar website usando origem URLs
diff --git a/htdocs/langs/pt_BR/withdrawals.lang b/htdocs/langs/pt_BR/withdrawals.lang
index a2a0af9b4a8..42af47c291c 100644
--- a/htdocs/langs/pt_BR/withdrawals.lang
+++ b/htdocs/langs/pt_BR/withdrawals.lang
@@ -1,19 +1,8 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Área de Débitos Diretos de Clientes
-NewStandingOrder=Novo Débito Direto
 StandingOrderToProcess=A Processar
-RequestStandingOrderToTreat=Pedido de processamento das ordems abertas
-RequestStandingOrderTreated=Pedido para ordems abertas processado
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ainda não é possível. Retirar o status deve ser definido como 'creditado' antes de declarar rejeitar em linhas específicas.
-NbOfInvoiceToWithdraw=Nb. da fatura para  realizar pedido
-NbOfInvoiceToWithdrawWithInfo=Nb. da fatura para realizar pedido para os clientes com informações de conta bancária definida
-InvoiceWaitingWithdraw=Faturas em Espera de Levantamento
-WithdrawsRefused=Débitos Diretos Rejeitados
 NoInvoiceToWithdraw=Nenhuma fatura a cliente com modo de pagamento 'Débito Directo' em espera. Ir ao separador 'Débito Directo' na ficha da fatura para fazer um pedido.
 ResponsibleUser=Usuário Responsável dos Débitos Diretos
-WithdrawStatistics=Estatísticas de Débitos Diretos
-WithdrawRejectStatistics=Estatísticas de Débitos Diretos Rejeitados
-LastWithdrawalReceipt=Os %s últimos Débitos Diretos Recebidos
 MakeWithdrawRequest=Realizar um Pedido de Débito Direto
 ThirdPartyBankCode=Código Banco do Fornecedor
 NoInvoiceCouldBeWithdrawed=Não há fatura de débito direto com sucesso. Verifique se a fatura da empresa tem um válido IBAN.
@@ -33,7 +22,6 @@ StatusRefused=Negado
 StatusMotif0=Não especificado
 StatusMotif1=Saldo insuficiente
 StatusMotif2=Solicitação contestada
-StatusMotif3=Não há pedido de retirada
 StatusMotif4=Pedido do Cliente
 StatusMotif5=RIB inutilizável
 StatusMotif8=Outras razões
@@ -43,25 +31,15 @@ OrderWaiting=Aguardando resolução
 NotifyTransmision=Retirada de Transmissão
 NotifyCredit=Revogação de crédito
 NumeroNationalEmetter=Nacional Número Transmissor
-BankToReceiveWithdraw=Conta bancária para receber saques
 CreditDate=A crédito
 WithdrawalFileNotCapable=Não foi possível gerar arquivos recibo retirada para o seu país %s (O seu país não é suportado)
 ShowWithdraw=Mostrar Retire
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se fatura não tem pelo menos um pagamento retirada ainda processado, não vai ser definido como pago para permitir a gestão de remoção prévia.
-DoStandingOrdersBeforePayments=Essa guia permite que você solicite uma ordem permanente. Uma vez feito isso, vá ao menu Banco-> Retirada para gerenciar a ordem permanente. Quando a ordem de pé é fechada, o pagamento da fatura será gravado automaticamente, e fatura fechada se restante a pagar é nulo.
 WithdrawalFile=Arquivo Retirada
 SetToStatusSent=Defina o status "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isto também se aplica aos pagamentos de faturas e classificá-los como "Paid"
 StatisticsByLineStatus=Estatísticas por situação de linhas
-RUMWillBeGenerated=Número RUM será gerada uma vez que informações de conta bancária são salvos
-WithdrawMode=Mode (FRST ou RECUR) retirar
 WithdrawRequestAmount=Retirar montante pedido:
 WithdrawRequestErrorNilAmount=Não é possível retirar pedido de montante zerado ou sem valor.
-InfoCreditSubject=Pagamento pendente pelo banco
-InfoCreditMessage=O pedido pendente foi pago pelo banco <br> Dados de pagamento:% s
-InfoTransSubject=Transmissão de pedido pendente para o banco
-InfoTransMessage=O pedido pendente foi enviada ao banco por% s% s. <br><br>
 InfoTransData=Valor:% s <br> Método:% s <br> Data:% s
-InfoRejectSubject=Pedido pedente recusado
-InfoRejectMessage=Olá, <br><br> a ordem permanente da fatura% s relacionadas à companhia% s, com um montante de% s foi recusado pelo banco. <br><br> - <br> % S
 ModeWarning=Opção para modo real não foi definido, paramos depois desta simulação
diff --git a/htdocs/langs/pt_BR/workflow.lang b/htdocs/langs/pt_BR/workflow.lang
index 474f547aef6..bf321ad72c6 100644
--- a/htdocs/langs/pt_BR/workflow.lang
+++ b/htdocs/langs/pt_BR/workflow.lang
@@ -3,6 +3,10 @@ WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
 WorkflowDesc=Este módulo é concebido para modificar o comportamento das ações automáticas para aplicação. Por padrão, o fluxo de trabalho está aberto (você pode fazer as coisas na ordem que você quiser). Você pode ativar as ações automáticas que você está interessado.
 ThereIsNoWorkflowToModify=Não há alterações do fluxo de trabalho disponíveis com os módulos ativados.
 descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Criar automaticamente uma ordem de cliente depois de uma proposta comercial é assinado
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que uma proposta comercial é assinada
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que um contrato é validado
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Criar automaticamente uma fatura de cliente depois que uma ordem do cliente é fechada
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classificar proposta fonte ligada ao bico quando a ordem do cliente é definido como pago
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique os pedido do cliente vinculado as fonte(s) das faturas quando a fatura do cliente ainda não foi paga
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique os pedidos do cliente vinculado as fonte(s) das faturas quando a fatura do cliente  for paga.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classificar proposta fonte ligada a construir quando fatura do cliente é validado
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index d67b8caba3c..208709f4f2f 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Diarios
 JournalFinancial=Diarios financeiros
 BackToChartofaccounts=Voltar ao plano de contas
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Selecione plano de contas
 Addanaccount=Adicione uma conta contabilistica
 AccountAccounting=Conta contabilistica
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Separação
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Separação de Cliente
-SuppliersVentilation=Separação de Fornecedor
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Relatórios
 NewAccount=Nova Conta Contabilistica
 Create=Criar
-CreateMvts=Create movement
-UpdateMvts=modificação de movimento
-WriteBookKeeping=Gravar conta em contabilidade geral
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Contabilidade geral
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Linhas de fatura a ser limpa
-InvoiceLinesDone=Linhas limpas de fatura
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Limpar
+Ventilate=Bind
 
 Processing=Processando
 EndProcessing=Fim de processamento
-AnyLineVentilate=Alguma linha para limpar
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selecione a linha
 Lineofinvoice=Linha de fatura
-VentilatedinAccount=Limpo com succeso na conta de contabilidade
-NotVentilatedinAccount=Por limpar na conta de contabilidade
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Número de elementos a ser mostrado por página (máxima recomendada: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Comece a classificação das páginas repartição "Tem que repartir" pelos elementos mais recentes
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a triagem das páginas repartidas "repartir " pelos elementos mais recentes
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Comprimento de conta geral
-ACCOUNTING_LENGTH_AACCOUNT=Comprimento de conta de terceiros
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Diário de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diário de compras
@@ -81,32 +102,31 @@ Sens=Sentido
 Codejournal=Diário
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Apagar os registos em Contabilidade geral
-
 DescSellsJournal=Diário de vendas
 DescPurchasesJournal=Diário de compras
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Pagamento de fatura de cliente
-
 ThirdPartyAccount=Conta de terceiros
-
-NewAccountingMvt=Novo movimento
-NumMvts=Numero de movimentos
-ListeMvts=Lista de movimentos
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Débito e crédito não pode ter um valor, ao mesmo tempo
 
-ReportThirdParty=Lista de contas de terceiros
-DescThirdPartyReport=Consulte aqui a lista  terceiros, clientes  e de fornecedores e as suas contas contábeis
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Lista de contas contabeis
 
@@ -114,22 +134,29 @@ Pcgtype=Classe de conta
 Pcgsubtype=sub-classe de conta
 Accountparent=raiz da conta
 
-DescVentilCustomer=Consulte aqui a repartição anual das contas de faturas a clientes
 TotalVente=Total turnover before tax
 TotalMarge=Margem total de vendas
-DescVentilDoneCustomer=Consulte aqui a lista das linhas de facturas a clientes  e as suas conta de contabilidade
-DescVentilTodoCustomer=Alinhar suas linhas de fatura do cliente com uma conta de contabilidade
-ChangeAccount=Alterar a conta contábil para linhas selecionadas por conta:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consulte aqui a desagregação anual das suas faturas de fornecedores
-DescVentilDoneSupplier=Consulte  as suas linhas da fatura de fornecedor com a conta de contabilidade
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validação automatica
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Erro, Não pode apagar uma conta em uso
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Carta de desagregação
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index affbb454602..a9f811d1929 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -6,13 +6,18 @@ VersionLastInstall=Versão Inicial instalada
 VersionLastUpgrade=Versão da Última Atualização
 VersionExperimental=Experimental
 VersionDevelopment=Desenvolvimento
-VersionUnknown=Desconhecida
+VersionUnknown=Desconhecido
 VersionRecommanded=Recomendada
-FileCheck=Integridade dos Ficheiros
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Ficheiros em Falta
 FilesUpdated=Ficheiros Atualizados
-FileCheckDolibarr=Verificar Integridade dos Ficheiros Dolibarr
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Id. da Sessão
 SessionSaveHandler=Gestor para guardar as sessões
 SessionSavePath=Localização para guardar a sessão
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a <b>%s</b
 DictionarySetup=Configurar Dicionário
 Dictionary=Dicionários
 Chartofaccounts=Gráfico de contas
-Fiscalyear=Anos fiscais
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=O código não pode conter o valor 0
 DisableJavascript=Desactivar as funções Javascript e Ajax ( Recomendado para pessoas cegas )
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nr palavras chave para adicionar á pesquisa: %s
 NotAvailableWhenAjaxDisabled=Não está disponível quando o Ajax esta desativado
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Javascript Desativado
 UsePreviewTabs=Ver Fichas "Vista Prévia"
 ShowPreview=Ver Vista Prévia
@@ -130,7 +135,7 @@ SystemToolsArea=Área de utilidades do sistema
 SystemToolsAreaDesc=Esta área oferece diferentes funções de administração. Use o menu para escolher a Funcionalidade e pesquisa.
 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 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 file <b>%s</b> defined for Syslog module (no risk of losing data)
+PurgeDeleteLogFile=Eliminar ficheiro de Log <b>%s</b> definido para o módulo Syslog (sem risco de perda de dados)
 PurgeDeleteTemporaryFiles=Apagar todos os ficheiros tempórarios (sem risco de perderem os dados)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os ficheiros da pasta <b>%s</b>. Ficheiros temporários e Ficheiros anexados a elementos (Terceiros, facturas, etc.) serão eliminados.
@@ -176,15 +181,16 @@ EncodeBinariesInHexa=Codificar os campos binarios em hexadecimal
 IgnoreDuplicateRecords=Ignore os erros de registros duplicados (INSERT IGNORE)
 AutoDetectLang=Autodetecção (navegador)
 FeatureDisabledInDemo=Opção desabilitada em demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissões
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Só os elementos de <a href
-ModulesDesc=Os módulos do ERP definem as Funcionalidadees disponiveis na aplicação. Alguns módulos requerem direitos que deverão indicar-se nos utilizadores para que possam aceder ás suas Funcionalidades.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=mais módulos...
 DoliStoreDesc=DoliStore, o mercado oficial para Dolibarr ERP / CRM módulos externos
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=Indique sites de referência para encontrar mais módulos...
 URL=Link
 BoxesAvailable=Aplicativos disponiveis
 BoxesActivated=Aplicativos activados
@@ -210,7 +216,7 @@ OfficialWebSiteLocal=Local web site (%s)
 OfficialWiki=Wiki ERP
 OfficialDemo=Demo em linha ERP/CRM
 OfficialMarketPlace=Mercado Oficial externo para os módulos / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWebHostingService=web hosting de serviços referenciados (hospedagem na nuvem)
 ReferencedPreferredPartners=Parceiros Preferidos
 OtherResources=Outros recursos
 ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do ERP: <br><b><a href
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Versão actual do ERP/CRM
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Última versão estável
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Pode introduzir qualquer máscara numérica. Nesta máscara, pode utilizar as seguintes etiquetas:<br><b>{000000} </b> corresponde a um número que se incrementa em cada um de %s. Introduza tantos zeros como longitude que deseja mostrar. O contador completar-se-á a partir de zeros pela esquerda com o fim de ter tantos zeros como a máscara. <br> <b> {000000+000}</ b> Igual que o anterior, com uma compensação correspondente ao número da direita do sinal + aplica-se a partir do primeiro %s. <br> <b> {000000@x}</b> igual que o anterior, mas o contador restablece-se a zero quando se chega a x meses (x entre 1 e 12). Se esta opção se utiliza e x é de 2 ou superior, então a sequência {yy}{mm} ou {yyyy}{mm} também é necessário. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mês (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{e}</b> ano em 2, 4 ou 1 figura.<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Qualquer outro caractere na máscara  fica sem alterações. <br>Não são permitidos espaços <br>
 GenericMaskCodes4a=<u>Exemplo em 99 ª %s o Terceiro a Empresa realizada em 31/03/2007: </u><br>
 GenericMaskCodes4b=<u>Exemplo sobre um Terceiro criado em 31/03/2007:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parâmetros para garantir URLs
 SecurityTokenIsUnique=Use um parâmetro securekey exclusivo para cada URL
 EnterRefToBuildUrl=Digite referência para %s objeto
 GetSecuredUrl=Obter URL seguro
-ButtonHideUnauthorized=Ocultar botões para ações não autorizadas em vez de mostrar os botões desactivados
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Taxa de IVA antiga
 NewVATRates=Nova Taxa de IVA
 PriceBaseTypeToChange=Modificar nos preços com base no valor de referência definido em
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Lista de selecção
 ExtrafieldSelectList = Selecionar da tabela
 ExtrafieldSeparator=Separador
+ExtrafieldPassword=Palavra Passe
 ExtrafieldCheckBox=Caixa de verificação
 ExtrafieldRadio=Botão
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Utilizadores e Grupos
@@ -428,8 +439,8 @@ Module55Name=Códigos de barras
 Module55Desc=Gestão dos códigos de barras
 Module56Name=Central Telefónica
 Module56Desc=Gestão da Central Telefónica
-Module57Name=Débitos Directos
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integração com ClickToDial
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Interface com calendario Webcalendar
 Module500Name=Despesas especiais
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salários
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Empréstimo
 Module520Desc=Gestão de empréstimos
 Module600Name=Notificações
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Bolsas
 Module700Desc=Gestão de Bolsas
 Module770Name=Relatórios de despesas
@@ -606,10 +617,10 @@ Permission142=Criar/modificar todos os projetos e tarefas (também os projetos p
 Permission144=Eliminar todos os projetos e tarefas (também os projetos privados em que eu não sou contactado)
 Permission146=Consultar Fornecedores
 Permission147=Consultar Estados
-Permission151=Consultar Débitos Directos
-Permission152=Configurar Débitos Directos
-Permission153=Consultar Débitos Directos
-Permission154=Crédito / recusar recibos de ordens permanentes
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Ler contractos/subscrições
 Permission162=Criar/modificar contractos/subscrições
 Permission163=Ativar um serviço/subscrição de um contracto
@@ -747,6 +758,7 @@ Permission1236=Exportar facturas de Fornecedores, atributos e pagamentos
 Permission1237=Exportar as encomendas do fornecedor e os seus ddetalhes
 Permission1251=Executar importações em massa de dados externos em bases de dados (dados de carga)
 Permission1321=Exportar facturas a clientes, atributos e cobranças
+Permission1322=Reopen a paid bill
 Permission1421=Exportar facturas de clientes e atributos
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução par
 LabelOnDocuments=Etiqueta sobre documentos
 NbOfDays=Nº de Dias
 AtEndOfMonth=No Fim de Mês
+CurrentNext=Current/Next
 Offset=Deslocado
 AlwaysActive=Sempre Activo
 Upgrade=Actualização
@@ -950,7 +967,7 @@ LogEventDesc=Pode activar o registo de eventos de segurança ERP/CRM aquí. os a
 AreaForAdminOnly=Estas funções só são acessiveis ao Utilizador Administrador.
 SystemInfoDesc=Esta informação do sistema é uma informação técnica acessível só para leitura dos administradores.
 SystemAreaForAdminOnly=Esta área só é acessível aos Utilizadores do tipo administradores. Nenhuma permissão ERP/CRM permite extender o círculo de Utilizadores autorizados.
-CompanyFundationDesc=Editar inserir nesta página toda a informação sobre a empresa ou associação a administrar
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Pode encontrar aqui todos os parâmetros relacionados com a apariencia do ERP
 AvailableModules=Módulos disponiveis
 ToActivateModule=Para activar os módulos, aceder á área de configuração.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar e-mails,
 PathToDocuments=Caminhos de acesso a documentos
 PathDirectory=Catálogo
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuração da tradução
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
 ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Utilizador TLS
 LDAPServerUseTLSExample=O seu servidor utiliza TLS
 LDAPServerDn=DN do servidor
 LDAPAdminDn=DN do administrador
-LDAPAdminDnExample=DN completo (ej: cn
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Palavra-passe do Administrador
 LDAPUserDn=DN dos Utilizadores
 LDAPUserDnExample=DN completo (ej: ou
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Exemplo : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Exemplo : objecto sid
 LDAPFieldEndLastSubscription=Data finalização como membro
-LDAPFieldTitle=Posto/Função
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Exemplo: título
 LDAPSetupNotComplete=Configuração LDAP incompleta (a completar em Outras pestañas)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Não foi indicado o administrador ou palavra-passe. Os acessos LDAP serão anónimos e no modo só de leitura.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produtos e Serviços de instalação de módulos
 NumberOfProductShowInSelect=Nº de produtos max em listas (0
 ViewProductDescInFormAbility=Visualização das descrições dos produtos nos formularios
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualização de produtos descrições no idioma de terceiros
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defeito para os produtos
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Motor interno
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Configuração do módulo Débitos Directos
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Configuração das importacções do fluxo RSS
 NewRSS=Gravação de um Novo fluxo RSS
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Abrir ano fiscal
 CloseFiscalYear=Fechar ano fiscal
 DeleteFiscalYear=Apagar ano fiscal
 ConfirmDeleteFiscalYear=Tem a certeza de que deseja apagar este ano fiscal?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Pode ser sempre editado
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Número máximo de carateres maiúsculos
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Cor de fundo
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Página Inicial
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 7c87063c105..5eebecf588c 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -27,13 +27,9 @@ AllTime=Do início
 Reconciliation=Conciliação
 RIB=Conta bancária
 IBAN=Identificador IBAN
-IbanValid=IBAN é Válido
-IbanNotValid=IBAN Não é Válido
 BIC=Identificador BIC/SWIFT
-SwiftValid=BIC/SWIFT é Válido
-SwiftNotValid=BIC/SWIFT Não é Válido
-StandingOrders=Débitos Directos
-StandingOrder=Domiciliação
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Extracto
 AccountStatementShort=Extracto
 AccountStatements=Extractos
@@ -78,6 +74,7 @@ AccountToCredit=Conta de crédito
 AccountToDebit=Conta de débito
 DisableConciliation=Desactivar a função de Conciliação para esta Conta
 ConciliationDisabled=Função de Conciliação desactivada
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Fechada
 AccountIdShort=Número
@@ -87,6 +84,8 @@ AddBankRecordLong=Realizar um registo manual fora de uma factura
 ConciliatedBy=Conciliado por
 DateConciliating=Data Conciliação
 BankLineConciliated=Registo conciliado
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Pagamento de cliente
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Pagamento de retirada
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Transferência bancária
 BankTransfers=Transferencias bancarias
-TransferDesc=Ao criar uma transferência de uma das suas contas bancárias para outra serão criados os registos contabilísticos em ambas (um de débito numa Conta e outro de crédito, do mesmo Montante, na outra Conta. A data e a descrição da transferência será a mesma em ambas as contas)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=De
 TransferTo=Para
 TransferFromToDone=A transferência de <b>%s</b> para <b>%s</b> de <b>%s</b> %s foi criado.
@@ -129,7 +129,7 @@ FutureTransaction=Transacção futura. Não há forma de conciliar.
 SelectChequeTransactionAndGenerate=Selecione o que pretende incluir no recibo de depósito e clique em &quot;Criar&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos
-ToConciliate=Para conciliar?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Em seguida, verifique as linhas presentes no extrato bancário e clique
 DefaultRIB=BAN Padrão
 AllRIB=Todos os BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 1b0fe101831..589b10f505c 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não pode cancelar uma fac
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Acções sobre a factura
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Desconto (Pronto pagamento)
 EscompteOfferedShort=Discount
 SendBillRef=Submissão da fatura %s
 SendReminderBillRef=Submissão da fatura %s (lembrete)
-StandingOrders=Débitos Directos
-StandingOrder=Domiciliação
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nenhuma factura rascunho
 NoOtherDraftBills=Nenhuma outra factura rascunho
 NoDraftInvoices=Sem rascunhos de faturas 
@@ -351,8 +351,8 @@ VarAmount=Quantidade variável (%% total.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Domiciliação bancaria
-PaymentTypeShortPRE=Domiciliação
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Espécies
 PaymentTypeShortLIQ=Espécies
 PaymentTypeCB=Cartão
@@ -381,6 +381,7 @@ ExtraInfos=Informações complementarias
 RegulatedOn=Pagar o
 ChequeNumber=Cheque nº
 ChequeOrTransferNumber=Cheque/Transferência nº
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Banco do cheque
 CheckBank=Verificar
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Pago por esse pagamento
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Tudo sem nota fiscal continuam a pagar será automaticamente fechada ao status de &quot;payed&quot;.
 ToMakePayment=Pagar
 ToMakePaymentBack=Reembolsar
 ListOfYourUnpaidInvoices=Lista de faturas não pagas
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Modelo de factura completo (IVA,  método de pago a mostrar, logotipo...)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 7a92ff778d8..5bf2ecc456e 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Mais antigos ativos de serviços vencidos
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Atividade Global (faturas, propostas, encomendas)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Propostas por mês
 NoTooLowStockProducts=Nenhum produto abaixo do limite mínimo de stock
 BoxProductDistribution=Distribuição de Produtos/Serviços
 BoxProductDistributionFor=Distribuição de %s para %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Facturas de Clientes
 ForCustomersOrders=Encomendas de clientes
 ForProposals=Orçamentos
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/pt_PT/cashdesk.lang b/htdocs/langs/pt_PT/cashdesk.lang
index b4b1f33d5e3..dc8c6d729cc 100644
--- a/htdocs/langs/pt_PT/cashdesk.lang
+++ b/htdocs/langs/pt_PT/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=em
 CashDeskThirdParty=Terceiro
 ShoppingCart=Carrinho de compras
 NewSell=​​Nova Venda
-BackOffice=Back office
 AddThisArticle=Adicionar este artigo
 RestartSelling=Voltar para vendas
-SellFinished=Terminar venda
+SellFinished=Sale complete
 PrintTicket=Imprimir Recibo
 NoProductFound=Nenhum artigo encontrado
 ProductFound=produto encontrado
diff --git a/htdocs/langs/pt_PT/categories.lang b/htdocs/langs/pt_PT/categories.lang
index 46e99c6bd4f..5b8d47ecb75 100644
--- a/htdocs/langs/pt_PT/categories.lang
+++ b/htdocs/langs/pt_PT/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Sub-Categorias
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Esta categoria não contem nenhum produto.
 ThisCategoryHasNoSupplier=Esta categoria não contem a nenhum fornecedor.
 ThisCategoryHasNoCustomer=Esta categoria não contem a nenhum cliente.
 ThisCategoryHasNoMember=Esta categoria não contém nenhum membro.
 ThisCategoryHasNoContact=Esta categoria não contém qualquer contato.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Atributos Complementares
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index 3625e0c61b7..7ffa25e156b 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Novo Particular
 NewCompany=Nova Empresa (Cliente Potencial, Cliente, Fornecedor)
 NewThirdParty=Novo Terceiro (Cliente Potencial, Cliente, Fornecedor)
 CreateDolibarrThirdPartySupplier=Criar entidade (fornecedor)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Área de prospeção
 IdThirdParty=ID Terceiro
 IdCompany=Id Empresa
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Fornecedores
 ThirdPartyType=Tipo de Terceiro
 Company/Fundation=Empresa/Associação
 Individual=Particular
-ToCreateContactWithSameName=Criar automaticamente um contacto fisico com a mesma informação
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Casa mãe
 Subsidiaries=Subsidiárias
 ReportByCustomers=Relatório por cliente
@@ -47,7 +49,7 @@ CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apelidos
 Firstname=Primeiro Nome
-PostOrFunction=Posto/Função
+PostOrFunction=Job position
 UserTitle=Título
 Address=Direcção
 State=Distrito
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Telef. Trabalho
 PhonePerso=Telef. particular
 PhoneMobile=Telemovel
-No_Email=Não envie e-mails em massa.
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Código postal
 Town=Concelho
@@ -73,7 +75,7 @@ Poste= Posição
 DefaultLang=Língua por omissão
 VATIsUsed=Sujeito a IVA
 VATIsNotUsed=Não Sujeito a IVA
-CopyAddressFromSoc=Preencha a morada com a morada do terceiro
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=CNPJ
 VATIntraShort=CNPJ
 VATIntraSyntaxIsValid=Sintaxe Válida
-VATIntraValueIsValid=Valor Válido
 ProspectCustomer=Cliente Potencial/Cliente
 Prospect=Cliente Potencial
 CustomerCard=Ficha de Cliente
@@ -261,7 +262,9 @@ AddContactAddress=Novo contacto/morada
 EditContact=Editar contato / endereço
 EditContactAddress=Editar contactos/endereços
 Contact=Contacto
+ContactId=Contact id
 ContactsAddresses=Contato / Endereços
+FromContactName=Name:
 NoContactDefinedForThirdParty=Não existem contactos definidos para este terceiro
 NoContactDefined=Nenhum contacto definido para este terceiro
 DefaultContact=Contacto por Defeito
@@ -284,7 +287,7 @@ CompanyDeleted=A Empresa "%s" foi Eliminada
 ListOfContacts=Lista de Contactos
 ListOfContactsAddresses=Lista de contactos/endereços
 ListOfThirdParties=Lista de Terceiros
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Mostrar Contacto
 ContactsAllShort=Todos (sem filtro)
 ContactType=Tipo de Contacto
@@ -294,6 +297,7 @@ ContactForProposals=Contacto de Orçamentos
 ContactForContracts=Contacto de Contratos
 ContactForInvoices=Contacto de Facturas
 NoContactForAnyOrder=Este contacto não é contacto de nenhum pedido
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Este contacto não é contacto de nenhum orçamento
 NoContactForAnyContract=Este contacto não é contacto de nenhum contrato
 NoContactForAnyInvoice=Este contacto não é contacto de nenhuma factura
@@ -352,9 +356,9 @@ ExportCardToFormat=Exportar ficha para o formato
 ContactNotLinkedToCompany=Contacto não vinculado a um Terceiro
 DolibarrLogin=Login
 NoDolibarrAccess=Sem Acesso
-ExportDataset_company_1=Terceiros (empresas/fundações/pessoas físicas) e propriedades
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contactos de Terceiro e Atributos
-ImportDataset_company_1=Terceiros (empresas/fundações/pessoas físicas) e propriedades
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contatos/Moradas (de terceiros ou não) e atributos
 ImportDataset_company_3=Dados bancários
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index ea1ef648766..06238977b21 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Despesas Especiais
 MenuTaxAndDividends=Impostos e Dividas
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index e9f0330904c..530d480bce2 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Configuração da gestão de tarefas agendadas
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Comando
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Tarefa
@@ -39,7 +39,7 @@ CronMethod=Método
 CronModule=Módulo
 CronNoJobs=Nenhuma tarefa registada
 CronPriority=Prioridade
-CronLabel=Descrição
+CronLabel=Label
 CronNbRun=N.º de Execução
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index c2df3fae294..2ee08054026 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Erro, o php deve ter o módulo <b>%s</b> instalado para utili
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Os armazéns de origem e de destino não devem ser iguais
 ErrorBadFormat=Formato incorrecto!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/pt_PT/help.lang b/htdocs/langs/pt_PT/help.lang
index f6e610abac3..9809eb259a8 100644
--- a/htdocs/langs/pt_PT/help.lang
+++ b/htdocs/langs/pt_PT/help.lang
@@ -2,10 +2,10 @@
 CommunitySupport=Fórum / Wiki apoio
 EMailSupport=Emails apoio
 RemoteControlSupport=On-line em tempo real / suporte remoto
-OtherSupport=Outros apoios
+OtherSupport=Outro apoio
 ToSeeListOfAvailableRessources=Para entrar em contato / ver recursos disponíveis:
 HelpCenter=Central de Ajuda
-DolibarrHelpCenter=Dolibarr Ajuda e Centro de Suporte
+DolibarrHelpCenter=Dolibarr Centro de Ajuda e Suporte
 ToGoBackToDolibarr=Caso contrário, clique <a href="%s">aqui para utilizar Dolibarr</a>
 TypeOfSupport=Fonte de apoio
 TypeSupportCommunauty=Comunidade (grátis)
@@ -16,7 +16,7 @@ Efficiency=Eficiência
 TypeHelpOnly=Ajuda só
 TypeHelpDev=Ajuda + Desenvolvimento
 TypeHelpDevForm=Ajuda + Desenvolvimento + Formação
-ToGetHelpGoOnSparkAngels1=Algumas empresas podem fornecer uma rápida (por vezes imediatos) e mais eficiente de suporte on-line, tomando o controle do seu computador. Tal ajuda pode ser encontrada <b>em %s</b> web site:
+ToGetHelpGoOnSparkAngels1=Algumas empresas podem fornecer uma forma mais rápida (por vezes imediata) e mais eficiente de suporte on-line, com acesso remoto ao seu computador. Tal ajuda pode ser encontrada <b>em %s</b> web site:
 ToGetHelpGoOnSparkAngels3=Você também pode ir para a lista de todas as ajudas disponíveis para Dolibarr, para este clique no botão
 ToGetHelpGoOnSparkAngels2=Às vezes, não há nenhuma empresa disponível no momento em que você faça a sua pesquisa, por isso acho que para mudar o filtro para procurar "todas as disponibilidade". Você será capaz de enviar mais pedidos.
 BackToHelpCenter=Caso contrário, clique aqui para ir <a href="%s">de volta ao centro de ajuda home page.</a>
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 225602d432b..0f6498c7363 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Este PHP suporta sessões.
 PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST.
 PHPSupportPOSTGETKo=É possível que a sua configuração PHP não suporte as variáveis POST e/ou GET. Verifique o seu parâmetro <b>variables_order</b> no php.ini
 PHPSupportGD=Este PHP suporta funções gráficas GD .
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Este PHP suporte funções UTF8.
 PHPMemoryOK=A sua memória máxima da sessão PHP está definida para <b>%s.</b> Isto deverá ser suficiente.
 PHPMemoryTooLow=A sua memória máxima da sessão PHP está definida para <b>%s</b> bytes. Isto deve ser muito baixo. Altere o seu <b>php.ini</b> para definir o parâmetro <b>memory_limit</b> para pelo menos <b>%s</b> bytes.
 Recheck=Clique aqui para um teste mais significativo
 ErrorPHPDoesNotSupportSessions=A sua instalação PHP não suporta sessões. Esta função é necessária para que o Dolibarr funcione. Verifique a sua configuração PHP.
 ErrorPHPDoesNotSupportGD=A sua instalação PHP não suporta a função gráfica GD. Não terá nenhum gráfico disponível.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=A sua instalação PHP não suporta as funções UTF8. O Dolibarr não pode funcionar corretamente. Resolva isto antes de instalar o Dolibarr.
 ErrorDirDoesNotExists=A diretoria %s não existe.
 ErrorGoBackAndCorrectParameters=Voltar atrás e corrigir os parâmetros errados.
@@ -86,7 +88,7 @@ DirectoryRecommendation=É recomendado a utilização da diretoria fora da sua d
 LoginAlreadyExists=Já existe
 DolibarrAdminLogin=Sessão Administrador Dolibarr
 AdminLoginAlreadyExists=A conta de administrador <b>' %s'</b> Dolibarr já existe. Volte atrás, se desejar criar uma conta.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Falha na criação da conta de Administrador do Dolibarr.
 WarningRemoveInstallDir=Aviso: por motivos de segurança, assim que a instalação ou a atualização estiverem completas, e para evitar novamente a utilização das ferramentas de instalação, deverá adicionar um ficheiro com o nome <b>install.lock</b> na diretoria de documentos Dolibarr, para evitar a sua utilização maliciosa.</b>
 FunctionNotAvailableInThisPHP=Não disponível neste PHP
 ChoosedMigrateScript=Escolhido migrar script
@@ -133,6 +135,10 @@ ActivateModule=Ative o módulo %s
 ShowEditTechnicalParameters=Clique aqui para mostrar/editar os parâmetros avançados (modo avançado)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Atualizar os dados nas ações
 MigrationPaymentMode=A migração de dados para o modo de pagamento
 MigrationCategorieAssociation=Migração de categorias
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Recarregar módulo %s
 ShowNotAvailableOptions=Mostrar opções indisponíveis
 HideNotAvailableOptions=Ocultar opções indisponíveis
diff --git a/htdocs/langs/pt_PT/interventions.lang b/htdocs/langs/pt_PT/interventions.lang
index 4e14d0da97b..84bd908adad 100644
--- a/htdocs/langs/pt_PT/interventions.lang
+++ b/htdocs/langs/pt_PT/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Contacto do cliente do seguimiento da in
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/pt_PT/ldap.lang b/htdocs/langs/pt_PT/ldap.lang
index fa58aac234d..65c1e6574d5 100644
--- a/htdocs/langs/pt_PT/ldap.lang
+++ b/htdocs/langs/pt_PT/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Data primeira adesão
 LDAPFieldFirstSubscriptionAmount=Montante primeira adesão
 LDAPFieldLastSubscriptionDate=Data da última adesão
 LDAPFieldLastSubscriptionAmount=Montante última adesão
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Utilizador sincronizado
 GroupSynchronized=Grupo sincronizado
 MemberSynchronized=Membro sincronizado
diff --git a/htdocs/langs/pt_PT/mails.lang b/htdocs/langs/pt_PT/mails.lang
index 572bed744d7..f5c85f63665 100644
--- a/htdocs/langs/pt_PT/mails.lang
+++ b/htdocs/langs/pt_PT/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Ler
 YourMailUnsubcribeOK=O e-mail <b>%s</b> foi cancelado corretamente na lista de discusões
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=E-mail enviado para %s destinatários.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selecionado
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Valor máximo
 AdvTgtSearchDtHelp=Utilizar intervalo para seleciona o valor da data
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Adicionar tudo
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 5bf495e8561..586b09345d1 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -67,6 +67,7 @@ SelectDate=Seleccionar uma data
 SeeAlso=Ver também %s
 SeeHere=Veja aqui
 BackgroundColorByDefault=Cor de fundo por omissão
+FileRenamed=The file was successfully renamed
 FileUploaded=O ficheiro foi enviado com sucesso
 FileWasNotUploaded=Um ficheiro foi seleccionada para ser anexado, mas ainda não foi carregado. Clique em 'Adicionar este Ficheiro' para anexar.
 NbOfEntries=Nº de entradas
@@ -245,6 +246,10 @@ DateBuild=Data da geração do Relatório
 DatePayment=Data de pagamento
 DateApprove=Data de aprovação
 DateApprove2=Data de aprovação (segunda aprovação)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=Ano
 DurationMonth=Mês
 DurationWeek=Semana
@@ -256,6 +261,7 @@ DurationDays=Dias
 Year=Ano
 Month=Mês
 Week=Semana
+WeekShort=Week
 Day=Dia
 Hour=Hora
 Minute=Minuto
@@ -278,6 +284,7 @@ MonthOfDay=Dia do mês
 HourShort=H
 MinuteShort=mn
 Rate=Tipo
+CurrencyRate=Currency conversion rate
 UseLocalTax=IVA incluído
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -554,7 +561,7 @@ Priority=Prioridade
 SendByMail=Enviar por e-mail
 MailSentBy=Mail enviado por
 TextUsedInTheMessageBody=Texto utilizado no corpo da mensagem
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=Enviar email de confirmação
 EMail=E-mail
 NoEMail=Sem e-mail
 NoMobilePhone=Sem telefone móvel
@@ -565,8 +572,11 @@ BackToList=Mostar Lista
 GoBack=Voltar
 CanBeModifiedIfOk=Pode ser modificado se for válido
 CanBeModifiedIfKo=Pode ser modificado senão for válido
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Registo modificado com êxito
 RecordsModified=%s registos modificados
+RecordsDeleted=%s records deleted
 AutomaticCode=Criação automática de código
 FeatureDisabled=Função Desactivada
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Não tem permissões para efectuar esta acção
 SessionName=Nome Sessão
 Method=Método
 Receive=Recepção
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Parcial
 TotalWoman=Total
 NeverReceived=Nunca Recebido
@@ -598,6 +609,7 @@ DisabledModules=Módulos Desactivados
 For=Para
 ForCustomer=Para cliente
 Signature=Assinatura
+DateOfSignature=Date of signature
 HidePassword=Esconder password
 UnHidePassword=Mostrar caracteres da password
 Root=Raíz
@@ -641,6 +653,15 @@ NewAttribute=Novo atributo
 AttributeCode=Código de atributo
 URLPhoto=Url da foto / logotipo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Criar Rascunho
 SetToDraft=Voltar para o rascunho
 ClickToEdit=Clique para editar
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Segunda-feira
 Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/margins.lang b/htdocs/langs/pt_PT/margins.lang
index 95d919740b0..f91c1790cc4 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/pt_PT/oauth.lang b/htdocs/langs/pt_PT/oauth.lang
index 872461dea71..288729c7c48 100644
--- a/htdocs/langs/pt_PT/oauth.lang
+++ b/htdocs/langs/pt_PT/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configuração de Oauth
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 2fbf00a25fa..e694c384818 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=As suas encomendas foram criadas
 OrderFail=Ocorreu um erro durante a criação das suas encomendas
 CreateOrders=Criar encomendas
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/pt_PT/printing.lang b/htdocs/langs/pt_PT/printing.lang
index 1cea7dc7940..1b7ebe6e61f 100644
--- a/htdocs/langs/pt_PT/printing.lang
+++ b/htdocs/langs/pt_PT/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Este controlador permite-lhe enviar documentos diretamente para uma impressora com a Impressão na Nuvem da Google.
 GCP_Name=Nome
 GCP_displayName=Exibir Nome
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index 75897662778..88bb22918eb 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lote/Nr. de Série
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lote/Número de série
 BatchNumberShort=Lote/Nr. de Série
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Detalhes de Lote/Nr. de Série
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lote/Nr. de Série: %s
@@ -19,3 +19,6 @@ printQty=Qt.: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 88297393fae..03423ca4e50 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Contabilidade (código de compra)
-ProductAccountancySellCode=Contabilidade (código vender)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produto ou Serviço
 ProductsAndServices=Produtos e Serviços
 ProductsOrServices=Produtos ou Serviços
@@ -59,6 +59,8 @@ SellingPriceHT=Preço de venda (líquido de impostos)
 SellingPriceTTC=Preço de venda (inc. IVA)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Novo preço
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=O preço de venda não pode ser inferior ao mínimo permitido para este produto ( %s sem impostos)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Gerar página para impressão
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Informações de código de barras do produto %s:
-BarCodeDataForThirdparty=Informações de código de barras do terceiro %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index c0bca7de10a..9d66ab66379 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=Lista de tarefas
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Ir para a lista de tarefas
 ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
-ListOrdersAssociatedProject=Lista de Encomendas Associadas ao Projeto
-ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projeto
-ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associados ao Projeto
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
 ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do pr
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projetos e tarefas
 ProjectCreatedInDolibarr=Projeto %s criado
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=%s tarefas criadas
 TaskModifiedInDolibarr=%s tarefas modificadas
 TaskDeletedInDolibarr=%s tarefas apagadas
@@ -153,7 +154,7 @@ PlannedWorkload=Carga de trabalho planeada
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Apenas oportunidades
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index af8fd746745..86481dff18b 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Novo Pagamento de Salário
 SalaryPayment=Pagamento de Salário
 SalariesPayments=Pagamentos de Salários
 ShowSalaryPayment=Mostrar pagamento de salário
-THM=Preço médio da hora
-TJM=Preço médio diário
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=Salário atual
 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
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 3e1ec53e125..929075b34e3 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Eliminar Envío
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movimentos
 ErrorWarehouseRefRequired=O nome de referencia do armazem é obrigatório
 ListOfWarehouses=Lista de Armazens
@@ -43,6 +45,7 @@ PMPValue=Valor (PMP)
 PMPValueShort=PMP
 EnhancedValueOfWarehouses=Valor de stocks
 UserWarehouseAutoCreate=Criar existencias automáticamente na criação de um utilizador
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantidade desagregada
 QtyDispatchedShort=Qt. despachada
@@ -120,8 +123,8 @@ StockMustBeEnoughForShipment= Stock level must be enough to add product/service
 MovementLabel=Label of movement
 InventoryCode=Movimento ou código do inventário
 IsInPackage=Contained into package
-WarehouseAllowNegativeTransfer=Stock can be negative
-qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
+WarehouseAllowNegativeTransfer=O stock pode ser negativo
+qtyToTranferIsNotEnough=Não tem stock suficiente no armazém principal
 ShowWarehouse=Mostrar armazém
 MovementCorrectStock=Stock correction for product %s
 MovementTransferStock=Stock transfer of product %s into another warehouse
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/pt_PT/supplier_proposal.lang b/htdocs/langs/pt_PT/supplier_proposal.lang
index 7d9557d9281..f20dc91e40a 100644
--- a/htdocs/langs/pt_PT/supplier_proposal.lang
+++ b/htdocs/langs/pt_PT/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 43d4ec4914a..22783e29d0e 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -7,13 +7,13 @@ History=Histórico
 ListOfSuppliers=Lista de Fornecedores
 ShowSupplier=Mostrar Fornecedor
 OrderDate=Data Pedido
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Alguns sub-produtos não têm preço definido
-AddSupplierPrice=Adicionar Preço de Fornecedor
-ChangeSupplierPrice=Modificar Preço de Fornecedor
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Este fornecedor de referência já está associado com uma referência: %s
 NoRecordedSuppliers=Sem Fornecedores Registados
 SupplierPayment=Pagamento a Fornecedor
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Lista das encomendas do fornecedor
 MenuOrdersSupplierToBill=Encomendas do fornecedor para faturar
 NbDaysToDelivery=Atraso da entrega em dias
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/pt_PT/users.lang b/htdocs/langs/pt_PT/users.lang
index 36838f8543f..571958325c0 100644
--- a/htdocs/langs/pt_PT/users.lang
+++ b/htdocs/langs/pt_PT/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Horas semanais
 ColorUser=Cor do utilizador
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/pt_PT/website.lang b/htdocs/langs/pt_PT/website.lang
index 9844de7802e..17844ea822a 100644
--- a/htdocs/langs/pt_PT/website.lang
+++ b/htdocs/langs/pt_PT/website.lang
@@ -12,6 +12,7 @@ EditMenu=Editar Menu
 EditPageMeta=Editar Metadados
 EditPageContent=Editar Conteúdo
 Website=Site da Web
+Webpage=Web page
 AddPage=Adicionar página
 PreviewOfSiteNotYetAvailable=A pré-visualização do seu site da Web <strong>%s</strong> ainda mão está disponível. Deve adicionar primeiro uma página.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -21,5 +22,7 @@ ViewSiteInNewTab=Ver site no novo separador
 ViewPageInNewTab=Ver página no novo separador
 SetAsHomePage=Definir como página Inicial
 RealURL=URL Real
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+ViewWebsiteInProduction=Ver site no utilizando URLs
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/pt_PT/withdrawals.lang b/htdocs/langs/pt_PT/withdrawals.lang
index 2c55d2d3d5c..2fb562fad12 100644
--- a/htdocs/langs/pt_PT/withdrawals.lang
+++ b/htdocs/langs/pt_PT/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Área de Débitos Directos de Clientes
-StandingOrders=Débitos Directos
-StandingOrder=Débitos Directos
-NewStandingOrder=Novo Débito Directo
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Para processar
-WithdrawalsReceipts=Ordens de Levantamento
-WithdrawalReceipt=Ordem de Levantamento
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Linhas de Levantamento
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Facturas em Espera de Levantamento
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Quantidade a Levantar
-WithdrawsRefused=Débitos Directos Rejeitados
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nenhuma factura a cliente com modo de pagamento 'Débito Directo' em espera. Ir ao separador 'Débito Directo' na ficha da factura para fazer um pedido.
 ResponsibleUser=Utilizador Responsável dos Débitos Directos
-WithdrawalsSetup=Configuração dos Débitos Directos
-WithdrawStatistics=Estatísticas de Débitos Directos
-WithdrawRejectStatistics=Estatísticas de Débitos Directos Rejeitados
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Realizar um Pedido de Débito Directo
 ThirdPartyBankCode=Código Banco do Terceiro
 NoInvoiceCouldBeWithdrawed=Não há factura de débito directo com sucesso. Verifique se a factura da empresa tem um válido IBAN.
@@ -46,7 +47,7 @@ StatusRefused=Rejeitado
 StatusMotif0=Indefinido
 StatusMotif1=Provisão insuffisante
 StatusMotif2=conteste Tirage
-StatusMotif3=Nenhuma pedido de levantamento
+StatusMotif3=No direct debit payment order
 StatusMotif4=Encomendas
 StatusMotif5=RIB inexploitable
 StatusMotif6=Conta sem saldo
@@ -61,28 +62,43 @@ 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 levantamento
+BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=Crédito em
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Mostrar levantamento
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=No entanto, se não tiver factura, pelo menos, um pagamento levantamento ainda processado, que não irá ser definido como pago para permitir o levantamento antes de administrar.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=arquivo retirado
 SetToStatusSent=Definir o estado como "arquivo enviado"
 ThisWillAlsoAddPaymentOnInvoice=Isso também irá criar pagamentos em facturas e classificá-los para pagar
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Pagamento de %s ordem permanente pelo banco
-InfoCreditMessage=O %s ordem permanente foi pago pelo banco <br> Dados de pagamento: %s
-InfoTransSubject=Transmissão de %s ordem permanente para o banco
-InfoTransMessage=O %s ordem permanente foi transmitido para o banco por %s %s. <br><br>
+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>
 InfoTransData=Valor: %s <br> Metode: %s <br> Data: %s
-InfoRejectSubject=Ordem permanente recusou
-InfoRejectMessage=Olá, <br><br>a autorização de débito directo da factura %s, para a empresa %s, com o montante de %s foi recusada pelo banco.<br><br>--<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
 ModeWarning=Opção para o modo real não foi definido, nós paramos depois desta simulação
diff --git a/htdocs/langs/pt_PT/workflow.lang b/htdocs/langs/pt_PT/workflow.lang
index 3b1ed4f9a40..adf9b5e7889 100644
--- a/htdocs/langs/pt_PT/workflow.lang
+++ b/htdocs/langs/pt_PT/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Configuração do módulo de Ritmo de Trabalho
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classifique a fonte ligada como prposta a cobrança quando a ordem do cliente for definida como paga
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada como cobrado quando a ordem(s) do cliente for definida como paga
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifique a fonte ligada a ordem(s) de clientes quando a fatura de cliente for validada
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 9e3767ac950..3b594fc2e49 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Jurnale
 JournalFinancial=Jurnale financiale
 BackToChartofaccounts=Înapi la plan de conturi
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Selectează un plan de conturi
 Addanaccount=Add un cont contabil
 AccountAccounting=Cont contabil
 AccountAccountingShort=Cont
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Ventilare
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Contabilitate
-CustomersVentilation=Ventilare clienţi
-SuppliersVentilation=Ventilare furnizori
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Rapoarte
 NewAccount=Cont contabil nou
 Create=Crează
-CreateMvts=Creaza transfer
-UpdateMvts=Modificare mişcare
-WriteBookKeeping=Înregistrare contabilă in Cartea Mare
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Cartea Mare
 AccountBalance=Sold cont
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Liniile facturii de ventilat
-InvoiceLinesDone=Liniile facturii ventilate
-IntoAccount=INregistreaza in conturi contabile
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Inregistreaza
+Ventilate=Bind
 
 Processing=Procesează
 EndProcessing=Sfârşitul procesării
-AnyLineVentilate=Nicio linie de inregistrat
+AnyLineVentilate=Any lines to bind
 SelectedLines=Linii selectate
 Lineofinvoice=Linia facturii
-VentilatedinAccount=Ventilare cu succes in conturi contabile
-NotVentilatedinAccount=Ne ventilate in conturi contabile
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Numărul de elemente de ventilat afişat pe pagină (maxim recomandat: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Începe sortarea paginilor ventilate "Trebuie ventilate" începand cu cele mai recente elemente
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începe sortarea paginilor ventilate "Ventilare" începand cu cele mai recente elemente
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Lungimea conturilor generale
-ACCOUNTING_LENGTH_AACCOUNT=Lungimea conturilor de terţi
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Număr nota contabila
 AccountingCategory=Categorie Contabilitate
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Şterge înregistrări din Cartea Mare
-
 DescSellsJournal=Jurnal Vânzări
 DescPurchasesJournal=Jurnal Cumpărări
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Incasare factura client
-
 ThirdPartyAccount=Cont terţi
-
-NewAccountingMvt=Transfer nou
-NumMvts=Numarul transferurilor
-ListeMvts=Lista transferurilor
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debitul și creditul nu pot avea o valoare, în același timp,
 
-ReportThirdParty=Lista Conturi terţi
-DescThirdPartyReport=Consultati aici lista terţilor furnizori și clienţi şi conturile lor  contabile
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Lista conturilor contabile
 
@@ -114,22 +134,29 @@ Pcgtype=Clasa contului
 Pcgsubtype=Sub Clasa contului
 Accountparent=Rădăcina contului
 
-DescVentilCustomer=Consultati aici ventilarea contabilă anuală a facturilor de clienților ale dvs.
 TotalVente=Total turnover before tax
 TotalMarge=Total Marje vânzări
-DescVentilDoneCustomer=Consultati aici lista liniilor de facturi client și conturile lor  contabile
-DescVentilTodoCustomer=Consultati aici lista liniilor de facturi client cu un cont contabil
-ChangeAccount=Schimbaţi contul contabil pentru liniile selectate prin contul:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consultati aici ventilarea contabilă anuală a facturilor de furnizori ale dvs.
-DescVentilDoneSupplier=Consultati aici lista liniilor de facturi furnizor și conturile lor  contabile
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validează automat
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
 MvtNotCorrectlyBalanced=Miscare incorect efectuata   . Credit = %s. Debit = %s
-FicheVentilation=Fişă Ventilare
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Aplica categorii bulk
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init contabilitate
-InitAccountancyDesc=Această pagină poate fi utilizată pentru a inițializa un cont pe produsele si servicile care nu au conturi definite pentru vanzari sau cumparari,. Verificați înainte dacă modulul contabilitate este complet configurat.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Opţiuni
 OptionModeProductSell=Mod vanzari
 OptionModeProductBuy=Mod cumparari
 OptionModeProductSellDesc=Afiseaza toate produsele care nu au conturi definite pentru vanzare
 OptionModeProductBuyDesc=Afiseaza toate produsele care nu au conturi definite pentru cumparare
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Rang cont contabil
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=Nicio categorie contabila nu este disponibila pentru aceasta tara
 ExportNotSupported=Formatul exportat nu este suportat in aceasta pagina
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index d5e6a80bb97..ce125e1701b 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Dezvoltare
 VersionUnknown=Necunoscut
 VersionRecommanded=Recomandat
-FileCheck= Integritate Fișiere
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing= Fișiere Lipsa
 FilesUpdated= Fișiere Actualizate
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Sesiune
 SessionSaveHandler=Handler pentru a salva sesiunile
 SessionSavePath=Storage sesiune localizare
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Eroare, o precizie mai mare decât  <b>%s</b>
 DictionarySetup=Setări Dictionar
 Dictionary=Dicţionare
 Chartofaccounts=Plan de conturi
-Fiscalyear=Ani fiscali
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Valorile 'system' și 'systemauto' pentru  tip sunt rezervate. Puteți utiliza 'user' ca valoare pentru a adăuga propriile dvs. înregistrări
 ErrorCodeCantContainZero=Codul nu poate conţine valoarea 0
 DisableJavascript=Dezactivează funcţiile JavaScript si Ajax (Recomandat pentru persoanele oarbe sau browserele text )
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Aşteaptă  să tastaţi o tastă înaintea înc
 DelaiedFullListToSelectContact=Aşteaptă  să tastaţi o tastă înaintea încărcării a listei combo de contacte (Acest lucru poate crește performanța dacă aveți un număr mare de contacte)
 NumberOfKeyToSearch=Nr caractere pentru a declanşa căutare: %s
 NotAvailableWhenAjaxDisabled=Nu este disponibil, atunci când Ajax cu handicap
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript dezactivat
 UsePreviewTabs=Utilizaţi taburile previzualizare
 ShowPreview=Arată previzualizare
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Codifică  date binar  în hexazecimal
 IgnoreDuplicateRecords=Ignora erorile de înregistrări duplicat (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser limbă)
 FeatureDisabledInDemo=Funcţonalitate dezactivată în demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permisiuni
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Numai elementele din <a href="%s"> module activate </a> sunt afişate.
-ModulesDesc=Dolibarr modulele care definesc funcţia este activată în software-ul. Unele module necesită permisiuni, trebuie să acorde pentru utilizatori, după care să permită modul.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Module mai multe ...
 DoliStoreDesc=DoliStore, market place oficial  pentru  module externe Dolibarr ERP / CRM
@@ -273,9 +279,10 @@ YouCanSubmitFile=La acest pas, puteți trimite pachetul utilizand acest instrume
 CurrentVersion=Dolibarr versiunea curentă
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Ultima versiune stabilă
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=Puteți introduce orice mască de numerotare. În această mască, ar putea fi folosit următoarele etichete: <br> <b>{000000}</b> corespunde unui număr care va fi incrementat pe fiecare% s. Introduceți cât mai multe zerouri ca lungimea dorită a contra. Contorul va fi completat cu zerouri la stânga, în scopul de a avea cât mai multe zerouri ca masca. <br> <b>{000000} +000</b> fel ca și anterior, dar o compensare corespunzător cu numărul din dreapta semnului + se aplică începând cu prima% s. <br> <b>{000000 @ x}</b> fel ca și anterior, dar contorul este resetat la zero atunci când se ajunge la o lună x (x între 1 și 12, sau 0 pentru a folosi primele luni ale anului fiscal definite în configurația dvs., sau 99 pentru a reseta la zero în fiecare lună ). Dacă această opțiune este folosită și x este 2 sau mai mare, atunci secvența {aa} {mm} sau {AAAA} {mm} este de asemenea necesară. <br> <b>{Dd}</b> zi (01 la 31). <br> <b>{Mm}</b> luni (01 la 12). <br> <b>{AA}, {AAAA}</b> sau <b>{y}</b> an peste 2, 4 sau 1 numere. <br>
-GenericMaskCodes2=<b>{Cccc}</b> codul de client pe n caractere <br> <b>{Cccc000}</b> codul de client pe n caractere este urmată de un contor dedicat pentru client. Acest contor dedicat clientului este resetat în același timp de contor global. <br><b>{tttt}</b>Tipul  codului terţului  pe n caractere (a se vedea tipurile dicționarului-terţi). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Toate celelalte caractere în masca va rămâne intactă. <br> Spaţiile nu sunt permise. <br>
 GenericMaskCodes4a=<u>Exemplu pe 99th %s de-a treia parte TheCompany făcut 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Exemplu de la o terţă parte a creat pe 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametrii pentru a asigura URL-uri
 SecurityTokenIsUnique=Utilizaţi un unic parametru securekey pentru fiecare URL
 EnterRefToBuildUrl=Introduceţi de referinţă pentru %s obiect
 GetSecuredUrl=Obţineţi URL-ul calculat
-ButtonHideUnauthorized=Ascunde butoane pentru acțiuni neautorizate în loc să arate butoane dezactivate
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Vechea rată TVA
 NewVATRates=Noua rată TVA
 PriceBaseTypeToChange=Modifică la prețuri cu valoarea de referință de bază definit pe
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select Listă 
 ExtrafieldSelectList = Select din tabel
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio buton
 ExtrafieldCheckBoxFromList= Checkbox din tabel
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Afiseaza adresa societatii
-DisplayCompanyInfoAndManagers=Afiseaza nume societate si manager
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Utilizatori & grupuri
@@ -428,8 +439,8 @@ Module55Name=Coduri de bare
 Module55Desc=Coduri de bare "de gestionare a
 Module56Name=Telefonie
 Module56Desc=Telefonie integrare
-Module57Name=Ordine de plată
-Module57Desc=Managementul Ordinelor de plată şi al retragerilor . De asemenea, include generarea fișierului SEPA pentru țările europene.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial integrare
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integrare
 Module500Name=Cheltuieli speciale
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salarii
-Module510Desc=Managementul salariilor angajatilor si a plaţiilor
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notificări
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donatii
 Module700Desc=MAnagementul Donaţiilor
 Module770Name=Rapoarte Cheltuieli
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Citiţi cu furnizorii
 Permission147=Citeşte stats
-Permission151=Citiţi cu ordine de plată
-Permission152=Setup ordine de plată
-Permission153=Citiţi cu ordine de plată încasări
-Permission154=De credit / refuza încasări Ordinele de plată
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Citește contracte / abonamente
 Permission162=Creare / modificare contracte / abonamente
 Permission163=Activează un serviciu / abonament al unui contract
@@ -747,6 +758,7 @@ Permission1236=Export furnizor de facturi, atribute şi plăţile
 Permission1237=Export comenzi furnizori şi alte detalii
 Permission1251=Run masa importurile de date externe în baza de date (date de sarcină)
 Permission1321=Export client facturi, atribute şi plăţile
+Permission1322=Reopen a paid bill
 Permission1421=Export client ordinele şi atribute
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Creare / Modificare sondaje
 Permission59001=Citeşte marje comerciale
 Permission59002=Defineşte marje comerciale
 Permission59003=Citeşte marjele fiecarui utilizator
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Tipuri terţi
 DictionaryCompanyJuridicalType=Forme Legale Terti
 DictionaryProspectLevel=Nivel potenţial Prospect
@@ -853,6 +869,7 @@ LabelUsedByDefault=Eticheta utilizat în mod implicit în cazul în care nu poat
 LabelOnDocuments=Eticheta de pe documente
 NbOfDays=Nr zile
 AtEndOfMonth=La sfârşitul lunii
+CurrentNext=Current/Next
 Offset=Decalaj
 AlwaysActive=Întotdeauna activ
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=Puteţi activa jurnalul de evenimente de securitate Dolibarr aici.
 AreaForAdminOnly=Aceste caracteristici pot fi utilizate numai de către <b>administratorul de utilizatori.</b> Administrator caracteristici şi pentru a ajuta sunt identificate în Dolibarr de următoarele picto:
 SystemInfoDesc=Sistemul de informare este diverse informaţii tehnice ai citit doar în modul şi vizibil doar pentru administratori.
 SystemAreaForAdminOnly=Această zonă este disponibil numai pentru utilizatorii de administrator. Nici una din Dolibarr permisiunile pot reduce această limită.
-CompanyFundationDesc=Editare de pe această pagină toate informaţiile cunoscute ale societăţii sau Fundaţia care aveţi nevoie pentru a gestiona
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Puteţi alege fiecare parametru legate de Dolibarr aspect aici
 AvailableModules=Modulelor disponibile
 ToActivateModule=Pentru a activa modulele, du-te la zona de configurare.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-m
 PathToDocuments=Cale de acces documente
 PathDirectory=Director
 SendmailOptionMayHurtBuggedMTA=Functionalitate pentru a trimite mesaje utilizând metoda "mail PHP direct" va genera un mesaj e-mail care nu s-ar putea să fie corect interpretat de către unele servere de e-mail . Rezultatul este că unele mail-uri nu pot fi citite de unele persoane . Este cazul unor furnizori de Internet (Ex: Orange în Franţa). Aceasta nu este o problemă în Dolibarr nici în PHP, dar primesc pe serverul de poştă electronică. Puteţi adăuga toate acestea, opţiunea MAIN_FIX_FOR_BUGGED_MTA la 1 în configurare - pentru a modifica alte Dolibarr pentru a evita acest lucru. Cu toate acestea, este posibil să aveţi probleme cu alte servere care sens strict standard SMTP. Altă soluţie (recommanded) este de a utiliza metoda "SMTP socket bibliotecă", care nu are dezavantaje.
-TranslationSetup=Configurarea traducerii
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
 ClassNotFoundIntoPathWarning=Clasa %s negăsită în calea PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Utilizaţi TLS
 LDAPServerUseTLSExample=Parerea LDAP server utilizează TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=Finalizarea DN (ex: cn= adminldap, dc= societate, dc= com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Parolă de administrator
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Finalizarea DN (ex: ou= users, dc= societate, dc= com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Exemplu: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Exemplu: objectsid
 LDAPFieldEndLastSubscription=Data de sfârşit de abonament
-LDAPFieldTitle=Post / Funcţia
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Examplu: titlu
 LDAPSetupNotComplete=LDAP setup nu complet (merg pe alţii file)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nr administrator sau parola furnizate. LDAP de acces vor fi anonime şi modul doar în citire.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produse şi Servicii de module de configurare
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=Max număr de produse din combos selectaţi liste (0= nici o limită)
 ViewProductDescInFormAbility=Vizualizare descrierile de produs, în forme (de altfel ca popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Vizualizarea de descrieri de produse în limba thirdparty
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=De asemenea, dacă aveți un număr mare produse (> 100 000), puteți crește viteza prin setarea constantei COMPANY_DONOTSEARCH_ANYWHERE la 1 la Setup->Other. Căutarea va fi limitată la începutul șirului.
 UseSearchToSelectProduct=Folositi un formular de căutare pentru a alege un produs (mai degrabă decât o listă derulantă).
 SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Motor intern
 BarCodeNumberManager=Manager pentru autodefinire numere coduri bare
 ##### Prelevements #####
-WithdrawalsSetup=Retragere de modul de configurare
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Extern RSS importurile setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Deschide an fiscal
 CloseFiscalYear=Închide an fiscal
 DeleteFiscalYear=Şterge an fiscal
 ConfirmDeleteFiscalYear=Sigur  doriţi să ştergeţi acest an fiscal  ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Permite a fi editat mereu
 MAIN_APPLICATION_TITLE=Forțează numele vizibil al aplicare (avertisment: setarea propriul nume aici poate duce la eliminarea facilitaţii de conectare automată atunci când se utilizează aplicația mobilă DoliDroid)
 NbMajMin=Numărul minim al caracterelor majuscule
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Culoare titlu pagina
 LinkColor=Culoare link-uri
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Culoare Background 
 TopMenuBackgroundColor=Culoare Background pentru Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Culoare Background pentru Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=Folositi ultima versiune stabilă
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index ddfffff60b1..e998f3ec04b 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -27,13 +27,9 @@ AllTime=De la inceput
 Reconciliation=Reconciliere
 RIB=Număr Cont Bancă
 IBAN=Cod IBAN
-IbanValid=IBAN este valid
-IbanNotValid=IBAN nu este valid
 BIC=Cod BIC / SWIFT
-SwiftValid=BIC / SWIFT este valid
-SwiftNotValid=BIC/SWIFT nu este valid
-StandingOrders=Ordine de plată
-StandingOrder=Ordin plată
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Extras Cont
 AccountStatementShort=Extras
 AccountStatements=Extrase Cont
@@ -78,6 +74,7 @@ AccountToCredit=Cont de credit
 AccountToDebit=Cont de debit
 DisableConciliation=Dezactivaţi reconcilierea pentru acest cont
 ConciliationDisabled=Reconciliere dezactivată
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Deschis
 StatusAccountClosed=Închis
 AccountIdShort=Cod
@@ -87,6 +84,8 @@ AddBankRecordLong=Adaugă tranzacţie manual
 ConciliatedBy=Decontat de
 DateConciliating=Data Decontare
 BankLineConciliated=Tranzacţie decontata
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Plată Client
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Retragerea de plată
 SocialContributionPayment=Plata taxe sociale sau fiscale și tva
 BankTransfer=Virament bancar
 BankTransfers=Viramente 
-TransferDesc=Viramentul de la un cont la altul, Dolibarr va creea două înregistrări (una de debit în cont sursă şi una de credit în contul destinaţie, cu aceeaşi valoare. Aceeaşi etichetă şi data vor fi utilizate pentru această tranzacţie)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=De la
 TransferTo=La
 TransferFromToDone=Un viramentr de la  <b>%s</b> la <b> %s </b>  de<b> %s</b> %s a fost creată.
@@ -129,7 +129,7 @@ FutureTransaction=Tranzacţie viitoare. In nici un caz de decontat.
 SelectChequeTransactionAndGenerate=Selectaţi/ filtraţi cecurile pentru a  le include în borderoul de remise şi faceţi clic pe "Crează".
 InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile : YYYYMM sau YYYYMMDD
 EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările
-ToConciliate=De decontat ?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul de bancă şi click
 DefaultRIB=IBAN Implicit
 AllRIB=Tot BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Sunteţi sigur că doriţi să marcati acest cec ca refuzat ?
 RejectCheckDate=data cecului ce a fost returnat
 CheckRejected=Cec returnat
 CheckRejectedAndInvoicesReopened=Cec returnat si facturi redeschise
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index a2cfc507ce6..a2826f41da3 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -56,7 +56,7 @@ SupplierBill=Factură Furnizor
 SupplierBills=Facturi Furnizori
 Payment=Plată
 PaymentBack=Restituire Plată
-CustomerInvoicePaymentBack=Payment back
+CustomerInvoicePaymentBack=Restituire Plată
 Payments=Plăţi
 PaymentsBack=Restituire Plaţi
 paymentInInvoiceCurrency=in moneda facturii
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o fact
 BillFrom=De la
 BillTo=La
 ActionsOnBill=Evenimente pe factura
-RecurringInvoiceTemplate=Factură recurentă
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=Nu există un model de factură potrivit pentru generare.
 FoundXQualifiedRecurringInvoiceTemplate=Au fost găsite %s modele de facturi recurente potrivite pentru generare.
 NotARecurringInvoiceTemplate=Nu este un model de factură recurentă.
@@ -209,8 +209,8 @@ EscompteOffered=Discount  oferit ( plată înainte de termen)
 EscompteOfferedShort=Discount
 SendBillRef=Trimitere factura %s
 SendReminderBillRef=Trimitere factura %s ( memento)
-StandingOrders=Comenzi în aşteptare
-StandingOrder=Comandă în aşteptare
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Nicio  factură schiţă
 NoOtherDraftBills=Nicio altă  factură schiţă
 NoDraftInvoices=Nicio factură schiţă
@@ -312,7 +312,7 @@ LatestRelatedBill=Ultima Factură asociată
 WarningBillExist=Avertisment, una sau mai multe facturi există deja
 MergingPDFTool=Instrument unire (merge) PDF
 AmountPaymentDistributedOnInvoice=Sumă plătită distribuită pe factură
-PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
+PaymentOnDifferentThirdBills=Permite plata la parteneri diferiţi cu aceeaşi companie părinte
 PaymentNote=Comentariu plată
 ListOfPreviousSituationInvoices=Lista facturilor de situaţie anterioare
 ListOfNextSituationInvoices=Lista facturilor de situaţie următoare
@@ -324,7 +324,7 @@ NextDateToExecution=Data pentru următoarea generare a facturii
 DateLastGeneration=Ultima dată de generare
 MaxPeriodNumber=Numărul maxim de facturi generate
 NbOfGenerationDone=Număr facturi deja generate
-MaxGenerationReached=Maximum nb of generations reached
+MaxGenerationReached=Numărul maxim de generări atins
 InvoiceAutoValidate=Validare automată facturi
 GeneratedFromRecurringInvoice=Generate din model factura recurentă %s
 DateIsNotEnough=Incă nu este data setată
@@ -351,8 +351,8 @@ VarAmount=Valoare variabilă (%% tot.)
 # PaymentType
 PaymentTypeVIR=Transfer bancar
 PaymentTypeShortVIR=Transfer bancar
-PaymentTypePRE=Ordin de plată
-PaymentTypeShortPRE=Ordin de plată
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Numerar
 PaymentTypeShortLIQ=Numerar
 PaymentTypeCB=Card de credit
@@ -381,6 +381,7 @@ ExtraInfos=Informaţii suplimentare
 RegulatedOn=Plătite pe
 ChequeNumber=Cec Nr
 ChequeOrTransferNumber=Cec / Transfer Nr
+ChequeBordereau=Borderou cec
 ChequeMaker=Verificare / transmițător Transfer
 ChequeBank=Banca Cec
 CheckBank=Verifică
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Nu se poate şterge o plată reconciliată
 PayedByThisPayment=Achitat cu aceasta plată
 ClosePaidInvoicesAutomatically=Clasează "Platită" toate facturile standard, de situatie sau  de înlocuire în întregime platite.
 ClosePaidCreditNotesAutomatically=Clasează "Platite" toate notele de credit rambursate în întregime
+ClosePaidContributionsAutomatically=Închide toate contribuţiile sociale sau fiscale plătite integral
 AllCompletelyPayedInvoiceWillBeClosed=Toate facturile cu rest de plată zero vor fi închise automat cu statusul "Plătită".
 ToMakePayment=Plăteşte
 ToMakePaymentBack=Rambursează
 ListOfYourUnpaidInvoices=Lista facturilor neplătite
 NoteListOfYourUnpaidInvoices=Notă: Această listă conține numai facturile pentru partenerii la care sunteţi reprezentant de vânzării.
 RevenueStamp=Timbru fiscal
-YouMustCreateInvoiceFromThird=Această opțiune este disponibilă numai atunci când se creează factura din tab-ul "client" al partenerului
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=Intai se poate crea o factură standard si se transforma in model pentru a avea un nou model de factura.
 PDFCrabeDescription=Şablon PDF Factura Crabe . Un șablon factură complet (format recomandat)
 PDFCrevetteDescription=Model factură PDF Crevette. Un model complet pentru factura de situaţie
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Eroare : actualizare preţ pe linia: %s
 ToCreateARecurringInvoice=Pentru a crea o factură recurentă la acest contract, se creeaza intai o factura schita, apoi se transforma cu un model de factura si se defineste frecventa generarii facturilor urmatoare.
 ToCreateARecurringInvoiceGene=Meniu pentru a crea facturi recurente manual <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=Daca este necesara generarea automata a facturilor, se solicita administratorului de sistem activarea modulului <strong>%s</strong>. Ambele metode (manuala si automata) pot fi utilizate simultan fara riscul duplicarii.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index 686048859aa..bcbb4b9232e 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Ultimele mele %s bookmark-uri
 BoxOldestExpiredServices=Cele mai vechi servicii active expirate
 BoxLastExpiredServices=Cele mai vechi %s contacte cu servicii active expirate
 BoxTitleLastActionsToDo=Ultimele %s acţiuni de realizat
-BoxTitleLastContracts=Ultimele %s contracte
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Ultimele %s donaţii modificate 
 BoxTitleLastModifiedExpenses=Ultimele %s deconturi modificare 
 BoxGlobalActivity=Activitate globală ( facturi, oferte, comenzi)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Oferte pe luni
 NoTooLowStockProducts=Niciun produs sub stocul de siguranţă
 BoxProductDistribution=Distribuţie Produse / Servicii
 BoxProductDistributionFor=Distribuţia de %s  pe  %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Facturi clienţi
 ForCustomersOrders=Comenzi clienți
 ForProposals=Oferte
 LastXMonthRolling=Rulaj ultimele %s luni
-ChooseBoxToAdd=Adaugă  widget in dashboard
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index e6209d24643..b7b47fbe5c1 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=pe
 CashDeskThirdParty=Terţ
 ShoppingCart=Cosul de cumparaturi
 NewSell=Vânzare nouă
-BackOffice=Back office
 AddThisArticle=Adauga acest articol
 RestartSelling=Du-te inapoi la vânzare
-SellFinished=Vânzare terminată
+SellFinished=Sale complete
 PrintTicket=Print bon
 NoProductFound=Niciun articol gasit
 ProductFound=produs găsit
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 6fa1f06c850..3a23e2fc559 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Tag-uri / categorii Clienții
 MembersCategoriesArea=Tag-uri  / categorii Membri
 ContactsCategoriesArea=Tag-uri / Categorii Contacte
 AccountsCategoriesArea=Tag-uri / Categorii Contabilitate
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategorii
 CatList=Lista Tag-uri / Categorii
 NewCategory=Tag / categorie noua
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Acest partener este asociat cu următoarele tag-u
 MemberIsInCategories=Acest menbru este asociat cu următoarele tag-uri/ categorii membri
 ContactIsInCategories=Acest contact este asociat cu următoarele tag-uri/ categorii contacte
 ProductHasNoCategory=Acest produs / serviciu nu este în niciun tag/ categorie
-CompanyHasNoCategory=Acest partener nu este asociat cu tag-uri/ categorii
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Acest membru nu este asociat cu tag-uri/ categorii
 ContactHasNoCategory=Acest contact nu este în niciun tag/ categorie
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Adauga la  tag / categorie
 NotCategorized=Fără tag / categorie
 CategoryExistsAtSameLevel=Această categorie  există deja cu această referinţă
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Tag-uri / categorii Produse
 MembersCategoriesShort=Tag-uri  / categorii Membri
 ContactCategoriesShort=Tag-uri / Categorii Contacte
 AccountsCategoriesShort=Tag-uri / Categorii Contabilitate
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Această categorie nu conţine nici un produs.
 ThisCategoryHasNoSupplier=Această categorie nu conţine nici un furnizor.
 ThisCategoryHasNoCustomer=Această categorie nu conţine nici un client.
 ThisCategoryHasNoMember=Această categorie nu conţine nici un membru.
 ThisCategoryHasNoContact=Această categorie nu conţine nici un contact
 ThisCategoryHasNoAccount=Această categorie nu conţine nici un cont
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Id Tag / Categorie
 CatSupList=Lista Tag-uri / Categorii furnizori
 CatCusList=Lista Categorii/ taguri  clienţi / prospecte
@@ -71,6 +75,7 @@ CatContactList=Lista Tag-uri / Categorii Contacte
 CatSupLinks=Legături dintre furnizori si taguri/categorii
 CatCusLinks=Legături dintre clienti/prospecti si  taguri/categorii
 CatProdLinks=Legături dintre  produse/servicii si ftaguri/categorii
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Elimina din tag-uri / categoriii
 ExtraFieldsCategories=Atribute complementare
 CategoriesSetup=Configurare Tag-uri / categorii
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 67016178423..75cd8dda623 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Particular nou
 NewCompany=Societate nouă (prospect, client, furnizor)
 NewThirdParty=Terţ nou (prospect, client, furnizor)
 CreateDolibarrThirdPartySupplier=Creare terţ ( furnizor)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospecte
 IdThirdParty=ID Terţ
 IdCompany=ID Societate
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Furnizori
 ThirdPartyType=Tip de terţi
 Company/Fundation=Societate / Fundaţie
 Individual=Persoană privată
-ToCreateContactWithSameName=Va crea automat un contact fizic cu aceleaşi Informatii
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Societatea-mamă
 Subsidiaries=Filiale
 ReportByCustomers=Raport pe client
@@ -47,7 +49,7 @@ CivilityCode=Mod adresare
 RegisteredOffice=Sediul social
 Lastname=Nume
 Firstname=Prenume
-PostOrFunction=Post / Funcţia
+PostOrFunction=Funcţie
 UserTitle=Titlu
 Address=Adresă
 State=Regiune / Judeţ
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Telefon Prof.
 PhonePerso=Telefon Pers.
 PhoneMobile=Telefon Mobil
-No_Email=Nu trimite e-mailuri în masă
+No_Email=Nu permite mass e-mailing
 Fax=Fax
 Zip=Cod postal
 Town=Oraş
@@ -73,8 +75,8 @@ Poste= Poziţie
 DefaultLang=Limba implicită
 VATIsUsed=Utilizează TVA-ul
 VATIsNotUsed=Nu utilizează TVA-ul
-CopyAddressFromSoc=Completaţi adresa cu adresa terţului
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+CopyAddressFromSoc=Fill address with third party address
+ThirdpartyNotCustomerNotSupplierSoNoRef=Terţii nu sunt clienţi sau furnizori, nu sunt obiecte asociate disponibile
 ##### Local Taxes #####
 LocalTax1IsUsed=Utilizează taxa secundă
 LocalTax1IsUsedES= RE este utilizat
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Codul de TVA
 VATIntraShort=Codul de TVA
 VATIntraSyntaxIsValid=Sintaxa este validă
-VATIntraValueIsValid=Valoarea este validă
 ProspectCustomer=Prospect / Client
 Prospect=Prospect
 CustomerCard=Fişa Client
@@ -261,7 +262,9 @@ AddContactAddress=Creare contact/adresă
 EditContact=Editare contact
 EditContactAddress=Editează contact
 Contact=Contact
+ContactId=Id contact
 ContactsAddresses=Contacte
+FromContactName=Name:
 NoContactDefinedForThirdParty=Niciun contact definit pentru acest terţ
 NoContactDefined=Niciun contact definit
 DefaultContact=Contact Implicit
@@ -284,7 +287,7 @@ CompanyDeleted=Societatea " %s" a fost ştearsă din baza de date.
 ListOfContacts=Lista Contacte
 ListOfContactsAddresses=Lista  contacte
 ListOfThirdParties=Lista  terţi
-ShowCompany=Arată terţ
+ShowCompany=Show third party
 ShowContact=Afişeză contact
 ContactsAllShort=Toate (fără filtru)
 ContactType=Tip Contact
@@ -294,6 +297,7 @@ ContactForProposals=Contact  Ofertă
 ContactForContracts=Contact  Contracte
 ContactForInvoices=Contact  Facturi
 NoContactForAnyOrder=Acest contact nu este  contact pentru nici o comanda
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Acest contact nu este contact pentru nicio ofertă comercială
 NoContactForAnyContract=Acest contact nu este  contact pentru nici un contract
 NoContactForAnyInvoice=Acest contact nu este  contact pentru nici o factură
@@ -352,9 +356,9 @@ ExportCardToFormat=Export fişă în format
 ContactNotLinkedToCompany=Contact nelegat la un terţ
 DolibarrLogin=Identificator utilizator
 NoDolibarrAccess=Niciun acces utilizator
-ExportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice)  şi atribute
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacte şi atribute
-ImportDataset_company_1=Terţi (societăţi / fundaţii/ persoane fizice)  şi atribute
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacte / Adrese(ale terţilor sau nu) şi atribute
 ImportDataset_company_3=Coordonate bancare
 ImportDataset_company_4=Terti /reprezentanti Vanzari (Afecteaza reprezentantii vanzari utilizato de companie )
@@ -369,8 +373,8 @@ AllocateCommercial=Asociat la reprezentant vânzări
 Organization=Organizaţia
 FiscalYearInformation=Informaţii pe anul fiscal
 FiscalMonthStart=Luna de început a anului fiscal
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+YouMustAssignUserMailFirst=Mai întâi trebuie creată o adresa de email pentru acest utilizator pentru a putea adaugă notificări pe email pentru el
+YouMustCreateContactFirst=Pentru a putea adaugă notificări pe email, este necesară definirea unor contacte pentru terţi cu adresa de email validă
 ListSuppliersShort=Lista  furnizori
 ListProspectsShort=Lista  prospecte
 ListCustomersShort=Lista  clienţi
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Tertii au fost imbinati
 SaleRepresentativeLogin=Autentificare reprezentant vânzări
 SaleRepresentativeFirstname=Prenume reprezentant vânzări
 SaleRepresentativeLastname=Nume reprezentant vânzări
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 02701da520b..b3d9254f8c5 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Taxa sociala / fiscala
 SocialContributions=Taxe sociale sau fiscale
 SocialContributionsDeductibles=Taxe deductibile
 SocialContributionsNondeductibles=Taxe nedeductibile
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Cheltuieli speciale
 MenuTaxAndDividends=Impozite şi dividende
 MenuSocialContributions=Taxe sociale / fiscale
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index c6ea0b03b0b..8841589e23c 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -14,7 +14,7 @@ ServiceStatusNotLateShort=Neexpirat
 ServiceStatusLate=În service, expirat
 ServiceStatusLateShort=Expirat
 ServiceStatusClosed=Închis
-ShowContractOfService=Show contract of service
+ShowContractOfService=Afişare contract pentru servicii
 Contracts=Contracte
 ContractsSubscriptions=Contracte / Abonamente
 ContractsAndLine=Contracte și linie contracte
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 81a59172979..29ffc75d264 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Şterge Job programat
 Permission23104 = Execută Job programat
 # Admin
 CronSetup= Setare Managementul joburilor programate
-URLToLaunchCronJobs=URL-ul pentru a verifica și a lansa joburi cron, dacă este necesar
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Sau pentru a verifica și  a lansa un anumit job
 KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
 FileToLaunchCronJobs=Linie de comandă pentru lansare joburi cron
@@ -23,7 +23,7 @@ CronCommand=Comandă
 CronList=Joburi programate
 CronDelete=Şterge Joburi programate
 CronConfirmDelete=Sunteţi sigur că doriţi să ştergeţi aceaste job-uri ?
-CronExecute=Lanseaza joburi programate
+CronExecute=Launch scheduled job
 CronConfirmExecute=Sunteţi sigur că doriţi să executati  aceaste job-uri programate  acum ?
 CronInfo=Modul de joburi programate permite să  se execute  job-uri  care au fost planificate
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modulul
 CronNoJobs=Niciun job înregistrat
 CronPriority=Prioritate
-CronLabel=Descriere
+CronLabel=Label
 CronNbRun=Nr. lansări
 CronMaxRun=Nr. max. lansări
 CronEach=Fiecare
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Module Instrument
 JobDisabled=Job dezactivat
 MakeLocalDatabaseDumpShort=Backup local baza de date
 MakeLocalDatabaseDump=Creare dump local baza de date
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 7e9b38f5227..5715ad17679 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Eroare, PHP trebuie să aibă modul <b>%s</b> instalat pentru
 ErrorOpenIDSetupNotComplete=Trebuie setat fișier de configurare Dolibarr pentru a permite autentificarea OpenID, dar URL-ul serviciului OpenID nu este definit în constanta %s
 ErrorWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
 ErrorBadFormat=Format gresit!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Eroare, acest membru nu este încă legat de nici un terţ. Link  Membru catre un terţ ezistent  sau creați un nou terţ înainte de crearea  abonamentului cu factura.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Eroare, există unele livrări legate de acest transport. Ștergere refuzată.
 ErrorCantDeletePaymentReconciliated=Nu se poate șterge o plată care a generat o tranzacție bancară care a fost decontată
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nu se poate șterge o plată partajată de cel puțin un factură cu statutul platită
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 44b336247f2..cd7f66a28f9 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Acest PHP susţine sesiuni.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST si GET.
 PHPSupportPOSTGETKo=Este posibil de configurare PHP nu suporta variabile POST şi / sau GET. Verificaţi <b>variables_order</b> de parametru în php.ini.
 PHPSupportGD=Acest PHP suportă  functii grafice GD.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Acest PHP suportă  funcţii  UTF8.
 PHPMemoryOK=PHP max memorie sesiune este setată la <b>%s.</b> Acest lucru ar trebui să fie suficient.
 PHPMemoryTooLow=PHP max memorie sesiune este setată la octeţi <b>%s.</b> Acest lucru ar trebui să fie prea mic. Modificarea <b>php.ini</b> pentru a seta parametrul <b>memory_limit</b> de bytes <b>%s</b> cel puţin.
 Recheck=Click aici pentru un test mult mai semnificativ
 ErrorPHPDoesNotSupportSessions=Instalarea dvs. PHP nu are suport pentru sesiuni. Această caracteristică este necesar pentru a face Dolibarr de lucru. Verificaţi configurarea PHP.
 ErrorPHPDoesNotSupportGD=Instalarea dvs. PHP nu are suport pentru funcţia de grafică HG nr. Graficul nu va fi disponibil.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Instalarea dvs. PHP nu are suport pentru funcţii utf8. Dolibarr nu poate funcţiona corect. Rezolva acest lucru înainte de a instala Dolibarr.
 ErrorDirDoesNotExists=Directorul  %s  nu există.
 ErrorGoBackAndCorrectParameters=Du-te înapoi şi de a corecta parametrii greşite.
@@ -133,6 +135,10 @@ ActivateModule=Activaţi modul %s
 ShowEditTechnicalParameters=Click aici pentru a vedea / edita  parametrii avansaţi (mod expert)
 WarningUpgrade=Avertisment: \nAti facut o copie de rezervă a bazei de date mai întâi? \nAcest lucru este foarte recomandat: de exemplu, din cauza unor bug-uri în sistemele de baze de date (de exemplu, mysql versiune 5.5.40/41/42/43), unele date sau tabele pot fi pierdute în timpul acestui proces, de aceea este foarte recomandat să aveți o copie completa a bazei de date înaintea pornirii migrariii. \n\nFaceți clic pe OK pentru a începe procesul de migrare ...
 ErrorDatabaseVersionForbiddenForMigration=Versiunea dvs. de baze de date este %s. Un bug va poate face sa pierdeti  date critice dacă faceti o schimbare a structurii pe baza de date,asa cum este impusă de procesul de migrare. De  aceea, migrare nu va fi permisa până când faceți upgrade la  baza de date la o versiune mai mare  (lista bug-urilor  cunoscute versiunea : %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Actualizare date pe acţiuni
 MigrationPaymentMode=Migrare de date pentru modul de plată
 MigrationCategorieAssociation=Migrarea categoriilor
 MigrationEvents=Migrația evenimentelor pentru a adăuga proprietarului evenimentul în tabelul de atribuire
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reîncarcă modul %s
 ShowNotAvailableOptions=Afişează opţiunile nedisponibile
 HideNotAvailableOptions=Acunde opţiunile nedisponibile
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 2d4df6a5eb3..2db579c6b77 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Contact client urmărire intervenţie
 # Modele numérotation
 PrintProductsOnFichinter=Printează si liniile de tip ''produs''( nu numai serviciile) pe fişa intervenţiei
 PrintProductsOnFichinterDetails=intervenții generate din comenzi
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistici intervenţii
 NbOfinterventions=Numar Fişe intervenţie
 NumberOfInterventionsByMonth=Numarul Fişelor intervenţie pe luna(data validare)
diff --git a/htdocs/langs/ro_RO/ldap.lang b/htdocs/langs/ro_RO/ldap.lang
index 8244ad75fc7..0e2d4bdf069 100644
--- a/htdocs/langs/ro_RO/ldap.lang
+++ b/htdocs/langs/ro_RO/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Prima data de abonament
 LDAPFieldFirstSubscriptionAmount=Pumn de abonament suma
 LDAPFieldLastSubscriptionDate=Ultima data de abonament
 LDAPFieldLastSubscriptionAmount=Ultima abonament suma
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Utilizator sincronizate
 GroupSynchronized=Grupul sincronizate
 MemberSynchronized=Statele sincronizate
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 5de5a281e11..0ef16b383ff 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Citit
 YourMailUnsubcribeOK=Emailul  <b>%s</b>  este dezabonat din mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail trimis la %s destinatari.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> destinatari adăugaţi în lista target
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nr selectat
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Valoare maxima
 AdvTgtSearchDtHelp=Foloseste interval pentru selectare valoare data
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=Final dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add tot
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index be3e85649d0..07e6102a820 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -67,6 +67,7 @@ SelectDate=selectează data
 SeeAlso=Vezi şi %s
 SeeHere=Vezi aici
 BackgroundColorByDefault=Culoarea de fundal implicită
+FileRenamed=The file was successfully renamed
 FileUploaded=Fişierul a fost încărcat cu succes
 FileWasNotUploaded=Un fișier este selectat pentru atașament, dar nu a fost încă încărcat. Clic pe "Ataşează fișier" pentru aceasta.
 NbOfEntries=Nr intrări
@@ -245,6 +246,10 @@ DateBuild=Dată generare raport
 DatePayment=Data plății
 DateApprove=Data Aprobare
 DateApprove2=Data aprobare (a doua aprobare)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=an
 DurationMonth=lună
 DurationWeek=săptămână
@@ -256,6 +261,7 @@ DurationDays=zile
 Year=An
 Month=Luna
 Week=Săptămâna
+WeekShort=Week
 Day=Zi
 Hour=Oră
 Minute=Minut
@@ -278,6 +284,7 @@ MonthOfDay=Luna curentă
 HourShort=H
 MinuteShort=mn
 Rate=Rată
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include taxa
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Inapoi la lista
 GoBack=Du-te înapoi
 CanBeModifiedIfOk=Poate fi modificat, dacă e valid
 CanBeModifiedIfKo=Poate fi modificat, dacă nu e valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Înregistrare modificată cu succes
 RecordsModified=%s înregistrări modificate
+RecordsDeleted=%s records deleted
 AutomaticCode=Cod automat
 FeatureDisabled=Funcţionalitate dezactivată
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Nu aveţi permisiuni pentru această acţiune
 SessionName=Nume Sesiune
 Method=Metoda
 Receive=Recepţionează
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Parţial
 TotalWoman=Total
 NeverReceived=Niciodată primit
@@ -598,6 +609,7 @@ DisabledModules=Module dezactivate
 For=Pentru
 ForCustomer=Pentru clienţi
 Signature=Semnătură
+DateOfSignature=Date of signature
 HidePassword=Afișare comanda cu parola ascunsă
 UnHidePassword=Afișare comanda reală cu parola în clar
 Root=Rădăcină
@@ -641,6 +653,15 @@ NewAttribute=Atribut nou
 AttributeCode=Cod Atribut
 URLPhoto=Url către foto/logo
 SetLinkToAnotherThirdParty=Link către un alt terţ
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Creareză schiţă
 SetToDraft=Inapoi la schiţă
 ClickToEdit=Clic pentru a edita
@@ -701,6 +722,9 @@ RelatedObjects=Obiecte asociate
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Luni
 Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index c68f9cc58a4..72a1d17dd87 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rata trebuie să fie numerică
 markRateShouldBeLesserThan100=Rata mîrcii trebuie să fie mai mica de 100
 ShowMarginInfos=Arată informaţii marjă
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/ro_RO/oauth.lang b/htdocs/langs/ro_RO/oauth.lang
index e5c38d636ab..46e01b9d971 100644
--- a/htdocs/langs/ro_RO/oauth.lang
+++ b/htdocs/langs/ro_RO/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Configurare Autentificare
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=Nicun token de acces salvat în baza de date locală
 HasAccessToken=Un token a fost generat și salvat în baza de date locală
 NewTokenStored=Token primit si salvat
@@ -9,7 +11,16 @@ RequestAccess=Faceți clic aici pentru a solicita / reînnoi accesul și a primi
 DeleteAccess=Click aici pentru a șterge token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/ro_RO/opensurvey.lang b/htdocs/langs/ro_RO/opensurvey.lang
index e3c65569f36..f82e12fb6bb 100644
--- a/htdocs/langs/ro_RO/opensurvey.lang
+++ b/htdocs/langs/ro_RO/opensurvey.lang
@@ -55,5 +55,5 @@ ErrorOpenSurveyFillFirstSection=Nu ati completat prima secțiune a creării sond
 ErrorOpenSurveyOneChoice=Introduceţi cel puţin o alegere
 ErrorInsertingComment=Era o eroare când se insera comentariul dvs.
 MoreChoices=Introdu mai multe opţiuni pentru votanţi
-SurveyExpiredInfo=The poll has been closed or voting delay has expired.
+SurveyExpiredInfo=Sondaj de opinie închis sau termen pentru vot expirat.
 EmailSomeoneVoted=%sa completat o linie.\nPuteţi găsi sondajul dvs. la linkul: \n%s
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 3df8ca2926d..827956f53ab 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Comenzile dvs au fost generate
 OrderFail=O eroare întâlnită în timpul creării comezilor dvs
 CreateOrders=Crează Comenzi
 ToBillSeveralOrderSelectCustomer=Pentru crearea unei facturi pentru câteva comenzi, click mai întâi pe client apoi alege "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ro_RO/printing.lang b/htdocs/langs/ro_RO/printing.lang
index d0bda85fc64..df5b1dacbb0 100644
--- a/htdocs/langs/ro_RO/printing.lang
+++ b/htdocs/langs/ro_RO/printing.lang
@@ -18,10 +18,6 @@ UserConf=Configurare pe utilizator
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Autentificare
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Acest driver permite trimiterea documentelor direct la imprimanta cu Google Cloud Print.
 GCP_Name=Nume
 GCP_displayName=Nume afişat
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index a4721496f53..3f4f41ba011 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot / Serie
 atleast1batchfield=Data expirare sau data de vânzare sau numărul de lot
 batch_number=Număr Lot / serie
 BatchNumberShort=Lot / Serie
-l_eatby=Data expirare
-l_sellby=Data vânzare
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Detalii Lot / Serie
 DetailBatchFormat=Lot/Serie: %s - Expira la: %s - Vindut la: %s (Cant : %d)
 printBatch=Lot/Serie: %s
@@ -19,3 +19,6 @@ printQty=Cant: %d
 AddDispatchBatchLine=Adauga o linie pentru Perioada de valabilitate expediere
 WhenProductBatchModuleOnOptionAreForced=Când modulul de lot / serial este pornit, modul de creștere / scădere a stocului este fortat la ultima alegere și nu poate fi editat. Alte opțiuni pot fi definite după cum doriți.
 ProductDoesNotUseBatchSerial=Acest produs nu foloseste numarul de lot / serie
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 5fa57851e29..2226dc7b849 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Modificare TVA în masă
 ProductVatMassChangeDesc=Această pagină poate fi folosită pentru a modifica o rată TVA definită la produse sau servicii de la o valoare la alta. Atenție, această schimbare se face în toată baza de date.
 MassBarcodeInit=Init cod de bare în  masă
 MassBarcodeInitDesc=Această pagină poate fi utilizată pentru a inițializa un cod de bare pe obiectele care nu au coduri de bare definit. Verificați înainte dacă  modulul cod de bare este complet configurat.
-ProductAccountancyBuyCode=Cont Contabilitate (cumpărare)
-ProductAccountancySellCode=Cont Contabilitate (vânzare)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produs sau serviciu
 ProductsAndServices=Produse si Servicii
 ProductsOrServices=Produse sau servicii
@@ -59,6 +59,8 @@ SellingPriceHT=Preţul de vânzare (net)
 SellingPriceTTC=Preţul de vânzare (incl. taxe)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Preţ nou
 MinPrice=Preţ minim vânzare
 CantBeLessThanMinPrice=Prețul de vânzare nu poate fi mai mic decât minimul permis pentru acest produs (%s fără tva). Acest mesaj poate apărea, de asemenea, dacă tastați o reducere prea important.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print câteva autocolante pentru un cod de bare
 BuildPageToPrint=Generare pagina pentru imprimantă
 FillBarCodeTypeAndValueManually=Completați tip cod de bare și valoarea manual.
 FillBarCodeTypeAndValueFromProduct=Completați tip cod de bare și valoareadin codul de bare al produsului.
-FillBarCodeTypeAndValueFromThirdParty=Completați tip cod de bare și valoareadin codul de bare al terţului.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definiția tipului sau valoarea codului de bare nu e completă pentru produsul %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valoarea codului de bare nu e completă pentru terţul %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Informaţii cod bare al produsului %s :
-BarCodeDataForThirdparty=Informaţii cod bare al terţului %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Defineşte valoare coduri de bare pentru toate înregistrările (aceasta va reseta, de asemenea, valorile deja definite, cu valori noi)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 78e9f59ec4b..56633e39fdb 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Lista oferte comerciale asociate la proiect
-ListOrdersAssociatedProject=Lista  comenzi asociate la proiect
-ListInvoicesAssociatedProject=Lista facturi clienti asociate la proiect
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Lista  comenzi  furnizori  asociate la proiectul
-ListSupplierInvoicesAssociatedProject=Lista facturi furnizori  asociate  la proiect
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista contracte  asociate  la  proiect
 ListFichinterAssociatedProject=Lista intervenţii  asociate  la  proiectului
 ListExpenseReportsAssociatedProject=Lista rapoartelor cheltuieli  asociate proiectului
@@ -123,6 +123,7 @@ ProjectReportDate=Schimbă data taskului conform cu data de debut a proiectului
 ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului
 ProjectsAndTasksLines=Proiecte şi taskuri
 ProjectCreatedInDolibarr=Proiect %s creat
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s creat
 TaskModifiedInDolibarr=Task %s modificat
 TaskDeletedInDolibarr=Task %s sters
@@ -153,7 +154,7 @@ PlannedWorkload=Volum de lucru Planificat
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Intrare pe zi
 InputPerWeek=Intrare pe saptamana
 InputPerAction=Intrare pe actiune
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index cecb82bae2a..2128edad3f6 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Plata noua salariu
 SalaryPayment=Plata salariu
 SalariesPayments=Plati salarii
 ShowSalaryPayment=Arata plata salariu
-THM=Pret mediu pe ora
-TJM=Pret mediu zilnic
+THM=Average hourly rate
+TJM=Average daily rate
 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
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 5ce20870c59..3411ebeff39 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Şterge expediere
 Stock=Stoc
 Stocks=Stocuri
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Mişcări
 ErrorWarehouseRefRequired=Referința  Depozit este obligatorie
 ListOfWarehouses=Lista  depozite
@@ -43,6 +45,7 @@ PMPValue=Valoric PMP
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Stoc valoric
 UserWarehouseAutoCreate=Creaţi un stoc în mod automat atunci când se creează un utilizator
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Stocul de produse și stocul de subproduse sunt independente
 QtyDispatched=Cantitate dipecerizată
 QtyDispatchedShort=Cant Expediate
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/ro_RO/supplier_proposal.lang b/htdocs/langs/ro_RO/supplier_proposal.lang
index b9afc2449b9..fbab3b91ae5 100644
--- a/htdocs/langs/ro_RO/supplier_proposal.lang
+++ b/htdocs/langs/ro_RO/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 63515e53c4e..7d191f12989 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -7,13 +7,13 @@ History=Istoric
 ListOfSuppliers=Lista  furnizori
 ShowSupplier=Afişează furnizor
 OrderDate=Data comandă
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Unele sub-produse nu au un preț definit
-AddSupplierPrice=Adaugă preţ furnizor
-ChangeSupplierPrice=Modifică preţ furnizor
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Acest furnizor este deja asociat cu referinta: % s
 NoRecordedSuppliers=Niciun furnizor înregistrat
 SupplierPayment=Plată Furnizor
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Lista comenzi furnizori
 MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
 NbDaysToDelivery= Intârziere Livrare in zile
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index 0cf2e342784..1baaadcedbd 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -36,7 +36,7 @@ AdministratorDesc=Administrator
 DefaultRights=Implicit permisiunile
 DefaultRightsDesc=Definiţi aici implicit permisiuni care sunt acordate în mod automat la un nou create de utilizator.
 DolibarrUsers=Dolibarr utilizatori
-LastName=Last Name
+LastName=Nume
 FirstName=Prenume
 ListOfGroups=Lista de grupuri
 NewGroup=Grup nou
@@ -45,8 +45,8 @@ RemoveFromGroup=Înlăturaţi din grup
 PasswordChangedAndSentTo=Parola schimbat şi a trimis <b>la %s.</b>
 PasswordChangeRequestSent=Cerere pentru a schimba parola <b>pentru %s %s</b> la trimis.
 MenuUsersAndGroups=Utilizatorii & Grupuri
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Ultimele %s grupuri create
+LastUsersCreated=Ultimii %s utilizatori creaţi
 ShowGroup=Arata grup
 ShowUser=Arata utilizator
 NonAffectedUsers=Non afectate utilizatori
@@ -98,5 +98,8 @@ OpenIDURL=URL OpenID
 LoginUsingOpenID=Utilizați OpenID pentru login
 WeeklyHours=Ore saptămânale
 ColorUser=Culoarea utilizatorului
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
+DisabledInMonoUserMode=Dezactivat in modul mentenanţă
+UserAccountancyCode=Cod contabil utilizator
+UserLogoff=Logoff utilizator
+UserLogged=Utilizator autentificat
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index dc4d111b95b..ef2d11978b1 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit meniu
 EditPageMeta=Edit Meta
 EditPageContent=Editare continut
 Website=Web site
+Webpage=Web page
 AddPage=Add pagina
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Seteaza ca  pagina Home 
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 96209293682..bf8e78b7f70 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Ordine de plată clienţi
-StandingOrders=Ordine de plată
-StandingOrder=Ordine de plată
-NewStandingOrder=Ordin nou de plată
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=De procesat
-WithdrawalsReceipts=Chitanţe retrageri
-WithdrawalReceipt=Chitanţă retrageri
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Linii retrageri
-RequestStandingOrderToTreat=Cerere pentru ordine de plată de procesat
-RequestStandingOrderTreated=Cerere pentru ordine de plată procesată
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Nu a fost încă posibil. Statutul Withdraw  trebuie să fie setat la "creditat" înaintea declarării respinge pe liniile specifice.
-NbOfInvoiceToWithdraw=Nr. facturii cu retrage cererea
-NbOfInvoiceToWithdrawWithInfo=Nr. facturii cu cererea retrage pentru clienții care au informațiile contului bancar definit
-InvoiceWaitingWithdraw=Factura de aşteptare pentru al retrage
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Suma de a se retrage
-WithdrawsRefused=Retrage refuzat
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nici un client nu facturii de plată, în modul de "retragere" este în aşteptare. Du-te la "Retrageţi fila" pe factura cardul pentru a face o cerere.
 ResponsibleUser=Responsabil de utilizator
-WithdrawalsSetup=Setare retragere
-WithdrawStatistics=Statistici Retrageri
-WithdrawRejectStatistics=Retrageţi respinge "statistici
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Face o retragă cererea
 ThirdPartyBankCode=Cod terţ bancă
 NoInvoiceCouldBeWithdrawed=Nu withdrawed factură cu succes. Verificaţi dacă factura sunt pe companii cu un valide BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refuzat
 StatusMotif0=Nespecificat
 StatusMotif1=Fonduri insuficiente
 StatusMotif2=Cerere contestată
-StatusMotif3=Nicio retragere pentru a
+StatusMotif3=No direct debit payment order
 StatusMotif4=Clientul Ordine
 StatusMotif5=RIB inutilizabil
 StatusMotif6=Cont fără sold
@@ -61,28 +62,43 @@ NotifyCredit=Retragerea de credit
 NumeroNationalEmetter=Numărul naţional transmiţător
 WithBankUsingRIB=Pentru conturile bancare folosind RIB
 WithBankUsingBANBIC=Pentru conturile bancare folosind codul IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Cont bancar pentru a primi retrage
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată.   Odată ce este dat intră în  meniul Bancă-> Retragere pentru a gestiona ordinul de plată. Când ordinul de plată este închis, plata pe factura va fi înregistrată în mod automat, iar factura închisă dacă restul de plata este nul.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Fişier Retragere
 SetToStatusSent=Setează statusul "Fişier Trimis"
 ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor  fi clasificate ca "Plătit"
 StatisticsByLineStatus=Statistici după starea  liniilor
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Plata %s comandă în picioare de către bancă
-InfoCreditMessage=%s pentru picioare a fost plătit de către bancă <br> Datele de plata: %s
-InfoTransSubject=Transmiterea %s ordine permanente la banca
-InfoTransMessage=Ordinul de plată %s a fost trimis la bancă de %s  %s. <br><br>
+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>
 InfoTransData=Suma: %s <br> Metoda: %s <br> Data: %s
-InfoRejectSubject=Ordin de plată refuzat
-InfoRejectMessage=Bună ziua, <br><br> ordinul de plata al facturii %s de la societatea %s în valoare de %s a fost refuzat de către bancă.<br><br>--<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
 ModeWarning=Opţiunea pentru modul real, nu a fost stabilit, ne oprim după această simulare
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index 73e612a0df6..d366301a934 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crează o factură client automat, după c
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasează propunere comercială legată ca facturată când comanda client este setată ca plătită
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Clasează comenzi(le) client sursă legate ca facturate, atunci când factura clientului este setată ca plătită
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasează comenzi(le) client sursă legate ca facturate, atunci când factura clientului este validată
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 977fad76b10..cfd1e0d6ee6 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
+ACCOUNTING_EXPORT_SEPARATORCSV=Разделитель колонок при экспорте в файл
+ACCOUNTING_EXPORT_DATE=Формат даты при экспорте в файл
+ACCOUNTING_EXPORT_PIECE=Экспортировать количество
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Экспорт с глобальным аккаунтом
+ACCOUNTING_EXPORT_LABEL=Метка экспорта
 ACCOUNTING_EXPORT_AMOUNT=Export amount
 ACCOUNTING_EXPORT_DEVISE=Export currency
 Selectformat=Select the format for the file
@@ -14,48 +14,69 @@ Journaux=Журналы
 JournalFinancial=Финансовые журналы
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Добавить бухгалтерский счёт
 AccountAccounting=Бухгалтерский счёт
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Распределение клиентов
-SuppliersVentilation=Распределение поставщиков
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Отчёты
 NewAccount=Новый бухгалтерский счёт
 Create=Создать
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Записать счета в главную книгу
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Главная книга
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Строки счёта для обсуждения
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Обсудить
+Ventilate=Bind
 
 Processing=Обрабатывается
 EndProcessing=Конец обработки
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Выделенные строки
 Lineofinvoice=Строка счёта
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
 ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Журнал
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Удалить записи главной книги
-
 DescSellsJournal=Журнал продаж
 DescPurchasesJournal=Журнал покупок
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Платёж счёта клиента
-
 ThirdPartyAccount=Бухгалтерский счёт контрагента
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Дебит и кредит не могут иметь значения одновременно
 
-ReportThirdParty=Список бухгалтерских счетов контрагентов
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Список бухгалтерских счетов
 
@@ -114,22 +134,29 @@ Pcgtype=Класс бухгалтерского счёта
 Pcgsubtype=Подкласс бухгалтерского счёта
 Accountparent=Владелец бухгалтерского счёта
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Итоговая наценка на продажи
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Подтверждать автоматически
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index fa286e546d8..bea1425a1a7 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -2,17 +2,22 @@
 Foundation=Фонд
 Version=Версия
 VersionProgram=Версия программы
-VersionLastInstall=Initial install version
+VersionLastInstall=Начальная версия установки
 VersionLastUpgrade=Latest version upgrade
 VersionExperimental=Экспериментальная
 VersionDevelopment=Разработка
 VersionUnknown=Неизвестно
 VersionRecommanded=Рекомендуемые
-FileCheck=Целостность файлов
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Отсутсвующие файлы
 FilesUpdated=Обновлённые файлы
-FileCheckDolibarr=Проверить целостность файлов системы Dolibarr
-XmlNotFound=Файл Xml, содержащий описание целостности файлов системы Dolibarr не найден  
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID сессии
 SessionSaveHandler=Обработчик для сохранения сессий
 SessionSavePath=Хранение сессии локализации
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Ошибка, точность выше, че
 DictionarySetup=Настройка словаря
 Dictionary=Словари
 Chartofaccounts=Схема учётных записей
-Fiscalyear=Финансовые года
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Значение 'system' и 'systemauto' для типа зарезервировано. Вы можете использовать значение 'user' для добавления вашей собственной записи
 ErrorCodeCantContainZero=Код не может содержать значение 0
 DisableJavascript=Отключить JavaScript и Ajax (Рекомендуется если пользователи пользуются текстовыми браузерами)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Кол-во символов для запуска поиска: %s
 NotAvailableWhenAjaxDisabled=Недоступно при отключенном Ajax
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript отключен
 UsePreviewTabs=Использовать вкладки предпросмотра
 ShowPreview=Предварительный просмотр
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Кодировать двоичные данные в ше
 IgnoreDuplicateRecords=Игнорировать ошибки дублирующихся записей (INSERT IGNORE)
 AutoDetectLang=Автоопределение (язык браузера)
 FeatureDisabledInDemo=Функция отключена в демо -
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Права
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Показаны только элементы из <a href="%s">включенных модулей</a>
-ModulesDesc=Модули Dolibarr определяют функциональность, которая включена в программе. Некоторые модули требуют прав которые вы должны предоставить пользователям, после включения модуля. Нажмите на кнопку вкл/выкл в столбце "Статус" для включения модуля/функционала
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Еще модули ...
 DoliStoreDesc=DoliStore, официальный магазин внешних модулей Dolibarr ERP / CRM
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Текущая версия Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Сервер обновления недоступен
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Все другие символы в маске останутся нетронутыми. <br> Пространства, не допускается. <br>
 GenericMaskCodes4a=<u>Пример на 99-м% х третья сторона TheCompany сделали 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Пример на сторонних из 2007-03-01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Параметры для обеспечения адр
 SecurityTokenIsUnique=Используйте уникальный параметр securekey для каждого URL
 EnterRefToBuildUrl=Введите ссылку на объект %s
 GetSecuredUrl=Получить рассчитывается URL
-ButtonHideUnauthorized=Прятать кнопки, действия с которыми не разрешены, вместо того, чтобы делать их неактивными
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Предыдущее значение НДС
 NewVATRates=Новое значение НДС
 PriceBaseTypeToChange=Изменить цены с базой их эталонного значения, определенной на
@@ -349,6 +356,7 @@ ExtrafieldMail = Адрес электронной почты
 ExtrafieldSelect = Выбрать список
 ExtrafieldSelectList = Выбрать из таблицы
 ExtrafieldSeparator=Разделитель
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=флажок
 ExtrafieldRadio=Переключатель
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Пользователи и группы
@@ -428,8 +439,8 @@ Module55Name=Штрих-коды
 Module55Desc=Штрих-коды управления
 Module56Name=Телефония
 Module56Desc=Телефония интеграции
-Module57Name=Постоянные заказы
-Module57Desc=Регулярные заказы и управление отменами. Также включает в себя создание SEPA-файла для европейских стран.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial интеграции
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar интеграции
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Зарплаты
-Module510Desc=Управление зарплатами сотрудников и платежами
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Ссуда
 Module520Desc=Управление ссудами
 Module600Name=Уведомления
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Пожертвования
 Module700Desc=Пожертвования управления
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Читать провайдеров
 Permission147=Читайте статистику
-Permission151=Прочитайте Регламент
-Permission152=Настройка Регламент
-Permission153=Прочитайте Регламент поступления
-Permission154=Кредитные / отказаться регламент поступления
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Открыть котракты/подписки
 Permission162=Создать/изменить котракты/подписки
 Permission163=Активировать усгулу/подписку на контракте
@@ -747,6 +758,7 @@ Permission1236=Экспорт поставщиком счета-фактуры,
 Permission1237=Детализированный экспорт заказов поставщика
 Permission1251=Запуск массового импорта внешних данных в базу данных (загрузка данных)
 Permission1321=Экспорт клиентом счета-фактуры, качества и платежей
+Permission1322=Reopen a paid bill
 Permission1421=Экспорт заказов и атрибуты
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Создать/изменить опросы
 Permission59001=Открыть коммерческие маржи
 Permission59002=Задать коммерческие маржи
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Потенциальный уровень предполагаемого клиента
@@ -853,6 +869,7 @@ LabelUsedByDefault=Метки, используемые по умолчанию,
 LabelOnDocuments=Этикетка на документах
 NbOfDays=Кол-во дней
 AtEndOfMonth=На конец месяца
+CurrentNext=Current/Next
 Offset=Сдвиг
 AlwaysActive=Всегда активный
 Upgrade=Обновление
@@ -950,7 +967,7 @@ LogEventDesc=Вы можете включить в журнале событий
 AreaForAdminOnly=Эти функции могут быть использованы только <b>администратору пользователей.</b> Администратор черт и помочь определены в Dolibarr по следующим picto:
 SystemInfoDesc=Система информации разного техническую информацию Вы получите в режиме только для чтения и видимые только для администраторов.
 SystemAreaForAdminOnly=Эта область доступна для пользователей только администратором. Ни одно из разрешений Dolibarr может снизить этот предел.
-CompanyFundationDesc=Изменить эту страницу всем известной информации о компании или Фонд нужно управлять
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Вы можете выбрать каждого параметра, связанных с Dolibarr выглядеть и чувствовать себя здесь
 AvailableModules=Доступные модули
 ToActivateModule=Чтобы активировать модуль, перейдите на настройку зоны.
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Предупреждение, на некоторых
 PathToDocuments=Путь к документам
 PathDirectory=Каталог
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Настройка перевода
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
 ClassNotFoundIntoPathWarning=Класс %s не найден по PHP пути
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Использовать TLS
 LDAPServerUseTLSExample=Ваш LDAP сервер использования TLS
 LDAPServerDn=Сервер DN
 LDAPAdminDn=Администратор DN
-LDAPAdminDnExample=Complete DN (ex: cn=adminldap,dc=society,dc=Полное Д.Н. (например, CN= adminldap, DC= обществе, DC= COM)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Пароль администратора
 LDAPUserDn=Пользователи 'DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Полное Д.Н. (например, OU= Пользователи, DC= обществе, DC= COM)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Пример: O
 LDAPFieldSid=SID
 LDAPFieldSidExample=Пример: objectsid
 LDAPFieldEndLastSubscription=Дата окончания подписки
-LDAPFieldTitle=Должность/Функция
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Например, заголовок
 LDAPSetupNotComplete=Установка не завершена (переход на другие вкладки)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Нет администратора или пароль предусмотрено. LDAP доступ будет анонимным и в режиме только для чтения.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Продукты и услуги установки моду
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=Максимальное количество товаров в комбинации выберите списки (0= без ограничений)
 ViewProductDescInFormAbility=Визуализация продукта описания в форме (иначе как всплывающие подсказки)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Визуализация продуктов описания в сторонних язык
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Использовать форму поиска для выбора продукта (вместо выпадающего списка).
 SetDefaultBarcodeTypeProducts=Стандартный вид штрих-кода, используемого для продуктов
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Путь для запуска к утилите генера
 BarcodeInternalEngine=Внутренние средства управления
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Снятие модуля настройки
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Внешние RSS импорт установки
 NewRSS=Новые RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Открыть финансовый год
 CloseFiscalYear=Закрыть финансовый год
 DeleteFiscalYear=Удалить финансовый год
 ConfirmDeleteFiscalYear=Вы точно хотите удалить этот финансовый год?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Всегда может быть отредактировано
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Минимальное количество символов в врехнем регистре
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Список основных уведомлений
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Перейти на вкладку "Уведомления" контрагентов, чтобы добавить или удалить уведомления для контактов / адресов
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Порог
 BackupDumpWizard=Мастер создания резервной копии базы данных
 SomethingMakeInstallFromWebNotPossible=Установка внешних модулей через веб-интерфейс не возможна по следующей причине:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 99b360195c8..c39ffcb4be3 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -27,13 +27,9 @@ AllTime=Сначала
 Reconciliation=Примирение
 RIB=Bank Account Number
 IBAN=IBAN номера
-IbanValid=Номер счета IBAN верный
-IbanNotValid=Номер счета IBAN не верный
 BIC=BIC / SWIFT число
-SwiftValid=Номер BIC/SWIFT верный
-SwiftNotValid=Номер BIC/SWIFT не верный
-StandingOrders=Постоянные заказы
-StandingOrder=Постоянная порядка
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Выписка со счета
 AccountStatementShort=Утверждение
 AccountStatements=Выписки со счета
@@ -78,6 +74,7 @@ AccountToCredit=Счета к кредитам
 AccountToDebit=Счет дебетовать
 DisableConciliation=Отключите функцию примирения для этой учетной записи
 ConciliationDisabled=Согласительный функция отключена
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Открытые
 StatusAccountClosed=Закрытые
 AccountIdShort=Количество
@@ -87,6 +84,8 @@ AddBankRecordLong=Добавить сделки вручную
 ConciliatedBy=Conciliated путем
 DateConciliating=Согласительную дата
 BankLineConciliated=Сделка conciliated
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Заказчиком оплаты
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Снятие оплаты
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Банковский перевод
 BankTransfers=Банковские переводы
-TransferDesc=Перевод с одного счета на другой, Dolibarr запишет две записи (в дебет счета источник и целевой кредит в счете, на ту же сумму. В тот же ярлык и даты будут использоваться для этой сделке)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=От
 TransferTo=К
 TransferFromToDone=<b>Передача%</b> от <b>S в% х %s%</b> S был записан.
@@ -129,7 +129,7 @@ FutureTransaction=Сделки в Futur. Ни в коем случае к сог
 SelectChequeTransactionAndGenerate=Выбор / фильтр проверяет, включать в получении депозита проверки и нажмите кнопку &quot;Создать&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Укажите категорию для классификации записей
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Проверьте последние строки в выписке по счёту из банка и нажмите
 DefaultRIB=Номер счета BAN по умолчанию
 AllRIB=Все номера счетов BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 9e5c0cef4ec..4d0e21a3ebb 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Ошибка, невозможн
 BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Предоставлена скидка (за досрочный
 EscompteOfferedShort=Discount
 SendBillRef=Представление счёта %s
 SendReminderBillRef=Представление счёта %s (напоминание)
-StandingOrders=Регламенты
-StandingOrder=Регламент
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Нет проектов счетов-фактур
 NoOtherDraftBills=Нет других проектов счетов-фактур
 NoDraftInvoices=Нет проектов счетов
@@ -351,8 +351,8 @@ VarAmount=Произвольное значение (%% от суммы)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Платежное поручение
-PaymentTypeShortPRE=Плат. поручение
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Наличные
 PaymentTypeShortLIQ=Наличные
 PaymentTypeCB=Кредитная карта
@@ -381,6 +381,7 @@ ExtraInfos=Доп.инфо
 RegulatedOn=Регулируемый по
 ChequeNumber=Чек N
 ChequeOrTransferNumber=Чек/Перевод N
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Банк чека
 CheckBank=Проверить
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Оплачен этим платежом
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Все счета, без остатка к оплате будут автоматически закрыты со статусом "Оплачен".
 ToMakePayment=Платить
 ToMakePaymentBack=Возврат платежа
 ListOfYourUnpaidInvoices=Список неоплаченных счетов
 NoteListOfYourUnpaidInvoices=Примечание: Этот список содержит счета только тех контрагентов, которые связаны с нами, как представители по сбыту.
 RevenueStamp=Штамп о уплате налогов
-YouMustCreateInvoiceFromThird=Эта опция доступна только при создании счёта на вкладке "клиент" из раздела Контрагенты
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Шаблон Счета-фактуры Crabe. Полный шаблон (вспомогательные опции НДС, скидки, условия платежей, логотип и т.д. ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/ru_RU/boxes.lang b/htdocs/langs/ru_RU/boxes.lang
index c8c55cb3e92..32176c00cd9 100644
--- a/htdocs/langs/ru_RU/boxes.lang
+++ b/htdocs/langs/ru_RU/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Старейшие активных истек услуги
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Глобальная активность (фактуры, предложения, заказы)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Предложений в месяц
 NoTooLowStockProducts=Ни один из продуктов не достиг минимума складского запаса
 BoxProductDistribution=РаспространениеТоваров/Услуг
 BoxProductDistributionFor=Распространение %s  для %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Счета-фактуры Покупателей
 ForCustomersOrders=Заказы клиентов
 ForProposals=Предложения
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 60da0b74948..32019fcd1c3 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=на
 CashDeskThirdParty=Третье лицо
 ShoppingCart=Корзина
 NewSell=Новые продать
-BackOffice=Бэк-офис
 AddThisArticle=Добавить эту статью
 RestartSelling=Вернитесь на продажу
-SellFinished=Продажа готового
+SellFinished=Sale complete
 PrintTicket=Печать билетов
 NoProductFound=Ни одна статья найдены
 ProductFound=продукт найден
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index e7676c8974a..7c07084897b 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Раздел тегов/категорий клиент
 MembersCategoriesArea=Раздел тегов/категорий участников
 ContactsCategoriesArea=Раздел тегов/категорий контактов
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Подкатегории
 CatList=Список тегов/категорий
 NewCategory=Новый тег/категория
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=У этого продукта/услуги  нет тегов/категорий
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=У этого участника нет тегов/категорий
 ContactHasNoCategory=Это контакт не имеет тега или не принадлежит категории
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Без тега/категории
 CategoryExistsAtSameLevel=Категория к таким кодом уже существует
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Теги/категории  товаров
 MembersCategoriesShort=Теги/категории участников
 ContactCategoriesShort=Теги/категории контактов
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=В этой категории нет товаров.
 ThisCategoryHasNoSupplier=В этой категории нет поставщиков.
 ThisCategoryHasNoCustomer=В этой категории нет покупателей.
 ThisCategoryHasNoMember=В этой категории нет участников.
 ThisCategoryHasNoContact=Эта категория не содержит ни одного контакта
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=ID тега/категории
 CatSupList=Список тегов/категорий поставщика
 CatCusList=Список тегов/категорий клиента/потенциального клиента
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Связи между поставщиками и  тегами/категориями
 CatCusLinks=Связи между клиентами/потенц. клиентами  и  тегами/категориями
 CatProdLinks=Связи между продуктами/услугами  и  тегами/категориями
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Удалить из тега/категории
 ExtraFieldsCategories=Дополнительные атрибуты
 CategoriesSetup=Настройка тегов/категорий
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index b88d70f500f..3ec8d12f1e7 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Новое физическое лицо
 NewCompany=Новая компания (проспект, покупатель, поставщик)
 NewThirdParty=Новые третьей стороне (проспект, клиента, поставщика)
 CreateDolibarrThirdPartySupplier=Создать контрагента (поставщика)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Область потенциальных клиентов
 IdThirdParty=Код контрагента
 IdCompany=Код компании
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Поставщики
 ThirdPartyType=Тип контрагента
 Company/Fundation=Организация
 Individual=Физическое лицо
-ToCreateContactWithSameName=Будет автоматически создан контакт с теми же данными
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Материнская компания
 Subsidiaries=Филиалы
 ReportByCustomers=Отчет по клиентам
@@ -47,7 +49,7 @@ CivilityCode=Код корректности
 RegisteredOffice=Зарегистрированный офис
 Lastname=Фамилия
 Firstname=Имя
-PostOrFunction=Должность/Функция
+PostOrFunction=Job position
 UserTitle=Название
 Address=Адрес
 State=Штат/Провинция
@@ -64,7 +66,7 @@ Chat=Чат
 PhonePro=Раб. телефон
 PhonePerso=Личн. телефон
 PhoneMobile=Мобильный
-No_Email=Не отправлять массовые рассылки
+No_Email=Refuse mass e-mailings
 Fax=Факс
 Zip=Почтовый индекс
 Town=Город
@@ -73,7 +75,7 @@ Poste= Должность
 DefaultLang=Язык по умолчанию
 VATIsUsed=НДС используется
 VATIsNotUsed=НДС не используется
-CopyAddressFromSoc=Заполните адрес адресом контагента
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Номер НДС
 VATIntraShort=Номер НДС
 VATIntraSyntaxIsValid=Синтаксис корректен
-VATIntraValueIsValid=Значение корректено
 ProspectCustomer=Потенц. клиент / Покупатель
 Prospect=Потенц. клиент
 CustomerCard=Карточка Покупателя
@@ -261,7 +262,9 @@ AddContactAddress=Создать контакт/адрес
 EditContact=Изменить контакт / адреса
 EditContactAddress=Редактировать контакт/адрес
 Contact=Контакт
+ContactId=Contact id
 ContactsAddresses=Контакты/Адреса
+FromContactName=Name:
 NoContactDefinedForThirdParty=Не задан контакт для этого контрагента
 NoContactDefined=У этого контрагента не указаны контакты
 DefaultContact=Контакт по умолчанию
@@ -284,7 +287,7 @@ CompanyDeleted=Компания " %s" удалена из базы данных.
 ListOfContacts=Список контактов/адресов
 ListOfContactsAddresses=Список контактов/адресов
 ListOfThirdParties=Список контрагентов
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Показать контакт
 ContactsAllShort=Все (без фильтра)
 ContactType=Вид контакт
@@ -294,6 +297,7 @@ ContactForProposals=Контакт потенциального клиента
 ContactForContracts=Контакт договора
 ContactForInvoices=Контакт счета-фактуры
 NoContactForAnyOrder=Этот контакт не является контактом заказа
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Этот контакт не является контактом коммерческого предложения
 NoContactForAnyContract=Этот контакт не является контактом договора
 NoContactForAnyInvoice=Этот контакт не является контактом счета-фактуры
@@ -352,9 +356,9 @@ ExportCardToFormat=Экспорт карточки в формате
 ContactNotLinkedToCompany=Контакт не связан с каким-либо контрагентом
 DolibarrLogin=Имя пользователя Dolibarr
 NoDolibarrAccess=Нет доступа к Dolibarr
-ExportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Контакты и свойства
-ImportDataset_company_1=Контрагенты (компании, фонды, физические лица) и свойства
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Контакты/Адреса (контрагенты и другие) и атрибуты
 ImportDataset_company_3=Банковские реквизиты
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 2c20d875f66..6f0fe3a8638 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Специальные расходы
 MenuTaxAndDividends=Налоги и дивиденды
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index de4201d3a52..f8670b91b7e 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Настройки запланированных заданий
-URLToLaunchCronJobs=Ссылка для проверки и запуска заданий планировщика cron (если требуется)
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Или проверить и запустить специальную задачу
 KeyForCronAccess=Ключ безопасности для запуска запланированных заданий
 FileToLaunchCronJobs=Командная строка для запуска запланированных заданий. 
@@ -23,7 +23,7 @@ CronCommand=Команда
 CronList=Scheduled jobs
 CronDelete=Удалить запланированные задания
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Запустить запланированные задания
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Модуль запланированных задач позволяет выполнять запланированные задачи
 CronTask=Задание
@@ -39,7 +39,7 @@ CronMethod=Метод
 CronModule=Модуль
 CronNoJobs=Нет зарегистрированных заданий
 CronPriority=Приоритет
-CronLabel=Описание
+CronLabel=Label
 CronNbRun=Кол-во запусков
 CronMaxRun=Max nb. launch
 CronEach=Каждый
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 46e8f52aa3f..2be6508c293 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Ошибка. Ваш PHP  должен иметь модул
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Исходящий и входящий склад должны отличаться
 ErrorBadFormat=Неправильный формат!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Не удается удалить платёж, поскольку есть по крайней мере один счет со статусом 'оплачен'
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index ce447666af7..9ce1896ff66 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Эта версия PHP поддерживает сессии
 PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
 PHPSupportPOSTGETKo=Возможно,  ваша версия PHP не поддерживает переменные и POST или GET. Проверьте параметр <b>variables_order</b> в php.ini.
 PHPSupportGD=Эта версия PHP  поддерживает библиотеку.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Эта версия PHP поддерживает UTF8 функции.
 PHPMemoryOK= Максимально допустимый размер памяти для сессии установлен <b>в %s.</b> Это должно быть достаточно.
 PHPMemoryTooLow=Ваш PHP макс сессии памяти установлен <b>в %s</b> байт. Это должно быть слишком низким. Измените свой <b>php.ini</b> установить параметр <b>memory_limit,</b> по крайней <b>мере %s</b> байт.
 Recheck=Нажмите здесь для более significative тест
 ErrorPHPDoesNotSupportSessions=Ваш PHP установки не поддерживает сессии. Эта функция требует, чтобы Dolibarr работает. Проверьте настройки PHP.
 ErrorPHPDoesNotSupportGD=Ваш PHP установки не поддерживает графические функции GD. Нет графике будет иметься в наличии.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Ваш PHP установки не поддерживает UTF8 функций. Dolibarr не может работать корректно. Решать эту перед установкой Dolibarr.
 ErrorDirDoesNotExists=Каталог %s не существует.
 ErrorGoBackAndCorrectParameters=Перейти назад и исправить неправильные параметры.
@@ -133,6 +135,10 @@ ActivateModule=Активировать модуль %s
 ShowEditTechnicalParameters=Показать расширенные параметры (для опытных пользователей)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Версия вашей СУБД %s. Она содержит критическую ошибку, которая приводит к потере данных, если вы меняете структуру БД, как это требуется в процессе миграции. По этой причине, перенос не будет осуществлён до момента, пока вы не обновите вашу СУБД до работоспособной версии (версии с критическими ошибками %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Обновление данных о действия
 MigrationPaymentMode=Миграция данных для оплаты режим
 MigrationCategorieAssociation=Миграция категорий
 MigrationEvents=Перенос событий для добавления владельца в таблицу присваиванья
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Перегрузите модуль %s
 ShowNotAvailableOptions=Показать недоступные опции
 HideNotAvailableOptions=Скрыть недоступные опции
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index efe85e176ad..75af8e48cb1 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=После деятельность за
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/ru_RU/ldap.lang b/htdocs/langs/ru_RU/ldap.lang
index a04544da37b..83dccfb9bf3 100644
--- a/htdocs/langs/ru_RU/ldap.lang
+++ b/htdocs/langs/ru_RU/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Дата первой подписки
 LDAPFieldFirstSubscriptionAmount=Размер первой подписки
 LDAPFieldLastSubscriptionDate=Дата последней подписки
 LDAPFieldLastSubscriptionAmount=Размер последней подписки
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Пользователь синхронизирован
 GroupSynchronized=Группа синхронизирована
 MemberSynchronized=Участник синхронизирован
diff --git a/htdocs/langs/ru_RU/mails.lang b/htdocs/langs/ru_RU/mails.lang
index 4fb9ccd25fa..1d8536e4f7c 100644
--- a/htdocs/langs/ru_RU/mails.lang
+++ b/htdocs/langs/ru_RU/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Читать
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Email отправлено %s получателям.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> добавлено в список получателей
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 89e3374be64..97a6c1a85a8 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -67,6 +67,7 @@ SelectDate=Выбрать дату
 SeeAlso=Смотрите также %s
 SeeHere=Посмотрите сюда
 BackgroundColorByDefault=Цвет фона по умолчанию
+FileRenamed=The file was successfully renamed
 FileUploaded=Файл успешно загружен
 FileWasNotUploaded=Файл выбран как вложение, но пока не загружен. Для этого нажмите "Вложить файл".
 NbOfEntries=Кол-во записей
@@ -245,6 +246,10 @@ DateBuild=Дата формирования отчета
 DatePayment=Дата оплаты
 DateApprove=Дата утверждения
 DateApprove2=Дата утверждения (повторного)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=год
 DurationMonth=месяц
 DurationWeek=неделя
@@ -256,6 +261,7 @@ DurationDays=дней
 Year=Год
 Month=Месяц
 Week=Неделя
+WeekShort=Week
 Day=День
 Hour=Час
 Minute=Минута
@@ -278,6 +284,7 @@ MonthOfDay=Месяц дня
 HourShort=ч
 MinuteShort=мин.
 Rate=Курс
+CurrencyRate=Currency conversion rate
 UseLocalTax=Включить налог
 Bytes=Байт
 KiloBytes=Килобайт
@@ -565,8 +572,11 @@ BackToList=Вернуться к списку
 GoBack=Назад
 CanBeModifiedIfOk=Может быть изменено, если корректно
 CanBeModifiedIfKo=Может быть изменено, если ненекорректно
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Запись успешно изменена
 RecordsModified=Изменено %s записей
+RecordsDeleted=%s records deleted
 AutomaticCode=Автоматический код
 FeatureDisabled=Функция отключена
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=У вас нет разрешений на это дейс
 SessionName=Имя Сессии
 Method=Метод
 Receive=Получить
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Частичное
 TotalWoman=Всего
 NeverReceived=Никогда не получено
@@ -598,6 +609,7 @@ DisabledModules=Отключенные модули
 For=Для
 ForCustomer=Для клиента
 Signature=Подпись
+DateOfSignature=Date of signature
 HidePassword=Показать команду со скрытым паролем
 UnHidePassword=Показать реальную команду с открытым паролем
 Root=Корень
@@ -641,6 +653,15 @@ NewAttribute=Новый атрибут
 AttributeCode=Код атрибута
 URLPhoto=Адрес фотографии/логотипа
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Создать проект
 SetToDraft=Назад к черновику
 ClickToEdit=Нажмите, чтобы изменить
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Понедельник
 Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 8fd4e77bbeb..88927b87560 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Ставка должна быть числом
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Показать инф-цию о наценке
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/ru_RU/oauth.lang b/htdocs/langs/ru_RU/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/ru_RU/oauth.lang
+++ b/htdocs/langs/ru_RU/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 8d879a19c71..220ec78057e 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Ваши заказы созданы
 OrderFail=Возникла ошибка при создании заказов
 CreateOrders=Создать заказы
 ToBillSeveralOrderSelectCustomer=Для создания счёта на несколько заказов, сначала нажмите на клиента, затем выберете  "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/ru_RU/printing.lang b/htdocs/langs/ru_RU/printing.lang
index 78387d40584..1c967aea894 100644
--- a/htdocs/langs/ru_RU/printing.lang
+++ b/htdocs/langs/ru_RU/printing.lang
@@ -18,10 +18,6 @@ UserConf=Настройка для пользователя
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Этот драйвер позволяет отправлять документы на принтер с использованием сервиса Google Cloud Print
 GCP_Name=Имя
 GCP_displayName=Отображаемое имя
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 2c8c22c3e23..a5f3843d83f 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Партии/серийный номер
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=номер партии/серийный номер
 BatchNumberShort=Lot/Serial
-l_eatby=Дата окончания срока годности
-l_sellby=Дата продажи
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Детали номера партии/серийного номера
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=номер партии/серийный номер: %s
@@ -19,3 +19,6 @@ printQty=Кол-во:%d
 AddDispatchBatchLine=Добавить строку Срока годности
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 127709f6394..d1b7e50bbe6 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Массовое изменение НДС
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Массовое создание штрих-кода
 MassBarcodeInitDesc=Эта страница может быть использована для создания штрих-кодов для объектов, у которых нет штрих-кода. Проверьте перед выполнением настройки модуля штрих-кодов.
-ProductAccountancyBuyCode=Код бухгалтерии  (купли)
-ProductAccountancySellCode=Код бухгалтерии (продажи)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Товар или Услуга
 ProductsAndServices=Товары и Услуги
 ProductsOrServices=Товары  или Услуги
@@ -59,6 +59,8 @@ SellingPriceHT=Продажная цена (за вычетом налогов)
 SellingPriceTTC=Продажная цена (вкл. налоги)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Новая цена
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Продажная цена не может быть ниже минимальной для этого товара (%s без налогов). Это сообщение также возникает, если вы задаёте слишком большую скидку.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Печатать несколько стикеров д
 BuildPageToPrint=Создать страницу для печати
 FillBarCodeTypeAndValueManually=Заполнить тип и значение штрих-кода вручную.
 FillBarCodeTypeAndValueFromProduct=Заполнить тип и значение из штрих-кода товара.
-FillBarCodeTypeAndValueFromThirdParty=Заполнить тип и значение из штрих-кода контрагента.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Тип и значение штрих-кода не заданы для товара %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Тип и значение штрих-кода не заданы для контрагента %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Информация по штрих-коду продукта %s:
-BarCodeDataForThirdparty=Информация штрих-кода контрагента %s 
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Задать значение штри х-кода ля всех записей (это также установит значение штрих-кода для тех записей, где он был уже задан)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 62f7b873b49..eb74c80fe6c 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Списки коммерческих предложений, связанных с проектом
-ListOrdersAssociatedProject=Списки заказы, связанные с проектом
-ListInvoicesAssociatedProject=Списки счетов, связанных с проектом
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Список поставщиков заказов, связанных с проектом
-ListSupplierInvoicesAssociatedProject=Список поставщиков счетов-фактур, связанных с проектом
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Перечень договоров, связанных с проектом
 ListFichinterAssociatedProject=Список мероприятий, связанных с проектом
 ListExpenseReportsAssociatedProject=Список отчётов о затратах, связанных с проектом
@@ -123,6 +123,7 @@ ProjectReportDate=Изменить дату задачи в соответств
 ErrorShiftTaskDate=Невозможно сдвинуть дату задачи по причине новой даты начала проекта
 ProjectsAndTasksLines=Проекты и задачи
 ProjectCreatedInDolibarr=Проект %s создан
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Задача %s создана
 TaskModifiedInDolibarr=Задача %s изменена
 TaskDeletedInDolibarr=Задача %s удалена
@@ -153,7 +154,7 @@ PlannedWorkload=Запланированная нагрузка
 PlannedWorkloadShort=Рабочая нагрузка
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Ввод по дням
 InputPerWeek=Ввод по неделе
 InputPerAction=Ввод по действиям
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 14228f538de..b8e57d32292 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Новая выплата зарплаты
 SalaryPayment=Выплата зарплаты
 SalariesPayments=Выплата зарплат
 ShowSalaryPayment=Показать выплату зарплаты
-THM=Средняя расценка почасовой оплаты
-TJM=Средняя расценка дневной оплаты
+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
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 29ffd42cbe9..8c0c22c8e08 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Удалить отправку
 Stock=Фондовый
 Stocks=Акции
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Перевозкой
 ErrorWarehouseRefRequired=Склад ссылкой зовут требуется
 ListOfWarehouses=Список складов
@@ -43,6 +45,7 @@ PMPValue=Значение
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Склады стоимости
 UserWarehouseAutoCreate=Создать запас автоматически при создании пользователя
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Запас товара на складе и запас суб-товара на складе не связаны
 QtyDispatched=Количество направил
 QtyDispatchedShort=Кол-во отправлено
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/ru_RU/supplier_proposal.lang b/htdocs/langs/ru_RU/supplier_proposal.lang
index e95f51bbf4a..b50e814b76b 100644
--- a/htdocs/langs/ru_RU/supplier_proposal.lang
+++ b/htdocs/langs/ru_RU/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Создание модели по умолч
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index e3a49ffe51b..7e7b69bd496 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -7,13 +7,13 @@ History=История
 ListOfSuppliers=Список поставщиков
 ShowSupplier=Показать поставщика
 OrderDate=Дата заказа
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Для субтоваров  товаров не указана цена
-AddSupplierPrice=Добавить цену поставщика
-ChangeSupplierPrice=Изменить цену поставщика
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Эта ссылка поставщиком уже связан с ссылкой: %s
 NoRecordedSuppliers=Нет зарегистрированных поставщиков
 SupplierPayment=Оплаты поставщика
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Список заказов поставщиков
 MenuOrdersSupplierToBill=Заказы поставщика для выписки счёта
 NbDaysToDelivery=Задержка доставки в днях
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 925b3648fd2..e762715e725 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Часов в неделю
 ColorUser=Цвет пользователя
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/ru_RU/website.lang b/htdocs/langs/ru_RU/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/ru_RU/website.lang
+++ b/htdocs/langs/ru_RU/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 96d1bc9f5e5..d73b01e0d8f 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Раздел постоянных заказов клиентов
-StandingOrders=Постоянные заказы
-StandingOrder=Постоянные заказы
-NewStandingOrder=Новый постоянный заказ
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Для обработки
-WithdrawalsReceipts=Снятие квитанции
-WithdrawalReceipt=Снятие получения
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Снятие линии
-RequestStandingOrderToTreat=Запрос на обработку постоянных заказов
-RequestStandingOrderTreated=Запрос на обработку постоянных заказов выполнен
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Номер счёта с запросом на снятие
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Счет ожидает снятия
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Сумма снятия
-WithdrawsRefused=Отзывает отказала
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Нет счета клиента в оплате режиме "отозвать" ждет. Переход на "Вывод 'вкладки на счету карточки сделать запрос.
 ResponsibleUser=Ответственный пользователь
-WithdrawalsSetup=Выход установки
-WithdrawStatistics=Выходит статистика
-WithdrawRejectStatistics=Снять отвергает Статистика
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Сделать отозвать запрос
 ThirdPartyBankCode=Третьей стороной банковский код
 NoInvoiceCouldBeWithdrawed=Нет счета withdrawed с успехом. Убедитесь в том, что счета-фактуры на компании с действительным запрета.
@@ -46,7 +47,7 @@ StatusRefused=Отказавшийся
 StatusMotif0=Не указано
 StatusMotif1=Предоставление insuffisante
 StatusMotif2=Тираж conteste
-StatusMotif3=Нет Выплаты порядка
+StatusMotif3=No direct debit payment order
 StatusMotif4=Клиент Заказать
 StatusMotif5=RIB inexploitable
 StatusMotif6=Счет без остатка
@@ -61,28 +62,43 @@ NotifyCredit=Снятие кредитную
 NumeroNationalEmetter=Национальный передатчик Количество
 WithBankUsingRIB=Для банковских счетов с использованием RIB
 WithBankUsingBANBIC=Для банковских счетов с использованием IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Банковский счет для получения отзывает
+BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=Кредит на
 WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
 ShowWithdraw=Показать Вывод
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Однако, если счет-фактура имеет по крайней мере один вывод оплаты еще не обработан, то он не будет установлен, как оплачиваются, чтобы управлять снятие ранее.
-DoStandingOrdersBeforePayments=Эта вкладка позволяет сделать запрос на постоянный заказ. Используйте меню Банк-Постоянные заказы для управления постоянными заказами. Когда постоянный заказ закрыт, платёж по счёту будет автоматически записан, и счёт будет закрыть, если нет уведомления о платеже.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Установить статус "Файл отправлен"
 ThisWillAlsoAddPaymentOnInvoice=Это также применит оплату по счетам и установит статус счетов на "Оплачен"
 StatisticsByLineStatus=Статистика статуса по строкам
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Оплата постоянных %s порядке банк
-InfoCreditMessage=Постоянное поручение %s была выплачена банком <br> Данные оплаты: %s
-InfoTransSubject=Передача стоять %s чтобы банк
-InfoTransMessage=Постоянное поручение %s был Передано в банк %s %s. <br><br>
+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>
 InfoTransData=Сумма: %s <br> Metode: %s <br> Дата: %s
-InfoRejectSubject=Постоянное платежное поручение отказался
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Вариант для реального режима не был установлен, мы останавливаемся после этого моделирования
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index e942de3b8f6..4e6028ded66 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Установка модуля Рабочих процессов
 WorkflowDesc=Данный модуль предназначен для изменения поведения автоматических действий в приложении. По умолчанию рабочий процесс открыт (вы можете делать вещи в произвольном порядке). Вы можете включить автоматические действия, которые вам необходимы.
 ThereIsNoWorkflowToModify=Для активированных модулей нет доступных изменений рабочего процесса.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Автоматически создава
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Классифицировать связанные коммерческие предложения оплаченными, когда заказ клиента обозначен, как оплаченный
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента оплачен. 
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицировать связанные заказы клиента оплаченными, когда счёт клиента подтверждён.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 0b16bb01cc7..36c5e28dde5 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -3,9 +3,9 @@ ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
 ACCOUNTING_EXPORT_DATE=Date format for export file
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
+ACCOUNTING_EXPORT_LABEL=Exportovať názov
+ACCOUNTING_EXPORT_AMOUNT=Exportovať sumu
+ACCOUNTING_EXPORT_DEVISE=Exportovať menu
 Selectformat=Select the format for the file
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
 
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
-AccountAccountingShort=Account
+AccountAccountingShort=Účet
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Rozpis
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
-MenuAccountancy=Accountancy
-CustomersVentilation=Rozpis zákazníkov
-SuppliersVentilation=Rozpis dodávateľov
+MenuAccountancy=Účtovníctvo
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Zostavy
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
-AccountBalance=Account balance
+AccountBalance=Stav účtu
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Trvanie prístupových údajov pre všeobecné účtovníctvo
+ACCOUNTING_LENGTH_AACCOUNT=Trvanie prístupových údajov pre účtovníctvo tretej strany
+ACCOUNTING_MANAGE_ZERO=Upravte nulu na konci účtovného účtu. Potrebné pre niektoré krajiny. V základe vypnuté. 
+BANK_DISABLE_DIRECT_INPUT=Vypnite voľné vkladanie bankovych prevodov ( Zapnuté v základe s tymto modulom )
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -65,7 +86,7 @@ ACCOUNTING_SOCIAL_JOURNAL=Social journal
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
 ACCOUNTING_ACCOUNT_SUSPENSE=Account of wait
-DONATION_ACCOUNTINGACCOUNT=Account to register donations
+DONATION_ACCOUNTINGACCOUNT=Účet pre registráciu príspevkov
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
@@ -79,34 +100,33 @@ Code_tiers=Thirdparty
 Labelcompte=Label account
 Sens=Sens
 Codejournal=Journal
-NumPiece=Piece number
-AccountingCategory=Accounting category
-
-NotMatch=Not Set
-
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+NumPiece=Číslo kusu
+AccountingCategory=Účtovná kategória
+NotMatch=Nenastavené
+DeleteMvt=Zmazať riadky hlavnej účtovnej knihy
+DelYear=Rok na zmazanie
+DelJournal=Žurnále na zmazanie
+ConfirmDeleteMvt=Táto akcia zmaže riadky hlavnej účtovnej knihy  pre rok a/alebo konkrétny žurnál.
+ConfirmDeleteMvtPartial=Táto akcia zmaže vybrané riadky z hlavnej účtovnej knihy
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,25 +134,32 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Priradzovať automaticky
+AutomaticBindingDone=Automatické priradenie dokončené
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+MvtNotCorrectlyBalanced=Pohyby nie sú vyvážené. Kredit = %S Debit = %s
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
-ApplyMassCategories=Apply mass categories
+ApplyMassCategories=Použiť hromadne kategóriu
 
 ## Export
 Exports=Exports
@@ -141,29 +168,37 @@ Modelcsv=Model of export
 OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
 Selectmodelcsv=Select a model of export
 Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
-Modelcsv_ebp=Export towards EBP
-Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_CEGID=Exportovať pre CEGID Expert
+Modelcsv_COALA=Exportovať pre Sage Coala
+Modelcsv_bob50=Exportovať pre Sage BOB 50
+Modelcsv_ciel=Exportovať pre Sage Ciel Compta alebo Compta Evolution
+Modelcsv_quadratus=Exportovať pre Quadratus QuadraCompta
+Modelcsv_ebp=Exportovať pre EBP
+Modelcsv_cogilog=Exportovať pre Cogilog
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
-Options=Options
-OptionModeProductSell=Mode sales
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+InitAccountancy=Načítať účtovníctvo
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
+Options=Možnosti
+OptionModeProductSell=Mód predaja
+OptionModeProductBuy=Mód nákupu
+OptionModeProductSellDesc=Zobrazit produkty ktoré nemjú priradené účtovné účty pre predaj.
+OptionModeProductBuyDesc=Zobrazit produkty ktoré nemjú priradené účtovné účty pre nákup.
+CleanFixHistory=Odstrániť účtovný kód z riadkov, ktorý neexistuje v tabuľke účtov
+CleanHistory=Resetovať všetky priradenia pre zvolený rok
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=Rozsah účtovného účtu
+Calculated=Vypočítané
+Formula=Vzorec
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+ErrorNoAccountingCategoryForThisCountry=Pre túto krajinu nie je dostupná žiadna účtovná kategória
+ExportNotSupported=Exportovaný formát nie je podporovaný pre túto stránku
+BookeppingLineAlreayExists=Riadky už existujú v archíve
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index c7df3c85e6c..bcf79c303ee 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -2,17 +2,22 @@
 Foundation=Nadácia
 Version=Verzia
 VersionProgram=Verzia programu
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Základná inštalovaná verzia
+VersionLastUpgrade=Upgradovať na najnovšiu verziu
 VersionExperimental=Experimentálna
 VersionDevelopment=Vývojárska
 VersionUnknown=Neznáma
 VersionRecommanded=Odporúčaná
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Kontrola integrity súborov
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
+FilesMissing=Chýbajúce súbory
+FilesUpdated=Aktualizované súbory
+FileCheckDolibarr=Skontrolovať integritu aplikačných súborov
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Integrita XML súboru aplikácie nenájdená
 SessionId=ID relácie
 SessionSaveHandler=Handler pre uloženie sedenia
 SessionSavePath=Adresár pre ukladanie relácií
@@ -46,10 +51,10 @@ SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Chyba, tento modul vyžaduje PHP verzia %s alebo vyššia
 ErrorModuleRequireDolibarrVersion=Chyba, tento modul vyžaduje Dolibarr verzie %s alebo vyššia
 ErrorDecimalLargerThanAreForbidden=Chyba, presnosť vyššia než <b>%s</b> nie je podporované.
-DictionarySetup=Dictionary setup
-Dictionary=Dictionaries
+DictionarySetup=Nastavenie slovníka
+Dictionary=Slovníky
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiškálny rok
 ErrorReservedTypeSystemSystemAuto=Hodnota &quot;systém&quot; a &quot;systemauto&quot; typu je vyhradená. Môžete použiť &quot;používateľom&quot; ako hodnota pridať svoj vlastný rekord
 ErrorCodeCantContainZero=Kód môže obsahovať hodnotu 0
 DisableJavascript=Vypnúť JavaScript a funkcie Ajax (Odporúča sa pre nevidiace osoby alebo pri textových prehliadačoch)
@@ -59,14 +64,14 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Predradníka znaky na spustenie hľadania: %s
 NotAvailableWhenAjaxDisabled=Nie je k dispozícii pri Ajax vypnutej
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript so zdravotným postihnutím
 UsePreviewTabs=Použitie ukážky karty
 ShowPreview=Zobraziť náhľad
 PreviewNotAvailable=Náhľad nie je k dispozícii
 ThemeCurrentlyActive=Téma aktívnej
 CurrentTimeZone=Časové pásmo PHP (server)
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=TimeZone MySql (databáza)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=Miesto
 Table=Tabuľka
@@ -101,9 +106,9 @@ OtherOptions=Ďalšie možnosti
 OtherSetup=Ďalšie nastavenia
 CurrentValueSeparatorDecimal=Desatinný oddeľovač
 CurrentValueSeparatorThousand=Oddeľovač tisícov
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Destinácia
+IdModule=ID Modulu
+IdPermissions=ID Povolení
 Modules=Moduly
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Parametre lokalizácie
@@ -115,27 +120,27 @@ DaylingSavingTime=Letný čas
 CurrentHour=PHP Čas (server)
 CurrentSessionTimeOut=Časový limit súčasnej relácie
 YouCanEditPHPTZ=Ak chcete nastaviť iné časové pásmo PHP (nie je podmienkou), môžete skúsiť pridať súbor. Htacces s linkou, ako je tento &quot;TZ setenv Europe / Paris&quot;
-Box=Widget
-Boxes=Widgets
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Box=Panel
+Boxes=Panely
+MaxNbOfLinesForBoxes=Maximálny počet panelov
 PositionByDefault=Predvolené poradie
 Position=Pozícia
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=Menu manažér nastaví obsah dvoch menu panelov ( horizontálne a vertikálne)
+MenusEditorDesc=Menu editor vám umožní nastaviť vlastné položky menu. Použivajte opatrne abz ste predišli nestabilite a nedostupnosti menu. <br/> Niektoré moduly pridáte do menu ( v menu <b> Všetko </b> večšinou ) Ak niektoré položky odstránite omylom, možete ich obnoviť vypnutím a znova yapnutím.
 MenuForUsers=Menu pre užívateľov
 LangFile=súbor .lang
 System=Systém
 SystemInfo=Informácie o systéme
-SystemToolsArea=Systémové nástroje priestor
+SystemToolsArea=Priestor pre systémové nástroje
 SystemToolsAreaDesc=Táto oblasť poskytuje správu funkcií. V menu vyberte funkciu, ktorú hľadáte.
 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 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 file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
+PurgeAreaDesc=Táto stránka vám umožní zmazať všetky súbory vytvorené alebo uložené Dolibarrom (dočasné súbory alebo všetko v priečinku <b>%s</b>) Použitie tejto voľby nie je nutné. Voľba je určená akoobchádzka pre použiváteľov ktorým poskztovateľ hostingu neumožnuje zmazať súbory generované web servrom
+PurgeDeleteLogFile=Zmaztať log file <b>%s</b> definovaný pre Syslog modul ( bez risku straty dát)
+PurgeDeleteTemporaryFiles=Zmazať všetky dočasné súbory (bez risku straty dát)
 PurgeDeleteTemporaryFilesShort=Delete temporary files
 PurgeDeleteAllFilesInDocumentsDir=Odstráňte všetky súbory v adresári <b>%s.</b> Dočasné súbory, ale aj zálohovanie databázy skládky, súbory pripojené k prvkom (tretie strany, faktúry, ...) a vkladajú do modulu ECM, budú vymazané.
 PurgeRunNow=Vyčistiť teraz
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=Žiadne súbory alebo priečinky na zmazanie
 PurgeNDirectoriesDeleted=<b>%s</b> súbory alebo adresáre odstránené.
 PurgeAuditEvents=Vyčistiť všetky bezpečnostné udalosti
 ConfirmPurgeAuditEvents=Ste si istí, že chcete očistiť všetky bezpečnostné udalosti? Všetky bezpečnostné záznamy budú odstránené, bude žiadna ďalšia dáta budú odstránené.
@@ -176,18 +181,19 @@ EncodeBinariesInHexa=Zakódovať binárne dáta v hexadecimálnom tvare
 IgnoreDuplicateRecords=Ignorovať chyby duplicitných záznamov (INSERT ignorovať)
 AutoDetectLang=Autodetekcia (jazyk prehliadača)
 FeatureDisabledInDemo=Funkcia zakázaný v demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Oprávnenie
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Iba prvky z <a href="%s">povolených modulov</a> sú uvedené.
-ModulesDesc=Dolibarr moduly definujú, ktorá je povolená funkcia v softvéri. Niektoré moduly vyžadujú oprávnenia, musíte udeliť používateľom, po zapnutí modulu. Kliknite na tlačidlo ON / OFF v stĺpci &quot;Status&quot;, aby bol modul / funkcie.
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
+ModulesMarketPlaceDesc=Viac modulov na stiahnutie môžete nájst na internete
 ModulesMarketPlaces=Viac moduly ...
 DoliStoreDesc=DoliStore, oficiálny trh pre Dolibarr ERP / CRM externých modulov
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=Referenčná stránka pre nájdenie viacero modulov
 URL=Odkaz
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
+BoxesAvailable=Dostupné doplnky
+BoxesActivated=Aktivované doplnky
 ActivateOn=Aktivácia na
 ActiveOn=Aktivovaná
 SourceFile=Zdrojový súbor
@@ -210,8 +216,8 @@ OfficialWebSiteLocal=Local web site (%s)
 OfficialWiki=Dolibarr dokumentácie na Wiki
 OfficialDemo=Dolibarr on-line demo
 OfficialMarketPlace=Oficiálny trh pre externé moduly / addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+OfficialWebHostingService=Odkazované služby web hostingu ( Cloud hosting )
+ReferencedPreferredPartners=Preferovaní partneri
 OtherResources=Autres ressources
 ForDocumentationSeeWiki=Pre používateľov alebo vývojárov dokumentácie (doc, FAQs ...) <br> pozrite sa na Dolibarr Wiki: <br> <a href="%s" target="_blank"><b>%s</b></a>
 ForAnswersSeeForum=V prípade akýchkoľvek ďalších otázok / help, môžete použiť fórum Dolibarr: <br> <a href="%s" target="_blank"><b>%s</b></a>
@@ -246,8 +252,8 @@ ModulesSetup=Moduly nastavenie
 ModuleFamilyBase=Systém
 ModuleFamilyCrm=Riadenie vzťahov so zákazníkmi (CRM)
 ModuleFamilySrm=Supplier Relation Management (SRM)
-ModuleFamilyProducts=Products Management (PM)
-ModuleFamilyHr=Human Resource Management (HR)
+ModuleFamilyProducts=Správa produktov ( PM )
+ModuleFamilyHr=Správa ľudských zdrojov ( HR )
 ModuleFamilyProjects=Projekty / tímovú prácu
 ModuleFamilyOther=Ostatné
 ModuleFamilyTechnic=Multi-moduly náradie
@@ -260,22 +266,23 @@ MenuHandlers=Menu manipulátory
 MenuAdmin=Menu Editor
 DoNotUseInProduction=Nepoužívajte vo výrobe
 ThisIsProcessToFollow=To je nastavený tak, aby proces:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=Toto je alternatívne nastavenie pre postup:
 StepNb=Krok %s
 FindPackageFromWebSite=Nájsť balíčka, ktorý obsahuje funkciu, ktorú chcete (napr. na oficiálnych webových stránkach %s).
-DownloadPackageFromWebSite=Download package (for example from official web site %s).
-UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr server directory dedicated to external modules: <b>%s</b>
+DownloadPackageFromWebSite=Stiahnúť  balíček ( napr. z oficiálnej stránky %s ).
+UnpackPackageInDolibarrRoot=Rozbaľte balíček na server do priečinka určeného na externé moduly:  <b>%s</b>
 SetupIsReadyForUse=Inštalácia je dokončená a Dolibarr je pripravený na použitie s touto nový komponent.
 NotExistsDirect=Alternatívne koreňový adresár nie je definovaná. <br>
 InfDirAlt=Od verzie 3 je možné definovať alternatívny koreň directory.This umožňuje ukladať, rovnaké miesto, plug-iny a vlastné šablóny. <br> Stačí vytvoriť adresár v koreňovom adresári Dolibarr (napr.: vlastné). <br>
 InfDirExample=<br> Potom vyhlásiť ju v súbore conf.php <br> $ Dolibarr_main_url_root_alt = 'http://myserver/custom &quot; <br> $ Dolibarr_main_document_root_alt = '/ cesta / of / Dolibarr / htdocs / vlastný &quot; <br> * Tieto riadky sú okomentované znakom &quot;#&quot;, odkomentovať odobrať iba charakter.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
+YouCanSubmitFile=V tomto kroku, môžete poslať balíček použitím tohto nástroja: Vybrať modul
 CurrentVersion=Dolibarr aktuálna verzia
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
-UpdateServerOffline=Update server offline
+LastStableVersion= Najnovšia stabilná verzia
+LastActivationDate=Last activation date
+UpdateServerOffline=Aktualizovať server offline
 GenericMaskCodes=Môžete zadať akékoľvek masku číslovanie. V tejto maske, by mohli byť použité nasledovné značky: <br> <b>{000000}</b> zodpovedá množstvu, ktoré sa zvýšia na každej %s. Vložiť počet núl na požadovanú dĺžku pultu. Počítadlo sa vyplní nulami zľava, aby sa čo najviac nuly ako maska. <br> <b>{000000} 000</b> rovnako ako predchádzajúce, ale posun zodpovedá číslu na pravej strane znamienko + je aplikovaný začína na prvej %s. <br> <b>{000000 @ x}</b> rovnaká ako predchádzajúca, ale počítadlo sa resetuje na nulu, keď je mesiac x hodnoty (x medzi 1 a 12 alebo 0, používať prvých mesiacoch fiškálneho roka definované v konfigurácii, alebo 99 pre resetovanie na nulu každý mesiac ). Ak je táto voľba sa používa, a x je 2 alebo vyššia, potom postupnosť {yy} {mm} alebo {yyyy} {} mm je tiež potrebné. <br> <b>{Dd}</b> deň (01 až 31). <br> <b>{Mm}</b> mesiac (01 až 12). <br> <b>{Yy}, {RRRR}</b> alebo <b>{y}</b> ročne po dobu 2, 4 alebo 1 číslice. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Všetky ostatné znaky v maske zostanú nedotknuté. <br> Medzery nie sú povolené. <br>
 GenericMaskCodes4a=<u>Príklad na 99. %s tretej strany Thecompany vykonáva 2007-01-31:</u> <br>
 GenericMaskCodes4b=<u>Príklad na tretie osoby vytvorené na 03.1.2007:</u> <br>
@@ -294,7 +301,7 @@ UMaskExplanation=Tento parameter umožňuje definovať oprávnenia v predvolenom
 SeeWikiForAllTeam=Pozrite sa na wiki stránku pre kompletný zoznam všetkých účastníkov a ich organizácie
 UseACacheDelay= Oneskorenie pre ukladanie do medzipamäte export reakcie v sekundách (0 alebo prázdne bez vyrovnávacej pamäte)
 DisableLinkToHelpCenter=Skryť odkaz <b>&quot;Potrebujete pomoc či podporu&quot;</b> na prihlasovacej stránke
-DisableLinkToHelp=Hide link to online help "<b>%s</b>"
+DisableLinkToHelp=Skryť odkaz na online pomoc "<b>%s</b>"
 AddCRIfTooLong=Neexistuje žiadny automatický balení, takže ak linka je mimo stránky na dokumentoch, pretože príliš dlho, musíte pridať sami návrat vozíka do textového poľa.
 ConfirmPurge=Ste si istí, že chcete spustiť toto očistenie? <br> Tým dôjde k vymazaniu určite všetky dátové súbory žiadny spôsob, ako je obnoviť (ECM súbory, ktoré sú pripojené súbory, ...).
 MinLength=Minimálna dĺžka
@@ -315,7 +322,7 @@ ThemeDir=Skins adresár
 ConnectionTimeout=Connexion timeout
 ResponseTimeout=Reakcia timeout
 SmsTestMessage=Skúšobná správa od __ PHONEFROM__ do __ PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=Modul  <b>%s</b> musí byť aktívny ak potrebujete túto možnosť
 SecurityToken=Kľúč k zabezpečenej URL
 NoSmsEngine=Nie odosielateľ SMS manažér k dispozícii. SMS odosielateľa manažér nie sú nainštalované s predvolené rozloženie (pretože závisí na externom dodávateľom), ale môžete nájsť niektoré z %s
 PDF=PDF
@@ -324,14 +331,14 @@ PDFAddressForging=Pravidlá sa budujú adresy boxy
 HideAnyVATInformationOnPDF=Skryť všetky informácie týkajúce sa DPH na generované PDF
 HideDescOnPDF=Skryť opis výrobkov z vytvoreného PDF
 HideRefOnPDF=Skryť produkty čj. na vytvorené PDF
-HideDetailsOnPDF=Hide product lines details on generated PDF
+HideDetailsOnPDF=Skryť detaily produktu v generovanóm PDF
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=Knižnica
 UrlGenerationParameters=Parametre na zabezpečenie URL
 SecurityTokenIsUnique=Používame unikátny securekey parameter pre každú adresu URL
 EnterRefToBuildUrl=Zadajte odkaz na objekt %s
 GetSecuredUrl=Získajte vypočítanú URL
-ButtonHideUnauthorized=Skryť tlačidlá pre neautorizovaným zásahom miesto ukazuje zdravotným tlačidla
+ButtonHideUnauthorized=Skryť tlačítka pre non admin užívateľov kôli neoprávneným akciám namiesto zobrazenia sivých tlačidiel
 OldVATRates=Staré Sadzba DPH
 NewVATRates=Nová sadzba DPH
 PriceBaseTypeToChange=Zmeniť na cenách s hodnotou základného odkazu uvedeného na
@@ -349,17 +356,18 @@ ExtrafieldMail = E-mail
 ExtrafieldSelect = Vyberte zoznam
 ExtrafieldSelectList = Vyberte z tabuľky
 ExtrafieldSeparator=Oddeľovač
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Zaškrtávacie políčko
 ExtrafieldRadio=Prepínač
 ExtrafieldCheckBoxFromList= Checkbox from table
-ExtrafieldLink=Link to an object
+ExtrafieldLink=Odkaz na objekt
 ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
 ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
+LibraryToBuildPDF=Knižnica používaná pre generovanie PDF
 WarningUsingFPDF=Upozornenie: Váš <b>conf.php</b> obsahuje direktívu <b>dolibarr_pdf_force_fpdf = 1.</b> To znamená, že môžete používať knižnicu FPDF pre generovanie PDF súborov. Táto knižnica je stará a nepodporuje mnoho funkcií (Unicode, obraz transparentnosť, azbuka, arabské a ázijské jazyky, ...), takže môže dôjsť k chybám pri generovaní PDF. <br> Ak chcete vyriešiť tento a majú plnú podporu generovanie PDF, stiahnite si <a href="http://www.tcpdf.org/" target="_blank">TCPDF knižnice</a> , potom komentár alebo odstrániť riadok <b>$ dolibarr_pdf_force_fpdf = 1,</b> a namiesto neho doplniť <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir &quot;</b>
 LocalTaxDesc=Some countries apply 2 or 3 taxes on each invoice line. If this is the case, choose type for second and third tax and its rate. Possible type are:<br>1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)<br>2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)<br>3 : local tax apply on products without vat (localtax is calculated on amount without tax)<br>4 : local tax apply on products including vat (localtax is calculated on amount + main vat)<br>5 : local tax apply on services without vat (localtax is calculated on amount without tax)<br>6 : local tax apply on services including vat (localtax is calculated on amount + tax)
 SMS=SMS
@@ -371,23 +379,26 @@ DefaultLink=Východiskový odkaz
 SetAsDefault=Set as default
 ValueOverwrittenByUserSetup=Pozor, táto hodnota môže byť prepísaná užívateľom špecifické nastavenia (každý užívateľ môže nastaviť vlastné clicktodial url)
 ExternalModule=Externý modul - inštalovaný do adresára %s
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Init value for next %s empty records
-EraseAllCurrentBarCode=Erase all current barcode values
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values ?
-AllBarcodeReset=All barcode values have been removed
+BarcodeInitForThirdparties=Masové načítanie čiarových kódov pre tretie osoby
+BarcodeInitForProductsOrServices=Masové načítanie čiarových kódov alebo reset pre produkty alebo služby
+CurrentlyNWithoutBarCode=Aktuálne máte <strong>%s</strong> záznamov na <strong>%s</strong> %s bez definovaného čiarového kódu
+InitEmptyBarCode=Načítať hodnotu pre %s prázdne hodnoty
+EraseAllCurrentBarCode=Zmazať aktuálne hodnoty čiarových kódov
+ConfirmEraseAllCurrentBarCode=Určite chcete zamazať aktuálne hodnoty čiarových kódov ?
+AllBarcodeReset=Hodnoty čiarových kódov boli zmazané
 NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled into barcode module setup.
 EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Používatelia a skupiny
@@ -428,8 +439,8 @@ Module55Name=Čiarové kódy
 Module55Desc=Barcode riadenie
 Module56Name=Telefónia
 Module56Desc=Telefónia integrácia
-Module57Name=Trvalé príkazy
-Module57Desc=Správa trvalých príkazov a peňažných výberov. Obsahuje tiež generovanie SEPA súborov pre európske krajiny.
+Module57Name=Objednávky platené bankovým prevodom
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrácia ClickToDial systému (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -451,55 +462,55 @@ Module200Desc=LDAP synchronizácia adresárov
 Module210Name=PostNuke
 Module210Desc=PostNuke integrácia
 Module240Name=Exporty dát
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=Nástroje pre export  Dolibarr dát ( s asistentom )
 Module250Name=Import dát
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=Nástroje pre import Dolibarr dát ( s asistentom )
 Module310Name=Členovia
 Module310Desc=Nadácia členovia vedenia
 Module320Name=RSS Feed
 Module320Desc=Pridať RSS kanál vnútri obrazoviek Dolibarr
 Module330Name=Záložky
-Module330Desc=Bookmarks management
+Module330Desc=Správca záložiek
 Module400Name=Projekty/Príležitosti/Vyhliadky
 Module400Desc=Riadenie projektov, príležitostí alebo vyhliadok. Môžete priradiť ľubovoľný prvok (faktúra, objednávka, návrh, intervencia, ...) k projektu a získať priečny pohľad z pohľadu projektu.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integrácia
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
-Module520Name=Loan
-Module520Desc=Management of loans
+Module500Name=špeciálne rozšírenia
+Module500Desc=Správca špeciálnych rozšírení ( dane, sociálne a fiškálne dane, dividendy )
+Module510Name=Zamestnanecké zmluvy a platy
+Module510Desc=Spravovanie zamestnaneckých zmlúv, platov a platieb
+Module520Name=Pôžička
+Module520Desc=Správca pôžičiek
 Module600Name=Upozornenie
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Dary
 Module700Desc=Darovanie riadenie
 Module770Name=Expense reports
 Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module1120Name=Dodávateľský obchodný návrh
+Module1120Desc=Vyžiadať dodávateľskú obchodnú ponuku a ceny
 Module1200Name=Mantis
 Module1200Desc=Mantis integrácia
 Module1400Name=Účtovníctvo
 Module1400Desc=Vedenie účtovníctva (dvojité strany)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
+Module1520Name=Generovanie dokumentov
+Module1520Desc=Masové emailové generovanie dokumentov
 Module1780Name=Štítky / Kategórie
 Module1780Desc=Vytvorte štítky / kategórie (produkty, zákazníkov, dodávateľov, kontakty alebo členov)
 Module2000Name=WYSIWYG editor
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
-Module2200Name=Dynamic Prices
-Module2200Desc=Enable the usage of math expressions for prices
+Module2000Desc=Povoliť úpravu niektorého textu použitím rozšíreného oditora ( Založené na CKEditor )
+Module2200Name=Dynamická cena
+Module2200Desc=Zapnúť používanie matematických výrazov pre ceny
 Module2300Name=Cron
 Module2300Desc=Správa plánovaných úloh
-Module2400Name=Agenda/Events
+Module2400Name=Agenda/Udalosti
 Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
 Module2500Name=Elektronický Redakčný
 Module2500Desc=Uložiť a zdieľať dokumenty
-Module2600Name=API/Web services (SOAP server)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API/Web services (REST server)
-Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2600Name=API/Webové služby ( SOAP server )
+Module2600Desc=Spustiť Dolibarr SOAP server ponukajúci služby API
+Module2610Name=API/Web služby  ( REST server )
+Module2610Desc=Zapnúť Dolibarr REST server ponúkajúci API službu
 Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
@@ -508,7 +519,7 @@ Module2800Desc=FTP klient
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverzie možnosti
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=Pridať Skype tlačidlo na úžívateľskú kartu používateľa / tretej osoby / kontaktu
 Module4000Name=HRM
 Module4000Desc=Human resources management
 Module5000Name=Multi-spoločnosť
@@ -517,22 +528,22 @@ Module6000Name=Workflow
 Module6000Desc=Workflow management
 Module10000Name=Websites
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
-Module20000Name=Leave Requests management
+Module20000Name=Opustiť správcu požiadaviek
 Module20000Desc=Declare and follow employees leaves requests
 Module39000Name=Product lot
 Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
 Module50000Name=Paybox
 Module50000Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paybox
 Module50100Name=Bod predaja
-Module50100Desc=Point of sales module (POS).
+Module50100Desc=Modul predajné miesta ( POS )
 Module50200Name=Paypal
 Module50200Desc=Modul ponúknuť on-line platby kreditnou kartou stránku s Paypal
-Module50400Name=Accounting (advanced)
+Module50400Name=Učtovníctvo (pokročilé)
 Module50400Desc=Accounting management (double parties)
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Poll, Survey or Vote
-Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Anketa, Dotazník, Hlasovanie
+Module55000Desc=Modul pre vytváranie online dotazníkov a hlasovaní ( ako : Doodle, Studs, Rdvz, ...)
 Module59000Name=Okraje
 Module59000Desc=Modul pre správu marže
 Module60000Name=Provízie
@@ -570,7 +581,7 @@ Permission71=Prečítajte členov
 Permission72=Vytvoriť / upraviť členov
 Permission74=Zmazať členov
 Permission75=Nastaviť typy členstva
-Permission76=Export data
+Permission76=Exportovať data
 Permission78=Prečítajte si predplatné
 Permission79=Vytvoriť / upraviť predplatné
 Permission81=Prečítajte objednávky odberateľov
@@ -580,10 +591,10 @@ Permission86=Poslať objednávky odberateľov
 Permission87=Zavrieť zákazníkov objednávky
 Permission88=Storno objednávky odberateľov
 Permission89=Odstrániť objednávky odberateľov
-Permission91=Read social or fiscal taxes and vat
-Permission92=Create/modify social or fiscal taxes and vat
-Permission93=Delete social or fiscal taxes and vat
-Permission94=Export social or fiscal taxes
+Permission91=Čítať sociálne alebo fiškálne dane a DPH
+Permission92=Vytvoriť/Upraviť sociálne alebo fiškálne dane a DPH
+Permission93=Zmazať sociálne alebo fiškálne dane a DPH
+Permission94=Exportovať sociálne alebo fiškálne dane
 Permission95=Prečítajte si správy
 Permission101=Prečítajte si sendings
 Permission102=Vytvoriť / upraviť sendings
@@ -601,15 +612,15 @@ Permission121=Prečítajte tretej strany v súvislosti s užívateľmi
 Permission122=Vytvoriť / modifikovať tretie strany spojené s používateľmi
 Permission125=Odstránenie tretej strany v súvislosti s užívateľmi
 Permission126=Export tretej strany
-Permission141=Read all projects and tasks (also private projects i am not contact for)
-Permission142=Create/modify all projects and tasks (also private projects i am not contact for)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+Permission141=Čítať projekty a úlohy ( taktiež súkromné projekty pre ktoré niesom kontakt )
+Permission142=Vytvoriť/Upraviť projekty a úlohy ( taktiež súkromné projekty pre ktoré nie som kontakt )
+Permission144=Zmazať projekty a úlohy ( taktiež súkromné projekty pre ktoré nie som kontakt )
 Permission146=Prečítajte si poskytovatelia
 Permission147=Prečítajte si štatistiky
-Permission151=Prečítajte si trvalé príkazy
-Permission152=Vytvoriť / upraviť trvalých príkazov žiadosť
-Permission153=Prevodovka trvalých príkazov príjmy
-Permission154=Kredit / odmietnuť trvalých príkazov príjmy
+Permission151=Read direct debit payment orders
+Permission152=Vytvoriť/Upraviť inkaso objednávku
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Prečítajte si zákazky / predplatné
 Permission162=Vytvoriť / upraviť zákazky / predplatné
 Permission163=Aktivovať službu / predplatné zmluvy
@@ -694,15 +705,15 @@ Permission401=Prečítajte zľavy
 Permission402=Vytvoriť / upraviť zľavy
 Permission403=Overiť zľavy
 Permission404=Odstrániť zľavy
-Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission510=Čítať mzdy
+Permission512=Vytvoriť/Upraviť mzdy
+Permission514=Zmazať platy
+Permission517=Exportovať platy
+Permission520=Čítať pôžičky
+Permission522=Vytvoriť/Upraviť pôžičky
+Permission524=Zmazať pôžičky
+Permission525=Pôžičková kalkulačka
+Permission527=Exportovať pôžičku
 Permission531=Prečítajte služby
 Permission532=Vytvoriť / upraviť služby
 Permission534=Odstrániť služby
@@ -735,7 +746,7 @@ Permission1185=Schváliť dodávateľských objednávok
 Permission1186=Objednávky Objednať dodávateľ
 Permission1187=Potvrdenie prijatia dodávateľských objednávok
 Permission1188=Odstrániť dodávateľských objednávok
-Permission1190=Approve (second approval) supplier orders
+Permission1190=Schváliť ( 2. schválenie ) dodávateľská objednávka
 Permission1201=Získajte výsledok exportu
 Permission1202=Vytvoriť / Upraviť vývoz
 Permission1231=Prečítajte si dodávateľskej faktúry
@@ -747,6 +758,7 @@ Permission1236=Export dodávateľské faktúry, atribúty a platby
 Permission1237=Export dodávateľské objednávky a informácie o nich
 Permission1251=Spustiť Hmotné dovozy externých dát do databázy (načítanie dát)
 Permission1321=Export zákazníkov faktúry, atribúty a platby
+Permission1322=Reopen a paid bill
 Permission1421=Export objednávok zákazníkov a atribúty
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -775,44 +787,48 @@ Permission50101=Použite mieste predaja
 Permission50201=Prečítajte transakcie
 Permission50202=Importné operácie
 Permission54001=Vytlačiť
-Permission55001=Read polls
-Permission55002=Create/modify polls
-Permission59001=Read commercial margins
-Permission59002=Define commercial margins
+Permission55001=Čítať anekety
+Permission55002=Vytvoriť/Upraviť anketu
+Permission59001=Čítať komerčné marže
+Permission59002=Definovať komerčné marže
 Permission59003=Read every user margin
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=Prospect potential level
-DictionaryCanton=State/Province
-DictionaryRegion=Regions
-DictionaryCountry=Countries
-DictionaryCurrency=Currencies
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Social or fiscal taxes types
-DictionaryVAT=VAT Rates or Sales Tax Rates
-DictionaryRevenueStamp=Amount of revenue stamps
-DictionaryPaymentConditions=Payment terms
-DictionaryPaymentModes=Payment modes
-DictionaryTypeContact=Contact/Address types
-DictionaryEcotaxe=Ecotax (WEEE)
-DictionaryPaperFormat=Paper formats
-DictionaryFees=Types of fees
-DictionarySendingMethods=Shipping methods
-DictionaryStaff=Staff
-DictionaryAvailability=Delivery delay
-DictionaryOrderMethods=Ordering methods
-DictionarySource=Origin of proposals/orders
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=Typy tretích osôb
+DictionaryCompanyJuridicalType=Právne formy tretích osôb
+DictionaryProspectLevel=Úroveň možnej vyhlidky
+DictionaryCanton=Kraj
+DictionaryRegion=Okres
+DictionaryCountry=Štáty
+DictionaryCurrency=Platobné meny
+DictionaryCivility=Osobný a profesionálny titul
+DictionaryActions=Typy udalostí agendy
+DictionarySocialContributions=Typy sociálnych alebo fiškálnych daní
+DictionaryVAT=Sadzby DPH alebo Sociálnej dane
+DictionaryRevenueStamp=Množstvo kolkov
+DictionaryPaymentConditions=Podmienky platby
+DictionaryPaymentModes=Metódy platby
+DictionaryTypeContact=Kontakt/Adresa
+DictionaryEcotaxe=Ekologická daň
+DictionaryPaperFormat=Papierový formát
+DictionaryFees=Poplatky
+DictionarySendingMethods=Možnosti doručenia
+DictionaryStaff=Zamestnanec
+DictionaryAvailability=Oneskorenie doručenia
+DictionaryOrderMethods=Možnosti objednávky
+DictionarySource=Pôvod ponuky / objednávky
 DictionaryAccountancyCategory=Accounting categories
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
-DictionaryUnits=Units
+DictionaryAccountancysystem=Modely účtovných osnov
+DictionaryEMailTemplates=Šablóny emailov
+DictionaryUnits=Jednotky
 DictionaryProspectStatus=Prospection status
 DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
+DictionaryOpportunityStatus=Status príležitosti pre projekt/vedenie
 SetupSaved=Nastavenie uložené
 BackToModuleList=Späť na zoznam modulov
-BackToDictionaryList=Back to dictionaries list
+BackToDictionaryList=Napäť do zoznamu slovníkov
 VATManagement=DPH riadenia
 VATIsUsedDesc=By default when creating prospects, invoices, orders etc the VAT rate follows the active standard rule:<br>If the seller is not subjected to VAT, then VAT defaults to 0. End of rule.<br>If the (selling country= buying country), then the VAT by default equals the VAT of the product in the selling country. End of rule. <br>If seller and buyer are both in the European Community and goods are transport products (car, ship, plane), the default VAT is 0 ( The VAT should be paid by the buyer to the customoffice of his country and not to the seller). End of rule.<br>If seller and buyer are both in the European Community and the buyer is not a company, then the VAT by defaults to the VAT of the product sold.  End of rule.<br>If seller and buyer are both in the European Community and the buyer is a company, then the VAT is 0 by default . End of rule.<br>In any othe case the proposed default is VAT=0. End of rule.
 VATIsNotUsedDesc=V predvolenom nastavení je navrhovaná DPH 0, ktorý možno použiť v prípadoch, ako je združenie jednotlivcov ou malých podnikov.
@@ -842,17 +858,18 @@ LocalTax2IsUsedDescES= RE sadzba v predvolenom nastavení pri vytváraní vyhlia
 LocalTax2IsNotUsedDescES= V predvolenom nastavení je navrhovaná IRPF je 0. Koniec vlády.
 LocalTax2IsUsedExampleES= V Španielsku, na voľnej nohe a nezávislí odborníci, ktorí poskytujú služby a firmy, ktorí sa rozhodli daňového systému modulov.
 LocalTax2IsNotUsedExampleES= V Španielsku sú bussines, ktoré nie sú predmetom daňového systému modulov.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
+CalcLocaltax=Vypisy lokálnej dane
+CalcLocaltax1=Predaj - Platba
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2=Purchases
+CalcLocaltax2=Platby
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3=Sales
+CalcLocaltax3=Predaje
 CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
 LabelUsedByDefault=Label používa v predvolenom nastavení, pokiaľ nie je preklad možno nájsť kód
 LabelOnDocuments=Štítok na dokumenty
 NbOfDays=Nb dní
 AtEndOfMonth=Na konci mesiaca
+CurrentNext=Current/Next
 Offset=Ofset
 AlwaysActive=Vždy aktívny
 Upgrade=Vylepšiť
@@ -887,7 +904,7 @@ DefaultMenuSmartphoneManager=Smartphone Ponuka manažér
 Skin=Skin téma
 DefaultSkin=Default skin téma
 MaxSizeList=Maximálna dĺžka zoznamu
-DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeList=Základná max. dĺžka zoznamu
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=Správa dňa
 MessageLogin=Prihlasovacia stránka správu
@@ -903,13 +920,13 @@ CompanyZip=Zips
 CompanyTown=Mesto
 CompanyCountry=Krajina
 CompanyCurrency=Hlavná mena
-CompanyObject=Object of the company
+CompanyObject=Objekt spoločnosti
 Logo=Logo
 DoNotSuggestPaymentMode=Nenaznačujú
 NoActiveBankAccountDefined=Žiadny aktívny bankový účet definovaný
 OwnerOfBankAccount=Majiteľ %s bankových účtov
 BankModuleNotActive=Účty v bankách modul nie je povolený,
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Zobraziť odkaz "<strong>%s</strong>"
 Alerts=Upozornenie
 DelaysOfToleranceBeforeWarning=Tolerancia oneskorenie pred varovanie
 DelaysOfToleranceDesc=Táto obrazovka umožňuje definovať tolerovať oneskorenie pred upozornenie je hlásený na obrazovke s %s Piktogram pre každý neskoré prvok.
@@ -928,29 +945,29 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Tolerancia oneskorenie (v dňoch) p
 Delays_MAIN_DELAY_MEMBERS=Tolerancia oneskorenie (v dňoch) pred záznam o meškaní členského poplatku
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tolerancia oneskorenie (v dňoch) pred pohotovosti pre kontrolu vklad robiť
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
+SetupDescription1=Oblasť nastavení je pre základné nastavenia pre začatím používania Dolubarru
 SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
 SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
 SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
 SetupDescription5=Ostatné položky menu spravovať voliteľné parametre.
 LogEvents=Udalosti bezpečnostný audit
 Audit=Audit
-InfoDolibarr=About Dolibarr
-InfoBrowser=About Browser
-InfoOS=About OS
-InfoWebServer=About Web Server
-InfoDatabase=About Database
-InfoPHP=About PHP
-InfoPerf=About Performances
-BrowserName=Browser name
-BrowserOS=Browser OS
+InfoDolibarr=O Dolibarre
+InfoBrowser=O prehliadači
+InfoOS=O OS
+InfoWebServer=O Web Servri
+InfoDatabase=O Databaze
+InfoPHP=O PHP
+InfoPerf=Info o výkone
+BrowserName=Meno prehliadača
+BrowserOS=OS prehliadača
 ListOfSecurityEvents=Zoznam Dolibarr udalostí zabezpečenia
 SecurityEventsPurged=Bezpečnostnej akcie očistil
 LogEventDesc=Môžete povoliť tu zapisovanie udalostí Dolibarr zabezpečenia. Správcovia môžu potom vidieť jeho obsah pomocou <b>nástrojov systému</b> menu <b>- audit.</b> Pozor, táto funkcia môže spotrebovať veľké množstvo dát v databáze.
 AreaForAdminOnly=Tieto vlastnosti môžu byť použité <b>správcom užívateľa.</b>
 SystemInfoDesc=Systémové informácie je rôzne technické informácie získate v režime iba pre čítanie a viditeľné len pre správcov.
 SystemAreaForAdminOnly=Táto oblasť je k dispozícii pre správcu užívateľa. Žiadny z Dolibarr oprávnenia môže znížiť tento limit.
-CompanyFundationDesc=Úpravy na tejto stránke všetky známe informácie o spoločnosti alebo nadácie, ktoré potrebujete k riadeniu (K tomu, kliknite na tlačidlo &quot;Upraviť&quot; v dolnej časti stránky)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Môžete si vybrať každý parameter týkajúce sa vzhľadu Dolibarr a cítiť sa tu
 AvailableModules=Dostupné moduly
 ToActivateModule=Pre aktiváciu modulov, prejdite na nastavenie priestoru (Domov-&gt; Nastavenie-&gt; Modules).
@@ -963,9 +980,9 @@ TriggerDisabledAsModuleDisabled=Trigger v tomto súbore sú zakázané ako modul
 TriggerAlwaysActive=Trigger v tomto súbore sú vždy aktívne, či už sú aktivované Dolibarr moduly.
 TriggerActiveAsModuleActive=Trigger v tomto súbore sú aktívne ako modul <b>%s</b> je povolené.
 GeneratedPasswordDesc=Definujte tu pravidlo, ktoré chcete použiť na vytvorenie nového hesla, ak sa spýtate mať automaticky generované heslo
-DictionaryDesc=Insert all reference data. You can add your values to the default.
+DictionaryDesc=Vložte referenčné data. Môžete pridať vaše hodnoty ako základ
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
-MiscellaneousDesc=All other security related parameters are defined here.
+MiscellaneousDesc=Ostatné bezpečnostné parametre sú definované tu.
 LimitsSetup=Limity / Presné nastavenie
 LimitsDesc=Môžete definovať limity, upresnenie a optimalizácia používané Dolibarr tu
 MAIN_MAX_DECIMALS_UNIT=Max desatinná pre jednotkových cien
@@ -1012,8 +1029,8 @@ MAIN_PROXY_PASS=Heslo používať proxy server
 DefineHereComplementaryAttributes=Definujte tu všetky atribúty, ktoré ešte nie sú k dispozícii v predvolenom nastavení, a že chcete byť podporované %s.
 ExtraFields=Doplnkové atribúty
 ExtraFieldsLines=Doplnkové atribúty (linky)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Doplnkové hodnoty ( riadky objednávky ) 
+ExtraFieldsSupplierInvoicesLines=Doplnkové hodnoty ( riadky faktúry ) 
 ExtraFieldsThirdParties=Doplnkové atribúty (thirdparty)
 ExtraFieldsContacts=Doplnkové atribúty (kontakt / adresa)
 ExtraFieldsMember=Doplnkové atribúty (člen)
@@ -1024,15 +1041,23 @@ ExtraFieldsSupplierInvoices=Doplnkové atribúty (faktúry)
 ExtraFieldsProject=Doplnkové atribúty (projekty)
 ExtraFieldsProjectTask=Doplnkové atribúty (úlohy)
 ExtraFieldHasWrongValue=Atribút %s má nesprávnu hodnotu.
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=iba alfanumerické a malé znaky bez medzier
 SendmailOptionNotComplete=Upozornenie na niektorých operačných systémoch Linux, posielať e-maily z vášho e-mailu, musíte sendmail prevedenie inštalácie obsahuje voľbu-BA (parameter mail.force_extra_parameters do súboru php.ini). Ak niektorí príjemcovia nikdy prijímať e-maily, skúste upraviť tento parameter spoločne s PHP mail.force_extra_parameters =-BA).
 PathToDocuments=Cesta k dokumentom
 PathDirectory=Adresár
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Konfigurácia de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TranslationSetup=Nastavenie prekladu
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TotalNumberOfActivatedModules=Počet aktivovaných modulov :  <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
 ClassNotFoundIntoPathWarning=Trieda %s nenašli cestu do PHP
 YesInSummer=Áno v lete
@@ -1040,22 +1065,22 @@ OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are op
 SuhosinSessionEncrypt=Úložisko relácie šifrovaná Suhosin
 ConditionIsCurrently=Podmienkou je v súčasnej dobe %s
 YouUseBestDriver=Pomocou ovládača %s, že je najlepší vodič súčasnej dobe k dispozícii.
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
+YouDoNotUseBestDriver=Používate jednotku %s ale odporúčaná jednotka je %s
 NbOfProductIsLowerThanNoPb=Máte len %s produktov / služieb do databázy. To však nie je nutné žiadne špeciálne optimalizácie.
 SearchOptim=Optimalizácia pre vyhľadávače
 YouHaveXProductUseSearchOptim=Máte %s produkt do databázy. Mali by ste pridať konštantný PRODUCT_DONOTSEARCH_ANYWHERE do 1 do Home-Nastavenie-Ostatné, môžete obmedziť vyhľadávanie na začiatku reťazca, ktoré umožňujú pre databázy používať index, a vy by ste mali dostať okamžitú odpoveď.
 BrowserIsOK=Používate %s webovom prehliadači. Tento prehliadač je v poriadku pre bezpečnosť a výkon.
 BrowserIsKO=Používate %s webovom prehliadači. Tento prehliadač je známe, že zlá voľba pre bezpečnosť, výkon a spoľahlivosť. Sme Odporúčam vám používať Firefox, Chrome, Operu alebo Safari.
-XDebugInstalled=XDebug is loaded.
+XDebugInstalled=XDebug je načítaný
 XCacheInstalled=XCache načítaný.
 AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
 AskForPreferredShippingMethod=Ask for preferred Sending Method for Third Parties.
 FieldEdition=Vydanie poľných %s
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
+FillThisOnlyIfRequired=Príklad: +2 ( vyplňte iba ak sú predpokladané problémy s časovým posunom )
+GetBarCode=Získať čiarový kód
 ##### Module password generation
 PasswordGenerationStandard=Späť heslo generované podľa interného algoritmu Dolibarr: 8 znakov obsahujúci zdieľanej čísla a znaky malými písmenami.
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
+PasswordGenerationNone=Heslo musí byť vložené manuálne
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=According to your configuration
 PasswordPatternDesc=Password pattern description
@@ -1080,8 +1105,8 @@ WatermarkOnDraft=Vodoznak na návrhu dokumentu
 JSOnPaimentBill=Activate feature to autofill payment lines on payment form
 CompanyIdProfChecker=Pravidlá pre profesionálne IDs
 MustBeUnique=Musí byť jedinečný?
-MustBeMandatory=Mandatory to create third parties ?
-MustBeInvoiceMandatory=Mandatory to validate invoices ?
+MustBeMandatory=Potrebné pre vytvorenie tretej strany ?
+MustBeInvoiceMandatory=Potrebné pre overenie faktúr ?
 Miscellaneous=Zmiešaný
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Export odkaz na <b>%s</b> formáte je k dispozícii na nasledujúcom odkaze: %s
@@ -1136,9 +1161,9 @@ WatermarkOnDraftInterventionCards=Vodoznak na dokumentoch intervenčných karty
 ##### Contracts #####
 ContractsSetup=Nastaviť modul Zmluvy / Predplatné
 ContractsNumberingModules=Zákazky číslovanie moduly
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Modely zmlúv
+FreeLegalTextOnContracts=Poznámka k zmluve
+WatermarkOnDraftContractCards=Vodoznak na návrhy zmluvy ( nie ak prázdne ) 
 ##### Members #####
 MembersSetup=Členovia modul nastavenia
 MemberMainOptions=Hlavné voľby
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Použiť TLS
 LDAPServerUseTLSExample=Váš server LDAP použitie TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Kompletné DN (ex: cn = admin, dc = priklad, dc = com)
+LDAPAdminDnExample=Úplna doména (pr: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com pre aktívny priečinok )
 LDAPPassword=Heslo správcu
 LDAPUserDn=DN užívateľov
 LDAPUserDnExample=Kompletné DN (ex: ou = používatelia, dc = priklad, dc = com)
@@ -1248,8 +1273,8 @@ LDAPFieldTownExample=Príklad: l
 LDAPFieldCountry=Krajina
 LDAPFieldDescription=Popis
 LDAPFieldDescriptionExample=Príklad: opis
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
+LDAPFieldNotePublic=Verejná poznámka
+LDAPFieldNotePublicExample=Príklad: verejná poznámka
 LDAPFieldGroupMembers= Členovia skupiny
 LDAPFieldGroupMembersExample= Príklad: uniqueMember
 LDAPFieldBirthdate=Dátum narodenia
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Príklad: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Príklad: objectSID
 LDAPFieldEndLastSubscription=Dátum ukončenia predplatného
-LDAPFieldTitle=Post / Funkcia
+LDAPFieldTitle=Poradie úlohy
 LDAPFieldTitleExample=Príklad: title
 LDAPSetupNotComplete=Nastavenie LDAP nie je úplná (prejdite na záložku Iné)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Žiadny správcu alebo heslo k dispozícii. LDAP prístup budú anonymné a iba pre čítanie.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produkty a služby moduly nastavenie
 NumberOfProductShowInSelect=Maximálny počet výrobkov v kombá vyberte zoznamy (0 = bez obmedzenia)
 ViewProductDescInFormAbility=Vizualizácia popisy produktov vo formách (inak ako vyskakovacie bubline)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Vizualizácia Popisy výrobkov v thirdparty jazyku
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Použť vyhľadávací formulár pre výber produktu (namiesto rozbaľovacieho zoznamu).
 SetDefaultBarcodeTypeProducts=Predvolený typ čiarového kódu použiť pre produkty
@@ -1327,13 +1352,13 @@ BarcodeDescUPC=Čiarových kódov typu UPC
 BarcodeDescISBN=Čiarový kód typu ISBN
 BarcodeDescC39=Čiarový kód typu C39
 BarcodeDescC128=Čiarový kód typu C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
+BarcodeDescDATAMATRIX=Čiarový kód typu Datamatrix
+BarcodeDescQRCODE=Čiarový kód typu QR code
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Vnútorná motor
-BarCodeNumberManager=Manager to auto define barcode numbers
+BarCodeNumberManager=Správca pre automatické definovanie čísla čiarového kódu
 ##### Prelevements #####
-WithdrawalsSetup=Odstúpenie modul nastavenia
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Externé RSS dovoz Nastavenie
 NewRSS=New RSS Feed
@@ -1343,7 +1368,7 @@ RSSUrlExample=Zaujímavý RSS zdroj
 MailingSetup=E-mailom Nastavenie modulu
 MailingEMailFrom=Odosielateľa (From) pre emailov zasielaných e-mailom na modul
 MailingEMailError=Späť E-mail (chyby-do) e-maily s chybami
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Po poslaní ďalšej správy čakať (sec)
 ##### Notification #####
 NotificationSetup=Nastavenie modulu e-mailových upozornení
 NotificationEMailFrom=Odosielateľa (From) e-maily zaslané na oznámenia
@@ -1354,7 +1379,7 @@ SendingsReceiptModel=Odoslanie potvrdenky modelu
 SendingsNumberingModules=Sendings číslovanie moduly
 SendingsAbility=Support shipping sheets for customer deliveries
 NoNeedForDeliveryReceipts=Vo väčšine prípadov sú sendings príjmy použité ako listov pre dodávky zákazníkom (zoznam výrobkov na odoslanie) a na hárkoch, ktoré je recevied a podpísaný zákazníkom. Takže dodávok výrobkov príjmy je duplicitné funkcie a je zriedka aktivovaný.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Pozámka pre doručovateľa
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Produkty dodávky príjem číslovanie modul
 DeliveryOrderModel=Produkty dodávky prijatie modelu
@@ -1405,10 +1430,10 @@ DeleteMenu=Zmazať položku ponuky
 ConfirmDeleteMenu=Ste si istí, že chcete zmazať <b>%s</b> položka menu?
 FailedToInitializeMenu=Failed to initialize menu
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=Nastavenie modulu Dane, sociálne a fiškálne dane a dividendy
 OptionVatMode=DPH z dôvodu
-OptionVATDefault=Cash basis
-OptionVATDebitOption=Accrual basis
+OptionVATDefault=Hotovostný základ
+OptionVATDebitOption=Základ nárastu
 OptionVatDefaultDesc=DPH je splatná: <br> - Na dobierku za tovar (používame dátumu vystavenia faktúry) <br> - Platby za služby
 OptionVatDebitOptionDesc=DPH je splatná: <br> - Na dobierku za tovar (používame dátumu vystavenia faktúry) <br> - Na faktúru (debetné) na služby
 SummaryOfVatExigibilityUsedByDefault=Time of VAT exigibility by default according to chosen option:
@@ -1440,13 +1465,13 @@ ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a so
 ##### Point Of Sales (CashDesk) #####
 CashDesk=Bod predaja
 CashDeskSetup=Mieste predaja modulu nastavenie
-CashDeskThirdPartyForSell=Default generic third party to use for sells
+CashDeskThirdPartyForSell=Základná tretia osoba pre predaj
 CashDeskBankAccountForSell=Predvolený účet použiť na príjem platieb v hotovosti
 CashDeskBankAccountForCheque= Predvolený účet použiť pre príjem platieb šekom
 CashDeskBankAccountForCB= Predvolený účet použiť pre príjem platieb prostredníctvom kreditnej karty
 CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
 CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
-StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabled=Odpočítavanie skladu z miesta predaja vypnuté
 StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
 CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
 ##### Bookmark #####
@@ -1459,12 +1484,12 @@ WebServicesDesc=Tým, že tento modul, Dolibarr stal webový server služby posk
 WSDLCanBeDownloadedHere=WSDL deskriptor súbory poskytovaných služieb možno stiahnuť tu
 EndPointIs=SOAP klienti musia poslať svoje požiadavky na koncový bod Dolibarr k dispozícii na adrese
 ##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
+ApiSetup=Nastavenie API modulu
+ApiDesc=Zapnutím tohto modulu získate rôzne služby REST servra
 ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
-ApiExporerIs=You can explore the APIs at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
+ApiExporerIs=API možete preskúmať na adrese
+OnlyActiveElementsAreExposed=Iba prvky zapnutého modulu sú odhalené
+ApiKey=Kľúč pre API
 ##### Bank #####
 BankSetupModule=Bankové modul nastavenia
 FreeLegalTextOnChequeReceipts=Voľný text na kontroly príjmov
@@ -1482,7 +1507,7 @@ SuppliersSetup=Dodávateľ modul nastavenia
 SuppliersCommandModel=Kompletná šablóna sa s dodávateľmi poriadku (logo. ..)
 SuppliersInvoiceModel=Kompletná šablóna dodávateľskej faktúry (logo. ..)
 SuppliersInvoiceNumberingModel=Dodávateľských faktúr číslovanie modelov
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+IfSetToYesDontForgetPermission=Ak nastavené ANO, nezabudnite poskytnúť povolenia pre skupiny alebo užívateľov oprávnených pre povoľovanie 2. stupňa
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modul nastavenia
 PathToGeoIPMaxmindCountryDataFile=Cesta k súboru obsahujúci MaxMind IP pre krajiny preklade. <br> Príklady: <br> / Usr / local / share / GeoIP / GeoIP.dat <br> / Usr / share / GeoIP / GeoIP.dat
@@ -1496,80 +1521,82 @@ ProjectsSetup=Projekt modul nastavenia
 ProjectsModelModule=Projekt správy Vzor dokladu
 TasksNumberingModules=Úlohy číslovanie modul
 TaskModelModule=Úlohy správy Vzor dokladu
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
+UseSearchToSelectProject=Použiť automatické doplňanie pre výber projektu ( namiesto použitia okna so zoznamom )
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-AlwaysEditable=Can always be edited
+FiscalYears=Fiškálne roky
+FiscalYearCard=Karta fiškálneho roka
+NewFiscalYear=Nový fiškálny rok
+OpenFiscalYear=Otvoriť fiškálny rok
+CloseFiscalYear=Zatvoriť fiškálny rok
+DeleteFiscalYear=Zmazať fiškálny rok
+ConfirmDeleteFiscalYear=Určite chcete zmazať tento fiškálny rok ?
+ShowFiscalYear=Show fiscal year
+AlwaysEditable=Môže byť vždy upravené
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
+NbMajMin=Minimálny počet veľkých znakov
+NbNumMin=Minimálny počet čísel
+NbSpeMin=Minimálny počet špeciálnych znakov
+NbIteConsecutive=Maaximálny počet opakujúcich sa znakov
+NoAmbiCaracAutoGeneration=Nepoúžívajte znaky  ("1","l","i","|","0","O") pre automatické generovanie
+SalariesSetup=Nastavenei mzdového modulu
+SortOrder=Zoradiť objednávky
+Format=Formát
 TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
-IncludePath=Include path (defined into variable %s)
+IncludePath=Zahrnúť cestu ( definovať do premennej %s )
 ExpenseReportsSetup=Setup of module Expense Reports
 TemplatePDFExpenseReports=Document templates to generate expense report document
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=You may find options for EMail notifications by enabling and configuring the module "Notification".
+YouMayFindNotificationsFeaturesIntoModuleNotification=Možnosti pre E-Mailové upozornenia nájdete po zapnutí a nastavení modulu "Upozornenia" 
 ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
-ListOfFixedNotifications=List of fixed notifications
+ListOfFixedNotifications=Zoznam fixnych upozornení
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
-Threshold=Threshold
-BackupDumpWizard=Wizard to build database backup dump file
-SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
+Threshold=Maximálna hodnota
+BackupDumpWizard=Pomocník pre databázovú zálohu
+SomethingMakeInstallFromWebNotPossible=Inštalácia externého modulu z webu nie je možná kôli : 
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesOnMouseHover=Zvýrazniť riadok pre prechode kurzora
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
 TextTitleColor=Color of page title
 LinkColor=Color of links
-PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
-BackgroundColor=Background color
-TopMenuBackgroundColor=Background color for Top menu
-LeftMenuBackgroundColor=Background color for Left menu
-BackgroundTableTitleColor=Background color for Table title line
-BackgroundTableLineOddColor=Background color for odd table lines
-BackgroundTableLineEvenColor=Background color for even table lines
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
-NbAddedAutomatically=Number of days added to counters of users (automatically) each month
+PressF5AfterChangingThis=Stlačte F5 pre aktualizáciu hodnôt po zmene
+NotSupportedByAllThemes=Spolupracuje so základnou témou, nemusí byť podporované externou témou
+BackgroundColor=Farba pozadia
+TopMenuBackgroundColor=Farba pozadia pre vrchné menu
+TopMenuDisableImages=Hide images in Top menu
+LeftMenuBackgroundColor=Farba pozadia pre ľavé menu
+BackgroundTableTitleColor=Farba pozadia pre riadok s názvom
+BackgroundTableLineOddColor=Farba pozadia pre nepárne riadky tabuľky
+BackgroundTableLineEvenColor=Farba pozadia pre párne riadky tabuľky
+MinimumNoticePeriod=Minimálny oznamovací čas ( Vaša požiadávka musi byť zaznamenaná pred týmto časom )
+NbAddedAutomatically=Počet dní pridaných do počítadla užívateľov ( automaticky ) každý mesiac
 EnterAnyCode=This field contains a reference to identify line. Enter any value of your choice, but without special characters.
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For exemple: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 PositionIntoComboList=Position of line into combo lists
-SellTaxRate=Sale tax rate
+SellTaxRate=Hodnota dane z predaja
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
 UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipping, you can enter it here. You can use the key {TRACKID} into URL parameters so the system will replace it with value of tracking number user entered into shipment card.
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
-TypeOfTemplate=Type of template
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+TypeOfTemplate=Typ šablôny
+TemplateIsVisibleByOwnerOnly=Šablóna je viditelná iba pre majiteľa
+FixTZ=Oprava časovej zóny
+FillFixTZOnlyIfRequired=Príklad: +2 ( vyplňte iba ak máte problém )
 ExpectedChecksum=Expected Checksum
 CurrentChecksum=Current Checksum
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
+MailToSendProposal=Zákaznícka ponuka na poslanie
+MailToSendOrder=Zákaznícka objednávka na poslanie
+MailToSendInvoice=Zákaznícka faktúra na poslanie
+MailToSendShipment=Pošta na poslanie
 MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToSendSupplierRequestForQuotation=Citácia pre dodávateľa na poslanie
+MailToSendSupplierOrder=Dodávateľska objednávka na poslanie
+MailToSendSupplierInvoice=Dodávateľská faktúra na poslanie
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 6ee9c014b61..dcb79dcea00 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -6,14 +6,14 @@ Agendas=Program
 Calendar=Kalendár
 LocalAgenda=Interný kalendár
 ActionsOwnedBy=Udalosť vytvorená: 
-ActionsOwnedByShort=Owner
+ActionsOwnedByShort=Majiteľ
 AffectedTo=Priradené
 Event=Udalosť
 Events=Udalosti
 EventsNb=Počet udalostí
 ListOfActions=Zoznam udalostí
 Location=Umiestnenie
-ToUserOfGroup=To any user in group
+ToUserOfGroup=Každému užívateľovy v skupine
 EventOnFullDay=Akcie po celý deň (y)
 MenuToDoActions=Všetky neúplné udalosti
 MenuDoneActions=Všetky ukončené akcie
@@ -23,73 +23,73 @@ ListOfEvents=Zoznam udalostí (interný kalendár)
 ActionsAskedBy=Akcia hlásené
 ActionsToDoBy=Akcia priradené
 ActionsDoneBy=Akcie vykonané
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=Udalosť priradená na 
 ViewCal=Mesačný pohľad
 ViewDay=Denné zobrazenie
 ViewWeek=Zobraziť týždeň
-ViewPerUser=Per user view
-ViewPerType=Per type view
+ViewPerUser=Podľa zobrazenia uživateľa
+ViewPerType=Podľa typu zobrazenia
 AutoActions= Automatické plnenie
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+AgendaAutoActionDesc= Tu definujte udalosti, ktoré má Dolibarr automaticky pridať do agendy. Ak nič nie je zaškrtnuté iba manuálne akcie budu pridané do agendy. Automatické sledovanie firemných akcií pre objekty ( overenie, zmena statusu ) nebudú uložené.
 AgendaSetupOtherDesc= Táto stránka poskytuje možnosti, ako dať export vašich akcií Dolibarr do externého kalendára (thunderbird, Google kalendár, ...)
 AgendaExtSitesDesc=Táto stránka umožňuje deklarovať externé zdroje kalendárov vidieť svoje akcie do programu Dolibarr.
 ActionsEvents=Udalosti, pre ktoré Dolibarr vytvorí akciu v programe automaticky
 PropalValidatedInDolibarr=Návrh %s overená
 InvoiceValidatedInDolibarr=Faktúra %s overená
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=Faktúra %s overená z miesta predaja
 InvoiceBackToDraftInDolibarr=Faktúra %s vrátiť do stavu návrhu
 InvoiceDeleteDolibarr=Faktúra %s zmazaná
 OrderValidatedInDolibarr=Objednať %s overená
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=Objednávka %s doručená
 OrderCanceledInDolibarr=Objednať %s zrušený
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Objednávka %s faktúrovaná
 OrderApprovedInDolibarr=Objednať %s schválený
-OrderRefusedInDolibarr=Order %s refused
+OrderRefusedInDolibarr=Objednávka %s odmietnutá
 OrderBackToDraftInDolibarr=Objednať %s vrátiť do stavu návrhu
 ProposalSentByEMail=Komerčné návrh %s zaslaná e-mailom
 OrderSentByEMail=%s zákazníkov objednávka zaslaná e-mailom
 InvoiceSentByEMail=%s faktúre Zákazníka zaslaná e-mailom
 SupplierOrderSentByEMail=%s Dodávateľ objednávka zaslaná e-mailom
 SupplierInvoiceSentByEMail=%s dodávateľskej faktúry zasielané e-mailom
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
+ShippingSentByEMail=Zásielka %s odosláná E-mailom
+ShippingValidated= Zásielka %s overená
+InterventionSentByEMail=Zákrok %s odoslaný E-mailom
+ProposalDeleted=Ponuka zmazaná
+OrderDeleted=Objednávka zmazaná
+InvoiceDeleted=Faktúra zmazaná
 NewCompanyToDolibarr= Tretia strana vytvorená
 DateActionStart= Dátum začatia
 DateActionEnd= Dátum ukončenia
 AgendaUrlOptions1=Môžete tiež pridať nasledujúce parametre filtrovania výstupu:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
+AgendaUrlOptions2=<b>login=%s</b> pre obmedzenie výstupu akciám vytvoreným alebo prideleným užívateľom <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> pre obmedzenie výstupu akciam ktoré vlastní užívateľ <b>%s</b>.
 AgendaUrlOptions4=<b>logint = %s</b> obmedziť výstup na akcie priradených užívateľských <b>%s.</b>
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> pre obmedzenie výstupu akciam prideleným projektu <b>PROJECT_ID</b>.
+AgendaShowBirthdayEvents=Zobraziť narodeniny kontaktov
+AgendaHideBirthdayEvents=Skryť naroodeniny kontaktov
 Busy=Zaneprázdnený
 ExportDataset_event1=Zoznam agendy udalostí
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Rozsah pracovných dní ( Pr.:1-5, 1-6 )
+DefaultWorkingHours=Pracovná doba ( Pr.: 9-18 )
 # External Sites ical
 ExportCal=Export kalendár
 ExtSites=Importovať externé kalendára
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Zobrazit externé kalendáre ( definované v globálnom nastavení ) do agendy. Nemá vplyv na externé kalendáre definované užívateľom.
 ExtSitesNbOfAgenda=Počet kalendárov
 AgendaExtNb=Kalendár nb %s
 ExtSiteUrlAgenda=URL pre prístup. Súbor iCal
 ExtSiteNoLabel=Nie Popis
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
+VisibleTimeRange=Vyditelný časový rozsah
+VisibleDaysRange=Vyditelný rozsah dní
 AddEvent=Vytvoriť udalosť
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
-CloneAction=Clone event
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
-RepeatEvent=Repeat event
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+MyAvailability=Moja dostupnosť
+ActionType=Typ udalosti
+DateActionBegin=Začiatok udalosti
+CloneAction=Duplikovať udalosť
+ConfirmCloneEvent=Určite chcete duplikovať udalosť <b>%s</b> ?
+RepeatEvent=Opakovať udalosť
+EveryWeek=Každý týždeň
+EveryMonth=Každý mesiac
+DayOfMonth=Deň v mesiaci
+DayOfWeek=Deň v týždni
+DateStartPlusOne=Čas začatia + 1 hodina
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index 8e5015fb9d6..df6dd49990a 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -5,7 +5,7 @@ BankName=Názov banky
 FinancialAccount=Účet
 BankAccount=Bankový účet
 BankAccounts=Bankové účty
-ShowAccount=Show Account
+ShowAccount=Zobraziť účet
 AccountRef=Finančný účet ref
 AccountLabel=Finančný účet štítok
 CashAccount=Pokladničné účet
@@ -23,17 +23,13 @@ EndBankBalance=Koniec zostatok
 CurrentBalance=Bežný zostatok
 FutureBalance=Budúce rovnováha
 ShowAllTimeBalance=Zobraziť rovnováhy od začiatku
-AllTime=From start
+AllTime=Od začiatku
 Reconciliation=Zmierenie
 RIB=Číslo bankového účtu
 IBAN=IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT číslo
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Trvalé príkazy
-StandingOrder=Trvalý príkaz
+StandingOrders=Inkaso objednávky
+StandingOrder=Inkaso objednávka
 AccountStatement=Výpis z účtu
 AccountStatementShort=Vyhlásenie
 AccountStatements=Výpisy z účtov
@@ -73,12 +69,13 @@ Conciliable=Môže byť porovnaná
 Conciliate=Zmieriť
 Conciliation=Zmierenie
 IncludeClosedAccount=Zahrnúť uzatvorených účtov
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=Iba otvorené účty
 AccountToCredit=Účet na úver
 AccountToDebit=Účet na vrub
 DisableConciliation=Zakázať zmierenie funkciu pre tento účet
 ConciliationDisabled=Odsúhlasenie funkcia vypnutá
-StatusAccountOpened=Open
+LinkedToAConciliatedTransaction=Priradené k preverovanej tranzakcii
+StatusAccountOpened=Otvorení
 StatusAccountClosed=Zatvorené
 AccountIdShort=Číslo
 LineRecord=Transakcie
@@ -87,14 +84,17 @@ AddBankRecordLong=Pridať obchod ručne
 ConciliatedBy=Odsúhlasené
 DateConciliating=Synchronizovať dáta
 BankLineConciliated=Transakcie zmieril
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Klientská platba
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
+SupplierInvoicePayment=Dodávatelská platba
+SubscriptionPayment=Odberatelská platba
 WithdrawalPayment=Odstúpenie platba
-SocialContributionPayment=Social/fiscal tax payment
+SocialContributionPayment=Platba sociálnej/fiškálnej dane
 BankTransfer=Bankový prevod
 BankTransfers=Bankové prevody
-TransferDesc=Prenos z jedného účtu na iný, bude Dolibarr písať dva záznamy (debetnej v zdrojovom účte a úver v cieľovom účte, v rovnakej výške. Rovnaké označenie a dátum bude použitý pre túto transakciu)
+MenuBankInternalTransfer=Interný prevod
+TransferDesc=Prevod z jedného účtu na druhý, Dolibarr zapíše 2 tranzakcie ( Debit na zdrojovom účte a Kredit na cieľovom účte ) Rovnaká suma, názov, a čas pre túto tranzakciu.
 TransferFrom=Z
 TransferTo=Na
 TransferFromToDone=Transfer z <b>%s</b> na <b>%s</b> %s <b>%s</b> zo bol zaznamenaný.
@@ -104,7 +104,7 @@ ConfirmValidateCheckReceipt=Ste si istí, že chcete overiť začiarknutie tohto
 DeleteCheckReceipt=Odstráňte začiarknutie tohto príjmu?
 ConfirmDeleteCheckReceipt=Ste si istí, že chcete zmazať toto políčko príjem?
 BankChecks=Bankové šeky
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=Šeký čakajúce na zaplatenie
 ShowCheckReceipt=Zobraziť skontrolovať depozitné potvrdenie
 NumberOfCheques=Nb šeku
 DeleteTransaction=Odstrániť transakcie
@@ -114,11 +114,11 @@ BankMovements=Pohyby
 PlannedTransactions=Plánované transakcie
 Graph=Grafika
 ExportDataset_banque_1=Bankové transakcie a výpis z účtu
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Doklad o vklade
 TransactionOnTheOtherAccount=Transakcie na iný účet
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=Číslo platby úspešne aktualizované
 PaymentNumberUpdateFailed=Platba číslo nemožno aktualizovať
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=Čas platby úspešne aktualizovaný
 PaymentDateUpdateFailed=Dátum platby nemožno aktualizovať
 Transactions=Transakcie
 BankTransactionLine=Bankové transakcie
@@ -127,18 +127,21 @@ BackToAccount=Späť na účte
 ShowAllAccounts=Zobraziť pre všetky účty
 FutureTransaction=Transakcie v Futur. Žiadny spôsob, ako sa zmieriť.
 SelectChequeTransactionAndGenerate=Výber / filter, aby kontroly zahŕňali do obdržaní šeku vkladov a kliknite na &quot;Vytvoriť&quot;.
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+InputReceiptNumber=Zvoľte výpis z účtu  potrebný pre náhľad. Zoraďťe podľa číselnej hodnoty YYYYMM alebo YYYYMMDD
 EventualyAddCategory=Nakoniec určiť kategóriu, v ktorej chcete klasifikovať záznamy
-ToConciliate=Zmieriť?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Potom skontrolujte, či riadky, ktoré sú vo výpise z účtu a potom kliknite na tlačidlo
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+DefaultRIB=Základný BAN
+AllRIB=Všetky BAN
+LabelRIB=Názov BAN
+NoBANRecord=Žiadny BAN nájdený
+DeleteARib=Zmazať BAN záznam
+ConfirmDeleteRib=Určite chcete zmazať BAN záznam ?
+RejectCheck=Šek vrátený
+ConfirmRejectCheck=Určite chcete označiť tento šek ako odmietnutý ?
+RejectCheckDate=Dátum kedy bol šek odmietnutý
+CheckRejected=Šek vrátený
+CheckRejectedAndInvoicesReopened=Šek vrátený a faktúra znova otvorená
+BankAccountModelModule=Šablóny dokumentov pre bankové účty
+DocumentModelSepaMandate=Šablóny SEPA. Užitočné iba pre krajiny v EEC
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 34c6dc923c0..9dd715ebb8d 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Faktúra
 Bills=Faktúry
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Zákaznícke faktúrý
+BillsCustomer=Zákaznícke faktúrý
+BillsSuppliers=Dodávateľské faktúrý
+BillsCustomersUnpaid=Nezaplatené zákaznícke faktúrý
 BillsCustomersUnpaidForCompany=Nezaplatené faktúry pre zákazníka %s
 BillsSuppliersUnpaid=Nezaplatené faktúry dodávateľa
 BillsSuppliersUnpaidForCompany=Nezaplatené faktúry dodávateľa pre %s
 BillsLate=Oneskorené platby
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatistics=Štatistiky zákazníckych faktúr
+BillsStatisticsSuppliers=Štatistiky dodávateľskych faktúr
+DisabledBecauseNotErasable=Vypnuté lebo nemôze byť zmazané
 InvoiceStandard=Štandardné faktúra
 InvoiceStandardAsk=Štandardné faktúra
 InvoiceStandardDesc=Tento druh faktúry je spoločná faktúra.
@@ -75,12 +75,12 @@ PaymentsAlreadyDone=Platby neurobili
 PaymentsBackAlreadyDone=Platby späť neurobili
 PaymentRule=Platba pravidlo
 PaymentMode=Typ platby
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
-PaymentModeShort=Payment type
+IdPaymentMode=Typ platby (id)
+LabelPaymentMode=Typ platby (názov)
+PaymentModeShort=Typ platby
 PaymentTerm=Payment term
-PaymentConditions=Payment terms
-PaymentConditionsShort=Payment terms
+PaymentConditions=Platobné podmienky
+PaymentConditionsShort=Platobné podmienky
 PaymentAmount=Suma platby
 ValidatePayment=Overenie platby
 PaymentHigherThanReminderToPay=Platobné vyššia než upomienke na zaplatenie
@@ -93,7 +93,7 @@ ClassifyClosed=Klasifikáciu &quot;uzavretým&quot;
 ClassifyUnBilled=Classify 'Unbilled'
 CreateBill=Vytvoriť faktúru
 CreateCreditNote=Create credit note
-AddBill=Create invoice or credit note
+AddBill=Vytvoriť faktúru alebo kreditnú poznámku
 AddToDraftInvoices=Pridať k návrhu faktúru
 DeleteBill=Odstrániť faktúru
 SearchACustomerInvoice=Hľadať zákazníckej faktúre
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Chyba, nemožno zrušiť, ak fak
 BillFrom=Z
 BillTo=Na
 ActionsOnBill=Akcie na faktúre
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -187,7 +187,7 @@ NumberOfBills=Nb faktúr
 NumberOfBillsByMonth=Nb faktúr mesiace
 AmountOfBills=Výška faktúr
 AmountOfBillsByMonthHT=Výška faktúr mesačne (bez dane)
-ShowSocialContribution=Show social/fiscal tax
+ShowSocialContribution=Zobrazit sociálnu/fiškálnu daň
 ShowBill=Zobraziť faktúru
 ShowInvoice=Zobraziť faktúru
 ShowInvoiceReplace=Zobraziť výmene faktúru
@@ -199,18 +199,18 @@ AlreadyPaid=Už zaplatené
 AlreadyPaidBack=Už vráti
 AlreadyPaidNoCreditNotesNoDeposits=Už zaplatená (bez dobropisov a vklady)
 Abandoned=Opustený
-RemainderToPay=Remaining unpaid
-RemainderToTake=Remaining amount to take
-RemainderToPayBack=Remaining amount to pay back
+RemainderToPay=Zostávajúce nezaplatené
+RemainderToTake=Zostávajúce suma na prebratie
+RemainderToPayBack=Zostávajúca suma na vrátenie
 Rest=Až do
 AmountExpected=Nárokovanej čiastky
 ExcessReceived=Nadbytok obdržal
 EscompteOffered=Zľava ponúkol (platba pred semestra)
-EscompteOfferedShort=Discount
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Trvalé príkazy
-StandingOrder=Trvalý príkaz
+EscompteOfferedShort=Zľava
+SendBillRef=Odovzdanie faktúry %s
+SendReminderBillRef=Odovzdanie faktúry %s (pripomienka)
+StandingOrders=Inkaso objednávky
+StandingOrder=Inkaso objednávka
 NoDraftBills=Žiadne návrhy faktúry
 NoOtherDraftBills=Žiadne iné návrhy faktúry
 NoDraftInvoices=Žiadne návrhy faktúry
@@ -227,21 +227,21 @@ DateInvoice=Faktúra Dátum
 DatePointOfTax=Point of tax
 NoInvoice=No faktúra
 ClassifyBill=Klasifikovať faktúru
-SupplierBillsToPay=Unpaid supplier invoices
-CustomerBillsUnpaid=Unpaid customer invoices
+SupplierBillsToPay=Nezaplatené dodávatelské faktúry
+CustomerBillsUnpaid=Nezaplatené zákaznické faktúry
 NonPercuRecuperable=Nevratná
 SetConditions=Nastaviť platobné podmienky
 SetMode=Nastaviť platobný režim
 SetRevenuStamp=Set revenue stamp
 Billed=Účtované
 RecurringInvoices=Recurring invoices
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Šablóna faktúry
+RepeatableInvoices=Šablóna faktúr
+Repeatable=Šablóna
+Repeatables=Šablóny
+ChangeIntoRepeatableInvoice=Previesť na šablónu faktúry
+CreateRepeatableInvoice=Vytvoriť šablónu faktúry
+CreateFromRepeatableInvoice=Vytvoriť zo šablóny faktúry
 CustomersInvoicesAndInvoiceLines=Zákazníkov faktúry a faktúra je vedenie
 CustomersInvoicesAndPayments=Zákazníkov faktúry a platby
 ExportDataset_invoice_1=Zákazník faktúry a faktúra je zoznam liniek
@@ -281,9 +281,9 @@ BillAddress=Bill adresa
 HelpEscompte=Táto zľava je zľava poskytnutá zákazníkovi, pretože jej platba bola uskutočnená pred horizonte.
 HelpAbandonBadCustomer=Táto suma bola opustená (zákazník povedal, aby bol zlý zákazník) a je považovaný za výnimočný voľné.
 HelpAbandonOther=Táto suma bola opustená, pretože došlo k chybe (chybný zákazník alebo faktúra nahradený iný napríklad)
-IdSocialContribution=Social/fiscal tax payment id
+IdSocialContribution=Sociálna/fiškálna daň ID
 PaymentId=Platba id
-PaymentRef=Payment ref.
+PaymentRef=Platobná referencia
 InvoiceId=Faktúra id
 InvoiceRef=Faktúra čj.
 InvoiceDateCreation=Faktúra Dátum vytvorenia
@@ -313,19 +313,19 @@ WarningBillExist=Warning, one or more invoice already exist
 MergingPDFTool=Merging PDF tool
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
-PaymentNote=Payment note
+PaymentNote=Poznámka platby
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
+FrequencyPer_d=Každých %s dní
+FrequencyPer_m=Každých %s mesiacov
+FrequencyPer_y=Každých %s rokov
 toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
-NextDateToExecution=Date for next invoice generation
-DateLastGeneration=Date of latest generation
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
+NextDateToExecution=Dátum dalšieho generovania faktúr
+DateLastGeneration=Dátum posledného generovania faktúr
+MaxPeriodNumber=Maximálny počet generovaných faktúr
+NbOfGenerationDone=Počet už vygenerovaných faktúr
 MaxGenerationReached=Maximum nb of generations reached
-InvoiceAutoValidate=Validate invoices automatically
+InvoiceAutoValidate=Overiť faktúrý automaticky
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
@@ -342,17 +342,17 @@ PaymentConditionShort60DENDMONTH=60 days of month-end
 PaymentCondition60DENDMONTH=Within 60 days following the end of the month
 PaymentConditionShortPT_DELIVERY=Dodanie
 PaymentConditionPT_DELIVERY=Na dobierku
-PaymentConditionShortPT_ORDER=Order
+PaymentConditionShortPT_ORDER=Objednávka
 PaymentConditionPT_ORDER=Na objednávku
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% vopred, 50%% pri dodaní
 FixAmount=Fix množstvo
 VarAmount=Variabilná čiastka (%% celk.)
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Banky, aby
-PaymentTypeShortPRE=Banky, aby
+PaymentTypeVIR=Bankový prevod
+PaymentTypeShortVIR=Bankový prevod
+PaymentTypePRE=Platba inkasom
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Hotovosť
 PaymentTypeShortLIQ=Hotovosť
 PaymentTypeCB=Kreditná karta
@@ -364,7 +364,7 @@ PaymentTypeShortTIP=TIP Payment
 PaymentTypeVAD=On line platby
 PaymentTypeShortVAD=On line platby
 PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
+PaymentTypeShortTRA=Návrh
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
 BankDetails=Bankové spojenie
@@ -372,7 +372,7 @@ BankCode=Kód banky
 DeskCode=Stôl kód
 BankAccountNumber=Číslo účtu
 BankAccountNumberKey=Kľúč
-Residence=Direct debit
+Residence=Inkaso
 IBANNumber=IBAN
 IBAN=IBAN
 BIC=BIC / SWIFT
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulované
 ChequeNumber=Skontrolujte N °
 ChequeOrTransferNumber=Skontrolujte / Prenos č
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -426,16 +427,18 @@ DisabledBecausePayments=Not possible since there are some payments
 CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified paid
 ExpectedToPay=Predpokladaný platba
 CantRemoveConciliatedPayment=Can't remove conciliated payment
-PayedByThisPayment=Paid by this payment
+PayedByThisPayment=Zaplatené touto platbou
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Zaplatiť
 ToMakePaymentBack=Oplatiť
 ListOfYourUnpaidInvoices=Zoznam nezaplatených faktúr
 NoteListOfYourUnpaidInvoices=Poznámka: Tento zoznam obsahuje iba faktúry pre tretie strany si sú prepojené ako obchodného zástupcu.
 RevenueStamp=Kolek
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Zmazať šablónu faktúrý
+ConfirmDeleteRepeatableInvoice=Určite chcete zmazať šablónu faktúry ?
 
diff --git a/htdocs/langs/sk_SK/bookmarks.lang b/htdocs/langs/sk_SK/bookmarks.lang
index d398283a247..c31ec837ee0 100644
--- a/htdocs/langs/sk_SK/bookmarks.lang
+++ b/htdocs/langs/sk_SK/bookmarks.lang
@@ -14,5 +14,5 @@ BehaviourOnClick=Správanie pri kliknutí na URL
 CreateBookmark=Vytvoriť záložku
 SetHereATitleForLink=Nastavte názov pre záložku
 UseAnExternalHttpLinkOrRelativeDolibarrLink=Použite externú http adresu URL alebo relatívnu adresu URL Dolibarr
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Zvolte či sa odkaz na stránku má otvoriť na novej krate alebo nie 
 BookmarksManagement=Záložky riadenie
diff --git a/htdocs/langs/sk_SK/boxes.lang b/htdocs/langs/sk_SK/boxes.lang
index 2eb137267be..5c6a9eaecf6 100644
--- a/htdocs/langs/sk_SK/boxes.lang
+++ b/htdocs/langs/sk_SK/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Najstarší aktívny vypršala služby
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Globálna aktivita (faktúry, návrhy, objednávky)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Návrhy za mesiac
 NoTooLowStockProducts=Žiadny výrobok na základe nízkeho limitu skladom
 BoxProductDistribution=Produkty / služby distribúcie
 BoxProductDistributionFor=Distribúcia %s pre %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Zákazníci faktúry
 ForCustomersOrders=Zákazníci objednávky
 ForProposals=Návrhy
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/sk_SK/cashdesk.lang b/htdocs/langs/sk_SK/cashdesk.lang
index 8178f3e0300..c6e63000bfb 100644
--- a/htdocs/langs/sk_SK/cashdesk.lang
+++ b/htdocs/langs/sk_SK/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=na
 CashDeskThirdParty=Treťou stranou
 ShoppingCart=Nákupný vozík
 NewSell=Nový predať
-BackOffice=Back office
 AddThisArticle=Pridať tento článok
 RestartSelling=Vráťte sa na predaj
-SellFinished=Predaj skončil
+SellFinished=Predaj ukončený
 PrintTicket=Tlač vstupeniek
 NoProductFound=Žiadny článok nájdených
 ProductFound=výrobky, ktoré sa
@@ -31,5 +30,5 @@ ShowCompany=Zobraziť spoločnosť
 ShowStock=Zobraziť skladu
 DeleteArticle=Kliknutím odstránite tento článok
 FilterRefOrLabelOrBC=Vyhľadávanie (Ref / Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+UserNeedPermissionToEditStockToUsePos=Žiadate o zníženie skladu pri vytvorení faktúry, užívateľ pouzívajúci POS musí mať povolenie upravovať sklad.
+DolibarrReceiptPrinter=Dolibarr tlačiareň bločkov
diff --git a/htdocs/langs/sk_SK/categories.lang b/htdocs/langs/sk_SK/categories.lang
index b592bde8df8..e299e423d2d 100644
--- a/htdocs/langs/sk_SK/categories.lang
+++ b/htdocs/langs/sk_SK/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Podkategórie
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Táto kategória už existuje s týmto čj
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Táto kategória neobsahuje žiadny produkt.
 ThisCategoryHasNoSupplier=Táto kategória neobsahuje žiadne dodávateľa.
 ThisCategoryHasNoCustomer=Táto kategória neobsahuje žiadne zákazníka.
 ThisCategoryHasNoMember=Táto kategória neobsahuje žiadne člena.
 ThisCategoryHasNoContact=Táto kategória neobsahuje žiadny kontakt.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
index 91e9752fcb0..082374d5bbd 100644
--- a/htdocs/langs/sk_SK/commercial.lang
+++ b/htdocs/langs/sk_SK/commercial.lang
@@ -5,15 +5,15 @@ Customer=Zákazník
 Customers=Zákazníci
 Prospect=Vyhliadka
 Prospects=Vyhliadky
-DeleteAction=Delete an event
-NewAction=New event
-AddAction=Create event
-AddAnAction=Create an event
-AddActionRendezVous=Create a Rendez-vous event
-ConfirmDeleteAction=Are you sure you want to delete this event ?
+DeleteAction=Zmazať udalosť
+NewAction=Nová udalosť
+AddAction=Vytvoriť udalosť
+AddAnAction=Vytvoriť udalosť
+AddActionRendezVous=Vytvoriť Rendez-vous udalosť
+ConfirmDeleteAction=Určite chcete zmazať túto udalosť ?
 CardAction=Udalosť karty
-ActionOnCompany=Related company
-ActionOnContact=Related contact
+ActionOnCompany=Podobná spoločnosť
+ActionOnContact=Podobný kontakt
 TaskRDVWith=Stretnutie s %s
 ShowTask=Zobraziť úloha
 ShowAction=Zobraziť akcie
@@ -28,8 +28,8 @@ ShowCustomer=Zobraziť zákazníkovi
 ShowProspect=Zobraziť vyhliadky
 ListOfProspects=Zoznam vyhliadky
 ListOfCustomers=Zoznam zákazníkov
-LastDoneTasks=Latest %s completed tasks
-LastActionsToDo=Oldest %s not completed actions
+LastDoneTasks=Najnovšie %s dokončené úlohy
+LastActionsToDo=Najstaršie %s nedokončené úlohy
 DoneAndToDoActions=Dokončené a Ak chcete udalosti
 DoneActions=Dokončenej akcie
 ToDoActions=Neúplné udalosti
@@ -52,7 +52,7 @@ ActionAC_FAX=Odoslať fax
 ActionAC_PROP=Poslať e-mailom návrh
 ActionAC_EMAIL=Odoslať e-mail
 ActionAC_RDV=Schôdza
-ActionAC_INT=Intervention on site
+ActionAC_INT=Zásah na stránke
 ActionAC_FAC=Poslať zákazníka faktúru poštou
 ActionAC_REL=Poslať zákazníka faktúru poštou (pripomienka)
 ActionAC_CLO=Zavrieť
@@ -68,4 +68,4 @@ ActionAC_AUTO=Automaticky vložené udalosti
 Stats=Predajné štatistiky
 StatusProsp=Prospect stav
 DraftPropals=Navrhnúť obchodné návrhy
-NoLimit=No limit
+NoLimit=Bez limitu
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index a7175c72e6e..55ed923d480 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nová súkromná osoba
 NewCompany=Nová spoločnosť (vyhliadka, zákazník, dodávateľ)
 NewThirdParty=Nový tretia strana (vyhliadka, zákazník, dodávateľ)
 CreateDolibarrThirdPartySupplier=Vytvoriť tretiu stranu (dodávateľa)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospekcia plochy
 IdThirdParty=Id treťou stranou
 IdCompany=IČ
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Dodávatelia
 ThirdPartyType=Tretí typ vyhľadávajúci večierky
 Company/Fundation=Spoločnosti / Nadácia
 Individual=Súkromná osoba
-ToCreateContactWithSameName=Automaticky vytvorí fyzický kontakt s rovnakými informáciami
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Materská spoločnosť
 Subsidiaries=Dcérske spoločnosti
 ReportByCustomers=Správa o zákazníkov
@@ -47,7 +49,7 @@ CivilityCode=Zdvorilosť kód
 RegisteredOffice=Sídlo spoločnosti
 Lastname=Priezvisko
 Firstname=Krstné meno
-PostOrFunction=Post / Funkcia
+PostOrFunction=Job position
 UserTitle=Názov
 Address=Adresa
 State=Štát / Provincia
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof telefón
 PhonePerso=Os. telefón
 PhoneMobile=Mobilné
-No_Email=Neposielajte e-hmotnosť poštovej zásielky
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Poštové smerovacie číslo
 Town=Mesto
@@ -73,7 +75,7 @@ Poste= Pozícia
 DefaultLang=Predvolený jazyk
 VATIsUsed=DPH sa používa
 VATIsNotUsed=DPH sa nepoužíva
-CopyAddressFromSoc=Vyplňte adresu s thirdparty adresu
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Daňové identifikačné číslo
 VATIntraShort=Daňové identifikačné číslo
 VATIntraSyntaxIsValid=Syntax je platná
-VATIntraValueIsValid=Hodnota je platná
 ProspectCustomer=Prospect / zákazník
 Prospect=Vyhliadka
 CustomerCard=Zákaznícka karta
@@ -261,7 +262,9 @@ AddContactAddress=Vytvoriť kontakt/adresu
 EditContact=Upraviť kontakt
 EditContactAddress=Upraviť kontakt / adresa
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakty / adresy
+FromContactName=Name:
 NoContactDefinedForThirdParty=Žiadny kontakt definovaná pre túto tretiu stranu
 NoContactDefined=Žiadny kontakt definované
 DefaultContact=Predvolené kontakt / adresa
@@ -284,7 +287,7 @@ CompanyDeleted=Spoločnosť &quot;%s&quot; vymazaný z databázy.
 ListOfContacts=Zoznam kontaktov adries /
 ListOfContactsAddresses=Zoznam kontaktov adries /
 ListOfThirdParties=Zoznam tretích strán
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Zobraziť kontakt
 ContactsAllShort=Všetko (Bez filtra)
 ContactType=Kontaktujte typ
@@ -294,6 +297,7 @@ ContactForProposals=Návrh je kontakt
 ContactForContracts=Zmluva je kontakt
 ContactForInvoices=Faktúra je kontakt
 NoContactForAnyOrder=Tento kontakt nie je kontakt na ľubovoľnom poradí
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Tento kontakt nie je kontaktnou osobou pre akékoľvek komerčné návrhu
 NoContactForAnyContract=Tento kontakt nie je kontakt u každej zákazky
 NoContactForAnyInvoice=Tento kontakt nie je kontakt pre každé faktúre
@@ -352,9 +356,9 @@ ExportCardToFormat=Export do formátu karty
 ContactNotLinkedToCompany=Kontaktu, ktorý nie je spojený s akoukoľvek treťou stranou
 DolibarrLogin=Dolibarr prihlásenie
 NoDolibarrAccess=Žiadny prístup Dolibarr
-ExportDataset_company_1=Tretie strany (spoločnosti/nadácie/fyzické osoby) a vlastnosti
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakty a vlastnosti
-ImportDataset_company_1=Tretie strany (spoločnosti/nadácie/fyzické osoby) a vlastnosti
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakty/adresy (tretích strán aj iných) a atribúty
 ImportDataset_company_3=Bankové spojenie
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sk_SK/compta.lang b/htdocs/langs/sk_SK/compta.lang
index 44772c690a3..1c871411767 100644
--- a/htdocs/langs/sk_SK/compta.lang
+++ b/htdocs/langs/sk_SK/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Dane a dividendy
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index bc30d16b5c4..ec92729ec98 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -14,13 +14,13 @@ ServiceStatusNotLateShort=Neuplynula
 ServiceStatusLate=Beh, uplynula
 ServiceStatusLateShort=Vypršala
 ServiceStatusClosed=Zatvorené
-ShowContractOfService=Show contract of service
+ShowContractOfService=Zobraziť zmluvu služby
 Contracts=Zmluvy
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
+ContractsSubscriptions=Zmluvy/Predplatné
+ContractsAndLine=Zmluvy a riadky zmlúv
 Contract=Zmluva
-ContractLine=Contract line
-Closing=Closing
+ContractLine=Riadok zmluvy
+Closing=Zatváranie
 NoContracts=Žiadne zmluvy
 MenuServices=Služby
 MenuInactiveServices=Služby, ktoré nie sú aktívne
@@ -28,8 +28,8 @@ MenuRunningServices=Spustené služby
 MenuExpiredServices=Prepadnuté služby
 MenuClosedServices=Uzavreté služby
 NewContract=Nová zmluva
-NewContractSubscription=New contract/subscription
-AddContract=Create contract
+NewContractSubscription=Nová zmluva/predplatné
+AddContract=Vytvoriť zmluvu
 DeleteAContract=Odstránenie zmluvu
 CloseAContract=Zavrieť zmluvu
 ConfirmDeleteAContract=Ste si istí, že chcete zmazať túto zmluvu a všetky jeho služby?
@@ -50,8 +50,8 @@ ListOfClosedServices=Zoznam uzavretých služieb
 ListOfRunningServices=Zoznam spustených služieb
 NotActivatedServices=Neaktívne služby (u overených zmlúv)
 BoardNotActivatedServices=Služby pre aktiváciu u overených zmlúv
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+LastContracts=Najnovšie %s zmluvy
+LastModifiedServices=Posledné %s upravené služby
 ContractStartDate=Dátum začatia
 ContractEndDate=Dátum ukončenia
 DateStartPlanned=Plánovaný dátum začatia
@@ -80,9 +80,9 @@ ListOfServicesToExpireWithDuration=Zoznam služieb, ktoré vyprší v %s dní
 ListOfServicesToExpireWithDurationNeg=Zoznam služieb uplynula od viac ako %s dní
 ListOfServicesToExpire=Zoznam služieb vyprší
 NoteListOfYourExpiredServices=Tento zoznam obsahuje iba služby zmlúv pre tretie strany si sú prepojené ako obchodného zástupcu.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+StandardContractsTemplate=Šablóna štandardnej zmluvy
+ContactNameAndSignature=Pre %s, meno a podpis:
+OnlyLinesWithTypeServiceAreUsed=Iba riadky označené ako "Služba" budú skopírované
 
 ##### Types de contacts #####
 TypeContact_contrat_internal_SALESREPSIGN=Obchodný zástupca podpise zmluvy
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 806be4f8665..9d39f51d062 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Naplánované úlohy správy Nastavenie
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Bezpečnostný kľúč pre URL spustiť cron
 FileToLaunchCronJobs=Príkazový riadok spustiť cron
@@ -23,7 +23,7 @@ CronCommand=Príkaz
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Práca
@@ -39,7 +39,7 @@ CronMethod=Metóda
 CronModule=Modul
 CronNoJobs=Žiadny registrovaný práce
 CronPriority=Priorita
-CronLabel=Popis
+CronLabel=Label
 CronNbRun=Nb. začať
 CronMaxRun=Max nb. launch
 CronEach=Každý
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sk_SK/dict.lang b/htdocs/langs/sk_SK/dict.lang
index abde4299445..39549d11701 100644
--- a/htdocs/langs/sk_SK/dict.lang
+++ b/htdocs/langs/sk_SK/dict.lang
@@ -6,7 +6,7 @@ CountryES=Španielsko
 CountryDE=Nemecko
 CountryCH=Švajčiarsko
 CountryGB=Veľká Británia
-CountryUK=United Kingdom
+CountryUK=Spojené Kráľovstvo
 CountryIE=Írsko
 CountryCN=Čína
 CountryTN=Tunisko
@@ -138,7 +138,7 @@ CountryLS=Lesotho
 CountryLR=Libéria
 CountryLY=Líbyjská
 CountryLI=Lichtenštajnsko
-CountryLT=Lithuania
+CountryLT=Litva
 CountryLU=Luxembursko
 CountryMO=Macao
 CountryMK=Macedónsko, Bývalá juhoslovanská z
diff --git a/htdocs/langs/sk_SK/ecm.lang b/htdocs/langs/sk_SK/ecm.lang
index 0acd186fce7..5b976668184 100644
--- a/htdocs/langs/sk_SK/ecm.lang
+++ b/htdocs/langs/sk_SK/ecm.lang
@@ -22,7 +22,7 @@ ECMSearchByKeywords=Vyhľadávanie podľa kľúčových slov
 ECMSearchByEntity=Hľadať podľa objektu
 ECMSectionOfDocuments=Adresára dokumentov
 ECMTypeAuto=Automatický
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBySocialContributions=Dokumenty súviasiace so sociálnou alebo fiškálnou daňou
 ECMDocsByThirdParties=Dokumenty súvisiace s tretími stranami
 ECMDocsByProposals=Dokumenty súvisiace s návrhmi
 ECMDocsByOrders=Dokumenty súvisiace s zákazníkmi objednávky
@@ -30,8 +30,8 @@ ECMDocsByContracts=Dokumenty súvisiace so zmluvami
 ECMDocsByInvoices=Dokumenty súvisiace s faktúrami zákazníkmi
 ECMDocsByProducts=Dokumenty súvisiace s produktmi
 ECMDocsByProjects=Dokumenty súvisiace s projektmi
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByUsers=Dokumenty súvisiace s používateľmi
+ECMDocsByInterventions=Dokumenty súvisiace so zákrokom.
 ECMNoDirectoryYet=No vytvoril adresár
 ShowECMSection=Zobraziť adresár
 DeleteSection=Odstráňte adresár
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index c848d61f71e..b5120524120 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Chyba, musí mať PHP modul <b>%s</b> nainštalovať túto fu
 ErrorOpenIDSetupNotComplete=Môžete nastavenie Dolibarr konfiguračný súbor, aby OpenID overovania, ale URL OpenID služby nie je definovaný do stálych %s
 ErrorWarehouseMustDiffers=Zdrojovej a cieľovej sklady musia sa líši
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sk_SK/exports.lang b/htdocs/langs/sk_SK/exports.lang
index 425bc93b761..ebd9f9ff533 100644
--- a/htdocs/langs/sk_SK/exports.lang
+++ b/htdocs/langs/sk_SK/exports.lang
@@ -8,7 +8,7 @@ ImportableDatas=Importovateľné dataset
 SelectExportDataSet=Vyberte dátový súbor, ktorý chcete exportovať ...
 SelectImportDataSet=Vyberte dátový súbor, ktorý chcete importovať ...
 SelectExportFields=Vyberte polia, ktoré chcete exportovať, alebo vyberte preddefinovanú export profil
-SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
+SelectImportFields=Zvoľte zdrojove polia ktoré chcete importovať a finálne polia v databáze  presunutím hore a dole so zarovnaním %s alebo zvoľte preddefinovaný profil importu.
 NotImportedFields=Oblasti zdrojovom súbore sa nedovážajú
 SaveExportModel=Uložiť tento export profil, ak máte v pláne znova neskôr ...
 SaveImportModel=Uložiť túto importu profilu, ak máte v pláne znova neskôr ...
@@ -38,10 +38,10 @@ FormatedExportDesc2=First step is to choose a predefined dataset, then to choose
 FormatedExportDesc3=When data to export are selected, you can define output file format you want to export your data to.
 Sheet=List
 NoImportableData=Žiadne dovážať dáta (žiadny modul s definíciami povoliť import dát)
-FileSuccessfullyBuilt=File generated
+FileSuccessfullyBuilt=Dokument vygenerovaný
 SQLUsedForExport=Otázka SQL použiť na vytvorenie exportovaného súboru
 LineId=Id riadku
-LineLabel=Label of line
+LineLabel=Názov riadka
 LineDescription=Popis linky
 LineUnitPrice=Jednotková cena linky
 LineVATRate=Sadzba DPH linky
@@ -72,7 +72,7 @@ FieldSource=Zdroj polia
 NbOfSourceLines=Počet riadkov v zdrojovom súbore
 NowClickToTestTheImport=Kontrola parametrov importu, ktoré ste definovali. Ak sú v poriadku, kliknite na tlačidlo <b>&quot;%s&quot;</b> spustíte simuláciu procesu importu (žiadne dáta sa zmení v databáze, je to len simulácia pre túto chvíľu) ...
 RunSimulateImportFile=Spustite import simuláciu
-FieldNeedSource=This field requires data from the source file
+FieldNeedSource=Toto pole vyžaduje údaje zo zdrojového dokumentu
 SomeMandatoryFieldHaveNoSource=Niektoré povinné polia nemajú zdroje z dátového súboru
 InformationOnSourceFile=Informácie o zdrojovom súbore
 InformationOnTargetTables=Informácie o cieľových oblastiach,
@@ -80,7 +80,7 @@ SelectAtLeastOneField=Prepnutie aspoň jeden zdrojový poľa v stĺpci polí pre
 SelectFormat=Zvoľte túto importu súboru vo formáte
 RunImportFile=Spustenie importu súboru
 NowClickToRunTheImport=Skontrolujte výsledok importu simulácie. Ak je všetko v poriadku, spustite trvalému dovozu.
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
+DataLoadedWithId=Všetky dáta budú načítane s id:  <b>%s</b>
 ErrorMissingMandatoryValue=Povinné údaje je prázdny v zdrojovom súbore pre poľné <b>%s.</b>
 TooMuchErrors=Tam je ešte <b>%s</b> ďalšie zdrojové riadky s chybami, ale výkon bol obmedzený.
 TooMuchWarnings=Tam je ešte <b>%s</b> ďalšie zdrojové riadky s varovaním, ale výkon bol obmedzený.
@@ -93,14 +93,14 @@ NbOfLinesImported=Počet riadkov úspešne importovaných: <b>%s.</b>
 DataComeFromNoWhere=Hodnota vložiť pochádza z ničoho nič v zdrojovom súbore.
 DataComeFromFileFieldNb=Hodnota vložiť pochádza z <b>%s</b> číslo poľa v zdrojovom súbore.
 DataComeFromIdFoundFromRef=Hodnota, ktorá pochádza z <b>%s</b> číslo poľa zdrojový súbor bude použitý k nájdeniu id nadradený objekt používať (teda obísť <b>%s</b> ktorý má čj. Zo zdrojového súboru musí byť do Dolibarr existuje).
-DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
+DataComeFromIdFoundFromCodeId=Kód z poľa číslo <b>%s</b> zo zdrojového dokumentu bude použité pre nájdenie ID rodičovského objektu pre použitie. ( kód zo zdrojového dokumentu musí existovať v slovníku  <b>%s</b>)  Ak poznáte ID, môžete ho použiť v zdrojovóm dokumente namiesto kódu. Import by mal fungovať v oboch prípadoch.
 DataIsInsertedInto=Dáta prichádzajúce zo zdrojového súboru budú vložené do nasledujúceho poľa:
 DataIDSourceIsInsertedInto=Id z nadradeného objektu zistené na základe údajov v zdrojovom súbore, sa vloží do nasledujúceho poľa:
 DataCodeIDSourceIsInsertedInto=Id materskej línie našli kódu, bude vložený do nasledujúceho políčka:
 SourceRequired=Hodnota dát je povinné
 SourceExample=Príklad možné hodnoty údajov
 ExampleAnyRefFoundIntoElement=Akékoľvek ref našli prvkov <b>%s</b>
-ExampleAnyCodeOrIdFoundIntoDictionary=Any code (or id) found into dictionary <b>%s</b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Kód (alebo ID) nájdené v slovníku <b>%s</b>
 CSVFormatDesc=<b>Hodnoty oddelené čiarkami</b> formát súboru (. Csv). <br> Jedná sa o textový formát súboru, kde sú polia oddelené oddeľovačom [%s]. Ak oddeľovač sa nachádza vo vnútri poľa obsahu je pole zaoblené charakteru kola [%s]. Útek charakter unikať okolo znaku je %s [].
 Excel95FormatDesc=<b>Excel</b> formát súboru (. Xls) <br> Toto je natívny formát programu Excel 95 (BIFF5).
 Excel2007FormatDesc=<b>Excel</b> formát súboru (. Xlsx) <br> Toto je natívny formát programu Excel 2007 (SpreadsheetML).
@@ -109,16 +109,16 @@ ExportFieldAutomaticallyAdded=Terénne <b>%s</b> bol automaticky pridaný. Bude
 CsvOptions=Csv možnosti
 Separator=Oddeľovač
 Enclosure=Príloha
-SpecialCode=Special code
-ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
-ImportFromLine=Import starting from line number
-EndAtLineNb=End at line number
-SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
+SpecialCode=Špeciálny kód
+ExportStringFilter=%% umožňuje nahradenie jedného alebo viac znakov v texte
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filtre podľa jedného rok/mesiac/deň<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filtre cez hodnotu roky/mesiace/dni<br> > YYYY, > YYYYMM, > YYYYMMDD : filtre na nasledujúce roky/mesiace/dni<br> < YYYY, < YYYYMM, < YYYYMMDD : filtre na predchádzajúce roky/mesiace/dni
+ExportNumericFilter='NNNNN' filtre podľa hodnoty <br>'NNNNN+NNNNN' filtre cez rozsah hodnôt <br>'&gt;NNNNN' filtre podľa najnižšej hodnoty<br>'&gt;NNNNN' filtre podľa najvyššej
+ImportFromLine=Import začína od riadka číslo
+EndAtLineNb=Číslo konca riadka
+SetThisValueTo2ToExcludeFirstLine=Napríklad, nastavte túto hodnotu na 3 pre vynechanie prvých 2 riadkov
+KeepEmptyToGoToEndOfFile=Nechajte tento riadok prázdny pre skok na koniec dokumentu
 ## filters
 SelectFilterFields=Ak chcete filtrovať niektoré hodnoty, stačí zadať hodnoty tu.
 FilteredFields=Filtrované polia
 FilteredFieldsValues=Hodnota za filtrom
-FormatControlRule=Format control rule
+FormatControlRule=Nastavte kontrolné pravidlo
diff --git a/htdocs/langs/sk_SK/ftp.lang b/htdocs/langs/sk_SK/ftp.lang
index 29980926415..541f0eadf5b 100644
--- a/htdocs/langs/sk_SK/ftp.lang
+++ b/htdocs/langs/sk_SK/ftp.lang
@@ -10,5 +10,5 @@ FailedToConnectToFTPServerWithCredentials=Nepodarilo sa prihlásiť k FTP server
 FTPFailedToRemoveFile=Nepodarilo sa odstrániť súbor <b>%s.</b>
 FTPFailedToRemoveDir=Nepodarilo sa odstrániť adresár <b>%s</b> (Skontrolujte oprávnenia a že adresár je prázdny).
 FTPPassiveMode=Pasívny režim
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+ChooseAFTPEntryIntoMenu=Pridajte položku FTP do menu
+FailedToGetFile=Získanie súborov %s zlyhalo
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 3ffb37fe69a..97a58e92fd5 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Vaše PHP podporuje relácie.
 PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a GET.
 PHPSupportPOSTGETKo=Je možné, že vaša inštalácia PHP nepodporuje premenné POST a / alebo GET. Skontrolujte parameter <b>variables_order</b> v php.ini.
 PHPSupportGD=Vaše PHP podporuje grafické funkcie GD .
+PHPSupportCurl=PHP podporuje Curl
 PHPSupportUTF8=Vaše PHP podporuje funkcie UTF8.
 PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. To by malo stačiť.
 PHPMemoryTooLow=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. Môže to byť príliš málo.Upravte súbor <b>php.ini</b> a nastavte parameter <b>memory_limit</b> aspoň na hodnotu <b>%s</b> bajtov.
 Recheck=Kliknite sem pre viac signifikantný test
 ErrorPHPDoesNotSupportSessions=Vaša inštalácia PHP nepodporuje relácie. Táto funkcia je nutná, aby Dolibarr fungoval. Skontrolujte vaše nastavenia PHP.
 ErrorPHPDoesNotSupportGD=Vaša inštalácia PHP nepodporuje grafické funkcie GD. Grafy nebudú k dispozícii.
+ErrorPHPDoesNotSupportCurl=Vaše nainštalované PHP nepodporuje Curl
 ErrorPHPDoesNotSupportUTF8=Vaša inštalácia PHP nepodporuje funkcie UTF8. Dolibarr nemôže pracovať správne. Pred inštaláciou Dolibarr treba tento problém vyriešiť.
 ErrorDirDoesNotExists=Adresár %s neexistuje.
 ErrorGoBackAndCorrectParameters=Choďte späť a opravte chybné parametre.
@@ -76,7 +78,7 @@ SetupEnd=Koniec nastavenie
 SystemIsInstalled=Táto inštalácia je dokončená.
 SystemIsUpgraded=Dolibarr bol aktualizovaný úspešne.
 YouNeedToPersonalizeSetup=Je potrebné nakonfigurovať Dolibarr aby vyhovoval vašim potrebám (vzhľad, vlastnosti, ...). Ak to chcete, prosím, na nižšie uvedený odkaz:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+AdminLoginCreatedSuccessfuly=Dolibarr administrátorský účet '<b>%s</b>' úspešne vytvorený
 GoToDolibarr=Prejsť na Dolibarr
 GoToSetupArea=Prejsť na Dolibarr (nastavenie plochy)
 MigrationNotFinished=Verzia databázy nie je úplne aktuálna, takže budete musieť spustiť proces aktualizácie znova.
@@ -86,7 +88,7 @@ DirectoryRecommendation=Je odporúčané používať adresár mimo adresára zo
 LoginAlreadyExists=Už existuje
 DolibarrAdminLogin=Dolibarr admin login
 AdminLoginAlreadyExists=Dolibarr účtu správcu <b>&quot;%s</b> 'už existuje. Vráť sa, ak chcete vytvoriť ďalšie.
-FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
+FailedToCreateAdminLogin=Vytvorenie Dolibarr administratórskeho účtu zlyhalo
 WarningRemoveInstallDir=Pozor, z bezpečnostných dôvodov, akonáhle inštaláciu alebo upgrade je kompletný, aby sa zabránilo používanie inštaláciu nástroja znova, mali by ste pridať súbor s názvom <b>install.lock</b> do adresára dokumentov Dolibarr, aby sa zabránilo škodlivému využitie.
 FunctionNotAvailableInThisPHP=Nie je k dispozícii na tejto PHP
 ChoosedMigrateScript=Vyberte si skript migrácie
@@ -131,8 +133,12 @@ MigrationFinished=Migrácia dokončená
 LastStepDesc=<strong>Posledný krok:</strong> Definujte tu prihlasovacie meno a heslo budete používať pre pripojenie k softvéru. Nestrácajte to, ako to je účet, spravovať všetky ostatné.
 ActivateModule=Aktivácia modulu %s
 ShowEditTechnicalParameters=Kliknite tu pre zobrazenie / editovať pokročilé parametre (expertný režim)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=UPOZORNENIE\n\nZálohovali ste databázu ?\nOdporúča sa zálohovať databázu kôli chybám (napr. mysql v..5.40/41/42/43), niektoré data alebo tabuľky sa môžu stratiť počas tohto procesu. Zálohujte si databázu pred začatím migrácie.\n\nKliknutím na tlačidlo OK spustíte migráciu.
 ErrorDatabaseVersionForbiddenForMigration=Verzia Vašej databázy je %s. Obsahuje kritickú chybu spôsobujúcu stratu dát v prípade zmeny štruktúry databázy; takáto zmena je však migračným procesom vyžadovaná. Migrácia preto nebude povolená kým si nezaktualizujete svoju databázu na vyššiu, opravenú verziu. (Zoznam známych chybných verzií: %s)
+KeepDefaultValuesWamp=Používate Dolibarr inštalátor z DoliWamp čiže hodnoty sú už optimalizované. Zmenite ich iba v prípade, že viete čo robíte.
+KeepDefaultValuesDeb=Používate Dolibarr inštalátor z Linux balíčka (Ubuntu, Debian, Fedora...), čiže hodnoty sú už optimalizované. Iba nastavenia hesla databáze su potrebné. Ostatné parametrezmente iba v prípade, že viete čo robíte.
+KeepDefaultValuesMamp=Používate Dolibarr inštalátor z DoliMamp čiže hodnoty sú už optimalizované. Zmenite ich iba v prípade, že viete čo robíte.
+KeepDefaultValuesProxmox=Používate Dolibarr inštalátor z Proxmox čiže hodnoty sú už optimalizované. Zmenite ich iba v prípade, že viete čo robíte.
 
 #########
 # upgrade
@@ -142,7 +148,7 @@ MigrationSupplierOrder=Migrácia dát pre dodávateľov objednávky
 MigrationProposal=Migrácia dát na komerčné návrhov
 MigrationInvoice=Migrácia dát pre zákazníka faktúry
 MigrationContract=Migrácia dát pre zmluvy
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=Upgrade úspešný
 MigrationUpdateFailed=Nepodarilo proces upgradu
 MigrationRelationshipTables=Migrácia dát pre vzťah tabuliek (%s)
 MigrationPaymentsUpdate=Platba korekcia dát
@@ -156,7 +162,7 @@ MigrationContractsLineCreation=Vytvorte riadku zmluvy pre %s zmluvných ref
 MigrationContractsNothingToUpdate=Žiadne ďalšie vecí, ktoré sa
 MigrationContractsFieldDontExist=Pole fk_facture neexistuje už nie. Čo robiť.
 MigrationContractsEmptyDatesUpdate=Zmluva prázdna dáta korekcia
-MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=Úprava hodnoty úspešná
 MigrationContractsEmptyDatesNothingToUpdate=Žiadna zmluva prázdny Dátum opraviť
 MigrationContractsEmptyCreationDatesNothingToUpdate=Žiadna zmluva dátum vytvorenia opraviť
 MigrationContractsInvalidDatesUpdate=Bad valuty zmluva korekcia
@@ -164,7 +170,7 @@ MigrationContractsInvalidDateFix=Správne zmluvy %s (dátum na zmluve = %s, Zač
 MigrationContractsInvalidDatesNumber=%s zmluvy zmenená
 MigrationContractsInvalidDatesNothingToUpdate=Žiadny dátum so zlou hodnotu k náprave
 MigrationContractsIncoherentCreationDateUpdate=Zlá hodnota zmluvy Dátum vytvorenia korekcia
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
+MigrationContractsIncoherentCreationDateUpdateSuccess=Úprava hodnoty úspešná
 MigrationContractsIncoherentCreationDateNothingToUpdate=Žiadna zlá hodnota pre dátum vytvorenia zmluvy k náprave
 MigrationReopeningContracts=Otvorte zmluva uzatvorená chyby
 MigrationReopenThisContract=Znovu zmluvné %s
@@ -185,7 +191,9 @@ MigrationActioncommElement=Aktualizovať údaje o činnosti
 MigrationPaymentMode=Migrácia dát platobného režimu
 MigrationCategorieAssociation=Migrácia kategórií
 MigrationEvents=Migrácia udalostí za účelom pridania vlastníka udalosti do priraďovacej tabuľky
-MigrationReloadModule=Reload module %s
+MigrationRemiseEntity=Aktualizácia hodnoty llx_societe_remise
+MigrationRemiseExceptEntity=Aktualizácia hodnoty llx_societe_remise_except
+MigrationReloadModule=Znovu načítať modul %s
 ShowNotAvailableOptions=Zobraziť nedostupné možnosti
 HideNotAvailableOptions=Skryť nedostupné možnosti
-ErrorFoundDuringMigration=Error were reported during migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but application or some features may not work correctly until fixed.
+ErrorFoundDuringMigration=Počas migrácies sa vyskytol problém preto nasledujúci krok nie je dostupný. Pre ignorovanie chýb môžete <a href="%s">kliknúť tu</a>, ale niektoré funkcie aplikácie nebudu fungovať správne pokial ich neopravíte.
diff --git a/htdocs/langs/sk_SK/interventions.lang b/htdocs/langs/sk_SK/interventions.lang
index d5e01f5a6e3..8cdf98d4db4 100644
--- a/htdocs/langs/sk_SK/interventions.lang
+++ b/htdocs/langs/sk_SK/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=V nadväznosti kontakt so zákazníkom
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Zásahy vytvorené z objednávok
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index 2a6843717d1..2831aabf612 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_ar_AR=Arabčina
 Language_ar_SA=Arabčina
-Language_bn_BD=Bengali
+Language_bn_BD=Bengálština
 Language_bg_BG=Bulharčina
 Language_bs_BA=Bosniansky
 Language_ca_ES=Katalánčina
@@ -22,26 +22,26 @@ Language_en_US=Angličtina (Spojené štáty)
 Language_en_ZA=Angličtina (Južná Afrika)
 Language_es_ES=Španielčina
 Language_es_AR=Španielčina (Argentína)
-Language_es_BO=Spanish (Bolivia)
+Language_es_BO=Španělština (Bolívia)
 Language_es_CL=Španielčina (Chile)
-Language_es_CO=Spanish (Colombia)
+Language_es_CO=Španielčina (Kolumbia)
 Language_es_DO=Španielčina (Dominikánska Republika)
 Language_es_HN=Španielčina (Honduras)
 Language_es_MX=Španielčina (Mexiko)
 Language_es_PY=Španielčina (Paraguaj)
 Language_es_PE=Španielčina (Peru)
 Language_es_PR=Španielčina (Puerto Rico)
-Language_es_VE=Spanish (Venezuela)
+Language_es_VE=Španielčina (Venezuela)
 Language_et_EE=Estónčina
 Language_eu_ES=Basque
 Language_fa_IR=Perzština
-Language_fi_FI=Finnish
+Language_fi_FI=Finština
 Language_fr_BE=Francúzština (Belgicko)
 Language_fr_CA=Francúzština (Kanada)
 Language_fr_CH=Francúzština (Švajčiarsko)
 Language_fr_FR=Francúzština
 Language_fr_NC=Francúzština (Nová Kaledónia)
-Language_fy_NL=Frisian
+Language_fy_NL=Frízština
 Language_he_IL=Hebrejčina
 Language_hr_HR=Chorvátsky
 Language_hu_HU=Maďarčina
@@ -49,10 +49,10 @@ Language_id_ID=Indonézština
 Language_is_IS=Islandský
 Language_it_IT=Taliančina
 Language_ja_JP=Japonština
-Language_ka_GE=Georgian
-Language_kn_IN=Kannada
+Language_ka_GE=Gruzínčina
+Language_kn_IN=Kannadština
 Language_ko_KR=Kórejčina
-Language_lo_LA=Lao
+Language_lo_LA=Laoština
 Language_lt_LT=Litovský
 Language_lv_LV=Lotyština
 Language_mk_MK=Macedónsky
@@ -71,8 +71,8 @@ Language_sv_SV=Švédsky
 Language_sv_SE=Švédsky
 Language_sq_AL=Albánčina
 Language_sk_SK=Slovenčina
-Language_sr_RS=Serbian
-Language_sw_SW=Kiswahili
+Language_sr_RS=Srbština
+Language_sw_SW=Svahilština
 Language_th_TH=Thai
 Language_uk_UA=Ukrajinec
 Language_uz_UZ=Uzbek
diff --git a/htdocs/langs/sk_SK/ldap.lang b/htdocs/langs/sk_SK/ldap.lang
index fffaf4f2843..95f2fbfc644 100644
--- a/htdocs/langs/sk_SK/ldap.lang
+++ b/htdocs/langs/sk_SK/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Prvý dátum predplatné
 LDAPFieldFirstSubscriptionAmount=Prvý úpisu
 LDAPFieldLastSubscriptionDate=Posledný dátum predplatné
 LDAPFieldLastSubscriptionAmount=Posledný úpisu
+LDAPFieldSkype=Skype ID
+LDAPFieldSkypeExample=Príklad" skypeMeno
 UserSynchronized=Užívateľ synchronizované
 GroupSynchronized=Skupina synchronizované
 MemberSynchronized=Člen synchronizované
diff --git a/htdocs/langs/sk_SK/mailmanspip.lang b/htdocs/langs/sk_SK/mailmanspip.lang
index 30fea010bc6..dac61ddcda2 100644
--- a/htdocs/langs/sk_SK/mailmanspip.lang
+++ b/htdocs/langs/sk_SK/mailmanspip.lang
@@ -3,8 +3,8 @@ MailmanSpipSetup=Poštár a SPIP modul nastavenia
 MailmanTitle=Poštár mailing list systém
 TestSubscribe=Ak chcete vyskúšať predplatné poštár zoznamy
 TestUnSubscribe=Ak chcete otestovať odhlásiť zo zoznamu poštár
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
+MailmanCreationSuccess=Test prihlásenia na odber bol úspešne spustený
+MailmanDeletionSuccess=Test odhlásenia z odberu bol úspešne spustený
 SynchroMailManEnabled=Poštár aktualizácia bude vykonaná
 SynchroSpipEnabled=Aktualizácia SPIP bude vykonaná
 DescADHERENT_MAILMAN_ADMINPW=Poštár heslo správcu
@@ -23,5 +23,5 @@ DeleteIntoSpip=Odstrániť z SPIP
 DeleteIntoSpipConfirmation=Ste si istí, že chcete odstrániť tohto člena z SPIP?
 DeleteIntoSpipError=Nepodarilo sa potlačiť užívateľovi SPIP
 SPIPConnectionFailed=Nepodarilo sa pripojiť k SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+SuccessToAddToMailmanList=%s úspešne pridaný do mailového listu %s alebo SPIP databáze
+SuccessToRemoveToMailmanList=%s úspešne odstránený z mailového listu %s alebo SPIP databáze
diff --git a/htdocs/langs/sk_SK/mails.lang b/htdocs/langs/sk_SK/mails.lang
index caa5dfbbc4c..afa99780e92 100644
--- a/htdocs/langs/sk_SK/mails.lang
+++ b/htdocs/langs/sk_SK/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Čítať
 YourMailUnsubcribeOK=Napísať <b>%s</b> správne unsubcribe z mailing listu
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Email bol odoslaný na %s príjemcom.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 8347633a226..10068b10593 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -67,6 +67,7 @@ SelectDate=Vybrať dátum
 SeeAlso=Pozri tiež %s
 SeeHere=Viď tu
 BackgroundColorByDefault=Predvolené farba pozadia
+FileRenamed=The file was successfully renamed
 FileUploaded=Súbor sa úspešne nahral
 FileWasNotUploaded=Súbor vybraný pre pripojenie, ale ešte nebol nahraný. Kliknite na &quot;Priložiť súbor&quot; za to.
 NbOfEntries=Nb záznamov
@@ -245,6 +246,10 @@ DateBuild=Správa dátum zostavenia
 DatePayment=Dátum platby
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=rok
 DurationMonth=mesiac
 DurationWeek=týždeň
@@ -256,6 +261,7 @@ DurationDays=dni
 Year=Rok
 Month=Mesiac
 Week=Týždeň
+WeekShort=Week
 Day=Deň
 Hour=Hodina
 Minute=Minúta
@@ -278,6 +284,7 @@ MonthOfDay=Mesiaca odo dňa
 HourShort=H
 MinuteShort=mn
 Rate=Sadzba
+CurrencyRate=Currency conversion rate
 UseLocalTax=Vrátane DPH
 Bytes=Bytov
 KiloBytes=Kilobajty
@@ -565,8 +572,11 @@ BackToList=Späť na zoznam
 GoBack=Vrátiť sa
 CanBeModifiedIfOk=Môže byť zmenený, ak platí
 CanBeModifiedIfKo=Môže byť zmenená, pokiaľ nie je platný
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Nahrávanie bolo úspešne upravené
 RecordsModified=%s záznamy zmenená
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatické kód
 FeatureDisabled=Funkcia vypnutá
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Nemáte oprávnenie pre túto akciu
 SessionName=Názov relácie
 Method=Metóda
 Receive=Prijať
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Čiastočný
 TotalWoman=Celkový
 NeverReceived=Nikdy nedostal
@@ -598,6 +609,7 @@ DisabledModules=Zakázané moduly
 For=Pre
 ForCustomer=Pre zákazníkov
 Signature=Podpis
+DateOfSignature=Date of signature
 HidePassword=Zobraziť príkaz s heslom skryté
 UnHidePassword=Zobraziť skutočné velenie s jasným heslom
 Root=Koreň
@@ -641,6 +653,15 @@ NewAttribute=Nový atribút
 AttributeCode=Atribút kód
 URLPhoto=URL fotky/loga
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Vytvorte návrh
 SetToDraft=Späť na návrh
 ClickToEdit=Kliknutím možno upraviť
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Pondelok
 Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index fed8ef71939..92cda82858c 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index d136c1d59e3..e41f2cbb5a2 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -65,7 +65,7 @@ SubscriptionLate=Neskoro
 SubscriptionNotReceived=Vstupné nikdy nedostal
 ListOfSubscriptions=Zoznam predplatné
 SendCardByMail=Poslať kartu e-mailom
-AddMember=Create member
+AddMember=Vytvoriť používateľa
 NoTypeDefinedGoToSetup=Žiadny člen definované typy. Choď na menu &quot;Členovia typy&quot;
 NewMemberType=Nový člen typu
 WelcomeEMail=Vitajte e-mail
@@ -92,15 +92,15 @@ BlankSubscriptionFormDesc=Dolibarr vám môže poskytnúť verejnú adresu URL,
 EnablePublicSubscriptionForm=Povoliť verejné auto-prihlasovací formulár
 ExportDataset_member_1=Členovia a predplatné
 ImportDataset_member_1=Členovia
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
+LastMembersModified=Naposledy %s modifikovaní používatelia
+LastSubscriptionsModified=Naposledy %s modifikované predplatné
 String=Reťaz
 Text=Text
 Int=Int
 DateAndTime=Dátum a čas
 PublicMemberCard=Členské verejné karta
-SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
+SubscriptionNotRecorded=Predplatné nie je zaznamenané
+AddSubscription=Vytvoriť predplatné
 ShowSubscription=Zobraziť predplatné
 SendAnEMailToMember=Poslať e-mail Informácie o členovi
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Predmet e-mailu dostal v prípade auto-nápis host
@@ -141,7 +141,7 @@ LastSubscriptionAmount=Posledný úpisu
 MembersStatisticsByCountries=Členovia Štatistiky podľa krajiny
 MembersStatisticsByState=Členovia štatistika štát / provincia
 MembersStatisticsByTown=Členovia štatistika podľa mesta
-MembersStatisticsByRegion=Members statistics by region
+MembersStatisticsByRegion=Štatistiky užívateľov podľa regiónu
 NbOfMembers=Počet členov
 NoValidatedMemberYet=Žiadne overené členmi nájdených
 MembersByCountryDesc=Táto obrazovka vám ukáže štatistiku členov jednotlivých krajinách. Grafika však závisí od Google on-line služby grafu a je k dispozícii iba v prípade, je pripojenie k internetu funguje.
@@ -164,9 +164,9 @@ CanEditAmount=Návštevník si môže vybrať / upraviť výšku svojho upísan
 MEMBER_NEWFORM_PAYONLINE=Prejsť na integrované on-line platobné stránky
 ByProperties=Charakteristikami
 MembersStatisticsByProperties=Členovia štatistiky podľa charakteristík
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
+MembersByNature=Tento pohľad zobrazuje štatistiky používateľov podľa krajiny
+MembersByRegion=Tento pohľad zobrazuje štatistiky používateľov podľa regiónu
 VATToUseForSubscriptions=Sadzba DPH sa má použiť pre predplatné
 NoVatOnSubscription=Nie TVA za upísané vlastné imanie
-MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+MEMBER_PAYONLINE_SENDEMAIL=Email pre upozornenia ked Dolibarr zaznamená potvrdenie overenej platby pre odber. ( pr. paymentdone@example.com)
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Produkt použitý pre riadok predplatného vo faktúre %s
diff --git a/htdocs/langs/sk_SK/oauth.lang b/htdocs/langs/sk_SK/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/sk_SK/oauth.lang
+++ b/htdocs/langs/sk_SK/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index b9010e64429..a97f86caebf 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Vaše objednávky boli vytvorené
 OrderFail=Došlo k chybe pri vytváraní objednávky
 CreateOrders=Vytvorenie objednávky
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/sk_SK/paybox.lang b/htdocs/langs/sk_SK/paybox.lang
index 5d76e0bc128..0f90dd5aa01 100644
--- a/htdocs/langs/sk_SK/paybox.lang
+++ b/htdocs/langs/sk_SK/paybox.lang
@@ -34,6 +34,6 @@ MessageKO=Správa o zrušení strane platobnej návrate
 NewPayboxPaymentReceived=Nový Paybox prijatej platby
 NewPayboxPaymentFailed=Nový Paybox platba snažil sa ale prepadal
 PAYBOX_PAYONLINE_SENDEMAIL=E-mail upozorniť po platbe (úspech alebo zlyhanie)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=Hodnota pre PBX SITE
+PAYBOX_PBX_RANG=Hodnota pre PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Hodnota pre PBX ID
diff --git a/htdocs/langs/sk_SK/printing.lang b/htdocs/langs/sk_SK/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/sk_SK/printing.lang
+++ b/htdocs/langs/sk_SK/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index bbdd3e4bff1..a8e7becf17e 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Produkt čj.
 ProductLabel=Produkt štítok
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductLabelTranslated=Preložený názov produktu
+ProductDescriptionTranslated=Preložený popis produktu
+ProductNoteTranslated=Preložená poznámka produktu
 ProductServiceCard=Produkty / služby karty
 Products=Produkty
 Services=Služby
@@ -14,26 +14,26 @@ Create=Vytvoriť
 Reference=Referencie
 NewProduct=Nový produkt
 NewService=Nová služba
-ProductVatMassChange=Mass VAT change
-ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
-MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Účtovníctvo kód (kúpiť)
-ProductAccountancySellCode=Účtovníctvo kód (predaj)
+ProductVatMassChange=Hromadná zmena DPH
+ProductVatMassChangeDesc=Tu môžete upraviť hodnotu DPH pre produkty alebo služby. Upozornenie, táto zmena bude použitá pre celú databázu
+MassBarcodeInit=Hromadné načítanie čiarového kódu
+MassBarcodeInitDesc=Tu môžete načítať čiarový kód pre produkt kde nie je definovaný. Skontroluje pred načítaním modulu čiarového kódu
+ProductAccountancyBuyCode=Účtovný kód (kúpa)
+ProductAccountancySellCode=Účtovný kód (predaj)
 ProductOrService=Produkt alebo služba
 ProductsAndServices=Produkty a služby
-ProductsOrServices=Výrobky alebo služby
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product card
-CardProduct1=Service card
+ProductsOrServices=Produkty alebo služby
+ProductsOnSell=Produkt na predaj alebo kúpu
+ProductsNotOnSell=Produkt nie je na predaj alebo kúpu
+ProductsOnSellAndOnBuy=Produkt na predaj a kúpu
+ServicesOnSell=Služba na predaj alebo kúpu
+ServicesNotOnSell=Služba nie je na predaj
+ServicesOnSellAndOnBuy=Služba na predaj a kúpu
+LastModifiedProductsAndServices=Naposledy %s upravené produkty/služby
+LastRecordedProducts=Naposledy %s uložené produkty
+LastRecordedServices=Naposledy %s uložené služby
+CardProduct0=Karta produktu
+CardProduct1=Karta služby
 Stock=Sklad
 Stocks=Zásoby
 Movements=Pohyby
@@ -50,23 +50,25 @@ ProductStatusOnBuy=Pre nákup
 ProductStatusNotOnBuy=Nemožno zakúpiť
 ProductStatusOnBuyShort=Pre nákup
 ProductStatusNotOnBuyShort=Nemožno zakúpiť
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+UpdateVAT=Upraviť DPH
+UpdateDefaultPrice=Upraviť základnú cenu
+UpdateLevelPrices=Upraviť cenu pre každý stupeň
 AppliedPricesFrom=Aplikovaná ceny od
 SellingPrice=Predajná cena
 SellingPriceHT=Predajná cena (bez DPH)
 SellingPriceTTC=Predajná cena (s DPH)
-CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
-CostPriceUsage=In a future version, this value could be used for margin calculation.
+CostPriceDescription=Táto cena (  po odpočítani daňe ) môže byť použitá pri výpočte nákladov  na tento produkt. Može to byt hocijaká cena ktorú vypočítate. Napr. priemerná nákupná cena plus priemerná cena produkcie a distribúcie.
+CostPriceUsage=V budúcej verzii môže byť táto hodnota použitá pre kalkuláciu tržby
+SoldAmount=Predané množstvo
+PurchasedAmount=Kúpené množstvo
 NewPrice=Nová cena
-MinPrice=Min. selling price
+MinPrice=Minimálna predajná cena
 CantBeLessThanMinPrice=Predajná cena nesmie byť nižšia ako minimálna povolená pre tento produkt (%s bez dane). Toto hlásenie sa môže tiež zobrazí, ak zadáte príliš dôležitú zľavu.
 ContractStatusClosed=Zatvorené
 ErrorProductAlreadyExists=Výrobok s referenčným %s už existuje.
 ErrorProductBadRefOrLabel=Chybná hodnota pre referenčné alebo etikety.
 ErrorProductClone=Vyskytol sa problém pri pokuse o klonovaní produkt alebo službu.
-ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
+ErrorPriceCantBeLowerThanMinPrice=Chyba, cena nemôže byt nižšia ako minimálna cena
 Suppliers=Dodávatelia
 SupplierRef=Dodávateľa produktov čj.
 ShowProduct=Zobraziť produkt
@@ -76,7 +78,7 @@ ProductsArea=Produkt oblasť
 ServicesArea=Poskytovanie služieb v oblasti
 ListOfStockMovements=Zoznam skladových pohybov
 BuyingPrice=Nákup cenu
-PriceForEachProduct=Products with specific prices
+PriceForEachProduct=Produkty so špecifickou cenou
 SupplierCard=Dodávateľ karty
 PriceRemoved=Cena odstránené
 BarCode=Čiarový kód
@@ -85,22 +87,22 @@ SetDefaultBarcodeType=Nastavte typ čiarového kódu
 BarcodeValue=Barcode hodnota
 NoteNotVisibleOnBill=Poznámka (nie je vidieť na návrhoch faktúry, ...)
 ServiceLimitedDuration=Je-li výrobok je služba s obmedzeným trvaním:
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=Viac cenovych oblastí pre produkt/službu (každý zákazníke je v inej oblasti)
 MultiPricesNumPrices=Počet cien
-AssociatedProductsAbility=Activate the package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this package product
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
+AssociatedProductsAbility=Zapnúť možnosti balíčkov
+AssociatedProducts=Produktový balíček
+AssociatedProductsNumber=Počet produktov v balíčku
+ParentProductsNumber=Počet rodičovských balíčkov produktu
+ParentProducts=Rodičovský produkt
+IfZeroItIsNotAVirtualProduct=Ak 0, tento produkt nie je balíček
+IfZeroItIsNotUsedByVirtualProduct=Ak 0, tento produkt sa nenachádza v žiadnom balíčku
 Translation=Preklad
 KeywordFilter=Kľúčové slovo filter
 CategoryFilter=Kategórie filtra
 ProductToAddSearch=Hľadanie informácií o produktoch pre pridanie
 NoMatchFound=Nie nájdená zhoda
-ProductAssociationList=List of products/services that are component of this virtual product/package
-ProductParentList=List of package products/services with this product as a component
+ProductAssociationList=Zoznam produktov/služieb v tomto virtuálnom balíčku
+ProductParentList=Zoznam  balíčkov kde je tento produkt
 ErrorAssociationIsFatherOfThis=Jedným z vybraného produktu je rodič s aktuálnou produkt
 DeleteProduct=Odstránenie produktu / služby
 ConfirmDeleteProduct=Ste si istí, že chcete zmazať tento výrobok / službu?
@@ -118,13 +120,13 @@ VATRateForSupplierProduct=Sadzba DPH (tohto podniku / produktu)
 DiscountQtyMin=Predvolené zľava Množstvo
 NoPriceDefinedForThisSupplier=Nie cena / ks definovaný tohto podniku / produktu
 NoSupplierPriceDefinedForThisProduct=Žiadny dodávateľ cena / ks definovaná pre tento produkt
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
-NotPredefinedProducts=Not predefined products/services
+PredefinedProductsToSell=Preddefinovaný produkt na predaj
+PredefinedServicesToSell=Preddefinovaná služba na predaj
+PredefinedProductsAndServicesToSell=Preddefinovaný produkt/služba na predaj
+PredefinedProductsToPurchase=Preddefinovaný produkt pre nákup
+PredefinedServicesToPurchase=Preddefinovaná služba pre nákup
+PredefinedProductsAndServicesToPurchase=Preddefinovaný produkt/služba na kúpu
+NotPredefinedProducts=Nie preddefinovaný produkt/služba
 GenerateThumb=Vytvoriť palec
 ServiceNb=Servisné # %s
 ListProductServiceByPopularity=Zoznam produktov / služieb podľa obľúbenosti
@@ -136,27 +138,27 @@ CloneProduct=Clone produkt alebo službu
 ConfirmCloneProduct=Ste si istí, že chcete klonovať produktov alebo služieb <b>%s?</b>
 CloneContentProduct=Klon všetky hlavné informácie o produkte / služby
 ClonePricesProduct=Klonovať hlavné informácie a ceny
-CloneCompositionProduct=Clone packaged product/service
+CloneCompositionProduct=Duplikovať balík produktov/služieb
 ProductIsUsed=Tento produkt sa používa
 NewRefForClone=Ref nového produktu / služby
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
+SellingPrices=Predajné ceny
+BuyingPrices=Nákupné ceny
+CustomerPrices=Zákaznícka cena
+SuppliersPrices=Dodávateľská cena
+SuppliersPricesOfProductsOrServices=Dodávateľské ceny (pre produkt aleob službu)
 CustomCode=Colné kód
 CountryOrigin=Krajina pôvodu
 Nature=Príroda
-ShortLabel=Short label
-Unit=Unit
+ShortLabel=Krátky názov
+Unit=Jednotka
 p=u.
-set=set
-se=set
-second=second
+set=nastaviť
+se=nastaviť
+second=sekunda
 s=s
-hour=hour
+hour=hodina
 h=h
-day=day
+day=deň
 d=d
 kilogram=kilogram
 kg=Kg
@@ -169,88 +171,88 @@ m2=m²
 m3=m³
 liter=liter
 l=L
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=Referenčná šablóna produktu
+ServiceCodeModel=Referenčná šablóna služby
 CurrentProductPrice=Aktuálna cena
 AlwaysUseNewPrice=Vždy používajte aktuálnu cenu produktu / služby
 AlwaysUseFixedPrice=Použite pevnú cenu
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Rozdielné ceny podľa quantity
 PriceByQuantityRange=Množstvo rozsah
-MultipriceRules=Price segment rules
-UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
-PercentVariationOver=%% variation over %s
-PercentDiscountOver=%% discount over %s
+MultipriceRules=Pravidlá cenových oblastí
+UseMultipriceRules=Použit cenové oblasti ( definované v nastavenia produktového modulu ) pre automatický výpočet ceny ostatných oblastí podľa prvej oblasti.
+PercentVariationOver=%% zmena cez %s
+PercentDiscountOver=%% zľava cez %s
 ### composition fabrication
 Build=Vyrobiť
-ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
-ServiceSellByQuarterHT=Services turnover quarterly before tax
+ProductsMultiPrice=Produkty a ceny pre každú cenovú oblasť
+ProductsOrServiceMultiPrice=Zákaznícke ceny (pre produkt alebo službu, multi-ceny)
+ProductSellByQuarterHT=Quartálový obrat produktov bez DPH
+ServiceSellByQuarterHT=Quartálový obrat služieb bez DPH
 Quarter1=Prvý. Štvrťrok
 Quarter2=2.. Štvrťrok
 Quarter3=3.. Štvrťrok
 Quarter4=4.. Štvrťrok
-BarCodePrintsheet=Print bar code
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
-PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
-DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
-ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
-AddCustomerPrice=Add price by customer
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-MinCustomerPrice=Minimum customer price
-DynamicPriceConfiguration=Dynamic price configuration
-DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
-ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
-ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+BarCodePrintsheet=Tlačiť čiarový kód
+PageToGenerateBarCodeSheets=S tímto nástrojom môžete vytlačiť hárky nálepiek s čiarovým kódom. Zvoľte formát nálepiek, typ kódu a hodnotu kódu, potom kliknite na tlačidllo <b>%s</b>.
+NumberOfStickers=Počet nálepiek na jednu stranu
+PrintsheetForOneBarCode=Tlačiť viac nálepiek pre jeden čiarový kód
+BuildPageToPrint=Generovať stranu pre tlač
+FillBarCodeTypeAndValueManually=Vyplniť typ kódu a hodnotu manuálne
+FillBarCodeTypeAndValueFromProduct=Vyplniť typ kódu a hodnotu z čiarového kódu produktu
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
+DefinitionOfBarCodeForProductNotComplete=Typ alebo hodnota čiarového kódu nevyplnená pre tento produkt %s
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
+BarCodeDataForProduct=Informácie o čiarovom kóde produktu %s
+BarCodeDataForThirdparty=Barcode information of third party %s :
+ResetBarcodeForAllRecords=Definujte čiarový kód pre všetký záznamy (táto možnosť resetuje už definované čiarové kódy)
+PriceByCustomer=Rozdielné ceny pre každého zákazníka
+PriceCatalogue=Rovnaká predajná cena pre produkt/službu
+PricingRule=Pravidlá pre predajné ceny
+AddCustomerPrice=Pridať cenu podľa zákazníka
+ForceUpdateChildPriceSoc=Nastaviť rovnakú cenu pre dcerske spoločnosti zákazníka
+PriceByCustomerLog=Vypis historických cien zákazníka
+MinimumPriceLimit=Minimálna cena nemôže byť nižšia ako %s
+MinimumRecommendedPrice=Minimálna odporúčaná cena je : %s
+PriceExpressionEditor=Editor cenových výrazov
+PriceExpressionSelected=Výraz zvolenej ceny
+PriceExpressionEditorHelp1="cena = 2 + 2" alebo "2 + 2"  pre nastavenie ceny. Použite ; pre oddelenie výrazov
+PriceExpressionEditorHelp2=Môžete použiť extra polia použitím premennej ako:\n<b>#extrafield_myextrafieldkey#</b> a globálnej premennej <b>#global_mycode#</b>
+PriceExpressionEditorHelp3=V oboch produktoch/službách a dodávateľských cenách sú dostupné tieto premenné: <br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=V cene produktu/služby zahrnuté: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Dostupné globálne hodnoty
+PriceMode=Cenový mód
+PriceNumeric=Počet
+DefaultPrice=Základná cena
+ComposedProductIncDecStock=Pridať/Odobrať pri zmene rodičovského
+ComposedProduct=Pod-produkt
+MinSupplierPrice=Minimálna dodávateľská cena
+MinCustomerPrice=Minimálna zákaznícka cena
+DynamicPriceConfiguration=Nastavenie dynamickej ceny
+DynamicPriceDesc=S tímto modulom zapnutým by ste mali mať možnosť nastaviť matematické funkcie pre výpočet Zákazníckej alebo Dodávateľskej ceny na karte produktu. Tu môžete nastaviť premenné ktoré chcete aby Dolibarr automaticky aktualizoval
+AddVariable=Pridať premennú
+AddUpdater=Pridať aktualizátor
+GlobalVariables=Globálna premenná
+VariableToUpdate=Premenná pre úpravu
+GlobalVariableUpdaters=Upravovač globálnej premennej
+UpdateInterval=Upraviť interval (minúty)
+LastUpdated=Naposledy upravené
+CorrectlyUpdated=Správne upravené
+PropalMergePdfProductActualFile=Súbor na pridanie do PDF Azur sú/je
+PropalMergePdfProductChooseFile=Vybrať PDF súbory
+IncludingProductWithTag=Zahrnúť produkt/službu so štítkom
+DefaultPriceRealPriceMayDependOnCustomer=Základná cena, skutočná cena môže záležať podľa zákazníka
+WarningSelectOneDocument=Prosím zvoľte minimálne jeden dokument
+DefaultUnitToShow=Jednotka
+NbOfQtyInProposals=Počet v ponuke
+ClinkOnALinkOfColumn=Kliknite na odkaz stĺpca %s pre detailné zobrazenie...
+TranslatedLabel=Preložený názov
+TranslatedDescription=Preložený popis
+TranslatedNote=Preložená poznámka
+ProductWeight=Hmotnosť pre 1 produkt
+ProductVolume=Objem pre 1 produkt
+WeightUnits=Jednotka hmotnosti
+VolumeUnits=Jednotka objemu
+SizeUnits=Jednotka veľkosti
+DeleteProductBuyPrice=Zmazat nákupnú cenu
+ConfirmDeleteProductBuyPrice=Určite chcete zmazať túto nákupnú cenu ?
 
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 3bfd4ab3a59..918e8c4e28c 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Zoznam obchodných návrhov spojených s projektom
-ListOrdersAssociatedProject=Zoznam objednávok zákazníka súvisiace s projektom
-ListInvoicesAssociatedProject=Zoznam zákazníka faktúry súvisiace s projektom
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Zoznam dodávateľa zákaziek súvisiace s projektom
-ListSupplierInvoicesAssociatedProject=Zoznam dodávateľských faktúr súvisiace s projektom
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Zoznam zákaziek súvisiacich s projektom
 ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Zmena úlohy termíne podľa dátumu začatia projektu
 ErrorShiftTaskDate=Nemožno presunúť úloha termín podľa nový dátum začatia projektu
 ProjectsAndTasksLines=Projekty a úlohy
 ProjectCreatedInDolibarr=Projekt vytvoril %s
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Plánované zaťaženie
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/sk_SK/propal.lang b/htdocs/langs/sk_SK/propal.lang
index 6520a2ce7a6..d70368d15b0 100644
--- a/htdocs/langs/sk_SK/propal.lang
+++ b/htdocs/langs/sk_SK/propal.lang
@@ -3,7 +3,7 @@ Proposals=Komerčné návrhy
 Proposal=Komerčné návrh
 ProposalShort=Návrh
 ProposalsDraft=Navrhnúť obchodné návrhy
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=Otvoriť komerčnú ponuku
 Prop=Komerčné návrhy
 CommercialProposal=Komerčné návrh
 ProposalCard=Návrh karty
@@ -12,21 +12,21 @@ NewPropal=Nový návrh
 Prospect=Vyhliadka
 DeleteProp=Zmazať obchodné návrh
 ValidateProp=Overiť obchodné návrh
-AddProp=Create proposal
+AddProp=Vytvoriť komerčnú ponuku
 ConfirmDeleteProp=Ste si istí, že chcete zmazať tento obchodný návrh?
 ConfirmValidateProp=Ste si istí, že chcete overiť túto obchodnú návrh pod názvom <b>%s?</b>
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+LastPropals=Najnovšie %s ponuky
+LastModifiedProposals=Nedávno %s upravené ponuky
 AllPropals=Všetky návrhy
 SearchAProposal=Hľadať návrh
-NoProposal=No proposal
+NoProposal=Žiadna ponuka
 ProposalsStatistics=Obchodné Návrh si štatistiky
 NumberOfProposalsByMonth=Číslo podľa mesiaca
 AmountOfProposalsByMonthHT=Suma, o mesiac (bez DPH)
 NbOfProposals=Počet obchodných návrhov
 ShowPropal=Zobraziť návrhu
 PropalsDraft=Dáma
-PropalsOpened=Open
+PropalsOpened=Otvoriť
 PropalStatusDraft=Návrh (musí byť overená)
 PropalStatusValidated=Overené (Návrh je v prevádzke)
 PropalStatusSigned=Podpis (potreby fakturácia)
@@ -46,8 +46,8 @@ SendPropalByMail=Poslať obchodný návrh poštou
 DatePropal=Dátum návrhu
 DateEndPropal=Platnosť koncový dátum
 ValidityDuration=Platnosť trvania
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=Nastaviť status na
+SetAcceptedRefused=Nastaviť Akceptované/Odmietnuté
 ErrorPropalNotFound=Prepáli %s nebol nájdený
 AddToDraftProposals=Pridať do predlohy návrhu
 NoDraftProposals=Žiadne návrhy riešení
@@ -78,5 +78,5 @@ DocModelAzurDescription=Kompletný návrh modelu (logo. ..)
 DefaultModelPropalCreate=Predvolené model, tvorba
 DefaultModelPropalToBill=Predvolená šablóna pri zatváraní obchodnej návrh (bude faktúrovať)
 DefaultModelPropalClosed=Predvolená šablóna pri zatváraní obchodnej návrh (nevyfakturované)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalCustomerSignature=Písomná akceptácia, firemná pečiatka, dátum a podpis
+ProposalsStatisticsSuppliers=Štatistiky dodávatelskej ponuky
diff --git a/htdocs/langs/sk_SK/resource.lang b/htdocs/langs/sk_SK/resource.lang
index f95121db351..214d0b66aa6 100644
--- a/htdocs/langs/sk_SK/resource.lang
+++ b/htdocs/langs/sk_SK/resource.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Zdroje
+MenuResourceAdd=Nový zdroj
+DeleteResource=Zmazať zdro
+ConfirmDeleteResourceElement=Potvrďte zmazanie zdroja pre túto časť
+NoResourceInDatabase=Žiadne zdroje
+NoResourceLinked=Žiadne zdroje poriradené
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Zoznam zdojov
+ResourceSingular=Zdroj
+ResourceCard=Karta Zdroja
+AddResource=Vytvoriť zdroj
+ResourceFormLabel_ref=Meno zdroja
+ResourceType=Typ zdroja
+ResourceFormLabel_description=Popis zdroja
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Zdroje priradené pre časť
 
-ShowResource=Show resource
+ShowResource=Zobraziť zdroj
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Čiastočné zdroje
+ResourceCreatedWithSuccess=Zdroj úspešne vytvorený
+RessourceLineSuccessfullyDeleted=Riadok zdroja úspešne zmazaný
+RessourceLineSuccessfullyUpdated=Riadok zdroja úspešne aktualizovaný
+ResourceLinkedWithSuccess=Rdroj úspešne priradený
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=Potvrďte zmazanie zdroja
+RessourceSuccessfullyDeleted=Zdroj úspešne zmazaný
+DictionaryResourceType=Typ zdroja
 
-SelectResource=Select resource
+SelectResource=Vybrať zdroj
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index 0a5d2ba74fa..752af88f226 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nová výplata mzdy
 SalaryPayment=Výplata mzdy
 SalariesPayments=Výplaty miezd
 ShowSalaryPayment=Ukázať výplatu mzdy
-THM=Priemerná hodinová cena
-TJM=Priemerná denná cena
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=Súčasná mzda
 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
diff --git a/htdocs/langs/sk_SK/sms.lang b/htdocs/langs/sk_SK/sms.lang
index 18ecb465326..cda868dae11 100644
--- a/htdocs/langs/sk_SK/sms.lang
+++ b/htdocs/langs/sk_SK/sms.lang
@@ -46,6 +46,6 @@ SendSms=Pošlite SMS v tvare
 SmsInfoCharRemain=Nb zostávajúcich znakov
 SmsInfoNumero= (Medzinárodným formátu, tj: 33899701761)
 DelayBeforeSending=Oneskorenie pred odoslaním (minúty)
-SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
+SmsNoPossibleSenderFound=Odosielateľ nedostupný. Skontrolijte nastavenie SMS poskytovateľa
 SmsNoPossibleRecipientFound=Žiadny cieľ k dispozícii. Skontrolujte nastavenia poskytovateľa služieb SMS.
 
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 65b6c69d14b..c5fb75ec58a 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Zmazať odoslanie
 Stock=Zásoba
 Stocks=Zásoby
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Pohyby
 ErrorWarehouseRefRequired=Referenčné meno skladu je povinné
 ListOfWarehouses=Zoznam skladov
@@ -43,6 +45,7 @@ PMPValue=Vážená priemerná cena
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Sklady hodnota
 UserWarehouseAutoCreate=Vytvorte sklad automaticky pri vytváraní užívateľa
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Zásoby produktu a podriadeného produktu sú nezávislé
 QtyDispatched=Množstvo odoslané
 QtyDispatchedShort=Odoslané množstvo
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/sk_SK/supplier_proposal.lang b/htdocs/langs/sk_SK/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/sk_SK/supplier_proposal.lang
+++ b/htdocs/langs/sk_SK/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 3283f721605..83444baefe4 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -7,13 +7,13 @@ History=História
 ListOfSuppliers=Zoznam dodávateľov
 ShowSupplier=Zobraziť dodávateľa
 OrderDate=Dátum objednávky
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Niektoré podradené výrobky nemajú určenú cenu.
-AddSupplierPrice=Pridať cenu dodávateľa tovaru
-ChangeSupplierPrice=Zmeniť cenu dodávateľa
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Tento odkaz Dodávateľ je už spojená s odkazom: %s
 NoRecordedSuppliers=Žiadni zaznamenaní dodávatelia
 SupplierPayment=Dodávateľská platba
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Zoznam dodávateľských objednávok
 MenuOrdersSupplierToBill=Vytvoriť faktúru z dodávateľskej objednávky
 NbDaysToDelivery=Zdržanie dodávky v dňoch
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/sk_SK/users.lang b/htdocs/langs/sk_SK/users.lang
index a7a6203eeb5..18df628ea60 100644
--- a/htdocs/langs/sk_SK/users.lang
+++ b/htdocs/langs/sk_SK/users.lang
@@ -32,11 +32,11 @@ NameNotDefined=Názov nie je definovaný.
 ListOfUsers=Zoznam užívateľov
 SuperAdministrator=Super Administrator
 SuperAdministratorDesc=Globálny správca
-AdministratorDesc=Administrator
+AdministratorDesc=Administrátor
 DefaultRights=Predvolené oprávnenia
 DefaultRightsDesc=Definujte tu <u>predvolené</u> oprávnenia, ktoré sú udelené automaticky <u>novo vytvorenému</u> užívateľovi (Zmeniť oprávnenia existujúceho užívateľa môžete na jeho karte).
 DolibarrUsers=Dolibarr užívatelia
-LastName=Last Name
+LastName=Priezvisko
 FirstName=Krstné meno
 ListOfGroups=Zoznam skupín
 NewGroup=Nová skupina
@@ -45,8 +45,8 @@ RemoveFromGroup=Odstrániť zo skupiny
 PasswordChangedAndSentTo=Heslo bolo zmenené a poslaný do <b>%s.</b>
 PasswordChangeRequestSent=Žiadosť o zmenu hesla <b>%s</b> zaslaná <b>%s.</b>
 MenuUsersAndGroups=Používatelia a skupiny
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=Najnovšie %s vytvorené skupiny
+LastUsersCreated=Najnovšie %s vytvorený používatelia
 ShowGroup=Zobraziť skupinu
 ShowUser=Zobraziť užívateľa
 NonAffectedUsers=Nepriradení užívatelia
@@ -98,5 +98,8 @@ OpenIDURL=OpenID URL
 LoginUsingOpenID=Použiť OpenID pre prihlásenie
 WeeklyHours=Počet hodín za týžden
 ColorUser=Farba priradená užívateľovi
-DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
+DisabledInMonoUserMode=Vypnuté v údržbovom móde
+UserAccountancyCode=Používatelský účtovný kód
+UserLogoff=Odhlásiť užívateľa
+UserLogged=Užívateľ prihlásený
+DateEmployment=Dátum zamestnania
diff --git a/htdocs/langs/sk_SK/website.lang b/htdocs/langs/sk_SK/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/sk_SK/website.lang
+++ b/htdocs/langs/sk_SK/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/sk_SK/withdrawals.lang b/htdocs/langs/sk_SK/withdrawals.lang
index 1c24067cec3..14d34affd51 100644
--- a/htdocs/langs/sk_SK/withdrawals.lang
+++ b/htdocs/langs/sk_SK/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Zákazníci trvalých príkazov plochu
-StandingOrders=Trvalé príkazy
-StandingOrder=Trvalé príkazy
-NewStandingOrder=Nový trvalého príkazu
+CustomersStandingOrdersArea=Inkaso area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Inkaso objednávky
+StandingOrder=Inkaso objednávka
+NewStandingOrder=Nová inkaso objednávka
 StandingOrderToProcess=Ak chcete spracovať
-WithdrawalsReceipts=Abstinenčné príjmy
-WithdrawalReceipt=Odstúpenie príjem
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Abstinenčné linky
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+WithdrawalsReceipts=Inkaso objednávky
+WithdrawalReceipt=Inkaso objednávka
+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 invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Faktúra čaká odstúpiť
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Suma, ktorá má zrušiť
-WithdrawsRefused=Odstúpi odmietol
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Žiadny zákazník faktúru na platbu režime &quot;stiahnuť&quot; čaká. Prejdite na &quot;odstúpiť&quot; kartu na faktúre karty podať žiadosť.
 ResponsibleUser=Zodpovedný užívateľ
-WithdrawalsSetup=Odstúpenie nastavenie
-WithdrawStatistics=Natiahnite si štatistiky
-WithdrawRejectStatistics=Natiahnite odmietnuť Štatistika
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Skontrolujte stiahnuť žiadosť
 ThirdPartyBankCode=Treťou stranou kód banky
 NoInvoiceCouldBeWithdrawed=Nie faktúra withdrawed s úspechom. Skontrolujte, že faktúry sú na firmy s platným BAN.
@@ -46,7 +47,7 @@ StatusRefused=Odmietol
 StatusMotif0=Nešpecifikovaný
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=Bez príkazu k výberu
+StatusMotif3=No direct debit payment order
 StatusMotif4=Objednávky zákazníka
 StatusMotif5=RIB unusable
 StatusMotif6=Účet bez rovnováhy
@@ -61,28 +62,43 @@ 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=Bankový účet pre príjem odstúpi
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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;
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Platba %s trvalého príkazu bankou
-InfoCreditMessage=Trvalý príkaz %s bola vyplatená bankou <br> Údaje o platbe: %s
-InfoTransSubject=Prenos %s trvalého príkazu do banky
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Trvalý príkaz odmietol
-InfoRejectMessage=Dobrý deň, <br><br> trvalý príkaz na faktúre %s týkajúcich sa spoločnosti, %s, s množstvom %s bola odmietnutá bankou. <br><br> - <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
 ModeWarning=Voľba pre reálny režim nebol nastavený, môžeme zastaviť po tomto simuláciu
diff --git a/htdocs/langs/sk_SK/workflow.lang b/htdocs/langs/sk_SK/workflow.lang
index 4b524b73000..9ad7535e41b 100644
--- a/htdocs/langs/sk_SK/workflow.lang
+++ b/htdocs/langs/sk_SK/workflow.lang
@@ -1,11 +1,13 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow modul nastavenia
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed
+WorkflowDesc=Tento modul vám pomôže nastaviť fingovanie automatických akcií v aplikácií. V základe je postup otvorený ( možete robiť úlohy v poradí v akom chcete) Môžete aktivovať automatické akcie aké chcete.
+ThereIsNoWorkflowToModify=Úprava postupu nie je možná pri aktivovanom module.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automaticky vytvoriť zákaznícku objednávku po podpísaní obchodného návrhu
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automaticky vytvoriť zákaznícku faktúru po podpísaní obchodného návrhu
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automaticky vytvoriť zákaznícku faktúru po overení zmluvy
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automaticky vytvoriť zákaznícku faktúru po uzavretí zákazníckej objednávky
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Triediť prepojené zdrojový návrh účtoval keď je objednávka zákazníka nastavený na platenú
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Triediť spojené zdroj objednávka zákazníka (y) účtoval, keď je zákazník faktúry nastavený na platené
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Triediť prepojený zdroj objednávky zákazníka (y) účtoval keď je overený zákazníkmi faktúra
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Označiť zdroj ako vyfakturovaný po overení zákazníckej faktúry
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Označiť ako odoslanépo overení odoslania ak odoslaný počet ks. je rovnaký ako v objednávke
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index 6cb5d5df657..b21d5069f13 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Revije
 JournalFinancial=Finančne revije
 BackToChartofaccounts=Prikaz kontnega plana
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Izberite kontni plan
 Addanaccount=Dodaj računovodskega račun
 AccountAccounting=Računovodstvo račun
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Pregled
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Pregled kupcev
-SuppliersVentilation=Pregled dobaviteljev
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Poročila
 NewAccount=Novi računovodski račun
 Create=Ustvari
-CreateMvts=Ustvari spremembo
-UpdateMvts=Sprememba pretoka
-WriteBookKeeping=Evidenčnih računov v glavno knjigo
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Glavna knjiga
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Linije računa, ki se prezračuje
-InvoiceLinesDone=Prezračevane linije računa
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Prezračiti
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=Konec obdelave
-AnyLineVentilate=Vrsticami prezračiti
+AnyLineVentilate=Any lines to bind
 SelectedLines=Izbrane vrstice
 Lineofinvoice=Line računa
-VentilatedinAccount=Uspešno prezračen v obračunskem računu
-NotVentilatedinAccount=Ni prezračen v obračunskem računu
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Število elementov za pregled po straneh (največ priporočeno: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Začni sortiranje strani za pregled "potrebno pregledati" z najnovejšimi elementi
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začni sortiranje strani za pregled "Pregledano" z najnovejšimi elementi
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Dolžina za prikaz opisa proizvodov in storitev v seznamih (najbolje = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Dolžina za prikaz oblike opisa računa proizvodov in storitev v seznamih (najbolje = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Dolžina glavne knjige
-ACCOUNTING_LENGTH_AACCOUNT=Dolžina računih tretjih oseb
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Prodam revija
 ACCOUNTING_PURCHASE_JOURNAL=Nakup revij
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Revija
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Izbriši zapise v glavno knjigo
-
 DescSellsJournal=Sells revija
 DescPurchasesJournal=Nakupi revija
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Plačilo računa kupca
-
 ThirdPartyAccount=Thirdparty račun
-
-NewAccountingMvt=Novo gibanje
-NumMvts=Število gibanja
-ListeMvts=Seznam gibanja
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debetne in Credit ne more imeti vrednosti hkrati
 
-ReportThirdParty=Seznam thirdparty račun
-DescThirdPartyReport=Tukaj poglejte seznam kupcev in dobaviteljev in njihovih računovodskih računov
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Seznam računovodskih računov
 
@@ -114,22 +134,29 @@ Pcgtype=Razred račun
 Pcgsubtype=Pod razred račun
 Accountparent=Root računa
 
-DescVentilCustomer=Tukaj poglejte letni pregled vaših računov kupcem
 TotalVente=Total turnover before tax
 TotalMarge=Skupaj prodajna marža
-DescVentilDoneCustomer=Tukaj poglejte seznam vrstic na računih za kupce in njihovih računovodskih računov
-DescVentilTodoCustomer=Prezračite svoje linije računa stranke z računovodsko račun
-ChangeAccount=Spremenite računovodsko račun linij, ki jih na račun izbranih:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Tukaj poglejte letni pregled računov vaših dobaviteljev
-DescVentilDoneSupplier=Tukaj poglejte seznam vrstic na računih dobaviteljev in njihovih računovodskih računov
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Potrditi Samodejno
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Napaka, ne morete izbrisati to računovodsko račun, ker se uporablja
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Kartica pregleda
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 93fa19d44be..d08c63cf02f 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Preizkusna
 VersionDevelopment=Razvojna
 VersionUnknown=Neznana
 VersionRecommanded=Priporočena
-FileCheck=Integriteta datotek
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Manjkajoče datoteke
 FilesUpdated=Posodobljene datoteke
-FileCheckDolibarr=Kontrola integritete Dolibarr datotek
-XmlNotFound=Ni najdena xml datoteka Dolibar integritete
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID seje
 SessionSaveHandler=Rutina za shranjevanje seje
 SessionSavePath=Lokalizacija shranjevanja seje
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Napaka, višja natančnost od <b>%s</b> ni po
 DictionarySetup=Nastavitve slovarja
 Dictionary=Slovarji
 Chartofaccounts=Kontni plan
-Fiscalyear=Fiskalna leta
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Vrednosti 'system' in 'systemauto' za tip sta rezervirani. Uporabite lahko 'user' za dodajanje lastnih zapisov
 ErrorCodeCantContainZero=Koda ne sme vsebovati vrednosti 0
 DisableJavascript=Onemogoči JavaScript in Ajax funkcije (priporočeno za slepe osebe ali tekstualne brskalnike)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Čakanje na pritisk tipke pred nalaganjem vsebine
 DelaiedFullListToSelectContact=Čakanje na pritisk tipke pred nalaganjem vsebine kombiniranega seznama kontaktov (to lahko izboljša zmogljivosti, če imate veliko število kontaktov)
 NumberOfKeyToSearch=Število znakov za sproženje iskanja: %s ViewFullDateActions=Prikaži celotne datume aktivnosti na tretjem listu
 NotAvailableWhenAjaxDisabled=Ni na voljo, če je Ajax onemogočen
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript onemogočen
 UsePreviewTabs=Uporabi zavihke za predogled
 ShowPreview=Prikaži predogled
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Kodiraj binarne podatke v hexadecimalne
 IgnoreDuplicateRecords=Prezri napako podvojenih zapisov (INSERT IGNORE)
 AutoDetectLang=Samozaznava (jezik iskalnika)
 FeatureDisabledInDemo=Funkcija onemogočena v demo različici
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Dovoljenja
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Prikazani so samo elementi <a href="%s">omogočenih modulov </a>.
-ModulesDesc=Dolibarr moduli določajo, katere funkcije programa so omogočene. Nekateri moduli zahtevajo, da po omogočanju modula dodelite dovoljenje uporabnikom. Kliknite gumb za vklop/izklop v koloni "Status" za omogočanje modula/funkcije.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Več modulov...
 DoliStoreDesc=DoliStore, uradna tržnica za Dolibarr ERP/CRM zunanje module
@@ -273,9 +279,10 @@ YouCanSubmitFile=V tem koraku lahko pošljete paket s pomočjo tega orodja: Izbe
 CurrentVersion=Trenutna različica Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Posodobitev strežnika brez povezave
 GenericMaskCodes=Vnesete lahko kakršnokoli številčno masko. V tej maski lahko uporabite naslednje oznake:<br><b>{000000}</b> ustreza številki, ki se poveča pri vsakem %s. Vnesite toliko ničel, kot je želena dolžina števca. Števec se bo zapolnil z ničlami na levi strani, da bi velikost ustrezala maski. <br><b>{000000+000}</b> enako kot prej, vendar je desno od znaka + odmik, ki je uporabljen na prvi %s. <br><b>{000000@x}</b> enako kot prej, vendar se števec resetira na 0, ko se doseže mesec x (x je med 1 in 12). Če je uporabljena ta opcija, ,in je x enak ali večji od 2, je zahtevana tudi sekvenca {yy}{mm} ali {yyyy}{mm}. <br><b>{dd}</b> dan (01 do 31).<br><b>{mm}</b> mesec (01 do 12).<br><b>{yy}</b>, <b>{yyyy}</b> ali <b>{y}</b> leto, izraženo z 2, 4 ali 1 številko. <br>
-GenericMaskCodes2=<b>{cccc}</b> koda klienta z n znaki<br><b>{cccc000}</b> koda klienta z n znaki se nadaljuje s števcem stranke. Ta namenski števec stranke se resetira obenem z globalnim števcem.<br><b>{tttt}</b> Koda partnerja z n znaki (glejte slovar-tipi partnerjev).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Vsi ostali znaki v maski bodo ostali nedotaknjeni.<br>Presledki niso dovoljeni.<br>
 GenericMaskCodes4a=<u>Primer 99-ega %s partnerja podjetja narejen 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Primer partnerja 99, kreiranega 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametri za zagotovitev URL
 SecurityTokenIsUnique=Uporabite edinstven parameter securekey za vsako URL
 EnterRefToBuildUrl=Vnesite sklic za predmet %s
 GetSecuredUrl=Get izračuna URL
-ButtonHideUnauthorized=Skrij gumbe za neavtorizirano uporabo, namesto prikaza zasenčenih gumbov
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Stara stopnja DDV
 NewVATRates=Nova stopnja DDV
 PriceBaseTypeToChange=Sprememba cen z definirano osnovno referenčno vrednostjo
@@ -349,6 +356,7 @@ ExtrafieldMail = E-pošta
 ExtrafieldSelect = Izberi seznam
 ExtrafieldSelectList = Izberi iz tabele
 ExtrafieldSeparator=Ločilo
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Potrditveno polje
 ExtrafieldRadio=Radijski gumb
 ExtrafieldCheckBoxFromList= Potrditveno polje iz tabele
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Uporabniki & skupine
@@ -428,8 +439,8 @@ Module55Name=Črtne kode
 Module55Desc=Upravljanje črtnih kod
 Module56Name=Telefonija
 Module56Desc=Integracija telefonije
-Module57Name=Trajniki
-Module57Desc=Upravljanje trajnikov in nakazil. Vključuje tudi generiranje SEPA za evropske države.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=Klic s klikom
 Module58Desc=Integracija klica s klikom
 Module59Name=Vaš zaznamek
@@ -466,12 +477,12 @@ Module410Name=Internetni koledar
 Module410Desc=Integracija internetnega koledarja
 Module500Name=Posebni stroški
 Module500Desc=Upravljanje posebnih stroškov (davki, socialni ali fiskalni prispevki, dividende)
-Module510Name=Plače
-Module510Desc=Upravljanje plač in plačil zaposlenim
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Posojilo
 Module520Desc=Upravljanje posojil
 Module600Name=Obvestila
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donacije
 Module700Desc=Upravljanje donacij
 Module770Name=Stroškovno poročilo
@@ -606,10 +617,10 @@ Permission142=Ustvari/spremeni vse projekte in naloge (tudi zasebne, za katere j
 Permission144=Izbriši vse projekte in naloge (tudi zasebne, za katere jaz nisem kontaktna oseba)
 Permission146=Brisanje ponudnikov
 Permission147=Branje statistike
-Permission151=Branje tekočih naročil
-Permission152=Nastavitve tekočih naročil
-Permission153=Prenos prejema tekočih naročil
-Permission154=Odobritev/zavrnitev prejema tekočih naročil
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Branje pogodb/naročnin
 Permission162=Kreiranje/spreminjanje pogodb/naročnin
 Permission163=Aktiviranje pogodbene storitve/naročnine
@@ -747,6 +758,7 @@ Permission1236=Izvoz računov dobavitelja, atributov in plačil
 Permission1237=Izvoz naročil pri dobavitelju in podrobnosti
 Permission1251=Izvajanje masovnega izvoza zunanjih podatkov v bazo podatkov (nalaganje podatkov)
 Permission1321=Izvoz računov za kupce, atributov in plačil
+Permission1322=Reopen a paid bill
 Permission1421=Izvoz naročil kupcev in atributov
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Kreiranje/spreminjanje anket
 Permission59001=Branje komercialnih marž
 Permission59002=Določitev komercialnih marž
 Permission59003=Branje vsake uporabniške marže
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Nivo potenciala možne stranke
@@ -853,6 +869,7 @@ LabelUsedByDefault=Privzet naziv, če za kodo ne obstaja prevod
 LabelOnDocuments=Naslov na dokumentu
 NbOfDays=Število dni
 AtEndOfMonth=Na koncu meseca
+CurrentNext=Current/Next
 Offset=Odmik
 AlwaysActive=Vedno aktiven
 Upgrade=Nadgradnja
@@ -950,7 +967,7 @@ LogEventDesc=Tukaj lahko omogočite beleženje dnevnika Dolibarr varnostnih dogo
 AreaForAdminOnly=Te funkcije lahko uporablja samo <b>administrator</b>.
 SystemInfoDesc=Sistemske informacije so raznovrstne tehnične informacije, ki so na voljo samo v bralnem načinu in jih vidi samo administrator.
 SystemAreaForAdminOnly=To področje je na voljo samo administratorju. Nobeno od Dolibarr dovoljenj ne more spremeniti teh omejitev.
-CompanyFundationDesc=Na tej strani urejate vse znane informacije o podjetju ali ustanovi, ki ga upravljate
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Tukaj lahko izberete parametre, ki določajo videz in vtis aplikacije Dolibarr
 AvailableModules=Moduli, ki so na voljo
 ToActivateModule=Za aktivacijo modula, pojdite na področje nastavitev (Domov->Nastavitve->Moduli).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Pozor, na nekaterih Linux sistemih mora za pošiljanje
 PathToDocuments=Pot do dokumentov
 PathDirectory=Mapa
 SendmailOptionMayHurtBuggedMTA=Funkcija za pošiljanje pošte z uporabo metode "PHP mail DIRECT" bo ustvarila poštno sporočilo, ki ga morda nekateri poštni strežniki ne bodo pravilno razčlenili. Posledica tega je, da nekatere pošte ne bodo mogli brati uporabniki, ki gostujejo na takih platformah. To veljalo za nekaj internetnih ponudnikov (npr.: Orange v Franciji). Problem ni v Dolibarr niti v PHP, ampak v sprejemanju poštnega strežnika. Lahko pa v nastavitvah dodate opcijo MAIN_FIX_FOR_BUGGED_MTA kot 1. v setup, da bi se temu izognili brez modifikacije Dolibarr. Vendar pa lahko pride do težav z drugimi strežniki, ki strogo spoštujejo SMTP standard. Druga rešitev (priporočena) je uporaba metode "SMTP socket knjižnice", ki nima teh slabosti.
-TranslationSetup=Konfiguracija prevoda
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
 ClassNotFoundIntoPathWarning=Ratzred %s ni najedn na poti PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Vaš LDAP strežnik uporablja TLS
 LDAPServerDn=DN strežnika
 LDAPAdminDn=DN administratorja
-LDAPAdminDnExample=Celoten DN (npr: cn=adminldap,dc=society,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Geslo administratorja
 LDAPUserDn=DN uporabnikov
 LDAPUserDnExample=Celoten DN (npr: ou=users,dc=society,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Položaj/Funkcija
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Primer: naziv
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Izdelki in storitve moduli za nastavitev
 NumberOfProductShowInSelect=Največje število proizvodov na kombiniranih seznamih(0=brez omejitev)
 ViewProductDescInFormAbility=Ponazoritev opisa proizvoda na obrazcu (kot pojavni opis)
 MergePropalProductCard=Aktivacija opcije za združevanje PDF dokumenta proizvoda in PDF ponudbe azur v zavihku priložene datoteke proizvod/storitev, če je proizvod/storitev v ponudbi
-ViewProductDescInThirdpartyLanguageAbility=Vizualizacija Poimenovanja izdelkov v thirdparty jeziku
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Če je število proizvodov zelo veliko (> 100 000), lahko povečate hitrost z nastavitvijo konstante PRODUCT_DONOTSEARCH_ANYWHERE na vrednost 1 v Nastavitve->Ostale nastavitve. S tem bo iskanje omejeno na začetek niza.
 UseSearchToSelectProduct=Uporabi iskanje za izbiro proizvoda (raje kot padajoči seznam)
 SetDefaultBarcodeTypeProducts=Privzet tip črtne kode za proizvode
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Orodje za generiranje črtne kode preko komandne vrstice (upo
 BarcodeInternalEngine=Interno orodje
 BarCodeNumberManager=Upravljanje avtomatskega določanja številk črtnih kod
 ##### Prelevements #####
-WithdrawalsSetup=Nastavitev modula za dvige
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Nastavitev uvoza zunanjih RSS
 NewRSS=Nov vir RSS
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Odpri fiskalno leto
 CloseFiscalYear=Zapri fiskalno leto
 DeleteFiscalYear=Izbriši fiskalno leto
 ConfirmDeleteFiscalYear=Ali zares želite izbrisati to fiskalni leto?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Lahko je vedno urejeno
 MAIN_APPLICATION_TITLE=Prisilni prikaz imena aplikacije (opozorilo: če tukaj nastavite vaše lastno ime, lahko prekinete funkcijo avtomatskega vnosa uporabniškega imena pri uporabi mobilne aplikacije DoliDroid)
 NbMajMin=Minimalno število velikih črk
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Seznam fiksnih obvestil
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Pojdite na zavihek "Obvestila" pri kontaktih partnerjev za odstranitev obveščanja za kontakt/naslov
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Prag
 BackupDumpWizard=Čarovnik za ustvarjanje datoteke z varnostnimi kopijami podatkovnih baz
 SomethingMakeInstallFromWebNotPossible=Instalacija eksternega modula s spletnega vmesnika ni možna zaradi naslednjega razloga:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Po spremembi te vrednosti jo aktivirate s tipko F5 na tipkovnici
-NotSupportedByAllThemes=Delovalo bo s temo eldy, vendar ni podprto v vseh temah
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Barva ozadja
 TopMenuBackgroundColor=Barva ozadja za zgornji meni
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Barva ozadja za levi meni
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Barva ozadja za lihe vrstice tabele
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Za pošiljanje intervencije
 MailToSendSupplierRequestForQuotation=Za pošiljanje zahteve za ponudbo dobavitelju
 MailToSendSupplierOrder=Za pošiljanje naročila pri dobavitelju
 MailToSendSupplierInvoice=Za pošiljanje računa dobavitelja
-MailToThirdparty=Za pošiljanje emaila od partnerja
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index 054aeaac85a..9fd668632da 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -27,13 +27,9 @@ AllTime=Od začetka
 Reconciliation=Usklajevanje
 RIB=Transakcijski račun
 IBAN=IBAN številka
-IbanValid=IBAN je veljaven
-IbanNotValid=IBAN ni veljaven
 BIC=BIC/SWIFT številka
-SwiftValid=BIC/SWIFT je veljaven
-SwiftNotValid=BIC/SWIFT ni veljaven
-StandingOrders=Trajni nalogi
-StandingOrder=Trajni nalog
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Izpisek računa
 AccountStatementShort=Izpisek
 AccountStatements=Izpiski računa
@@ -78,6 +74,7 @@ AccountToCredit=Kreditni konto
 AccountToDebit=Debetni konto
 DisableConciliation=Onemogoči funkcijo usklajevanja za ta konto
 ConciliationDisabled=Funkcija usklajevanja onemogočena
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Odpri
 StatusAccountClosed=Zaprt
 AccountIdShort=Številka
@@ -87,6 +84,8 @@ AddBankRecordLong=Ročno dodaj transakcijo
 ConciliatedBy=Uskladil
 DateConciliating=Datum uskladitve
 BankLineConciliated=Transakcija usklajena
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Plačilo kupca
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Nakazano plačilo
 SocialContributionPayment=Plačilo socialnega/fiskalnega davka
 BankTransfer=Bančni transfer
 BankTransfers=Bančni transferji
-TransferDesc=Pri transferju z enega na drug konto, bo Dolibarr zabeležil dva zapisa (Debit na izvornem kontu in kredit na ciljnem kontu, v enakem znesku. Za transakcijo bo uporabljen enak naziv in datum)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Na
 TransferFromToDone=Zabeležen je bil transfer od <b>%s</b> na <b>%s</b> v znesku <b>%s</b> %s.
@@ -129,7 +129,7 @@ FutureTransaction=Bodoča transakcija. Ni možna uskladitev.
 SelectChequeTransactionAndGenerate=Izberi/filtriraj čeke za vključitev v prevzemnico čekovnih nakazil in klikni na "Ustvari"
 InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira: YYYYMM ali YYYYMMDD
 EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis
-ToConciliate=Za posredovanje?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Nato preveri vrstice na bančnem izpisku in klikni
 DefaultRIB=Privzet BAN
 AllRIB=Vsi BAN-i
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Ali zares želite označiti ta ček kot zavrnjen?
 RejectCheckDate=Datum vrnitve čeka
 CheckRejected=Vrnjen ček
 CheckRejectedAndInvoicesReopened=Vrnjen ček in ponovno odprti računi
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 332cabc86ec..2528c7a3f28 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Napaka, ne morete preklicati ra
 BillFrom=Od
 BillTo=Račun za
 ActionsOnBill=Aktivnosti na računu
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Ponujen popust (plačilo pred rokom)
 EscompteOfferedShort=Discount
 SendBillRef=Oddaja račuuna %s
 SendReminderBillRef=Oddaja računa %s (opomin)
-StandingOrders=Trajniki
-StandingOrder=Trajnik
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Ni osnutka računa
 NoOtherDraftBills=Ni drugih osnutkov računov
 NoDraftInvoices=Ni osnutkov računov
@@ -351,8 +351,8 @@ VarAmount=Variabilni znesek (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Nakazilo
-PaymentTypeShortPRE=Nakazilo
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Gotovina
 PaymentTypeShortLIQ=Gotovina
 PaymentTypeCB=Kreditna kartica
@@ -381,6 +381,7 @@ ExtraInfos=Dodatne informacije
 RegulatedOn=Urejen dne
 ChequeNumber=Ček N°
 ChequeOrTransferNumber=Ček/Prenos N°
+ChequeBordereau=Check schedule
 ChequeMaker=Oddajnik čekov/prenosov
 ChequeBank=Banka izdajalka čeka
 CheckBank=Ček
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Plačano s tem plačilom
 ClosePaidInvoicesAutomatically=Označi s "Plačano" vse standardne, situacijske ali nadomestne račune, ki so bili v celoti plačani.
 ClosePaidCreditNotesAutomatically=Označi s "Plačano" vse dobropise, ki so bili v celoti vrnjeni.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Vsi računi, ki nimajo neplačanih preostankov, bodo avtomatsko zaključeni v status "Plačano".
 ToMakePayment=Plačati
 ToMakePaymentBack=Vrniti plačilo
 ListOfYourUnpaidInvoices=Seznam neplačanih računov
 NoteListOfYourUnpaidInvoices=Opomba: Ta seznam vsebuje samo račune za partnerje, ki so povezani z referentom.
 RevenueStamp=Žig prihodka
-YouMustCreateInvoiceFromThird=Ta opcija je na voljo samo, kadar ustvarite račun z zavihka "kupci" na področju Partnerjev
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Predloga računa Crabe. Predloga kompletnega računa (Podpora DDV opcije, popusti, pogoji plačila, logo, itd...)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/sl_SI/boxes.lang b/htdocs/langs/sl_SI/boxes.lang
index a9bd2c2833e..47de1a20079 100644
--- a/htdocs/langs/sl_SI/boxes.lang
+++ b/htdocs/langs/sl_SI/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Najstarejši dejavni potekla storitve
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Globalna aktivnost (računi, ponudbe, naročila)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Ponudbe na mesec
 NoTooLowStockProducts=Ni proizvodov pod spodnjo omejitvijo zaloge
 BoxProductDistribution=Distribucija proizvodov/storitev
 BoxProductDistributionFor=Distribucija of %s za %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Računi za kupce
 ForCustomersOrders=Naročila kupcev
 ForProposals=Ponudbe
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/sl_SI/cashdesk.lang b/htdocs/langs/sl_SI/cashdesk.lang
index d54b2e1b1e1..3dcce19dca7 100644
--- a/htdocs/langs/sl_SI/cashdesk.lang
+++ b/htdocs/langs/sl_SI/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=vklopljen
 CashDeskThirdParty=Partner
 ShoppingCart=Nakupovalni voziček
 NewSell=Nova prodaja
-BackOffice=Administracija
 AddThisArticle=Dodaj ta proizvod
 RestartSelling=Vrni se na prodajo
-SellFinished=Zaključek prodaje
+SellFinished=Sale complete
 PrintTicket=Natisni račun
 NoProductFound=Proizvod ne obstaja
 ProductFound=Najden proizvod
diff --git a/htdocs/langs/sl_SI/categories.lang b/htdocs/langs/sl_SI/categories.lang
index 7ad5f48c6c5..cf7d66dc343 100644
--- a/htdocs/langs/sl_SI/categories.lang
+++ b/htdocs/langs/sl_SI/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Področje značk/kategorij kupcev
 MembersCategoriesArea=Področje značk/kategorij članov
 ContactsCategoriesArea=Področje značk/kategorij kontaktov
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Podkategorije
 CatList=Seznam značk/kategorij
 NewCategory=Nova značka/kategorija
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Ta tretja stranka je povezana z naslednjimi dobav
 MemberIsInCategories=Ta član je povezana z naslednjimi člani Oznake / kategorije
 ContactIsInCategories=Ta kontakt je povezan z naslednjimi značkami/kategorijami
 ProductHasNoCategory=Ta proizvod/storitev ni vključen v nobenoznačko/ kategorijo
-CompanyHasNoCategory=Ta tretja stranka ni v nobenih Oznakah / kategorijah
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Ta član ni v nobeni znački/kategoriji
 ContactHasNoCategory=Ta kontakt ni v nobeni znački/kategoriji
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Dodaj značko / kategorijo
 NotCategorized=Brez značke/kategorije
 CategoryExistsAtSameLevel=Kategorija s to referenco že obstaja
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Značke/kategorije proizvodov
 MembersCategoriesShort=Značke/kategorije članov
 ContactCategoriesShort=Značke/kategorije kontaktov
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoSupplier=Ta kategorija ne vsebuje nobenega proizvoda.
 ThisCategoryHasNoCustomer=Ta kategorija ne vsebuje nobenega kupca.
 ThisCategoryHasNoMember=Ta kategorija ne vsebuje nobenega člana.
 ThisCategoryHasNoContact=Ta kategorija ne vsebuje nobenega kontakta.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=ID značke/kategorije
 CatSupList=Seznam značk/kategorij dobaviteljev
 CatCusList=Seznam značk/kategorij kupcev/možnih strank
@@ -71,6 +75,7 @@ CatContactList=Seznam kontaktnih oznak/kategorij
 CatSupLinks=Povezave med dobavitelji in značkami/kategorijami
 CatCusLinks=Povezave med kupci/možnimi strankami in značkami/kategorijami
 CatProdLinks=Povezave med proizvodi/storitvami in značkami/kategorijami
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Odstrani iz značk/kategorije
 ExtraFieldsCategories=Koplementarni atributi
 CategoriesSetup=Nastavitev značk/kategorij
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index a499ddbb2e3..bdc19663825 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nov posameznik
 NewCompany=Novo podjetje (možna stranka, kupec, dobavitelj)
 NewThirdParty=Nov partner (možna stranka, kupec, dobavitelj)
 CreateDolibarrThirdPartySupplier=Kreiraj partnerja (dobavitelj)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Področje možnih strank
 IdThirdParty=ID partnerja
 IdCompany=ID podjetja
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Dobavitelji
 ThirdPartyType=Vrsta partnerja
 Company/Fundation=Podjetje/osnovni podatki
 Individual=Posameznik
-ToCreateContactWithSameName=Avtomatsko kreiranje kontakta z enakimi podatki
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Lastniško podjetje
 Subsidiaries=Podružnice
 ReportByCustomers=Poročilo po kupcih
@@ -47,7 +49,7 @@ CivilityCode=Vljudnostni naziv
 RegisteredOffice=Registrirana poslovalnica
 Lastname=Priimek
 Firstname=Ime
-PostOrFunction=Položaj/Funkcija
+PostOrFunction=Job position
 UserTitle=Naziv
 Address=Naslov
 State=Dežela/Provinca
@@ -64,7 +66,7 @@ Chat=Klepetaj
 PhonePro=Službeni telefon
 PhonePerso=Osebni telefon
 PhoneMobile=Mobilni telefon
-No_Email=Ne pošiljaj masovne e-pošte
+No_Email=Refuse mass e-mailings
 Fax=Faks
 Zip=Poštna številka
 Town=Mesto
@@ -73,7 +75,7 @@ Poste= Položaj
 DefaultLang=Privzet jezik
 VATIsUsed=Davčni zavezanec
 VATIsNotUsed=Ni davčni zavezanec
-CopyAddressFromSoc=Izpolni naslov z naslovom partnerja
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Uporabi drugi davek
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Davčna številka
 VATIntraShort=Davčna številka
 VATIntraSyntaxIsValid=Ime zavezanca veljavno
-VATIntraValueIsValid=DDV številka je veljavna
 ProspectCustomer=Možna stranka / kupec
 Prospect=Možna stranka
 CustomerCard=Kartica kupca
@@ -261,7 +262,9 @@ AddContactAddress=Ustvari naslov
 EditContact=Uredi osebo / naslov
 EditContactAddress=Uredi kontakt/naslov
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakti/naslovi
+FromContactName=Name:
 NoContactDefinedForThirdParty=Pri tem partnerju ni definiranega kontakta
 NoContactDefined=Pri tem partnerju ni definiranega kontakta
 DefaultContact=Privzeti kontakt
@@ -284,7 +287,7 @@ CompanyDeleted=Podjetje "%s" izbrisano iz baze.
 ListOfContacts=Seznam kontaktov
 ListOfContactsAddresses=Seznam kontaktov/naslovov
 ListOfThirdParties=Seznam partnerjev
-ShowCompany=Prikaži partnerja
+ShowCompany=Show third party
 ShowContact=Pokaži kontakt
 ContactsAllShort=Vsi (brez filtra)
 ContactType=Vrsta kontakta
@@ -294,6 +297,7 @@ ContactForProposals=Kontakt za ponudbo
 ContactForContracts=Kontakt za pogodbo
 ContactForInvoices=Kontakt za račun
 NoContactForAnyOrder=Ta kontakt ni pravi za naročila
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ta kontakt ni pravi za komercialne ponudbe
 NoContactForAnyContract=Ta kontakt ni pravi za pogodbe
 NoContactForAnyInvoice=Ta kontakt ni pravi za račune
@@ -352,9 +356,9 @@ ExportCardToFormat=Izvoz podatkov v formatu
 ContactNotLinkedToCompany=Kontakt ni povezan z nobenim partnerjem
 DolibarrLogin=Uporabniško ime za Dolibarr
 NoDolibarrAccess=Nima dostopa v Dolibarr
-ExportDataset_company_1=Partnerji (podjetja/ustanove/fizične osebe) in lastnosti
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti in lastništvo
-ImportDataset_company_1=Partnerji (podjetja/ustanove/fizične osebe) in lastnosti
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakti/naslovi (partnerjev ali ne) in atributi
 ImportDataset_company_3=Podatki o banki
 ImportDataset_company_4=Patner/prodajni predstavnik (Vpliva na prodajne prdstavnike partnerjem)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Partnerja sta bila združena
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sl_SI/compta.lang b/htdocs/langs/sl_SI/compta.lang
index 2637aef84b0..f3615103219 100644
--- a/htdocs/langs/sl_SI/compta.lang
+++ b/htdocs/langs/sl_SI/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Posebni stroški
 MenuTaxAndDividends=Davki in dividende
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index 49ca93ab5b3..6812f99278e 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Ukaz
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Naloga
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Nobene naloge niso registrirane
 CronPriority=Prioriteta
-CronLabel=Opis
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index ec4d75b0ba5..51c11fffe57 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 722b7c2f115..e42bb6ef21f 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Ta PHP podpira seje.
 PHPSupportPOSTGETOk=Ta PHP podpira spremenljivke POST in GET.
 PHPSupportPOSTGETKo=Morda vaše PHP nastavitve ne podpirajo spremenljivk POST in/ali GET. Preverite parameter <b>variables_order</b> v datoteki php.ini.
 PHPSupportGD=Ta PHP podpira GD grafične funkcije.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Ta PHP podpira UTF8 funkcije.
 PHPMemoryOK=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b>. To bi moralo zadoščati.
 PHPMemoryTooLow=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b> bytov. To je morda premalo. Spremenite datoteko <b>php.ini</b> in nastavite parameter <b>memory_limit</b> najmanj na <b>%s</b> bytov.
 Recheck=Kliknite tukaj za pomembnejše teste
 ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podpira sej. Ta funkcija je zahtevana za delovanje Dolibarr. Preverite vaše PHP nastavitve.
 ErrorPHPDoesNotSupportGD=Vaša PHP instalacija ne podpira grafične funkcije GD. Grafi ne bodo na voljo.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Vaša PHP instalacija ne podpira funkcij UTF8. Dolibarr zato ne bo mogel pravilno delovati. Zadevo rešite pred namestitvijo Dolibarr.
 ErrorDirDoesNotExists=Mapa %s ne obstaja.
 ErrorGoBackAndCorrectParameters=Vrnite se nazaj in popravite napačne parametre.
@@ -133,6 +135,10 @@ ActivateModule=Vključite modul %s
 ShowEditTechnicalParameters=Kliknite tukaj za prikaz/popravek naprednih parametrov (expertni način)
 WarningUpgrade=Pozor:\nAli ste najprej pognali varnostno kopiranje baze ?\nTo je zelo priporočeno: na primer, zaradi napak v sistemu baze (na primer mysql verzija 5.5.40/41/42/43), se lahko nekateri podatki ali tabele v tem postopku izgubijo, zato močno priporočamo kopiranje celotne baze pred začetkom migracije.\n\nKliknite OK za začetek postopka migracije...
 ErrorDatabaseVersionForbiddenForMigration=Verzija vaše baze podatkov je %s. Vsebuje kritičnega hrošča, ki povzroči izgubo podatkov, če naredite strukturno spremembo baze, kot jo zahteva postopek migracije. Zato migracija ne bo dovoljena, dokler ne posodobite baze na višjo stabilno verzijo (seznam znanih hroščastih verzij: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Posodobitev podatkov o aktivnostih
 MigrationPaymentMode=Podatki, migracije za način plačila
 MigrationCategorieAssociation=Migracija kategorij
 MigrationEvents=Migracija dogodkov za dodajanje lastnika dogodka v dodelitveno tabelo
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Ponovno naložite modul %s
 ShowNotAvailableOptions=Prikaži opcije, ki niso na voljo
 HideNotAvailableOptions=Skrij opcije, ki niso na voljo
diff --git a/htdocs/langs/sl_SI/interventions.lang b/htdocs/langs/sl_SI/interventions.lang
index 4cb94fa43c6..bcf012884eb 100644
--- a/htdocs/langs/sl_SI/interventions.lang
+++ b/htdocs/langs/sl_SI/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Kontakt za nadaljnjo obravnavo pri kupcu
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=intervencije na osnovi naročil
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/sl_SI/ldap.lang b/htdocs/langs/sl_SI/ldap.lang
index 17d47ab628c..178ef3075b6 100644
--- a/htdocs/langs/sl_SI/ldap.lang
+++ b/htdocs/langs/sl_SI/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Datum prve naročnine
 LDAPFieldFirstSubscriptionAmount=Znesek prve naročnine
 LDAPFieldLastSubscriptionDate=Datum zadnje naročnine
 LDAPFieldLastSubscriptionAmount=Znesek zadnje naročnine
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Uporabnik sinhroniziran
 GroupSynchronized=Skupina sinhronizirana
 MemberSynchronized=Član sinhroniziran
diff --git a/htdocs/langs/sl_SI/mails.lang b/htdocs/langs/sl_SI/mails.lang
index 3e4cfc937f9..4f63ca771ef 100644
--- a/htdocs/langs/sl_SI/mails.lang
+++ b/htdocs/langs/sl_SI/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Preberite
 YourMailUnsubcribeOK=E-pošni naslov <b>%s</b>  je uspešno odjavljen s seznama za pošiljanje
 ActivateCheckReadKey=Ključ za enkripcijo URL, ki je uporabljen za funkciji "Branje potrdila" in "Odpoved naročnine"
 EMailSentToNRecipients=E-pošta poslana %s prejemnikom.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> prejemnikov dodanih na ciljni seznam
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=Izbrani vsi partnerji, ki jim je bila poslana pošta
 ResultOfMailSending=Rezultati masovnega e-poštnega pošiljanja
 NbSelected=Št. izbranih
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 9425be40e78..34681ed80f8 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -67,6 +67,7 @@ SelectDate=Izberi datum
 SeeAlso=Glejte tudi %s
 SeeHere=Glej tukaj
 BackgroundColorByDefault=Privzeta barva ozadja
+FileRenamed=The file was successfully renamed
 FileUploaded=Datoteka je bila uspešno naložena
 FileWasNotUploaded=Izbrana je bila datoteka za prilogo, vendar še ni dodana. Kliknite na "Pripni datoteko".
 NbOfEntries=Število vpisov
@@ -245,6 +246,10 @@ DateBuild=Datum izdelave poročila
 DatePayment=Datum plačila
 DateApprove=Datum odobritve
 DateApprove2=Datum odobritve (drugi nivo)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=leto
 DurationMonth=mesec
 DurationWeek=teden
@@ -256,6 +261,7 @@ DurationDays=dni
 Year=Leto
 Month=Mesec
 Week=Teden
+WeekShort=Week
 Day=Dan
 Hour=Ura
 Minute=Minuta
@@ -278,6 +284,7 @@ MonthOfDay=Dan v mesecu
 HourShort=H
 MinuteShort=Mn
 Rate=Stopnja
+CurrencyRate=Currency conversion rate
 UseLocalTax=Vključi davek
 Bytes=Byti
 KiloBytes=Kilobyti
@@ -565,8 +572,11 @@ BackToList=Nazaj na seznam
 GoBack=Pojdi nazaj
 CanBeModifiedIfOk=Lahko se spremeni, če je veljaven
 CanBeModifiedIfKo=Lahko se spremeni, če ni veljaven
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Zapis uspešno spremenjen
 RecordsModified=%s zapisov spremenjenih
+RecordsDeleted=%s records deleted
 AutomaticCode=Avtomatska koda
 FeatureDisabled=Funkcija onemogočena
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Nimate dovoljenja za to aktivnost
 SessionName=Ime seje
 Method=Metoda
 Receive=Prejeto
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Delni
 TotalWoman=Skupna
 NeverReceived=Nikoli prejeto
@@ -598,6 +609,7 @@ DisabledModules=Onemogočeni moduli
 For=Za
 ForCustomer=Za kupca
 Signature=Podpis
+DateOfSignature=Date of signature
 HidePassword=Prikaži komande s skritim geslom
 UnHidePassword=Prikaži resnične komande z vidnim geslom
 Root=Koren
@@ -641,6 +653,15 @@ NewAttribute=Nov atribut
 AttributeCode=Koda atributa
 URLPhoto=Url za fotografijo/logotip
 SetLinkToAnotherThirdParty=Povezava na drugega partnerja
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Ustvarite osnutek
 SetToDraft=Nazaj na osnutek
 ClickToEdit=Kliknite za urejanje
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Ponedeljek
 Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
index a5e207b944c..8b58d5c7431 100644
--- a/htdocs/langs/sl_SI/margins.lang
+++ b/htdocs/langs/sl_SI/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Stopnja mora biti numerična vrednost
 markRateShouldBeLesserThan100=Označena vrednost mora biti manjša od 100
 ShowMarginInfos=Prikaži informacije o marži
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/sl_SI/oauth.lang b/htdocs/langs/sl_SI/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/sl_SI/oauth.lang
+++ b/htdocs/langs/sl_SI/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index cdbbb198db6..f4e12548215 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Vaša naročila so bila ustvarjena
 OrderFail=Pri ustvarjanju naročil je prišlo do napake
 CreateOrders=Ustvari naročila
 ToBillSeveralOrderSelectCustomer=Za ustvarjanje računa za več naročil najprej kliknite na kupca, nato izberite "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/sl_SI/printing.lang b/htdocs/langs/sl_SI/printing.lang
index 2a654b5095f..525b5938f41 100644
--- a/htdocs/langs/sl_SI/printing.lang
+++ b/htdocs/langs/sl_SI/printing.lang
@@ -18,10 +18,6 @@ UserConf=Nastavitev po uporabniku
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index ceaf2292102..066465df6c1 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Masovna sprememba DDV
 ProductVatMassChangeDesc=Na tej strani lahko spremenite stopnjo DDV za proizvode in storitve iz ene na drugo vrednost. Pozor, ta sprememba se izvrši v celotni bazi podatkov.
 MassBarcodeInit=Vzpostavitev masovne črtne kode
 MassBarcodeInitDesc=Na tej strani lahko vzpostavite črtno kodo za objekte, ki črtne kode nimajo določene. Pred tem preverite, da je zaključena nastavitev modula za črtne kode.
-ProductAccountancyBuyCode=Računovodski konto (nakup)
-ProductAccountancySellCode=Računovodski konto (prodaja)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Proizvod ali storitev
 ProductsAndServices=Proizvodi in storitve
 ProductsOrServices=Proizvodi ali storitve
@@ -59,6 +59,8 @@ SellingPriceHT=Prodajne cene (brez DDV)
 SellingPriceTTC=Prodajne cene (z DDV)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nova cena
 MinPrice=Min. prodajna cena
 CantBeLessThanMinPrice=Prodajna cena ne more biti nižja od minimalne za ta proizvod (%s brez DDV). To sporočilo se pojavi lahko tudi, če vnesete prevelik popust
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Tiskaj več nalepk za eno črtno kodo
 BuildPageToPrint=Generiraj stran za tiskanje
 FillBarCodeTypeAndValueManually=Ročno vnesi tip črtne kode in vrednost.
 FillBarCodeTypeAndValueFromProduct=Vnesi tip črtne kode in vrednost iz črtne kode proizvoda.
-FillBarCodeTypeAndValueFromThirdParty=Vnesi tip črtne kode in vrednost iz črtne kode partnerja.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definicija tipa ali vrednosti črtne kode za proizvod %s ni popolna.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definicija tipa ali vrednosti črtne kode za partnerja %s ni popolna.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Informacija o črtni kodi proizvoda %s :
-BarCodeDataForThirdparty=Informacija o črtni kodi partnerja %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Določite vrednost črtnih kod za vse zapise (s tem boste tudi resetirali že določene vrednosti črtnih kod na novo vrednost)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 08ddf8d0343..6de8ca09a73 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Seznam komercialnih ponudb, povezanih s projektom
-ListOrdersAssociatedProject=Seznam naročil kupcev, povezanih s projektom
-ListInvoicesAssociatedProject=Seznam računov kupcem, povezanih s projektom
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Seznam naročil pri dobaviteljih, povezanih s projektom
-ListSupplierInvoicesAssociatedProject=Seznam računov dobaviteljev, povezanih s projektom
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Seznam pogodb, povezanih s projektom
 ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Spremenite datum naloge glede na začetni datum projekta
 ErrorShiftTaskDate=Nemogoče je spremeniti datum naloge glede na nov začetni datum projekta
 ProjectsAndTasksLines=Projekti in naloge
 ProjectCreatedInDolibarr=Projekt %s je bil ustvarjen
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planirana delovna obremenitev
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index bd5be6bdedb..5ed921b6232 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Novo izplačilo plače
 SalaryPayment=Izplačilo plače
 SalariesPayments=Izplačila plač
 ShowSalaryPayment=Prikaži izplačilo plač
-THM=Povprečna urna postavka
-TJM=Povprečna dnevna postavka
+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
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 82107827124..03e65cbe5c7 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Izbriši pošiljko
 Stock=Zaloga
 Stocks=Zaloge
 StocksByLotSerial=Zaloga po lotu/serijski številki
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Gibanja
 ErrorWarehouseRefRequired=Obvezno je referenčno ime skladišča
 ListOfWarehouses=Spisek skladišč
@@ -43,6 +45,7 @@ PMPValue=Uravnotežena povprečna cena
 PMPValueShort=UPC
 EnhancedValueOfWarehouses=Vrednost skladišč
 UserWarehouseAutoCreate=Avtomatsko ustvari zalogo, ko kreirate uporabnika
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Zaloga proizvodov in zaloga komponent sta neodvisni
 QtyDispatched=Odposlana količina
 QtyDispatchedShort=Odposlana količina
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/sl_SI/supplier_proposal.lang b/htdocs/langs/sl_SI/supplier_proposal.lang
index 325ddcfc33b..d472a00fdd9 100644
--- a/htdocs/langs/sl_SI/supplier_proposal.lang
+++ b/htdocs/langs/sl_SI/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index 52499374de6..d0cac687e5f 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -7,13 +7,13 @@ History=Zgodovina
 ListOfSuppliers=Seznam dobaviteljev
 ShowSupplier=Prikaži dobavitelja
 OrderDate=Datum naročila
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Nekateri pod-proizvodi nimajo določenih cen
-AddSupplierPrice=Dodaj ceno dobavitelja
-ChangeSupplierPrice=Spremeni ceno dobavitelja
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ta referenčni dobavitelj je že povezan z referenco: %s
 NoRecordedSuppliers=Ni vnesenih dobaviteljev
 SupplierPayment=Plačilo dobavitelju
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Seznam naročil dobaviitelja
 MenuOrdersSupplierToBill=Zaračunavanje naročil dobavitelja
 NbDaysToDelivery=Zakasnitev dobave v dnevih
 DescNbDaysToDelivery=Največja zamuda pri dobavi proizvodov iz tega naročila
-UseDoubleApproval=Uporabite dvojno odobritev, če je znesek (brez DDV) višji kot (Drugo odobritev lahko naredi katerikoli uporabnik z dovoljenjem. Vnesite 0, če ne želite dvojne odobritve)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/sl_SI/users.lang b/htdocs/langs/sl_SI/users.lang
index 4cff84d4119..3b8b74a9a2e 100644
--- a/htdocs/langs/sl_SI/users.lang
+++ b/htdocs/langs/sl_SI/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Tedenske ure
 ColorUser=Barve uporabnika
 DisabledInMonoUserMode=Izklopljeno v načinu vzdrževanja
 UserAccountancyCode=Računovodska koda uporabnika
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/sl_SI/website.lang b/htdocs/langs/sl_SI/website.lang
index a21bd0b5f9d..6976a582038 100644
--- a/htdocs/langs/sl_SI/website.lang
+++ b/htdocs/langs/sl_SI/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/sl_SI/withdrawals.lang b/htdocs/langs/sl_SI/withdrawals.lang
index b4eb9796a2d..d2756e9535d 100644
--- a/htdocs/langs/sl_SI/withdrawals.lang
+++ b/htdocs/langs/sl_SI/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Področje trajnikov kupcev
-StandingOrders=Trajniki
-StandingOrder=Trajnik
-NewStandingOrder=Nov trajnik
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za obdelavo
-WithdrawalsReceipts=Potrdila o nakazilih
-WithdrawalReceipt=Potrdilo o nakazilu
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Nakazane postavke
-RequestStandingOrderToTreat=Zahtevek po procesiranju trajnikov
-RequestStandingOrderTreated=Zahtevek po procesiranih trajnikih
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Trenutno ni možno. Status nakazila je potrebno nastaviti na 'kreditiran' pred zavrnitvijo specifičnih vrstic.
-NbOfInvoiceToWithdraw=Št. računov z zahtevkom za nakazilo
-NbOfInvoiceToWithdrawWithInfo=Št. računov z zahtevkom za nakazilo za stranke z navedenimi podatki o bančnem računu
-InvoiceWaitingWithdraw=Računi, ki čakajo na nakazilo
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Vrednost za nakazilo
-WithdrawsRefused=Zavrnjena nakazila
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Ni čakajočih plačil kupcev v načinu "nakazilo". Za izdelavo zahtevka pojdite na jeziček 'Nakazilo' na kartici računa.
 ResponsibleUser=Odgovorni uporabnik
-WithdrawalsSetup=Nastavitev nakazil
-WithdrawStatistics=Statistika nakazil
-WithdrawRejectStatistics=Statistika zavrnjenih nakazil
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Izdelaj zahtevek za nakazilo
 ThirdPartyBankCode=Bančna koda partnerja
 NoInvoiceCouldBeWithdrawed=Noben račun ni bil uspešno nakazan. Preverite, če imajo izdajatelji računov veljaven BAN.
@@ -46,7 +47,7 @@ StatusRefused=Zavrnjeno
 StatusMotif0=Nedoločeno
 StatusMotif1=Nezadostno stanje
 StatusMotif2=Sporna izdaja
-StatusMotif3=Umik brez nakazila
+StatusMotif3=No direct debit payment order
 StatusMotif4=Naročilo kupca
 StatusMotif5=RIB ni možno izkoristiti
 StatusMotif6=Račun brez bilance
@@ -61,28 +62,43 @@ 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=Informacija o vašem bančnem računu za prejem nakazil
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=Preko tega zavihka lahko zahtevate trajnik. Po zaključku lahko preko menija Banka->Nakazila upravljate trajnike. Ko je trajnik zaprt, se avtomatsko zapišejo plačila računa in račun se zapre, če ni preostanka za plačilo.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=S tem bodo plačila povezana z računi, ki bodo spremenili status v "Plačano"
 StatisticsByLineStatus=Statistika po statusu vrstic
-RUM=RUM
-RUMWillBeGenerated=Številka RUM bo ustvarjena, ko bodo shranjeni podatki o bančnem računu
-WithdrawMode=Način dviga (FRST ali RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Želen znesek dviga:
 WithdrawRequestErrorNilAmount=Ni možno ustvariti zahteve za dvig zneska nič.
+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
 
 ### Notifications
-InfoCreditSubject=Plačilo odprtega naročila %s s strani banke
-InfoCreditMessage=Odprto naročilo %s je bilo plačano s strani banke<br>Data of payment: %s
-InfoTransSubject=Prenos odprtega naročila %s na banko
-InfoTransMessage=Odprto naročilo %s je bilo preneseno na banko z %s %s.<br><br>
+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>
 InfoTransData=Znesek: %s<br>Način: %s<br>Datum: %s
-InfoRejectSubject=Odprto naročilo zavrnjeno
-InfoRejectMessage=Pozdravljeni,<br><br>odprto naročilo za račun %s, ki se nanaša na podjetje %s, v znesku %s je banka zavrnila.<br><br>--<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
 ModeWarning=Opcija za delo v živo ni bila nastavljena, zato se bo sistem ustavil po simulaciji
diff --git a/htdocs/langs/sl_SI/workflow.lang b/htdocs/langs/sl_SI/workflow.lang
index 74e202057e7..8608a104dae 100644
--- a/htdocs/langs/sl_SI/workflow.lang
+++ b/htdocs/langs/sl_SI/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Nastavitev modula poteka dela
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označi povezano izvorno ponudbo kot "zaračunano", ko naročilo kupca dobi status "plačano"
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označi povezano izvorno naročilo (ali več naročil) kupca kot "zaračunano", ko račun za kupca dobi status "plačano"
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označi povezano izvorno naročilo (ali več naročil) kupca kot "zaračunano", ko naročilo kupca dobi status "potrjeno"
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index af313850ba1..e5e37b68217 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Fjalëkalimi
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/sq_AL/boxes.lang b/htdocs/langs/sq_AL/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/sq_AL/boxes.lang
+++ b/htdocs/langs/sq_AL/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/sq_AL/cashdesk.lang b/htdocs/langs/sq_AL/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/sq_AL/cashdesk.lang
+++ b/htdocs/langs/sq_AL/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/sq_AL/categories.lang b/htdocs/langs/sq_AL/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/sq_AL/categories.lang
+++ b/htdocs/langs/sq_AL/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 44de76d2130..493c004fb2f 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -3,28 +3,30 @@ ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one
 ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
 ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
-DeleteContact=Delete a contact/address
+DeleteContact=Fshij një kontakt/adresë
 ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ?
 MenuNewThirdParty=New third party
-MenuNewCustomer=New customer
+MenuNewCustomer=Klient i ri
 MenuNewProspect=New prospect
-MenuNewSupplier=New supplier
+MenuNewSupplier=Furnitor i ri
 MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
 IdContact=Contact Id
-Contacts=Contacts/Addresses
+Contacts=Kontakte/Adresa
 ThirdPartyContacts=Third party contacts
 ThirdPartyContact=Third party contact/address
-Company=Company
-CompanyName=Company name
+Company=Kompani
+CompanyName=Emri i kompanisë
 AliasNames=Alias name (commercial, trademark, ...)
 AliasNameShort=Alias name
-Companies=Companies
+Companies=Kompanitë
 CountryIsInEEC=Country is inside European Economic Community
 ThirdPartyName=Third party name
 ThirdParty=Third party
@@ -34,46 +36,46 @@ ThirdPartyProspectsStats=Prospects
 ThirdPartyCustomers=Customers
 ThirdPartyCustomersStats=Customers
 ThirdPartyCustomersWithIdProf12=Customers with %s or %s
-ThirdPartySuppliers=Suppliers
+ThirdPartySuppliers=Furnitorët
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
 ReportByQuarter=Report by rate
 CivilityCode=Civility code
 RegisteredOffice=Registered office
-Lastname=Last name
-Firstname=First name
-PostOrFunction=Post/Function
+Lastname=Mbiemri
+Firstname=Emri
+PostOrFunction=Job position
 UserTitle=Title
-Address=Address
-State=State/Province
+Address=Adresa
+State=Shteti/Provinca
 StateShort=State
-Region=Region
+Region=Krahina
 Country=Country
 CountryCode=Country code
 CountryId=Country id
-Phone=Phone
+Phone=Telefon
 PhoneShort=Phone
 Skype=Skype
 Call=Call
 Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
-PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+PhoneMobile=Celular
+No_Email=Refuse mass e-mailings
 Fax=Fax
-Zip=Zip Code
-Town=City
+Zip=Kodi postar
+Town=Qyteti
 Web=Web
 Poste= Position
 DefaultLang=Language by default
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+VATIsUsed=Përdoret T.V.SH
+VATIsNotUsed=Nuk përdoret T.V.SH
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,13 +262,15 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Emri:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
 AddThirdParty=Create third party
-DeleteACompany=Delete a company
-PersonalInformations=Personal data
+DeleteACompany=Fshij kompani
+PersonalInformations=Të dhëna personale
 AccountancyCode=Accountancy code
 CustomerCode=Customer code
 SupplierCode=Supplier code
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -328,14 +332,14 @@ PL_MEDIUM=Medium
 PL_HIGH=High
 TE_UNKNOWN=-
 TE_STARTUP=Startup
-TE_GROUP=Large company
-TE_MEDIUM=Medium company
-TE_ADMIN=Governmental
-TE_SMALL=Small company
+TE_GROUP=Kompani e madhe
+TE_MEDIUM=Kompani e mesme
+TE_ADMIN=Qeveritar
+TE_SMALL=Kompani e vogël
 TE_RETAIL=Retailer
 TE_WHOLE=Wholetailer
 TE_PRIVATE=Private individual
-TE_OTHER=Other
+TE_OTHER=Tjetër
 StatusProspect-1=Do not contact
 StatusProspect0=Never contacted
 StatusProspect1=To be contacted
@@ -352,18 +356,18 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
 PriceLevel=Price level
 DeliveryAddress=Delivery address
-AddAddress=Add address
+AddAddress=Shto adresë
 SupplierCategory=Supplier category
 JuridicalStatus200=Independent
-DeleteFile=Delete file
+DeleteFile=Fshi skedar
 ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Assigned to sales representative
 Organization=Organization
@@ -377,8 +381,8 @@ ListCustomersShort=List of customers
 ThirdPartiesArea=Third parties and contact area
 LastModifiedThirdParties=Latest %s modified third parties
 UniqueThirdParties=Total of unique third parties
-InActivity=Open
-ActivityCeased=Closed
+InActivity=Hapur
+ActivityCeased=Mbyllur
 ProductsIntoElements=List of products/services into %s
 CurrentOutstandingBill=Current outstanding bill
 OutstandingBill=Max. for outstanding bill
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sq_AL/compta.lang b/htdocs/langs/sq_AL/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/sq_AL/compta.lang
+++ b/htdocs/langs/sq_AL/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index a95da81eaaa..939a26aef37 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Leaves
-CPTitreMenu=Leaves
+Holidays=Lejet
+CPTitreMenu=Lejet
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
 NotActiveModCP=You must enable the module Leaves to view this page.
@@ -11,13 +11,13 @@ DateFinCP=End date
 DateCreateCP=Creation date
 DraftCP=Draft
 ToReviewCP=Awaiting approval
-ApprovedCP=Approved
+ApprovedCP=Miratuar
 CancelCP=Canceled
-RefuseCP=Refused
+RefuseCP=Refuzuar
 ValidatorCP=Approbator
 ListeCP=List of leaves
 ReviewedByCP=Will be reviewed by
-DescCP=Description
+DescCP=Përshkrimi
 SendRequestCP=Create leave request
 DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
 MenuConfCP=Balance of leaves
@@ -29,14 +29,14 @@ ReturnCP=Return to previous page
 ErrorUserViewCP=You are not authorized to read this leave request.
 InfosWorkflowCP=Information Workflow
 RequestByCP=Requested by
-TitreRequestCP=Leave request
+TitreRequestCP=Kërkesë për leje
 NbUseDaysCP=Number of days of vacation consumed
 EditCP=Edit
-DeleteCP=Delete
-ActionRefuseCP=Refuse
+DeleteCP=Fshi
+ActionRefuseCP=Refuzo
 ActionCancelCP=Cancel
-StatutCP=Status
-TitleDeleteCP=Delete the leave request
+StatutCP=Statusi
+TitleDeleteCP=Fshi kërkesën për leje
 ConfirmDeleteCP=Confirm the deletion of this leave request?
 ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
 CantCreateCP=You don't have the right to make leave requests.
@@ -44,9 +44,9 @@ InvalidValidatorCP=You must choose an approbator to your leave request.
 NoDateDebut=You must select a start date.
 NoDateFin=You must select an end date.
 ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
+TitleValidCP=Aprovo kërkesën për leje
 ConfirmValidCP=Are you sure you want to approve the leave request?
-DateValidCP=Date approved
+DateValidCP=Data e miratimit
 TitleToValidCP=Send leave request
 ConfirmToValidCP=Are you sure you want to send the leave request?
 TitleRefuseCP=Refuse the leave request
@@ -76,8 +76,8 @@ BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
 HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+EmployeeLastname=Mbiemri i punonjësit
+EmployeeFirstname=Emri i punonjësit
 
 ## Configuration du Module ##
 LastUpdateCP=Latest automatic update of leaves allocation
diff --git a/htdocs/langs/sq_AL/hrm.lang b/htdocs/langs/sq_AL/hrm.lang
index 6730da53d2d..770e2102a68 100644
--- a/htdocs/langs/sq_AL/hrm.lang
+++ b/htdocs/langs/sq_AL/hrm.lang
@@ -12,6 +12,6 @@ CloseEtablishment=Close establishment
 DictionaryDepartment=HRM - Department list
 DictionaryFunction=HRM - Function list
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
+Employees=Punonjësit
+Employee=Punonjës
+NewEmployee=Punonjës i ri
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/sq_AL/interventions.lang b/htdocs/langs/sq_AL/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/sq_AL/interventions.lang
+++ b/htdocs/langs/sq_AL/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/sq_AL/ldap.lang b/htdocs/langs/sq_AL/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/sq_AL/ldap.lang
+++ b/htdocs/langs/sq_AL/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/sq_AL/mails.lang b/htdocs/langs/sq_AL/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/sq_AL/mails.lang
+++ b/htdocs/langs/sq_AL/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index 5e652e04419..1f7c78f5115 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Java
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/sq_AL/oauth.lang b/htdocs/langs/sq_AL/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/sq_AL/oauth.lang
+++ b/htdocs/langs/sq_AL/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/sq_AL/printing.lang b/htdocs/langs/sq_AL/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/sq_AL/printing.lang
+++ b/htdocs/langs/sq_AL/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/sq_AL/supplier_proposal.lang b/htdocs/langs/sq_AL/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/sq_AL/supplier_proposal.lang
+++ b/htdocs/langs/sq_AL/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/sq_AL/users.lang b/htdocs/langs/sq_AL/users.lang
index a8447504235..5b891dc4940 100644
--- a/htdocs/langs/sq_AL/users.lang
+++ b/htdocs/langs/sq_AL/users.lang
@@ -8,16 +8,16 @@ EditPassword=Edit password
 SendNewPassword=Regenerate and send password
 ReinitPassword=Regenerate password
 PasswordChangedTo=Password changed to: %s
-SubjectNewPassword=Your new password for Dolibarr
+SubjectNewPassword=Fjalëkalimi i ri i Dolibarr
 GroupRights=Group permissions
 UserRights=User permissions
 UserGUISetup=User display setup
-DisableUser=Disable
+DisableUser=Çaktivizo
 DisableAUser=Disable a user
 DeleteUser=Delete
 DeleteAUser=Delete a user
 EnableAUser=Enable a user
-DeleteGroup=Delete
+DeleteGroup=Fshi
 DeleteAGroup=Delete a group
 ConfirmDisableUser=Are you sure you want to disable user <b>%s</b> ?
 ConfirmDeleteUser=Are you sure you want to delete user <b>%s</b> ?
@@ -25,8 +25,8 @@ ConfirmDeleteGroup=Are you sure you want to delete group <b>%s</b> ?
 ConfirmEnableUser=Are you sure you want to enable user <b>%s</b> ?
 ConfirmReinitPassword=Are you sure you want to generate a new password for user <b>%s</b> ?
 ConfirmSendNewPassword=Are you sure you want to generate and send new password for user <b>%s</b> ?
-NewUser=New user
-CreateUser=Create user
+NewUser=Përdorues i ri
+CreateUser=Krijo përdorues
 LoginNotDefined=Login is not defined.
 NameNotDefined=Name is not defined.
 ListOfUsers=List of users
@@ -36,8 +36,8 @@ AdministratorDesc=Administrator
 DefaultRights=Default permissions
 DefaultRightsDesc=Define here <u>default</u> permissions that are automatically granted to a <u>new created</u> user (Go on user card to change permission of an existing user).
 DolibarrUsers=Dolibarr users
-LastName=Last Name
-FirstName=First name
+LastName=Mbiemri
+FirstName=Emri
 ListOfGroups=List of groups
 NewGroup=New group
 CreateGroup=Create group
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/sq_AL/website.lang b/htdocs/langs/sq_AL/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/sq_AL/website.lang
+++ b/htdocs/langs/sq_AL/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/sq_AL/withdrawals.lang b/htdocs/langs/sq_AL/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/sq_AL/withdrawals.lang
+++ b/htdocs/langs/sq_AL/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/sq_AL/workflow.lang b/htdocs/langs/sq_AL/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/sq_AL/workflow.lang
+++ b/htdocs/langs/sq_AL/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 1bee9a6bf9c..54b845b5599 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Izveštaji
 JournalFinancial=Finansijski izveštaji
 BackToChartofaccounts=Vrati tabelu računa
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Izaberi tabelu računa
 Addanaccount=Dodaj računovodstveni nalog
 AccountAccounting=Računovodstveni nalog
 AccountAccountingShort=Account
 AccountAccountingSuggest=Predlog računovodstvenog naloga
-Ventilation=Presek
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Računovodstvo
-CustomersVentilation=Presek kupaca
-SuppliersVentilation=Presek dobavljača
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Izveštaji
 NewAccount=Novi računovodstveni nalog
 Create=Kreiraj
-CreateMvts=Kreiraj promet
-UpdateMvts=Izmena prometa
-WriteBookKeeping=Snimanje računa u glavnoj knjizi
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Glavna knjiga
 AccountBalance=Stanje računa
 
 CAHTF=Ukupna nabavka bez PDV-a
-InvoiceLines=Linije faktura za kontrolu
-InvoiceLinesDone=Kontrolisane linije faktura
-IntoAccount=Kontrolisati u računovodstvenom nalogu
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Kontroliši
+Ventilate=Bind
 
 Processing=Obrada
 EndProcessing=Kraj obrade
-AnyLineVentilate=Bilo koja linija za kontrolu
+AnyLineVentilate=Any lines to bind
 SelectedLines=Izabrane linije
 Lineofinvoice=Linija faktura
-VentilatedinAccount=Uspešno prekontrolisano uračunovdstvenom nalogu
-NotVentilatedinAccount=Nije prekontrolisano u računovodstvenom nalogu
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Broj elemenata predviđeni za presek po strani (maksimalno preporučeno: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Započni sortiranje stranica za presek "Predvidjeno za presek" na osnovu najnovijih elemenata
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Započni sortiranje stranica za presek "Presek" na osnovu najnovijih elemenata
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Dužina za prikaz opisa proizvoda i usluga na spisku (Najbolje = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Dužina za prikaz forme opisa naloga proizvoda i usluga na spisku (Najbolje = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Dužina opštih naloga
-ACCOUNTING_LENGTH_AACCOUNT=Dužina računa subjekta
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Izveštaj prodaje
 ACCOUNTING_PURCHASE_JOURNAL=Izveštaj nabavke
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Izveštaj
 NumPiece=Deo broj
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Obriši evidenciju glavne knjige
-
 DescSellsJournal=Izveštaj prodaje
 DescPurchasesJournal=Izveštaj nabavke
 FinanceJournal=Finansijski izveštaji
 DescFinanceJournal=Finansijski izveštaji uključujući sve vrste uplata preko bankovnog računa
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Uplata kupca po fakturi
-
 ThirdPartyAccount=Račun subjekta
-
-NewAccountingMvt=Nov promet
-NumMvts=Broj prometa
-ListeMvts=Lista prometa
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit i Kredit ne smeju imati vrednost u isto vreme
 
-ReportThirdParty=Izlistaj račune subjekta
-DescThirdPartyReport=Ovde konsultuj listu kupaca i dobavljača i njihove računovodstvene naloge
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Lista računovodstvenih naloga
 
@@ -114,22 +134,29 @@ Pcgtype=Klasa računa
 Pcgsubtype=Pod klasom računa
 Accountparent=Koren računa
 
-DescVentilCustomer=Konsultuj ovde godišnji računovodstveni presek faktura kupaca
 TotalVente=Ukupni obrt pre poreza
 TotalMarge=Ukupna prodajna marža
-DescVentilDoneCustomer=Konsultuj ovde listu linija faktura kupaca i njihovih računovodstvenih naloga
-DescVentilTodoCustomer=Prekontroliši linije faktura kupaca sa računovodstvenim nalogom
-ChangeAccount=Izmeni računovodstveni nalog sa linijama odabranim od strane naloga:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Konsultuj ovde godišnju računovdstveni presek predračuna dobavljača
-DescVentilDoneSupplier=Konslutuj ovde listu linija faktura dobavljača i njihovih računovdstvenih naloga
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Odobri automatski
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete opbrisati ovaj računovodstveni nalog, jer  je u upotrebi
 MvtNotCorrectlyBalanced=Transakcija nema dobar balans. Credit = %s. Debit = %s
-FicheVentilation=Kartica preseka
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operacije su zapisane u glavnoj knjizi
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Započinjanje računovodstva
-InitAccountancyDesc=Ova stranica se može upotrebiti da inicializuje računovodstveni nalog proizvoda i usluga koji nemaju definisan računovodstveni nalog za prodaju i kupovinu. Proveri pre nego da se podešavanje modula računovodstva završi.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Opcije
 OptionModeProductSell=Vrsta prodaje
 OptionModeProductBuy=Vrsta kupovine
 OptionModeProductSellDesc=Prikaži sve proizvode bez računovodstvenog naloga definisanog za prodaju.
 OptionModeProductBuyDesc=Prikaži sve proizvode bez računovodstvenog naloga definisanog za kupovinu
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Opseg knjižnih računa
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 48d8543e48a..c0e982315a1 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
 VersionRecommanded=Preporučeno
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesija ID
 SessionSaveHandler=Rukovalac čuvanja sesije
 SessionSavePath=Lokalizacija smeštanja sesije
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Pročitaj zahteve za odsustvo (Vaše i Vašeg tima)
 Permission20002=Kreiraj/izmeni svoje zahteve za odsustvo
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Boja kojom će linija biti označena kada se mišem pređe p
 TextTitleColor=Color of page title
 LinkColor=Boja linkova
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Pozadinska boja za naslovnu liniju tabela
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Prikaži po defaultu na prikazu liste
 YouUseLastStableVersion=Koristite poslednju stabilnu verziju
 TitleExampleForMajorRelease=Primer poruke koju možete koristiti da biste najavili novu verziju (možete je koristiti na Vašim sajtovima)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 54e5d4b2516..ced5f8708ca 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -27,13 +27,9 @@ AllTime=Od početka
 Reconciliation=Poravnanje
 RIB=Broj bankovnog računa
 IBAN=IBAN broj
-IbanValid=IBAN je važeći
-IbanNotValid=IBAN je ne važeći
 BIC=BIC/SWIFT broj
-SwiftValid=BIC/SWIFT je važeći
-SwiftNotValid=BIC/SWIFT je ne važeći
-StandingOrders=Trajni nalozi
-StandingOrder=Trajni nalog
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Izvod
 AccountStatementShort=Izvod
 AccountStatements=Izvodi
@@ -78,6 +74,7 @@ AccountToCredit=Kreditni račun
 AccountToDebit=Debitni račun
 DisableConciliation=Onemogući poravnanje za ovaj račun
 ConciliationDisabled=Opcija poravnanja onemogućena
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Otvoreno
 StatusAccountClosed=Zatvoreno
 AccountIdShort=Broj
@@ -87,6 +84,8 @@ AddBankRecordLong=Dodaj transakciju ručno
 ConciliatedBy=Poravnjaj sa
 DateConciliating=Datum poravnanja
 BankLineConciliated=Transakcije poravnane
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Uplata kupca
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Povraćaj uplate
 SocialContributionPayment=Uplate poreza/doprinosa
 BankTransfer=Bankovni prenos
 BankTransfers=Bankovni prenosi
-TransferDesc=Prenosom sa jednog računa na drugi, Dolibarr će napraviti dva zapisa (debitni na računu porekla i kreditni na ciljanom računu iste vrednosti). Ista oznaka i datum će biti upotrebljen za ovu transakciju.
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Od
 TransferTo=Za
 TransferFromToDone=Prenos od  <b>%s</b> to <b>%s</b> of <b>%s</b> %s je zabeležen.
@@ -129,7 +129,7 @@ FutureTransaction=Transakcije u budućnosti. Ne postoji način za izmirenje.
 SelectChequeTransactionAndGenerate=Obeleži/filtriraj čekove da ih uključite u unovčene čekove i kliknite na "Kreiraj"
 InputReceiptNumber=Odaberi izvod iz banke povezan sa poravnanjem. Upotrebi sledeću numeričku vrednost: YYYYMM or YYYYMMDD
 EventualyAddCategory=Na kraju, definišite kategoriju u koju želite da klasifikujete izveštaje
-ToConciliate=Poravnati?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Potom, označite prikazane linije u izvodu i klinkite
 DefaultRIB=Podrazumevani BAN
 AllRIB=Svi BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Da li ste sigurni da želite da označite ovaj ček kao odbij
 RejectCheckDate=Datum vraćanja čeka
 CheckRejected=Vraćen ček
 CheckRejectedAndInvoicesReopened=Ček vraćen i faktura ponovo otvorena
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 6b616865ca0..49024d549b6 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne možete otkazati ra
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Akcije nad računom
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Izdavač čeka/transfera
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/sr_RS/boxes.lang b/htdocs/langs/sr_RS/boxes.lang
index 924c3bc2e98..8a295348220 100644
--- a/htdocs/langs/sr_RS/boxes.lang
+++ b/htdocs/langs/sr_RS/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Najstarije aktivne istekle usluge
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Opšta aktivnost (fakture, ponude, narudžbine)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Ponude na mesečnom nivou
 NoTooLowStockProducts=Nema proizvoda ispod donjeg limita zaliha
 BoxProductDistribution=Distribucija proizvoda/usluga
 BoxProductDistributionFor=Distribucija %s  za  %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Fakture klijenata
 ForCustomersOrders=Narudžbine klijenata
 ForProposals=Ponude
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/sr_RS/cashdesk.lang b/htdocs/langs/sr_RS/cashdesk.lang
index d4c2d9d7e75..f0b6820ede1 100644
--- a/htdocs/langs/sr_RS/cashdesk.lang
+++ b/htdocs/langs/sr_RS/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=na
 CashDeskThirdParty=Subjekt
 ShoppingCart=Korpa za kupovinu
 NewSell=Nova prodaja
-BackOffice=Finansijska služba
 AddThisArticle=Dodaj ovaj artikal
 RestartSelling=Vrati se nazad na prodaju
-SellFinished=Prodaja završena
+SellFinished=Sale complete
 PrintTicket=Štampaj kartu
 NoProductFound=Artikal nije pronađen
 ProductFound=proizvod pronađen
diff --git a/htdocs/langs/sr_RS/categories.lang b/htdocs/langs/sr_RS/categories.lang
index 2aa8f200d79..d2f0a1a3cce 100644
--- a/htdocs/langs/sr_RS/categories.lang
+++ b/htdocs/langs/sr_RS/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Oblast naziva/kategorije dobavljača
 MembersCategoriesArea=Oblast naziva/kategorije članova
 ContactsCategoriesArea=Oblast naziva/kategorija kontakata
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Podkategorije
 CatList=Lista naziva/kategorija
 NewCategory=Nov naziv/kategorija
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Ovaj subjekt je povezan sa sledećim nazivom/kate
 MemberIsInCategories=Ovaj član je povezan sa sledećim nazivom/kategorijom člana
 ContactIsInCategories=Ovaj kontakt je povezan sa sledećim nazivom/kategorijom kontakata
 ProductHasNoCategory=Ovaj proizvod/usluga nije ni u jednom nazivu/kategoriji
-CompanyHasNoCategory=Ovaj subjekt nije u jednom nazivu/kategoriji
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=Ovaj član nije u ni u jednom nazivu/kategoriji
 ContactHasNoCategory=Ovaj kontakt nije ni u jednom nazivu/kategoriji
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Dodaj u naziv/kategoriji
 NotCategorized=Bez naziva/kategorije
 CategoryExistsAtSameLevel=Ova kategorija već postoji za ovu referencu
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Nazivi/kategorije proizvoda
 MembersCategoriesShort=Nazivi/kategorije članova
 ContactCategoriesShort=Naziv/kategorija kontakata
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Ova kategorija ne sadrži nijedan proizvod.
 ThisCategoryHasNoSupplier=Ova kategorija ne sadrži nijednog dobavljača.
 ThisCategoryHasNoCustomer=Ova kategorija ne sadrži nijednog kupca.
 ThisCategoryHasNoMember=Ova kategorija ne sadrži nijednog člana.
 ThisCategoryHasNoContact=Ova kategorija ne sadrži nijedan kontakt.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=ID naziva/kategorije
 CatSupList=Lista naziva/kategorija dobavljača
 CatCusList=Lista naziva/kategorija kupca/prospekta
@@ -71,6 +75,7 @@ CatContactList=Lista naziva/kategorija kontakata
 CatSupLinks=Povezanost između dobavljača i naziva/kategorija
 CatCusLinks=Povezanost između kupaca/prospekta i naziva/kategorija
 CatProdLinks=Povezanost između proizvoda/usluga i naziva/kategorija
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Ukloni iz naziva/kategorije
 ExtraFieldsCategories=Komplementarni atributi
 CategoriesSetup=TPodešavanje naziva/kategorija
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 229bdcb9dc8..e7e70b6b1ff 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Novo fizičko lice
 NewCompany=Nova kompanija (kandidat, klijent, dobavljač)
 NewThirdParty=Novi subjekt (kandidat, klijent, dobavljač)
 CreateDolibarrThirdPartySupplier=Kreiraj subjekt (dobavljača)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Oblast istraživanja
 IdThirdParty=Id subjekta
 IdCompany=Id Kompanije
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Dobavljači
 ThirdPartyType=Tip subjekta
 Company/Fundation=Kompanija/Fondacija
 Individual=Fizičko lice
-ToCreateContactWithSameName=Automatski napraviti fizičko lice sa istim informacijama
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Osnovna kompanija
 Subsidiaries=SubsidiariesPoslovnice
 ReportByCustomers=Izveštaj po klijentima
@@ -47,7 +49,7 @@ CivilityCode=Prijavni kod
 RegisteredOffice=Registrovane kancelarije
 Lastname=Prezime
 Firstname=Ime
-PostOrFunction=Pozicija/Funkcija
+PostOrFunction=Job position
 UserTitle=Title
 Address=Adresa
 State=Država/Provincija
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Poslovni telefon
 PhonePerso=Lični telefon
 PhoneMobile=Mobilni
-No_Email=Ne slati masovne mailove
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Poštanski broj
 Town=Grad
@@ -73,7 +75,7 @@ Poste= Pozicija
 DefaultLang=Jezik po default-u
 VATIsUsed=U PDV-u
 VATIsNotUsed=Van PDV-a
-CopyAddressFromSoc=Ispuni adresu adresom subjekta
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Koristi drugu taksu
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=PDV broj
 VATIntraShort=PDV number
 VATIntraSyntaxIsValid=Sintaksa je ispravna
-VATIntraValueIsValid=Vrednost je ispravna
 ProspectCustomer=Kandidat / Klijent
 Prospect=Kandidat
 CustomerCard=Kartica klijenta
@@ -261,7 +262,9 @@ AddContactAddress=Kreiraj kontakt/adresuz
 EditContact=Izmeni kontakt
 EditContactAddress=Izmeni kontakt/adresu
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakti/Adrese
+FromContactName=Name:
 NoContactDefinedForThirdParty=Nema definisanih kontakta za ovaj subjekt
 NoContactDefined=Nema defnisanog kontakta
 DefaultContact=Default kontakt/adresa
@@ -284,7 +287,7 @@ CompanyDeleted=Kompanija "%s" je obrisana iz baze.
 ListOfContacts=Lista kontakta/adresa
 ListOfContactsAddresses=Lista kontakta/adresa
 ListOfThirdParties=Lista subjekata
-ShowCompany=Prikaži subjekt
+ShowCompany=Show third party
 ShowContact=Prikaži kontakt
 ContactsAllShort=Sve (Bez filtera)
 ContactType=Tip kontakta
@@ -294,6 +297,7 @@ ContactForProposals=Kontakt iz ponude
 ContactForContracts=Kontakt iz ugovora
 ContactForInvoices=Kontakt iz računa
 NoContactForAnyOrder=Ovaj kontakt nije ni u jednoj nadudžbini
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Ovaj kontakt nije ni u jednoj ponudi
 NoContactForAnyContract=Ovaj kontakt nije ni u jednom ugovoru
 NoContactForAnyInvoice=Ovaj kontakt nije ni u jednom računu
@@ -352,9 +356,9 @@ ExportCardToFormat=Izvozna kartica za formatiranje
 ContactNotLinkedToCompany=Kontakt nije povezan ni sa jednim subjektom
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=Nemoguć pristup Dolibarr-u
-ExportDataset_company_1=Subjekti (Kompanije/fondacije/fizička lica) i podešavanja
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakti i podešavanja
-ImportDataset_company_1=Subjekti (Kompanije/fondacije/fizička lica) i podešavanja
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakti/Adrese (subjekata i drugi) i atributi
 ImportDataset_company_3=Detalji banke
 ImportDataset_company_4=Subjekti/agenti prodaje (dodela agenata prodaje kompanijama)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Subjekti su spojeni
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sr_RS/compta.lang b/htdocs/langs/sr_RS/compta.lang
index 40a525227b3..30eb3515898 100644
--- a/htdocs/langs/sr_RS/compta.lang
+++ b/htdocs/langs/sr_RS/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Socijalni i poreski trošak
 SocialContributions=Socijalni i poreski troškovi
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Posebni troškovi
 MenuTaxAndDividends=Takse i dividende
 MenuSocialContributions=Socijalni/poreski troškovi
diff --git a/htdocs/langs/sr_RS/cron.lang b/htdocs/langs/sr_RS/cron.lang
index 56c8a6b4625..351527df5b5 100644
--- a/htdocs/langs/sr_RS/cron.lang
+++ b/htdocs/langs/sr_RS/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Obriši planiranu operaciju
 Permission23104 = Izvrši planiranu operaciju
 # Admin
 CronSetup= Podešavanja planiranih operacija
-URLToLaunchCronJobs=URL za proveru i izvršenje Cron operacija, ukoiko je potreban
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Ili za proveru i izvršenje određene operacije
 KeyForCronAccess=Security key za URL za izvršenje cron operacija
 FileToLaunchCronJobs=Komandna linija za izvršenje cron operacija
@@ -23,7 +23,7 @@ CronCommand=Komanda
 CronList=Planirane operacije
 CronDelete=Obriši planirane operacije
 CronConfirmDelete=Da li ste sigurni da želite da obrišete ove planirane operacije ?
-CronExecute=Izvrši planirane operacije
+CronExecute=Launch scheduled job
 CronConfirmExecute=Da li ste sigurni da želite da sada izvršite planirane operacije ?
 CronInfo=Modul planiranih aktivnosti omogućava izvršenje planirane aktivnosti
 CronTask=Operacija
@@ -39,7 +39,7 @@ CronMethod=Metoda
 CronModule=Modul
 CronNoJobs=Nema prijavljenih operacija
 CronPriority=Prioritet
-CronLabel=Opis
+CronLabel=Label
 CronNbRun=Br. izvršenja
 CronMaxRun=Maksimalni broj izvršenja
 CronEach=Svakih
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Bekap lokalne baze
 MakeLocalDatabaseDump=Kreirajte odbacivanje lokalne baze
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index b97b578f169..d233ab8b9d4 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Greška, PHP mora imati modul <b>%s</b> da biste koristili ov
 ErrorOpenIDSetupNotComplete=Podesili ste konfiguracioni fajl da odobrava OpenID autentifikaciju, ali URL OpenID servisa nije definisan u konstanti %s
 ErrorWarehouseMustDiffers=Izvorni i ciljani magacini moraju biti različiti
 ErrorBadFormat=Pogrešan format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Greška, ovaj član još nije povezan ni sa jednim subjektom. Povežite člana sa postojećim subjektom ili napravite nov subjekat pre kreiranja pretplate sa fakturom.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Greška, postoje objekti vezani za ovu isporuku. Brisanje je odbijeno.
 ErrorCantDeletePaymentReconciliated=Nemoguće obrisati uplatu koja je generisala bankovnu transakciju koja je već proknjižena
 ErrorCantDeletePaymentSharedWithPayedInvoice=Nemoguće obrisati uplatu koja je vezana za bar jednu fakturu sa statusom Plaćeno
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index 6a601a86a22..494516a29f9 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP podržava sesije.
 PHPSupportPOSTGETOk=PHP podržava POST i GET promenljive
 PHPSupportPOSTGETKo=Moguće je da Vaš PHP ne podržava POST i/ili GET promenljive. Proverite parametar <b>variables_order</b> u php.ini.
 PHPSupportGD=PHP podržava GD grafičke funkcije.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=PHP podržava UTF8 funkcije.
 PHPMemoryOK=Maksimalna memorija za sesije je <b>%s</b>. To bi trebalo biti dovoljno.
 PHPMemoryTooLow=Maksimalna memorija za sesije je <b>%s</b> bytes. Ovo ne bi trebalo da je dovoljno. Promenite <b>php.ini</b> i podesite <b>memory_limit</b> na najmanje <b>%s</b> bytes.
 Recheck=Kliknite ovde za detaljniji test
 ErrorPHPDoesNotSupportSessions=Vaš PHP ne podržava sesije. Ova funkcionalnost je neophodna za Dolibarr. Proverite PHP podešavanja.
 ErrorPHPDoesNotSupportGD=Vaša PHP instalacija ne podržava grafičke funkcije GD. Grafici neće biti dostupni.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Vaša PHP instalacija ne podržava UTF8 funkcije. Dolibarr ne može da funkcioniše kako treba. Ispravite ovo pre instalacije Dolibarr-a.
 ErrorDirDoesNotExists=Folder %s ne postoji.
 ErrorGoBackAndCorrectParameters=Vratite se nazad i ispravite pogrešne parametre.
@@ -133,6 +135,10 @@ ActivateModule=Aktiviraj modul %s
 ShowEditTechnicalParameters=Kliknite ovde da prikažete/editujete napredne parametre (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Ažuriranje podataka akcija
 MigrationPaymentMode=Migracija podataka načina plaćanja
 MigrationCategorieAssociation=Migracija kategorija
 MigrationEvents=Migracija događaja i dodavanje vlasnika događaja u assignment tabelu
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Ponovo učitavanje modula %s
 ShowNotAvailableOptions=Prikaži nedostupne opcije
 HideNotAvailableOptions=Sakrij nedostupne opcije
diff --git a/htdocs/langs/sr_RS/interventions.lang b/htdocs/langs/sr_RS/interventions.lang
index 72fd884d87a..3751e170b90 100644
--- a/htdocs/langs/sr_RS/interventions.lang
+++ b/htdocs/langs/sr_RS/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Kontakt klijenta koji prat intervenciju
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Intervencije generisane iz narudžbina
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistika intervencija
 NbOfinterventions=Broj kartica intervencije
 NumberOfInterventionsByMonth=Broj kartica intervencije na mesečnom nivou (datum potvrde)
diff --git a/htdocs/langs/sr_RS/ldap.lang b/htdocs/langs/sr_RS/ldap.lang
index 72ae63d8d7e..07cbc9ae468 100644
--- a/htdocs/langs/sr_RS/ldap.lang
+++ b/htdocs/langs/sr_RS/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Datum prve prijave
 LDAPFieldFirstSubscriptionAmount=Svota prve prijave
 LDAPFieldLastSubscriptionDate=Datum poslednje prijave
 LDAPFieldLastSubscriptionAmount=Svota poslednje prijave
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Korisnik sinhronizovan
 GroupSynchronized=Grupa sinhronizovana
 MemberSynchronized=Član sinhronizovan
diff --git a/htdocs/langs/sr_RS/mails.lang b/htdocs/langs/sr_RS/mails.lang
index 44c66968501..ccd8dcaa78d 100644
--- a/htdocs/langs/sr_RS/mails.lang
+++ b/htdocs/langs/sr_RS/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Pročitaj
 YourMailUnsubcribeOK=Email <b>%s</b> je uspešno uklonjen iz liste.
 ActivateCheckReadKey=Ključ za enkripciju URL-a u funkcionalnostima "Pregled Računa" i "Ukloni sa liste"
 EMailSentToNRecipients=Mail poslat %s primalaca.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> primalaca su dodati na listu
-OnlyPDFattachmentSupported=Ako je PDF dokumet već generisan za fakturu, biće dodat u prilog mejla. Ako ne, mejl neće biti poslat (takođe, imajte na umu da samo fakture u PDFu se mogu poslati u prilogu grupnih mejlova u ovoj verziji)
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=Svi subjekti su selektirani ukoliko imaju email.
 ResultOfMailSending=Rezultat masovnog mailinga
 NbSelected=Br selektiranih
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index c9ac8d36e55..338424278a2 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -67,6 +67,7 @@ SelectDate=Izaberi datum
 SeeAlso=Pogledajte i %s
 SeeHere=Pogledaj ovde
 BackgroundColorByDefault=Default boja pozadine
+FileRenamed=The file was successfully renamed
 FileUploaded=Fajl je uspešno uploadovan
 FileWasNotUploaded=Fajl je selektiran za prilog, ali još uvek nije uploadovan. Klikni na "Priloži fajl".
 NbOfEntries=Br linija
@@ -245,6 +246,10 @@ DateBuild=Datum generisanja izveštaja
 DatePayment=Datum uplate
 DateApprove=Vreme odobravanja
 DateApprove2=Vreme odobravanja (drugo odobrenje)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=godina
 DurationMonth=mesec
 DurationWeek=nedelja
@@ -256,6 +261,7 @@ DurationDays=dani
 Year=Godina
 Month=Mesec
 Week=Nedelja
+WeekShort=Week
 Day=Dan
 Hour=Sat
 Minute=Minut
@@ -278,6 +284,7 @@ MonthOfDay=Mesec dana
 HourShort=H
 MinuteShort=mn
 Rate=Kurs
+CurrencyRate=Currency conversion rate
 UseLocalTax=Uračunaj porez
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Nazad na listu
 GoBack=Nazad
 CanBeModifiedIfOk=Može biti izmenjeno ukoliko je validno.
 CanBeModifiedIfKo=Može biti izmenjeno ukoliko nije validno
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Linija uspešno izmenjena
 RecordsModified=%s linija izmenjeno
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatski kod
 FeatureDisabled=Funkcionalnost deaktivirana
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Nemate pravo da izvršite ovu operaciju
 SessionName=Ime sesije
 Method=Metoda
 Receive=Primi
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Delimično
 TotalWoman=Celo
 NeverReceived=Nije primljena
@@ -598,6 +609,7 @@ DisabledModules=Deaktivirani moduli
 For=Za
 ForCustomer=Za klijenta
 Signature=Potpis
+DateOfSignature=Date of signature
 HidePassword=Prikaži komandu sa sakrivenom lozinkom
 UnHidePassword=Prikaži realnu komandu sa vidljivom lozinkom
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=Novi atribut
 AttributeCode=Kod atributa
 URLPhoto=URL fotografije/logoa
 SetLinkToAnotherThirdParty=Link ka drugom subjektu
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Napravi draft
 SetToDraft=Nazad u draft
 ClickToEdit=Klikni za edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Ponedeljak
 Tuesday=Utorak
diff --git a/htdocs/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
index 92bdaa4ed8d..3f4fa46d631 100644
--- a/htdocs/langs/sr_RS/margins.lang
+++ b/htdocs/langs/sr_RS/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Stopa mora biti numerička
 markRateShouldBeLesserThan100=Stopa marže mora biti niža od 100
 ShowMarginInfos=Prikaži informacije marže
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index ce48a5f1279..0ef1e4e0946 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Vaše narudžbine su kreirane
 OrderFail=Došlo je do greške prilikom kreiranja Vaših narudžbina
 CreateOrders=Kreiraj narudžbine
 ToBillSeveralOrderSelectCustomer=Da biste kreirali fakturu za nekoliko narudžbina, prvo kliknite na klijenta, pa izaberite "%s"
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/sr_RS/printing.lang b/htdocs/langs/sr_RS/printing.lang
index 07e9e117fbb..0a8f4c05e5d 100644
--- a/htdocs/langs/sr_RS/printing.lang
+++ b/htdocs/langs/sr_RS/printing.lang
@@ -18,10 +18,6 @@ UserConf=Podešavanja po korisniku
 PRINTGCP_INFO=Google OAuth API podešavanja
 PRINTGCP_AUTHLINK=Autentifikacija
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Istekao
-PRINTGCP_TOKEN_EXPIRE_AT=Token ističe
-PRINTGCP_DELETE_TOKEN=Obriši sačuvani token
 PrintGCPDesc=Ovaj driver omogućava direktno štampanje sa Google Cloud Print.
 GCP_Name=Ime
 GCP_displayName=Prikazano Ime
diff --git a/htdocs/langs/sr_RS/productbatch.lang b/htdocs/langs/sr_RS/productbatch.lang
index 85f219e36a0..0e23a70285d 100644
--- a/htdocs/langs/sr_RS/productbatch.lang
+++ b/htdocs/langs/sr_RS/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Serija
 atleast1batchfield=Rok trajanja ili rok prodaje serije
 batch_number=Serijski broj
 BatchNumberShort=Serija
-l_eatby=Rok trajanja
-l_sellby=Rok prodaje
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Detalji Serije
 DetailBatchFormat=Serija: %s - Rok trajanja: %s - Rok prodaje: %s (kol. %d)
 printBatch=Serija: %s
@@ -19,3 +19,6 @@ printQty=Kol: %d
 AddDispatchBatchLine=Dodaj liniju za "Shelf Life" raspodelu 
 WhenProductBatchModuleOnOptionAreForced=Kada je modul Serija/Serijski broj aktivan, uvećanje/smanjenje zaliha je forsiran na poslednji izbor i ne može biti izmenjen. Druge opcije mogu biti podešene kako želite.
 ProductDoesNotUseBatchSerial=Ovaj proizvod ne koristi serijski broj
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 7e455210552..c01ecea0837 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Masivna promena PDV-a
 ProductVatMassChangeDesc=Na ovoj strani možete izmeniti stopu PDV-a definisanu za proizvode ili usluge. Upozorenje, ova promena će biti primenjena na celu bazu.
 MassBarcodeInit=Masivna inicijalizacija bar code-a.
 MassBarcodeInitDesc=Na ovoj strani možete inicijalizovati bar kod za objekte koji još uvek nemaju definisan kod. Prethodno proverite da li je završeno podešavanje modula bar kod.
-ProductAccountancyBuyCode=Računovodstveni kod (kupovina)
-ProductAccountancySellCode=Računovodstveni kod (prodaja)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Proizvod ili Usluga
 ProductsAndServices=Proizvodi i Usluge
 ProductsOrServices=Proizvodi ili Usluge
@@ -59,6 +59,8 @@ SellingPriceHT=Prodajna cena (neto)
 SellingPriceTTC=Prodajna cena (sa PDV-om)
 CostPriceDescription=Ovu cenu (neto) možete koristiti da zabeležite prosečnu cenu koštanja proizvoda za Vašu kompaniju. To može biti bilo koja cenu koju sami izračunate, npr. prosečna nabavna cena plus prosečna cena proizvodnje i distribucije.
 CostPriceUsage=U sledećoj verziji, ova vrednost će biti korisna za računanje marže.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nova cena
 MinPrice=Min. prodajna cena
 CantBeLessThanMinPrice=Prodajna cena ne može biti niža od dozvoljenog minimuma za ovaj proizvod (%s neto). Ova poruka se takođe može pojaviti ukoliko ste uneli preveliki popust.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Odštampaj više nalepnica za jedan bar code
 BuildPageToPrint=Generiši stranu za štampanje
 FillBarCodeTypeAndValueManually=Unesi ručno tip i vrednost bar code-a.
 FillBarCodeTypeAndValueFromProduct=Unesi tip i vrednost bar code-a koristeći proizvod.
-FillBarCodeTypeAndValueFromThirdParty=Unesi tip i vrednost bar code-a koristeći subjekt.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definicija tipa ili vrednosti bar code-a nije kompletna za proizvod %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definicija tipa ili vrednosti bar codea nije kompletna za subjekt %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode informacija proizvoda %s :
-BarCodeDataForThirdparty=Barcode informacija subjekta %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definiši bar kod vrednost za sve redove (ovo će takođe resetovati već definisane bar kod vrednosti)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index fe9a60fb030..47f60015401 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=Lista zadataka
 GoToListOfTimeConsumed=Idi na listu utrošenog vremena
 GoToListOfTasks=Idi na listu zadataka
 ListProposalsAssociatedProject=Lista komercijalnih ponuda vezanih za projekat
-ListOrdersAssociatedProject=Lista narudžbina klijenata vezanih za projekat
-ListInvoicesAssociatedProject=Lista računa klijenata vezanih za projekat
-ListPredefinedInvoicesAssociatedProject=Lista klijentovih nacrta računa povezanih sa projektom
-ListSupplierOrdersAssociatedProject=Lista dobavljčkih narudžbina vezanih za projekat
-ListSupplierInvoicesAssociatedProject=Lista dobavljačkih računa vezanih za projekat
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Lista ugovora vezanih za projekat
 ListFichinterAssociatedProject=Lista intervencija vezanih za projekat
 ListExpenseReportsAssociatedProject=Lista troškova povezanih sa ovim projektom
@@ -123,6 +123,7 @@ ProjectReportDate=Izmenite datum zadatka prema datumu početka projekta.
 ErrorShiftTaskDate=Nemoguće promeniti datum zadatka prema novom datumu početka projekta
 ProjectsAndTasksLines=Projekti i zadaci
 ProjectCreatedInDolibarr=Projekat %s je kreiran
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Zadatak %s je kreiran
 TaskModifiedInDolibarr=Zadatak %s je izmenjen
 TaskDeletedInDolibarr=Zadatak %s je obrisan
@@ -153,7 +154,7 @@ PlannedWorkload=Planirano utrošeno vreme
 PlannedWorkloadShort=Utrošeno vreme
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekat prvo mora biti odobren
-FirstAddRessourceToAllocateTime=Dodelite resurs da biste dodelili vreme
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Ulaz po danu
 InputPerWeek=Ulaz po nedelji
 InputPerAction=Ulaz po akciji
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistike na projektima/lead-ovima
 TaskAssignedToEnterTime=Zadatak je dodeljen. Unos vremena za ovaj zadatak je omogućen.
 IdTaskTime=Id vremena zadatka
-YouCanCompleteRef=Ukoliko želite da kompletirate referencu informacijama (da je koristite sa filterima pretrage), preporučivo da ih razdvojite simbolom - kako bi automatsko numerisanje i dalje moglo da funkcioniše. Npr. %s-ABC. Takođe može biti korisno dodati ključne reč u naziv.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Samo šanse
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/sr_RS/salaries.lang b/htdocs/langs/sr_RS/salaries.lang
index eb628d5481e..7d4cdee42fe 100644
--- a/htdocs/langs/sr_RS/salaries.lang
+++ b/htdocs/langs/sr_RS/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Nova isplata zarade
 SalaryPayment=Isplata zarade
 SalariesPayments=Isplate zarada
 ShowSalaryPayment=Prikaži isplatu zarade
-THM=Prosečna satnica
-TJM=Prosečna dnevnica
+THM=Average hourly rate
+TJM=Average daily rate
 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.
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 613d05d5c49..105e22c7fb7 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Obrii slanje
 Stock=Zaliha
 Stocks=Zalihe
 StocksByLotSerial=Zalihe po seriji
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Prometi
 ErrorWarehouseRefRequired=Referenca magacina je obavezna
 ListOfWarehouses=Lista magacina
@@ -43,6 +45,7 @@ PMPValue=Prosecna cena
 PMPValueShort=PC
 EnhancedValueOfWarehouses=Vrednost magacina
 UserWarehouseAutoCreate=Automatski kreiraj skladište prilikom kreacije korisnika
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Zaliha proizvoda i pod-proizvoda su nezavisne
 QtyDispatched=Raspoređena količina
 QtyDispatchedShort=Raspodeljena kol.
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index 1a8335de0cb..4946ebe0c34 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -7,13 +7,13 @@ History=Istorija
 ListOfSuppliers=Lista dobavljača
 ShowSupplier=Prikaži dobavljača
 OrderDate=Datum porudžbine
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Neki od pod-proizvoda nemaju definisanu cenu
-AddSupplierPrice=Dodaj cenu dobavljača
-ChangeSupplierPrice=Izmeni cenu dobavljača
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ovaj dobavljač je već vezan za referencu: %s
 NoRecordedSuppliers=Nema sačuvanih dobavljača
 SupplierPayment=Uplata dobavljača
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Lista narudžbina dobavljača
 MenuOrdersSupplierToBill=Narudžbine dobavljača za naplatu
 NbDaysToDelivery=Kašnjenje isporuke u danima
 DescNbDaysToDelivery=Najduže kašnjenje isporuke proizvoda iz ove narudžbine
-UseDoubleApproval=Koristite duplo odobravanje kada je iznos (neto) veći od (Drugo odobrenje može biti dato od strane bilo kog korisnika sa odgovarajućim pravima. Podesite 0 da ne bi bilo duplog odobravanja)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/sr_RS/users.lang b/htdocs/langs/sr_RS/users.lang
index 8ca91117816..e50a8c69c5b 100644
--- a/htdocs/langs/sr_RS/users.lang
+++ b/htdocs/langs/sr_RS/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Nedeljni broj sati
 ColorUser=Boja korisnika
 DisabledInMonoUserMode=Onemogućeno u modu održavanja
 UserAccountancyCode=Korisnikov računovodstveni kod
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/sr_RS/withdrawals.lang b/htdocs/langs/sr_RS/withdrawals.lang
index f7889cfb711..10a5edab463 100644
--- a/htdocs/langs/sr_RS/withdrawals.lang
+++ b/htdocs/langs/sr_RS/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Oblast trajnih naloga klijenata
-StandingOrders=Trajni nalozi
-StandingOrder=Trajni nalozi
-NewStandingOrder=Novi trajni nalog
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Za procesuiranje
-WithdrawalsReceipts=Prijemnice podizanja
-WithdrawalReceipt=Prijemnica podizanja
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Linije podizanja
-RequestStandingOrderToTreat=Zahtevi za procesuiranj trajnih naloga
-RequestStandingOrderTreated=Zahtev za trajni nalog procesuiran
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Još nije moguće. Status podizanja mora biti podešen na "kreditiran" pre odbijanja određenih linija.
-NbOfInvoiceToWithdraw=Br. računa sa zahtevom podizanja
-NbOfInvoiceToWithdrawWithInfo=Br. fakture sa zahtevom za podizanje za klijente koji su definisali informacije o bankovnom računu
-InvoiceWaitingWithdraw=Račun na čekanju za podizanje
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Svota za podizanje
-WithdrawsRefused=Odbijena podizanja
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Nema faktura klijenata u modu "podizanje" na čekanju. Otvorite tab "Podizanja" na kartici fakture da biste kreirali zahtev.
 ResponsibleUser=Odgovorni korisnik
-WithdrawalsSetup=Podešavanja podizanja
-WithdrawStatistics=Statistike podizanja
-WithdrawRejectStatistics=Statistike odbijenih podizanja
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Kreiraj zahtev za podizanje
 ThirdPartyBankCode=Bankarski kod subjekta
 NoInvoiceCouldBeWithdrawed=Nema uspešno podugnutih faktura. Proverite da su fakture na kompanijama sa validnim IBAN-om.
@@ -46,7 +47,7 @@ StatusRefused=Odbijen
 StatusMotif0=Neodređen
 StatusMotif1=Nedovoljno sredstava
 StatusMotif2=Primedba na zahtev uložena
-StatusMotif3=Nema narudžbine podizanja
+StatusMotif3=No direct debit payment order
 StatusMotif4=Narudžbina klijenta
 StatusMotif5=Neupotrebljiv IBAN
 StatusMotif6=Nema sredstava na računu
@@ -61,28 +62,43 @@ 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=Bankovni račun za podizanja
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=Ovaj tab Vam omogućava da zahtevate narudžbinu. Kada završite, otvorite meni Banka->Podizanja kako biste upravljali narudžbinom. Kada je narudžbina zatvorena, uplata za fakturu će biti automatski zabeležena i faktura će biti zatvorena ukoliko je isplaćen ceo iznos.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=Ovo će se takođe odnositi na uplate i fakture i označiti ih kao "Plaćene"
 StatisticsByLineStatus=Statistike po statusu linija
-RUM=RUM
-RUMWillBeGenerated=RUM broj će biti generisan kada informacije bankovnog računa budu sačuvane
-WithdrawMode=Način podizanja (FRST ili RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Tražena svota podizanja:
 WithdrawRequestErrorNilAmount=Nemoguće kreirati zahtev podizanja bez svote.
+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
 
 ### Notifications
-InfoCreditSubject=Plaćanje trajnog naloga %s od strane banke
-InfoCreditMessage=Trajni nalog %s je plaćen od strane banke<br>Podaci plaćanja: %s
-InfoTransSubject=Prenos trajnog naloga %s banci
-InfoTransMessage=Trajni nalog %s je poslat banci od strane %s %s.<br><br>
+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>
 InfoTransData=Svota: %s<br>Način: %s<br>Datum: %s
-InfoRejectSubject=Trajni nalog odbijen
-InfoRejectMessage=Zdravo,<br><br>narudžbina za fakturu %s vezanu za kompaniju %s, sa iznosom od %s je odbijena od strane banke.<br><br>--<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
 ModeWarning=Opcija za realni mod nije podešena, prekidamo posle ove simulacije.
diff --git a/htdocs/langs/sr_RS/workflow.lang b/htdocs/langs/sr_RS/workflow.lang
index 06bc17d1cb2..98456bd12a7 100644
--- a/htdocs/langs/sr_RS/workflow.lang
+++ b/htdocs/langs/sr_RS/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Podešavanja modula Workflow
 WorkflowDesc=Ovaj modul je namenjen za izmene automatskih akcija u aplikaciji. Po defaultu, workflow je otvoren (možete vršiti akcije redosledom kojim poželite). Možete aktivirati automatske akcije koje Vas interesuju.
 ThereIsNoWorkflowToModify=Nema mogućih izmena workflow-a u aktiviranim modulima.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatski kreiraj fakturu klijenta posle
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Označi komercijalnu ponudu kao naplaćenu kada se narudžbina klijenta označi kao plaćena.
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Označi komerijalnu(e) ponudu(e) kao naplaćenu(e) kada je račun klijenta označen kao plaćen.
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Označi komerijalnu(e) ponudu(e) kao naplaćenu(e) kada je račun klijenta označen kao potvrđen.
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index ce4980330ed..4d683e9fa09 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journaler
 JournalFinancial=Finansiella journaler
 BackToChartofaccounts=Avkastning kontoplan
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Välj en kontoplan
 Addanaccount=Lägg till ett redovisningskonto
 AccountAccounting=Redovisningskonto
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Fördelning
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Redovisning
-CustomersVentilation=Fördelning kunder
-SuppliersVentilation=Fördelning leverantörerna
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Rapporter
 NewAccount=Nytt redovisningskonto
 Create=Skapa
-CreateMvts=Skapa rörelse
-UpdateMvts=Ändring av en rörelse
-WriteBookKeeping=Record konton i huvudboken
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Huvudbok
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Linjer av faktura som ska ventileras
-InvoiceLinesDone=Ventilerade linjer faktura
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilera
+Ventilate=Bind
 
 Processing=Bearbetning
 EndProcessing=I slutet av behandlingen
-AnyLineVentilate=Några rader för att ventilera
+AnyLineVentilate=Any lines to bind
 SelectedLines=Valda linjer
 Lineofinvoice=Line of faktura
-VentilatedinAccount=Ventilerade framgångsrikt i redovisningskonto
-NotVentilatedinAccount=Inte ventilerad i redovisningskonto
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att vara uppdelning framgår av sidan (max rekommenderad: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sortering av nedbrytnings sidor "Måste uppdelning" av de senaste element
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av nedbrytnings sidor "Breakdown" av de senaste element
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Längd för att visa produkt och tjänstebeskrivning i listor (Bäst = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Längd för att visa produkt och tjänstekonto  i listor (Bäst = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Längd på de allmänna räkenskaperna
-ACCOUNTING_LENGTH_AACCOUNT=Längd av tredjepartskonton
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell ​​tidskrift
 ACCOUNTING_PURCHASE_JOURNAL=Bara tidskrift
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Ta bort posterna i huvudboken
-
 DescSellsJournal=Sells tidskrift
 DescPurchasesJournal=Inköp tidskrift
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Betalning av faktura kund
-
 ThirdPartyAccount=Tredjeparts konto
-
-NewAccountingMvt=Ny rörelse
-NumMvts=Antal rörelse
-ListeMvts=Lista över rörelsen
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit och kredit kan inte ha ett värde på samma gång
 
-ReportThirdParty=Listan tredjeparts konto
-DescThirdPartyReport=Konsul här listan över de tredjeparts kunder och leverantörer och deras bokföringskonton
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Förteckning över redovisningskonton
 
@@ -114,22 +134,29 @@ Pcgtype=Klass konto
 Pcgsubtype=Under klass konto
 Accountparent=Roten till kontot
 
-DescVentilCustomer=Rådgör här den årliga fördelningen redovisning av era fakturor kunder
 TotalVente=Total turnover before tax
 TotalMarge=Total försäljning marginal
-DescVentilDoneCustomer=Konsul här listan med linjerna av fakturor kunder och deras bokföringskonto
-DescVentilTodoCustomer=Ventilera dina rader av kundfaktura med en redovisningskonto
-ChangeAccount=Ändra bokföringskonto för linjer som valts ut av kontot:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Rådgör här den årliga fördelningen redovisning av dina fakturor leverantörer
-DescVentilDoneSupplier=Konsul här listan med linjerna av fakturor leverantör och deras bokföringskonto
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validera Automatiskt
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Uppdelning kort
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index c5952bf4c84..25077381aa6 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimentell
 VersionDevelopment=Utveckling
 VersionUnknown=Okänd
 VersionRecommanded=Rekommenderad
-FileCheck=Filer Integritet
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Saknade filer
 FilesUpdated=Uppdaterade filer
-FileCheckDolibarr=Kontrollera Dolibarr filer Integrity
-XmlNotFound=XML-fil av Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler för att spara sessioner
 SessionSavePath=Lagring session lokalisering
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Fel, en precision högre än <b>%s</b> stöds
 DictionarySetup=Lexikon inställnings
 Dictionary=Ordlista
 Chartofaccounts=Kontoplan
-Fiscalyear=Räkenskapsår
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Värdena "system" och "systemauto" för typ är reserverade. Du kan använda "user" som värde för att lägga till en egen post.
 ErrorCodeCantContainZero=Kod får inte innehålla värdet 0
 DisableJavascript=Inaktivera JavaScript och Ajax-funktioner (rekommenderas för blinda personer eller textbaserade webbläsare)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Vänta du trycker på en tangent innan lastning i
 DelaiedFullListToSelectContact=Vänta du trycker på en tangent innan lastning innehållet i kontakt combo listan (Detta kan öka prestandan om du har ett stort antal kontakter)
 NumberOfKeyToSearch=NBR tecken för att utlösa Sök: %s
 NotAvailableWhenAjaxDisabled=Inte tillgänglig när Ajax funktionshindrade
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript funktionshindrade
 UsePreviewTabs=Använd förhandsgranska flikar
 ShowPreview=Visa förhandsgranskning
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Koda binära data i hexadecimal
 IgnoreDuplicateRecords=Ignorera fel dubblettposter (INSERT ignorera)
 AutoDetectLang=Autodetektera (webbläsare språk)
 FeatureDisabledInDemo=Funktion avstängd i demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Behörigheter
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Endast delar av <a href="%s">aktiverade moduler</a> visas.
-ModulesDesc=Dolibarr moduler definiera vilka funktionen är aktiverad i programvaran. Vissa moduler kräver behörigheter som du skall ge till användare efter möjliggör modul.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Fler moduler ...
 DoliStoreDesc=DoliStore, den officiella marknadsplatsen för Dolibarr ERP / CRM externa moduler
@@ -273,9 +279,10 @@ YouCanSubmitFile=För detta steg kan du skicka paket med det här verktyget: Vä
 CurrentVersion=Dolibarr nuvarande version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Uppdatera server offline
 GenericMaskCodes=Du kan ange någon numrering mask. I denna mask skulle följande taggar användas: <br> <b>(000000)</b> motsvarar ett antal som kommer att ökas på varje %s. Ange så många nollor som den önskade längden på disken. Räknaren kommer att fyllas ut med nollor från vänster för att få så många nollor som masken. <br> <b>(000000 000)</b> samma som tidigare men en kompensation som motsvarar det antal till höger om tecknet + tillämpas med början den första %s. <br> <b>(000000 @ x)</b> samma som tidigare, men räknaren återställs till noll när månaden x uppnås (x mellan 1 och 12). Om detta alternativ används och x är 2 eller högre, då sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) krävs också. <br> <b>(Dd)</b> dag (01 till 31). <br> <b>(Mm)</b> månad (01 till 12). <br> <b>(Yy), (ÅÅÅÅ) eller (y)</b> år under 2, 4 eller ett nummer. <br>
-GenericMaskCodes2=<b>{Cccc}</b> klientkoden på n tecken <br> <b>{Cccc000}</b> klientkoden på n tecken följs av en räknare dedikerad för kunden. Denna räknare tillägnad kund återställs vid samma tidpunkt än den globala räknare. <br> <b>{Tttt}</b> Koden för tredjeparts typ på n tecken (se ordlistan-tredjeparts typer). <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Alla andra tecken i masken förblir intakt. <br> Blanksteg är inte tillåtna. <br>
 GenericMaskCodes4a=<u>Exempel på 99. %s den tredje part TheCompany gjort 2007/01/31:</u> <br>
 GenericMaskCodes4b=<u>Exempel på tredje part som har skapats på 2007/03/01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parametrar för att säkra webbadresser
 SecurityTokenIsUnique=Använd en unik securekey parameter för varje webbadress
 EnterRefToBuildUrl=Ange referens för objekt %s
 GetSecuredUrl=Få beräknat URL
-ButtonHideUnauthorized=Visa ej knappar för åtgärder för vilka behörighet saknas istället för att visa knapparna inaktiverade
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Gammal momssats
 NewVATRates=Ny momssats
 PriceBaseTypeToChange=Ändra om priser med bas referensvärde som definieras på
@@ -349,6 +356,7 @@ ExtrafieldMail = epost
 ExtrafieldSelect = Välj lista
 ExtrafieldSelectList = Välj från tabell
 ExtrafieldSeparator=Avskiljare
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Kryssruta
 ExtrafieldRadio=Radioknapp
 ExtrafieldCheckBoxFromList= Kryssruta från tabell
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Användare & grupper
@@ -428,8 +439,8 @@ Module55Name=Streckkoder
 Module55Desc=Barcode ledning
 Module56Name=Telefoni
 Module56Desc=Telefoni integration
-Module57Name=Stående order
-Module57Desc=Stående order och återkallande hantering. Inkluderar även generation SEPA-fil för europeiska länder.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integrering av ett ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=WebCalendar
 Module410Desc=WebCalendar integration
 Module500Name=Särskilda kostnader
 Module500Desc=Förvaltning av särskilda kostnader (skatter, sociala eller skattemässiga skatter, utdelningar)
-Module510Name=Löner
-Module510Desc=Förvaltning av de anställdas löner och betalningar
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Lån
 Module520Desc=Förvaltning av lån
 Module600Name=Anmälningar
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donationer
 Module700Desc=Donation ledning
 Module770Name=Räkningar
@@ -606,10 +617,10 @@ Permission142=Skapa / ändra alla projekt och uppgifter (även privata projekt j
 Permission144=Ta bort alla projekt och uppgifter (även privata projekt jag är inte kontakta för)
 Permission146=Läs leverantörer
 Permission147=Läs statistik
-Permission151=Läs stående order
-Permission152=Skapa / ändra en stående order begäran
-Permission153=Läs stående order kvitton
-Permission154=Kredit / vägrar stående order kvitton
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Läs kontrakt / abonnemang
 Permission162=Skapa / ändra avtal / abonnemang
 Permission163=Aktivera en tjänst / teckning av ett kontrakt
@@ -747,6 +758,7 @@ Permission1236=Export leverantörsfakturor, attribut och betalningar
 Permission1237=Export leverantörsorder och tillhörande information
 Permission1251=Kör massiv import av externa data till databasen (data last)
 Permission1321=Export kundfakturor, attribut och betalningar
+Permission1322=Reopen a paid bill
 Permission1421=Export kundorder och attribut
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Skapa / ändra omröstningar
 Permission59001=Läs kommersiella marginaler
 Permission59002=Definiera kommersiella marginaler
 Permission59003=Läs varje användaremarginal
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potentiella nivå
@@ -853,6 +869,7 @@ LabelUsedByDefault=Etikett som används som standard om ingen översättning kan
 LabelOnDocuments=Etikett på dokument
 NbOfDays=Nb dagar
 AtEndOfMonth=I slutet av månaden
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Alltid aktiv
 Upgrade=Uppgradera
@@ -950,7 +967,7 @@ LogEventDesc=Du kan aktivera här loggning för Dolibarr säkerhet händelser. A
 AreaForAdminOnly=Dessa funktioner kan användas av <b>administratören användare.</b>
 SystemInfoDesc=System information diverse teknisk information får du i skrivskyddad läge och synlig för administratörer bara.
 SystemAreaForAdminOnly=Detta område är tillgänglig för administratören användare. Ingen av de Dolibarr behörigheter kan minska denna gräns.
-CompanyFundationDesc=Redigera den här sidan all känd information för det bolag eller stiftelse du behöver hantera
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Du kan välja varje parameter i samband med Dolibarr utseendet här
 AvailableModules=Tillgängliga moduler
 ToActivateModule=För att aktivera moduler, gå på Setup-menyn (Hem-> Inställningar-> Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Varning, på vissa Linux-system, för att skicka e-pos
 PathToDocuments=Sökväg till handlingar
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Funktion för att skicka e-post med hjälp av metoden "PHP mail direct" genererar ett e-postmeddelande som kanske inte tolkas korrekt av vissa e-postservrar. Resultatet är att viss epost inte kan läsas av användare som hostas på sådana system som tolkar fel. Det är fallet för vissa internetleverantörer (t.ex. Orange i Frankrike). Detta är inte ett Dolibarr- eller PHP-problem men fel på inkommande e-post server. Du kan sätta MAIN_FIX_FOR_BUGGED_MTA till 1 i "Setup - andra" för att Dolibarr ska undvika detta. Du kan dock uppleva problem med andra servrar som strikt följer SMTP standard. Den andra lösningen (Rekomenderad) är att använda metoden "SMTP socket library" som inte har några nackdelar.
-TranslationSetup=Konfigurera översättning
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
 ClassNotFoundIntoPathWarning=Klass %s inte funnen i PHP-sökvägen
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Använd TLS
 LDAPServerUseTLSExample=LDAP-servern använder TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administratör DN
-LDAPAdminDnExample=Komplett DN (ex: cn = adminldap, dc = samhället, dc = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administratören lösenord
 LDAPUserDn=Användarnas DN
 LDAPUserDnExample=Komplett DN (ex: ou = användare, dc = samhället, dc = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Exempel: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Exempel: objectsid
 LDAPFieldEndLastSubscription=Datum för teckning slut
-LDAPFieldTitle=Post / Funktion
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Exempel: titel
 LDAPSetupNotComplete=LDAP setup komplett inte (gå på andra flikar)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administratör eller lösenord anges. LDAP tillgång kommer att bli anonym och i skrivskyddat läge.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Produkter och tjänster moduler setup
 NumberOfProductShowInSelect=Max antal produkter i combos välj listor (0 = ingen gräns)
 ViewProductDescInFormAbility=Visualisering av produktbeskrivning i formulären (i övrigt enligt popup tooltip)
 MergePropalProductCard=Aktivera i produkt / tjänst Bifogade fliken Filer en möjlighet att slå samman produkt PDF-dokument till förslag PDF azur om produkten / tjänsten är på förslaget
-ViewProductDescInThirdpartyLanguageAbility=Visualisering av produktbeskrivningar på tredjeparts språket
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Även om du har ett stort antal produkter (> 100 000), kan du öka hastigheten genom att sätta konstant PRODUCT_DONOTSEARCH_ANYWHERE till 1 i Setup-> Övrigt. Sökningen kommer då att begränsas till start av strängen.
 UseSearchToSelectProduct=Använd ett sökformuläret för att välja en produkt (i stället för en listruta).
 SetDefaultBarcodeTypeProducts=Standard streckkod som ska användas för produkter
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar kodgenerering kommandoradsverktyg (som används av intern
 BarcodeInternalEngine=Intern motor
 BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer
 ##### Prelevements #####
-WithdrawalsSetup=Återkallelse modul setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Externa RSS import setup
 NewRSS=Nytt RSS-flöde
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Öppet räkenskapsår
 CloseFiscalYear=Close räkenskapsår
 DeleteFiscalYear=Radera räkenskapsår
 ConfirmDeleteFiscalYear=Är du säker på att du vill ta bort detta verksamhetsår?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Kan alltid redigeras
 MAIN_APPLICATION_TITLE=Tvinga synliga namn ansökan (varning: ställa ditt eget namn här kan bryta funktionen Autofyll inloggning när du använder DoliDroid mobil applikation)
 NbMajMin=Minsta antal versaler
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Lista över fasta anmälningar
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Gå på fliken "Meddelanden" av en tredjeparts kontakt för att lägga till eller ta bort meddelanden för kontakter / adresser
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Tröskelvärde
 BackupDumpWizard=Guiden för att bygga databas backup dumpfilen
 SomethingMakeInstallFromWebNotPossible=Installation av extern modul är inte möjligt från webbgränssnittet av följande skäl:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Tryck på F5 på tangentbordet efter att ha ändrat detta värde för att få det effektiva
-NotSupportedByAllThemes=Will arbetar med Eldy tema men stöds inte av alla teman
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Bakgrundsfärg
 TopMenuBackgroundColor=Bakgrundsfärg för Huvudmeny
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Bakgrundsfärg för vänstermenyn
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Bakgrundsfärg för udda bords linjer
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Om du vill skicka ingripande
 MailToSendSupplierRequestForQuotation=Om du vill skicka Offertförfrågan till leverantör
 MailToSendSupplierOrder=Om du vill skicka leverantör ordning
 MailToSendSupplierInvoice=Om du vill skicka leverantörsfaktura
-MailToThirdparty=Om du vill skicka e-post från tredjeparts sida
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index 09eef5e8eef..e070a2f2b44 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -27,13 +27,9 @@ AllTime=Från början
 Reconciliation=Avstämning
 RIB=Bankkontonummer
 IBAN=IBAN-nummer
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT nummer
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Stående order
-StandingOrder=Stående order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Kontoutdrag
 AccountStatementShort=Uttalande
 AccountStatements=Kontoutdrag
@@ -78,6 +74,7 @@ AccountToCredit=Hänsyn till kreditinstitut
 AccountToDebit=Konto att debitera
 DisableConciliation=Inaktivera försoning för den här kontot
 ConciliationDisabled=Avstämning inaktiverad
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Öppen
 StatusAccountClosed=Stängt
 AccountIdShort=Antal
@@ -87,6 +84,8 @@ AddBankRecordLong=Lägg transaktion manuellt
 ConciliatedBy=Förenas med
 DateConciliating=Reconcile datum
 BankLineConciliated=Transaktion förenas
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Kundbetalning
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Tillbakadragande betalning
 SocialContributionPayment=Sociala och skattemässiga betalningar
 BankTransfer=Banköverföring
 BankTransfers=Banköverföringar
-TransferDesc=Överföring från ett konto till en annan, kommer Dolibarr skriva två poster (en debitera källa konto och en kredit i mål konto med samma belopp. Samma märke och datum kommer att användas för denna transaktion)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Från
 TransferTo=För att
 TransferFromToDone=En överföring från <b>%s</b> till <b>%s</b> av <b>%s</b> %s har registrerats.
@@ -129,7 +129,7 @@ FutureTransaction=Transaktioner i Futur. Inget sätt att blidka.
 SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på &quot;Skapa&quot;.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register
-ToConciliate=För att förena?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka
 DefaultRIB=Standard BAN
 AllRIB=Alla BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 5bd3fe876aa..20e45c95705 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura
 BillFrom=Från
 BillTo=Fakturamottagare
 ActionsOnBill=Åtgärder mot faktura
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Rabatterna (betalning innan terminen)
 EscompteOfferedShort=Discount
 SendBillRef=Inlämning av faktura %s
 SendReminderBillRef=Inlämning av faktura %s (påminnelse)
-StandingOrders=Stående order
-StandingOrder=Stående order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Inget förslag fakturor
 NoOtherDraftBills=Inga andra förslag fakturor
 NoDraftInvoices=Inget faktura-utkast
@@ -351,8 +351,8 @@ VarAmount=Variabelt belopp (%% summa)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bankens syfte
-PaymentTypeShortPRE=Bankens syfte
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Kontanter
 PaymentTypeShortLIQ=Kontanter
 PaymentTypeCB=Kreditkort
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regleras
 ChequeNumber=Kontrollera nr
 ChequeOrTransferNumber=Kontrollera / Transfer nr
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank av Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Betalas av denna betalning
 ClosePaidInvoicesAutomatically=Klassificera "Betald" alla standard-, löpande och ersättningsfakturor som är fullständigt betalda.
 ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald".
 ToMakePayment=Betala
 ToMakePaymentBack=Återbetala
 ListOfYourUnpaidInvoices=Lista över obetalda fakturor
 NoteListOfYourUnpaidInvoices=OBS: Denna lista innehåller bara fakturor för tredje parti som du är kopplade till som en försäljning representant.
 RevenueStamp=Intäkt stämpel
-YouMustCreateInvoiceFromThird=Det här alternativet är endast tillgängligt när du skapar faktura från fliken "kund" hos tredje parts
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Faktura modell Crabe. En fullständig faktura modell (Stöd moms alternativet, rabatter, betalningar villkor, logotyp, etc. ..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/sv_SE/boxes.lang b/htdocs/langs/sv_SE/boxes.lang
index 4eb68d917e2..eb5f2d9a0e8 100644
--- a/htdocs/langs/sv_SE/boxes.lang
+++ b/htdocs/langs/sv_SE/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Äldsta aktiva passerat tjänster
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global aktivitet (fakturor, förslag, order)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Förslag per månad
 NoTooLowStockProducts=Ingen produkt under den låga aktiegränsen
 BoxProductDistribution=Produkter / tjänster fördelning
 BoxProductDistributionFor=Fördelning av %s för %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Kundens fakturor
 ForCustomersOrders=Kund beställningar
 ForProposals=Förslag
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index 6b76a607ff8..aa07ed93674 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=på
 CashDeskThirdParty=Tredje part
 ShoppingCart=Kundvagn
 NewSell=Nya säljer
-BackOffice=Back office
 AddThisArticle=Lägg till den här artikeln
 RestartSelling=Gå tillbaka på sälj
-SellFinished=Sälja klar
+SellFinished=Sale complete
 PrintTicket=Skriv ut biljetten
 NoProductFound=Ingen produkt hittades
 ProductFound=Produkten finns
diff --git a/htdocs/langs/sv_SE/categories.lang b/htdocs/langs/sv_SE/categories.lang
index 440aca38b90..3155d7a8be7 100644
--- a/htdocs/langs/sv_SE/categories.lang
+++ b/htdocs/langs/sv_SE/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Underkategorier
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Denna kategori finns redan med denna ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Denna kategori innehåller inte någon produkt.
 ThisCategoryHasNoSupplier=Denna kategori innehåller inte någon leverantör.
 ThisCategoryHasNoCustomer=Denna kategori innehåller inte någon kund.
 ThisCategoryHasNoMember=Denna kategori innehåller inte någon medlem.
 ThisCategoryHasNoContact=Denna kategori innehåller inte någon kontakt.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Extra attibut
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 41f962a3348..ed439632443 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Nya privatperson
 NewCompany=Nytt företag (möjlig kund, kund, leverantör)
 NewThirdParty=Ny tredje part (möjlig kund, kund, leverantör)
 CreateDolibarrThirdPartySupplier=Skapa tredje part (leverantör)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospektering område
 IdThirdParty=Id tredje part
 IdCompany=Företag Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Leverantörer
 ThirdPartyType=Tredje part typ
 Company/Fundation=Företag / stiftelse
 Individual=Privatperson
-ToCreateContactWithSameName=Skapar automatiskt en fysisk kontakt med samma informationer
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Moderbolaget
 Subsidiaries=Dotterbolag
 ReportByCustomers=Betänkande av kunder
@@ -47,7 +49,7 @@ CivilityCode=Hövlighet kod
 RegisteredOffice=Säte
 Lastname=Efternamn
 Firstname=Förnamn
-PostOrFunction=Post / Funktion
+PostOrFunction=Job position
 UserTitle=Titel
 Address=Adress
 State=Delstat / provins
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. telefon
 PhonePerso=Pers. telefon
 PhoneMobile=Mobil
-No_Email=Skicka inte massutskick med epost
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Postnummer
 Town=Stad
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Språk som standard
 VATIsUsed=Moms används
 VATIsNotUsed=Moms används inte
-CopyAddressFromSoc=Fyll i adress med tredje parts adress
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT-nummer
 VATIntraShort=VAT-nummer
 VATIntraSyntaxIsValid=Syntaxen är giltigt
-VATIntraValueIsValid=Värdet är giltigt
 ProspectCustomer=Möjlig kund / Kund
 Prospect=Möjlig kund
 CustomerCard=Kundkort
@@ -261,7 +262,9 @@ AddContactAddress=Skapa kontakt / adress
 EditContact=Redigera kontakt / adress
 EditContactAddress=Redigera kontakt / adress
 Contact=Kontakt
+ContactId=Contact id
 ContactsAddresses=Kontakt / Adresser
+FromContactName=Name:
 NoContactDefinedForThirdParty=Ingen kontakt inlagd för denna tredje part
 NoContactDefined=Ingen kontakt inlagd
 DefaultContact=Standard kontakt / adress
@@ -284,7 +287,7 @@ CompanyDeleted=Företaget "%s" raderad från databasen.
 ListOfContacts=Lista med kontakter / adresser
 ListOfContactsAddresses=Lista med kontakter / adresser
 ListOfThirdParties=Förteckning över tredje part
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Visa kontakt
 ContactsAllShort=Alla (inget filter)
 ContactType=Kontakttyp
@@ -294,6 +297,7 @@ ContactForProposals=Offertens kontaktinformation
 ContactForContracts=Kontraktets kontaktinformation
 ContactForInvoices=Fakturans kontaktinformation
 NoContactForAnyOrder=Denna kontakt är inte kontakt för någon order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Denna kontakt är inte kontakt i någon kommersiell offert
 NoContactForAnyContract=Denna kontakt är inte kontakt för något kontrakt
 NoContactForAnyInvoice=Denna kontakt är inte kontakt för någon faktura
@@ -352,9 +356,9 @@ ExportCardToFormat=Export-kort för att formatera
 ContactNotLinkedToCompany=Kontakt ej länkad till någon tredje part
 DolibarrLogin=Dolibarr inloggning
 NoDolibarrAccess=Dolibarr ej nåbar
-ExportDataset_company_1=Tredje part (företag / stiftelser / fysiska personer) och egenskaper
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kontakter och egenskaper
-ImportDataset_company_1=Tredje part (företag / stiftelser / fysiska personer) och egenskaper
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kontakter / adresser (tredje part eller ej) och attribut
 ImportDataset_company_3=Bankuppgifter
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 8cff785bbc1..71a26273f25 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Särskilda kostnader
 MenuTaxAndDividends=Skatter och utdelning
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index d50456b29eb..b711b3f74d1 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Planerad jobbhantering installation
-URLToLaunchCronJobs=URL för att kontrollera och starta cron-jobb om det behövs
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Eller för att kontrollera och starta ett specifikt arbete
 KeyForCronAccess=Säkerhetsnyckel för URL för att lansera cron-jobb
 FileToLaunchCronJobs=Kommandorad för att starta cron jobb
@@ -23,7 +23,7 @@ CronCommand=Kommando
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Jobb
@@ -39,7 +39,7 @@ CronMethod=Metod
 CronModule=Modul
 CronNoJobs=Inga jobb registrerade
 CronPriority=Prioritet
-CronLabel=Beskrivning
+CronLabel=Label
 CronNbRun=Nb. lanseringen
 CronMaxRun=Max nb. launch
 CronEach=Varje
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index c87e571d60d..0564599cddb 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Fel, din PHP måste ha modul <b>%s</b> installerad för att a
 ErrorOpenIDSetupNotComplete=Du inställning för Dolibarr konfigurationsfil möjliggör OpenID autentisering, men webbadressen OpenID tjänsten definieras inte i ständig %s
 ErrorWarehouseMustDiffers=Källa och mål lager måste skiljer
 ErrorBadFormat=Dåligt format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fel, denna medlem ännu kopplad till någon tredjeparts. Länka medlem i en befintlig tredje part eller skapa en ny tredjeparts innan du skapar abonnemang med faktura.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Fel, det finns några leveranser kopplade till denna sändning. Radering vägrade.
 ErrorCantDeletePaymentReconciliated=Kan inte ta bort en betalning som hade genererat en banktransaktion som conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Kan inte ta bort en betalning som delas av minst en faktura med status betalt
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index 8c6c4f03f74..7b28df33a97 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Detta stöder PHP sessioner.
 PHPSupportPOSTGETOk=Detta stöder PHP variabler POST och GET.
 PHPSupportPOSTGETKo=Det är möjligt din PHP-installation inte stöder variabler POST eller GET. Kontrollera din parameter <b>variables_order</b> i php.ini.
 PHPSupportGD=Denna PHP stöd GD grafiska funktioner.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=Denna PHP stöd UTF8 funktioner.
 PHPMemoryOK=Din PHP max session minne är inställt på <b>%s.</b> Detta bör vara nog.
 PHPMemoryTooLow=Din PHP max session minne är inställt på <b>%s</b> byte. Detta bör vara för låg. Ändra din <b>php.ini</b> för att ställa <b>memory_limit</b> parameter till minst <b>%s</b> byte.
 Recheck=Klicka här för en mer signifikant test
 ErrorPHPDoesNotSupportSessions=Din PHP-installation inte stöd sessioner. Denna funktion är skyldig att Dolibarr fungerar. Kolla din PHP-konfiguration.
 ErrorPHPDoesNotSupportGD=Din PHP installation saknar stöd för grafisk funktion GD. Inga diagram kommer att finnas tillgängliga.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Din PHP-installation inte stöd för UTF8 funktioner. Dolibarr kan inte fungera korrekt. Lösa det här innan du installerar Dolibarr.
 ErrorDirDoesNotExists=Nummer %s finns inte.
 ErrorGoBackAndCorrectParameters=Gå tillbaka och rätta till felaktiga parametrar.
@@ -133,6 +135,10 @@ ActivateModule=Aktivera modul %s
 ShowEditTechnicalParameters=Klicka här för att visa / redigera avancerade parametrar (expertläge)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Din databas är av version %s. Den har en kritisk bugg vilket gör dataförluster om du gör strukturförändringar på din databas, som det krävs av migrationsprocessen. För detta skäl, kommer migrationen inte tillåtas förrän du uppgraderat din databas till en nyare fast version (lista över kända buggade versioner:%s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Uppdatera uppgifter om åtgärder
 MigrationPaymentMode=Datamigrering betalning mode
 MigrationCategorieAssociation=Migreringskategorier
 MigrationEvents=Överföring av händelser för att lägga till händelseägaren i uppdragslista
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Visa ej tillgängliga val
 HideNotAvailableOptions=Dölj ej tillgängliga val
diff --git a/htdocs/langs/sv_SE/interventions.lang b/htdocs/langs/sv_SE/interventions.lang
index ad18aa35771..79c279a2150 100644
--- a/htdocs/langs/sv_SE/interventions.lang
+++ b/htdocs/langs/sv_SE/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Uppföljning kundkontakt
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=Insatser skapade utifrån order
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/sv_SE/ldap.lang b/htdocs/langs/sv_SE/ldap.lang
index 6ccb49c5f55..6558ba7cc67 100644
--- a/htdocs/langs/sv_SE/ldap.lang
+++ b/htdocs/langs/sv_SE/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Första teckningsdag
 LDAPFieldFirstSubscriptionAmount=Fist teckningsbelopp
 LDAPFieldLastSubscriptionDate=Sista teckningsdag
 LDAPFieldLastSubscriptionAmount=Senaste teckningsbelopp
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Användare synkroniseras
 GroupSynchronized=Grupp synkroniseras
 MemberSynchronized=Medlem synkroniseras
diff --git a/htdocs/langs/sv_SE/mails.lang b/htdocs/langs/sv_SE/mails.lang
index 5d1038543b2..680688fad46 100644
--- a/htdocs/langs/sv_SE/mails.lang
+++ b/htdocs/langs/sv_SE/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Läsa
 YourMailUnsubcribeOK=<b>E-post %s</b> är korrekt avbeställt från sändlistan
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail skickas till% s mottagare.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>% s</b> mottagare läggs in i målet listan
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 6a9319038e4..0983b184bd4 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -67,6 +67,7 @@ SelectDate=Välj datum
 SeeAlso=Se även %s
 SeeHere=Se hänvisning
 BackgroundColorByDefault=Standard bakgrundsfärg
+FileRenamed=The file was successfully renamed
 FileUploaded=Filen har laddats upp
 FileWasNotUploaded=En fil är vald att bifogas, men har ännu inte laddats upp. Klicka på 'Bifoga fil' för detta.
 NbOfEntries=Antal värden
@@ -245,6 +246,10 @@ DateBuild=Rapportera byggdatum
 DatePayment=Datum för betalning
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=år
 DurationMonth=månad
 DurationWeek=vecka
@@ -256,6 +261,7 @@ DurationDays=dagar
 Year=År
 Month=Månad
 Week=Vecka
+WeekShort=Week
 Day=Dag
 Hour=Timme
 Minute=Minut
@@ -278,6 +284,7 @@ MonthOfDay=Dagens månad
 HourShort=H
 MinuteShort=mn
 Rate=Sats
+CurrencyRate=Currency conversion rate
 UseLocalTax=Inkludera skatt
 Bytes=Bytes
 KiloBytes=Kilobyte
@@ -565,8 +572,11 @@ BackToList=Tillbaka till listan
 GoBack=Gå tillbaka
 CanBeModifiedIfOk=Kan ändras om det är giltigt
 CanBeModifiedIfKo=Kan ändras om inte giltigt
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Post ändrades korrekt
 RecordsModified=%s poster ändrade
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatisk kod
 FeatureDisabled=Funktion avstängd
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Du har inte behörighet för denna åtgärd
 SessionName=Session namn
 Method=Metod
 Receive=Ta emot
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partiell
 TotalWoman=Totalt
 NeverReceived=Aldrig fick
@@ -598,6 +609,7 @@ DisabledModules=Avaktiverade moduler
 For=För
 ForCustomer=För kund
 Signature=Namnteckning
+DateOfSignature=Date of signature
 HidePassword=Visa kommando med dolt lösenord
 UnHidePassword=Visa riktiga kommandot med lösenord i klartext
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=Nya attribut
 AttributeCode=Attributkod
 URLPhoto=URL foto / logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Skapa utkast
 SetToDraft=Tillbaka till utkast
 ClickToEdit=Klicka för att redigera
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Måndag
 Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 50ea5998399..cff43d25c5f 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Betyg måste vara ett numeriskt värde
 markRateShouldBeLesserThan100=Mark takt bör vara lägre än 100
 ShowMarginInfos=Visa marginal information
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/sv_SE/oauth.lang b/htdocs/langs/sv_SE/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/sv_SE/oauth.lang
+++ b/htdocs/langs/sv_SE/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index c511cc550ed..eaf340219fa 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Din order har skapats
 OrderFail=Ett fel inträffade under din order skapande
 CreateOrders=Skapa order
 ToBillSeveralOrderSelectCustomer=För att skapa en faktura för flera ordrar, klicka först på kunden och välj sedan "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/sv_SE/printing.lang b/htdocs/langs/sv_SE/printing.lang
index b9e7299908c..bfbd9555751 100644
--- a/htdocs/langs/sv_SE/printing.lang
+++ b/htdocs/langs/sv_SE/printing.lang
@@ -18,10 +18,6 @@ UserConf=Inställningar per användare
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=Denna drivrutin skickar dokument direkt till en skrivare med Google Cloud Print.
 GCP_Name=Namn
 GCP_displayName=Visningsnamn
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index 828cb8b50f2..46057a5a4d6 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Ät efter datum
-l_sellby=Sälj före-datum
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Antal: %d
 AddDispatchBatchLine=Lägg en linje för Hållbarhet avsändning
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index a04bf05cfcc..c430805bff8 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Massändring av moms
 ProductVatMassChangeDesc=Denna sida kan användas för att ändra en momssats definierad för produkter eller tjänster från ett värde till ett annat. Varning: denna ändring utförs på hela databasen.
 MassBarcodeInit=Massvis streckkodinitiering
 MassBarcodeInitDesc=Denna sida kan användas för att initialisera en streckkod på objekt som inte har någon streckkod definierad. Kontrollera först att streckkodsmodulen har fullständiga inställningar.
-ProductAccountancyBuyCode=Bokföring kod (köp)
-ProductAccountancySellCode=Bokföring kod (sälja)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Produkt eller tjänst
 ProductsAndServices=Produkter och tjänster
 ProductsOrServices=Produkter eller tjänster
@@ -59,6 +59,8 @@ SellingPriceHT=Försäljningspris (exkl skatt)
 SellingPriceTTC=Försäljningspris (inkl. moms)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Nytt pris
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Försäljningspriset kan inte vara lägre än lägsta tillåtna för denna bok (%s utan skatt)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Skriv ut flera etiketter per streckkod
 BuildPageToPrint=Generera sidan som ska skrivas ut
 FillBarCodeTypeAndValueManually=Fyll i streckkodstyp och värde manuellt.
 FillBarCodeTypeAndValueFromProduct=Fyll i streckkodstyp och värde från en produkts streckkod.
-FillBarCodeTypeAndValueFromThirdParty=Fyll i streckkodstyp och värde från en tredje parts streckkod.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Angivelse av typ och värde för streckkod är ofullständig för produkt %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Angivelse av typ och värde för streckkod är ofullständig för tredje part %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Streckkodsinfo för produkt %s:
-BarCodeDataForThirdparty=Streckkodsinfo för tredje part %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Definiera streckkodsvärde för alla poster (detta kommer även att återställa streckkodsvärden som redan är definierade med nya värden)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 89f9d92f31e..34cf299d2b9 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Förteckning över de kommersiella förslag i samband med projektet
-ListOrdersAssociatedProject=Förteckning över kundens order i samband med projektet
-ListInvoicesAssociatedProject=Förteckning över kundens fakturor i samband med projektet
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Lista över leverantörens order i samband med projektet
-ListSupplierInvoicesAssociatedProject=Lista över leverantörens fakturor i samband med projektet
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Förteckning över avtal i samband med projektet
 ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Ändra uppgift datum enligt projektets startdatum
 ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
 ProjectsAndTasksLines=Projekt och uppdrag
 ProjectCreatedInDolibarr=Projekt %s skapad
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Uppgift %s skapad
 TaskModifiedInDolibarr=Uppgift %s modifierade
 TaskDeletedInDolibarr=Uppgift %s raderad
@@ -153,7 +154,7 @@ PlannedWorkload=Planerad arbetsbelastning
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekt måste valideras först
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index 1a0091a8651..8e59e0b8e28 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Ny löneutbetalning
 SalaryPayment=Lönebetalning
 SalariesPayments=Löneutbetalningar
 ShowSalaryPayment=Visa löneutbetalning
-THM=Genomsnitt timpris
-TJM=Genomsnittlig dagligt pris
+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
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 4c2ab82842a..fd7535a1631 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Radera sändning
 Stock=Lager
 Stocks=Lager
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Förändringar
 ErrorWarehouseRefRequired=Lagrets referensnamn krävs
 ListOfWarehouses=Lista över lager
@@ -43,6 +45,7 @@ PMPValue=Vägda genomsnittliga priset
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Lagervärde
 UserWarehouseAutoCreate=Skapa ett lager automatiskt när du skapar en användare
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Sänd kvantitet
 QtyDispatchedShort=Antal skickade
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/sv_SE/supplier_proposal.lang b/htdocs/langs/sv_SE/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/sv_SE/supplier_proposal.lang
+++ b/htdocs/langs/sv_SE/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 3f4c003342b..1cb8c9b567e 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -7,13 +7,13 @@ History=Historia
 ListOfSuppliers=Lista över leverantörer
 ShowSupplier=Visa leverantör
 OrderDate=Beställ datum
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Vissa under produkter har inget pris definierat
-AddSupplierPrice=Lägg leverantör pris
-ChangeSupplierPrice=Byta leverantör pris
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Denna hänvisning leverantör är redan kopplad till en referens: %s
 NoRecordedSuppliers=Inga leverantörer registreras
 SupplierPayment=Leverantör betalning
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Lista över leverantörsorder
 MenuOrdersSupplierToBill=Leverantörs order att fakturera
 NbDaysToDelivery=Leveransförsening, dagar
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index bb7e4a664c0..e526b39fd8c 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Vecko timmar
 ColorUser=Färg på användaren
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/sv_SE/website.lang b/htdocs/langs/sv_SE/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/sv_SE/website.lang
+++ b/htdocs/langs/sv_SE/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index 6502e5ab833..c50f93bb4ee 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Kunder stående order område
-StandingOrders=Stående order
-StandingOrder=Stående order
-NewStandingOrder=Nya stående order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=För att kunna behandla
-WithdrawalsReceipts=Återkallelse kvitton
-WithdrawalReceipt=Återkallelse kvitto
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Återkallelse linjer
-RequestStandingOrderToTreat=Begäran om stående order att bearbeta
-RequestStandingOrderTreated=Begäran om stående order bearbetas
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Ännu inte möjligt. Uttag status måste vara inställd på "kredit" innan den förklarar förkastar på specifika linjer.
-NbOfInvoiceToWithdraw=St. av faktura med återkallnings begäran
-NbOfInvoiceToWithdrawWithInfo=St. av faktura med återkallande begäran för kunder som har definierat bankkontouppgifter
-InvoiceWaitingWithdraw=Faktura väntar på återkalla
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Belopp att dra tillbaka
-WithdrawsRefused=Återkallar vägrade
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Ingen kund faktura betalning läge &quot;tillbaka&quot; väntar. Gå på &quot;Uttag&quot;-fliken på faktura kort att göra en förfrågan.
 ResponsibleUser=Ansvarig användare
-WithdrawalsSetup=Återkallelse setup
-WithdrawStatistics=Dra statistik
-WithdrawRejectStatistics=Dra avvisa statistik
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Gör en återkalla begäran
 ThirdPartyBankCode=Tredje part bankkod
 NoInvoiceCouldBeWithdrawed=Ingen faktura withdrawed med framgång. Kontrollera att fakturan på företag med en giltig förbud.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Ospecificerat
 StatusMotif1=Bestämmelse insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=Inga uttag för
+StatusMotif3=No direct debit payment order
 StatusMotif4=Kundorder
 StatusMotif5=RIB inexploitable
 StatusMotif6=Konto utan balans
@@ -61,28 +62,43 @@ NotifyCredit=Återkallelse Credit
 NumeroNationalEmetter=Nationella sändare Antal
 WithBankUsingRIB=För bankkonton med hjälp av RIB
 WithBankUsingBANBIC=För bankkonton som använder IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Bankkonto för att ta emot drar
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=Denna flik ger möjlighet att begära en stående order. Väl utförd, gå till meny Bank->Uttag för att ställa in stående order. När en stående order stängs kommer betalning på faktura att registreras automatiskt och fakturorna att stängas om restbelopp är noll.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=Utträde fil
 SetToStatusSent=Ställ in på status "File Skickat"
 ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
 StatisticsByLineStatus=Statistik efter status linjer
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Betalning av %s stående order av banken
-InfoCreditMessage=Den stående beställning %s har betalats av banken <br> Uppgifter om betalning: %s
-InfoTransSubject=Överföring av %s stående order till bank
-InfoTransMessage=Den stående beställning %s har transmited till bank med %s %s. <br><br>
+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>
 InfoTransData=Belopp: %s <br> Metode: %s <br> Datum: %s
-InfoRejectSubject=Stående order vägrade
-InfoRejectMessage=Hej, <br><br> den stående beställning av faktura %s relaterad till bolagets %s, med en mängd %s har avslagits av banken. <br><br>--<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
 ModeWarning=Alternativ på riktigt läget inte var satt, sluta vi efter denna simulering
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index e13eddb8bb6..51b7a106c09 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Arbetsflöde modul konfiguration
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Klassificera länkad förslag källa att faktureras när kundorder är inställd på betald
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura är inställd på betald
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificera länkade källa kundorder (s) för att faktureras när kundfaktura valideras
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index af313850ba1..9967530b1d2 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/sw_SW/banks.lang b/htdocs/langs/sw_SW/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/sw_SW/banks.lang
+++ b/htdocs/langs/sw_SW/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/sw_SW/boxes.lang b/htdocs/langs/sw_SW/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/sw_SW/boxes.lang
+++ b/htdocs/langs/sw_SW/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/sw_SW/cashdesk.lang b/htdocs/langs/sw_SW/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/sw_SW/cashdesk.lang
+++ b/htdocs/langs/sw_SW/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/sw_SW/categories.lang b/htdocs/langs/sw_SW/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/sw_SW/categories.lang
+++ b/htdocs/langs/sw_SW/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/sw_SW/compta.lang b/htdocs/langs/sw_SW/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/sw_SW/compta.lang
+++ b/htdocs/langs/sw_SW/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/sw_SW/cron.lang b/htdocs/langs/sw_SW/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/sw_SW/cron.lang
+++ b/htdocs/langs/sw_SW/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/sw_SW/install.lang b/htdocs/langs/sw_SW/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/sw_SW/install.lang
+++ b/htdocs/langs/sw_SW/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/sw_SW/interventions.lang b/htdocs/langs/sw_SW/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/sw_SW/interventions.lang
+++ b/htdocs/langs/sw_SW/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/sw_SW/ldap.lang b/htdocs/langs/sw_SW/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/sw_SW/ldap.lang
+++ b/htdocs/langs/sw_SW/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/sw_SW/mails.lang b/htdocs/langs/sw_SW/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/sw_SW/mails.lang
+++ b/htdocs/langs/sw_SW/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 18b0a7f14b8..040fe8d4e82 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/sw_SW/margins.lang
+++ b/htdocs/langs/sw_SW/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/sw_SW/orders.lang b/htdocs/langs/sw_SW/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/sw_SW/orders.lang
+++ b/htdocs/langs/sw_SW/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/sw_SW/printing.lang b/htdocs/langs/sw_SW/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/sw_SW/printing.lang
+++ b/htdocs/langs/sw_SW/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/sw_SW/productbatch.lang b/htdocs/langs/sw_SW/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/sw_SW/productbatch.lang
+++ b/htdocs/langs/sw_SW/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/sw_SW/salaries.lang b/htdocs/langs/sw_SW/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/sw_SW/salaries.lang
+++ b/htdocs/langs/sw_SW/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/sw_SW/suppliers.lang b/htdocs/langs/sw_SW/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/sw_SW/suppliers.lang
+++ b/htdocs/langs/sw_SW/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/sw_SW/users.lang b/htdocs/langs/sw_SW/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/sw_SW/users.lang
+++ b/htdocs/langs/sw_SW/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/sw_SW/withdrawals.lang b/htdocs/langs/sw_SW/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/sw_SW/withdrawals.lang
+++ b/htdocs/langs/sw_SW/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/sw_SW/workflow.lang b/htdocs/langs/sw_SW/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/sw_SW/workflow.lang
+++ b/htdocs/langs/sw_SW/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 5d3e2e67121..ff77a69ff10 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=วารสาร
 JournalFinancial=วารสารการเงิน
 BackToChartofaccounts=กลับผังบัญชี
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=เลือกผังบัญชี
 Addanaccount=เพิ่มบัญชีบัญชี
 AccountAccounting=บัญชีการบัญชี
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=การเสีย
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=รายละเอียดของลูกค้า
-SuppliersVentilation=ซัพพลายเออร์ที่พังทลาย
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=รายงาน
 NewAccount=บัญชีการบัญชีใหม่
 Create=สร้าง
-CreateMvts=Create movement
-UpdateMvts=การปรับเปลี่ยนของการเคลื่อนไหว
-WriteBookKeeping=บันทึกในบัญชีแยกประเภททั่วไป
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=บัญชีแยกประเภททั่วไป
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=เส้นของใบแจ้งหนี้ที่จะต้องมีการระบายอากาศ
-InvoiceLinesDone=สายช่องระบายความร้อนของใบแจ้งหนี้
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=ระบายอากาศ
+Ventilate=Bind
 
 Processing=การประมวลผล
 EndProcessing=ในตอนท้ายของการประมวลผล
-AnyLineVentilate=สายการใด ๆ เพื่อระบายอากาศ
+AnyLineVentilate=Any lines to bind
 SelectedLines=เลือกสาย
 Lineofinvoice=สายของใบแจ้งหนี้
-VentilatedinAccount=อากาศถ่ายเทได้ประสบความสำเร็จในบัญชีของบัญชี
-NotVentilatedinAccount=การระบายอากาศไม่ได้อยู่ในบัญชีการบัญชี
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=จำนวนขององค์ประกอบที่จะเป็นรายละเอียดที่แสดงโดยหน้า (สูงสุดที่แนะนำ: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=เริ่มต้นการเรียงลำดับของรายละเอียดหน้า "มีการสลาย" โดยองค์ประกอบล่าสุด
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=เริ่มต้นการเรียงลำดับของรายละเอียดหน้า "ถล่ม" โดยองค์ประกอบล่าสุด
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=ความยาวของบัญชีทั่วไป
-ACCOUNTING_LENGTH_AACCOUNT=ความยาวของบัญชีของบุคคลที่สาม
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=ขายวารสาร
 ACCOUNTING_PURCHASE_JOURNAL=วารสารการสั่งซื้อ
@@ -81,32 +102,31 @@ Sens=ซองส์
 Codejournal=วารสาร
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=ลบบันทึกบัญชีแยกประเภททั่วไป
-
 DescSellsJournal=วารสารขาย
 DescPurchasesJournal=ซื้อวารสาร
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=การชำระเงินของลูกค้าใบแจ้งหนี้
-
 ThirdPartyAccount=บัญชี Thirdparty
-
-NewAccountingMvt=การเคลื่อนไหวใหม่
-NumMvts=จำนวนของการเคลื่อนไหว
-ListeMvts=รายชื่อของการเคลื่อนไหว
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=เดบิตและเครดิตไม่สามารถมีค่าในเวลาเดียวกัน
 
-ReportThirdParty=ชื่อบัญชี thirdparty
-DescThirdPartyReport=ให้คำปรึกษาที่นี่รายชื่อของลูกค้าและซัพพลายเออร์ thirdparty และบัญชีบัญชีของพวกเขา
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=รายการบัญชีที่บัญชี
 
@@ -114,22 +134,29 @@ Pcgtype=ชั้นบัญชี
 Pcgsubtype=ภายใต้ระดับบัญชี
 Accountparent=รากของบัญชี
 
-DescVentilCustomer=ที่นี่ให้คำปรึกษารายละเอียดบัญชีของลูกค้าประจำปีของใบแจ้งหนี้ของคุณ
 TotalVente=Total turnover before tax
 TotalMarge=อัตรากำไรขั้นต้นรวมยอดขาย
-DescVentilDoneCustomer=ให้คำปรึกษาที่นี่รายชื่อของสายของลูกค้าใบแจ้งหนี้และบัญชีบัญชีของพวกเขา
-DescVentilTodoCustomer=ระบายอากาศในสายของคุณใบแจ้งหนี้ลูกค้าที่มีบัญชีการบัญชี
-ChangeAccount=เปลี่ยนบัญชีบัญชีสำหรับสายการคัดเลือกจากบัญชี:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=ที่นี่ให้คำปรึกษารายละเอียดบัญชีประจำปีของซัพพลายเออร์ใบแจ้งหนี้ของคุณ
-DescVentilDoneSupplier=ให้คำปรึกษาที่นี่รายชื่อของเส้นของผู้จัดจำหน่ายใบแจ้งหนี้และบัญชีบัญชีของพวกเขา
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=ตรวจสอบโดยอัตโนมัติ
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=ข้อผิดพลาดที่คุณไม่สามารถลบบัญชีบัญชีนี้เพราะมันถูกนำมาใช้
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=บัตรพังทลาย
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 7d084ae4a6f..54cba845db3 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=การทดลอง
 VersionDevelopment=พัฒนาการ
 VersionUnknown=ไม่ทราบ
 VersionRecommanded=แนะนำ
-FileCheck=ความสมบูรณ์ของไฟล์
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=ไฟล์ที่ขาดหายไป
 FilesUpdated=ไฟล์ล่าสุด
-FileCheckDolibarr=ตรวจสอบความสมบูรณ์ของไฟล์ Dolibarr
-XmlNotFound=ไฟล์ XML ของ Dolibarr ซื่อสัตย์ไม่พบ
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID เซสชั่น
 SessionSaveHandler=จัดการที่จะบันทึกการประชุม
 SessionSavePath=การจัดเก็บข้อมูลการแปลเซสชั่น
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=ข้อผิดพลาด, <b>ควา
 DictionarySetup=การติดตั้งพจนานุกรม
 Dictionary=พจนานุกรม
 Chartofaccounts=ผังบัญชี
-Fiscalyear=รอบระยะเวลาบัญชี
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=ค่า 'ระบบ' และ 'systemauto' สำหรับประเภทถูกสงวนไว้ คุณสามารถใช้ 'ของผู้ใช้เป็นค่าที่จะเพิ่มบันทึกของคุณเอง
 ErrorCodeCantContainZero=รหัสไม่สามารถมีค่า 0
 DisableJavascript=ปิดการใช้งาน JavaScript และฟังก์ชั่นอาแจ็กซ์ (แนะนำสำหรับคนตาบอดหรือเบราว์เซอร์ข้อความ)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=รอคุณกดปุ่มก่อนท
 DelaiedFullListToSelectContact=รอคุณกดปุ่มก่อนที่จะโหลดเนื้อหาของการติดต่อรายการคำสั่งผสม (ซึ่งอาจจะเพิ่มประสิทธิภาพการทำงานถ้าคุณมีจำนวนมากของการติดต่อ)
 NumberOfKeyToSearch=Nbr ของตัวละครที่จะเรียกการค้นหา:% s
 NotAvailableWhenAjaxDisabled=ไม่สามารถใช้ได้เมื่ออาแจ็กซ์ปิดการใช้งาน
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=ปิดใช้งาน JavaScript
 UsePreviewTabs=ใช้แท็บตัวอย่าง
 ShowPreview=แสดงตัวอย่าง
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=เข้ารหัสข้อมูลไบนาร
 IgnoreDuplicateRecords=ละเว้นข้อผิดพลาดของระเบียนที่ซ้ำกัน (INSERT IGNORE)
 AutoDetectLang=Autodetect (ภาษาเบราว์เซอร์)
 FeatureDisabledInDemo=ปิดใช้งานคุณลักษณะในการสาธิต
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=สิทธิ์
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=องค์ประกอบเฉพาะจาก <a href="%s">โมดูลที่เปิดใช้งาน</a> จะแสดง
-ModulesDesc=โมดูล Dolibarr กำหนดฟังก์ชั่นที่มีการใช้งานซอฟต์แวร์ โมดูลบางอย่างต้องใช้สิทธิ์ของคุณต้องให้กับผู้ใช้งานหลังจากการเปิดใช้งานโมดูล คลิกที่ปุ่มเปิด / ปิดในคอลัมน์ "สถานะ" เพื่อเปิดใช้งานโมดูล / คุณลักษณะ
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=โมดูลอื่น ๆ ...
 DoliStoreDesc=DoliStore สถานที่อย่างเป็นทางการสำหรับตลาด Dolibarr ERP / CRM โมดูลภายนอก
@@ -273,9 +279,10 @@ YouCanSubmitFile=สำหรับขั้นตอนนี้คุณสา
 CurrentVersion=รุ่นปัจจุบัน Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=เซิร์ฟเวอร์การอัพเดทออฟไลน์
 GenericMaskCodes=คุณอาจป้อนหน้ากากเลขใด ๆ ในหน้ากากนี้แท็กต่อไปนี้สามารถนำมาใช้: <br> <b>{000000}</b> สอดคล้องกับจำนวนที่จะเพิ่มขึ้นในแต่ละ% s ใส่เลขศูนย์เป็นจำนวนมากตามความยาวที่ต้องการของเคาน์เตอร์ เคาน์เตอร์จะแล้วเสร็จภายในศูนย์จากซ้ายเพื่อให้มีศูนย์มากที่สุดเท่าที่เป็นหน้ากาก <br> <b>{000000} + 000</b> เช่นเดียวกับก่อนหน้านี้ แต่ชดเชยที่สอดคล้องกับจำนวนที่อยู่ทางขวาของเครื่องหมาย + ถูกนำไปใช้ในการเริ่มต้นครั้งแรก% <br> <b>{000000 @ x}</b> เดียวกับก่อนหน้านี้ แต่นับตั้งค่าใหม่เป็นศูนย์เมื่อเดือน x ถึง (x ระหว่างวันที่ 1 และ 12 หรือ 0 จะใช้เดือนแรกของปีงบประมาณที่กำหนดไว้ในการกำหนดค่าของคุณหรือ 99 เพื่อตั้งค่าให้เป็นศูนย์ทุกเดือน ) ถ้าตัวเลือกนี้ถูกนำมาใช้และ x 2 หรือสูงกว่านั้นลำดับ {yy} {} มิลลิเมตรหรือปปปป {} {} มิลลิเมตรจะต้องมี <br> <b>{} วววัน</b> (01-31) <br> <b>{} มิลลิเมตรเดือน</b> (01-12) <br> <b>yy {}, {} หรือปปปป {y}</b> มากกว่าปีที่ 2, 4 หรือ 1 หมายเลข <br>
-GenericMaskCodes2=<b>{} CCCC</b> รหัสลูกค้าตัวอักษร n <br> <b>{} cccc000</b> รหัสลูกค้าตัวอักษร n จะตามมาด้วยความมุ่งมั่นที่เคาน์เตอร์สำหรับลูกค้า นับนี้ที่ทุ่มเทให้กับลูกค้าจะตั้งค่าในเวลาเดียวกันกว่าเคาน์เตอร์ทั่วโลก <br> <b>{} tttt</b> รหัสประเภท thirdparty ตัวอักษร n (ดูประเภทพจนานุกรม thirdparty) <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=ทุกตัวละครอื่น ๆ ในหน้ากากจะยังคงเหมือนเดิม <br> ช่องว่างที่ไม่ได้รับอนุญาต <br>
 GenericMaskCodes4a=<u>ตัวอย่างใน% s 99 ของ thecompany บุคคลที่สามทำ 2007/01/31:</u> <br>
 GenericMaskCodes4b=<u>ตัวอย่างของบุคคลที่สามที่สร้างขึ้นบน 2007/03/01:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=พารามิเตอร์ URL ที่การ
 SecurityTokenIsUnique=ใช้พารามิเตอร์ SecureKey ไม่ซ้ำกันสำหรับแต่ละ URL
 EnterRefToBuildUrl=ป้อนการอ้างอิงสำหรับวัตถุ% s
 GetSecuredUrl=รับ URL คำนวณ
-ButtonHideUnauthorized=ปุ่มซ่อนสำหรับการดำเนินการไม่ได้รับอนุญาตแทนที่จะแสดงปุ่มปิดการใช้งาน
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=อัตราภาษีมูลค่าเพิ่มเก่า
 NewVATRates=ใหม่อัตราภาษีมูลค่าเพิ่ม
 PriceBaseTypeToChange=การปรับเปลี่ยนราคาค่าอ้างอิงกับฐานที่กำหนดไว้ใน
@@ -349,6 +356,7 @@ ExtrafieldMail = อีเมล์
 ExtrafieldSelect = เลือกรายการ
 ExtrafieldSelectList = เลือกจากตาราง
 ExtrafieldSeparator=เครื่องสกัด
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=ช่องทำเครื่องหมาย
 ExtrafieldRadio=ปุ่ม
 ExtrafieldCheckBoxFromList= Checkbox จากตาราง
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=และกลุ่มผู้ใช้
@@ -428,8 +439,8 @@ Module55Name=บาร์โค้ด
 Module55Desc=การจัดการบาร์โค้ด
 Module56Name=โทรศัพท์
 Module56Desc=รวมโทรศัพท์
-Module57Name=ยืนคำสั่งซื้อ
-Module57Desc=คำสั่งยืนและการจัดการถอน นอกจากนี้ยังมีการสร้างไฟล์ SEPA สำหรับประเทศในยุโรป
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=บูรณาการของระบบ ClickToDial (ดอกจัน, ... )
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=บูรณาการ Webcalendar
 Module500Name=ค่าใช้จ่ายพิเศษ
 Module500Desc=การบริหารจัดการค่าใช้จ่ายพิเศษ (ภาษีภาษีสังคมหรือการเงินการจ่ายเงินปันผล)
-Module510Name=เงินเดือน
-Module510Desc=การบริหารจัดการของเงินเดือนพนักงานและการชำระเงิน
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=เงินกู้
 Module520Desc=การบริหารจัดการของเงินให้สินเชื่อ
 Module600Name=การแจ้งเตือน
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=การบริจาค
 Module700Desc=การจัดการการบริจาค
 Module770Name=รายงานค่าใช้จ่าย
@@ -606,10 +617,10 @@ Permission142=สร้าง / แก้ไขทุกโครงการแ
 Permission144=ลบทุกโครงการและงาน (ยังเป็นโครงการส่วนตัวฉันไม่ได้ติดต่อเพื่อขอ)
 Permission146=อ่านให้บริการ
 Permission147=อ่านสถิติ
-Permission151=อ่านคำสั่งยืน
-Permission152=สร้าง / แก้ไขคำสั่งยืนตามคำขอ
-Permission153=ใบเสร็จรับเงินการส่งคำสั่งยืน
-Permission154=เครดิต / ปฏิเสธยืนใบเสร็จรับเงินการสั่งซื้อ
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=อ่านสัญญา / สมัครสมาชิก
 Permission162=สร้าง / แก้ไขสัญญา / สมัครสมาชิก
 Permission163=เปิดใช้งานบริการ / สมัครสมาชิกของสัญญา
@@ -747,6 +758,7 @@ Permission1236=ส่งออกใบแจ้งหนี้, การจั
 Permission1237=ส่งออกคำสั่งผู้จัดจำหน่ายและรายละเอียดของพวกเขา
 Permission1251=เรียกมวลของการนำเข้าข้อมูลภายนอกลงในฐานข้อมูล (โหลดข้อมูล)
 Permission1321=ส่งออกใบแจ้งหนี้ของลูกค้าคุณลักษณะและการชำระเงิน
+Permission1322=Reopen a paid bill
 Permission1421=ส่งออกสั่งซื้อของลูกค้าและคุณลักษณะ
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=สร้าง / แก้ไขโพลล์
 Permission59001=อ่านอัตรากำไรขั้นต้นในเชิงพาณิชย์
 Permission59002=กำหนดอัตรากำไรขั้นต้นในเชิงพาณิชย์
 Permission59003=อ่านอัตรากำไรขั้นต้นผู้ใช้ทุกคน
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=ระดับศักยภาพ Prospect
@@ -853,6 +869,7 @@ LabelUsedByDefault=ฉลากใช้โดยเริ่มต้นถ้
 LabelOnDocuments=ป้ายเกี่ยวกับเอกสาร
 NbOfDays=nb วัน
 AtEndOfMonth=ในตอนท้ายของเดือน
+CurrentNext=Current/Next
 Offset=สาขา
 AlwaysActive=ใช้งานอยู่เสมอ
 Upgrade=อัพเกรด
@@ -950,7 +967,7 @@ LogEventDesc=คุณสามารถเปิดใช้การเข้
 AreaForAdminOnly=<b>คุณสมบัติเหล่านั้นสามารถนำมาใช้โดยผู้ใช้ผู้ดูแลระบบเท่านั้น</b>
 SystemInfoDesc=ข้อมูลระบบข้อมูลทางด้านเทคนิคอื่น ๆ ที่คุณได้รับในโหมดอ่านอย่างเดียวและมองเห็นสำหรับผู้ดูแลระบบเท่านั้น
 SystemAreaForAdminOnly=บริเวณนี้เป็นที่ใช้ได้สำหรับผู้ใช้ผู้ดูแลระบบเท่านั้น ไม่มีสิทธิ์ Dolibarr สามารถลดขีด จำกัด นี้
-CompanyFundationDesc=แก้ไขในหน้านี้ข้อมูลทั้งหมดที่รู้จักกันของ บริษัท หรือมูลนิธิคุณจะต้องจัดการ (สำหรับเรื่องนี้คลิกที่ปุ่ม "แก้ไข" ที่ด้านล่างของหน้า)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=คุณสามารถเลือกแต่ละพารามิเตอร์ที่เกี่ยวข้องกับ Dolibarr มองและความรู้สึกที่นี่
 AvailableModules=โมดูลที่มีจำหน่าย
 ToActivateModule=เพื่อเปิดใช้งานโมดูลไปในพื้นที่การติดตั้ง (หน้าแรก> Setup-> โมดูล)
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=คำเตือนในบางระบบลิ
 PathToDocuments=เส้นทางไปยังเอกสาร
 PathDirectory=สารบบ
 SendmailOptionMayHurtBuggedMTA=คุณสมบัติที่จะส่งอีเมลโดยใช้วิธีการ "PHP mail โดยตรง" จะสร้างข้อความอีเมลที่อาจจะไม่ได้แยกวิเคราะห์ได้อย่างถูกต้องโดยบางส่วนที่ได้รับเมลเซิร์ฟเวอร์ ผลที่ได้คืออีเมลบางอย่างไม่สามารถอ่านได้โดยคนที่เป็นเจ้าภาพโดยแพลตฟอร์มร้องเหล่านั้น เป็นกรณีสำหรับบางผู้ให้บริการอินเทอร์เน็ต (Ex: ออเรนจ์ในประเทศฝรั่งเศส) ซึ่งไม่เป็นปัญหาเข้า Dolibarr หรือเข้า PHP แต่บนเซิร์ฟเวอร์อีเมลที่ได้รับ แต่คุณสามารถเพิ่มตัวเลือก MAIN_FIX_FOR_BUGGED_MTA 1 เข้าสู่การตั้งค่า - อื่น ๆ ที่จะปรับเปลี่ยน Dolibarr หลีกเลี่ยงปัญหานี้ แต่คุณอาจพบปัญหากับเซิร์ฟเวอร์อื่น ๆ ที่เคารพอย่างเคร่งครัดมาตรฐาน SMTP วิธีการแก้ปัญหาอื่น ๆ (แนะนำ) คือการใช้วิธีการ "ห้องสมุด SMTP ซ็อกเก็ต" ที่มีข้อเสียไม่มี
-TranslationSetup=การกำหนดค่า de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=คุณต้องเปิดการใช้งานอย่างน้อย 1 โมดูล
 ClassNotFoundIntoPathWarning=คลาส% s ไม่พบเ​​ข้ามาในเส้นทาง PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=ใช้ TLS
 LDAPServerUseTLSExample=เซิร์ฟเวอร์ LDAP ใช้ TLS ของคุณ
 LDAPServerDn=เซิร์ฟเวอร์ DN
 LDAPAdminDn=DN ผู้ดูแลระบบ
-LDAPAdminDnExample=สมบูรณ์ DN (เช่น: cn = admin, dc = ตัวอย่างเช่น dc = com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=รหัสผ่านผู้ดูแลระบบ
 LDAPUserDn=ผู้ใช้ DN
 LDAPUserDnExample=สมบูรณ์ DN (เช่น: อู = ผู้ใช้ dc = ตัวอย่างเช่น dc = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=ตัวอย่าง: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=ตัวอย่าง: objectsid
 LDAPFieldEndLastSubscription=วันที่สิ้นสุดการสมัครสมาชิก
-LDAPFieldTitle=โพสต์ / ฟังก์ชั่น
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=ตัวอย่าง: ชื่อ
 LDAPSetupNotComplete=การติดตั้ง LDAP ไม่สมบูรณ์ (ไปที่แท็บอื่น ๆ )
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=ผู้ดูแลระบบหรือรหัสผ่าน เข้าถึง LDAP จะไม่ระบุชื่อและที่อยู่ในโหมดอ่านอย่างเดียว
@@ -1293,7 +1318,7 @@ ProductServiceSetup=ผลิตภัณฑ์และบริการกา
 NumberOfProductShowInSelect=จำนวนสูงสุดของผลิตภัณฑ์ในคอมโบเลือกรายการ (0 = ไม่ จำกัด )
 ViewProductDescInFormAbility=การแสดงของคำอธิบายผลิตภัณฑ์ในรูปแบบ (คำแนะนำเป็นอย่างอื่นเป็นป๊อปอัพ)
 MergePropalProductCard=เปิดใช้งานในผลิตภัณฑ์ / บริการที่แนบมาไฟล์ที่แท็บตัวเลือกที่จะผสานเอกสาร PDF สินค้ากับข้อเสนอในรูปแบบ PDF azur หากผลิตภัณฑ์ / บริการที่อยู่ในข้อเสนอ
-ViewProductDescInThirdpartyLanguageAbility=แสดงรายละเอียดของผลิตภัณฑ์ในภาษา thirdparty
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=นอกจากนี้ถ้าคุณมีจำนวนมากของผลิตภัณฑ์ (> 100 000) คุณสามารถเพิ่มความเร็วโดยการตั้งค่า PRODUCT_DONOTSEARCH_ANYWHERE คงเป็น 1 ใน Setup-> อื่น ๆ ค้นหาแล้วจะถูก จำกัด ในการเริ่มต้นของสตริง
 UseSearchToSelectProduct=ใช้แบบฟอร์มการค้นหาที่จะเลือกผลิตภัณฑ์ (มากกว่ารายการแบบหล่นลง)
 SetDefaultBarcodeTypeProducts=ประเภทบาร์โค้ดเริ่มต้นที่จะใช้สำหรับผลิตภัณฑ์
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=บาร์โค้ดเครื่องมือบร
 BarcodeInternalEngine=ภายในเครื่องยนต์
 BarCodeNumberManager=ผู้จัดการอัตโนมัติกำหนดหมายเลขบาร์โค้ด
 ##### Prelevements #####
-WithdrawalsSetup=การถอนการติดตั้งโมดูล
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=การติดตั้งภายนอก RSS การนำเข้า
 NewRSS=RSS ฟีดใหม่
@@ -1506,6 +1531,7 @@ OpenFiscalYear=เปิดปีงบประมาณ
 CloseFiscalYear=ปิดปีงบประมาณ
 DeleteFiscalYear=ลบปีงบประมาณ
 ConfirmDeleteFiscalYear=คุณแน่ใจที่จะลบปีงบประมาณนี้หรือไม่?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=มักจะสามารถแก้ไขได้
 MAIN_APPLICATION_TITLE=บังคับให้มองเห็นชื่อของโปรแกรม (คำเตือน: การตั้งชื่อของคุณเองที่นี่อาจแบ่งคุณลักษณะเข้าสู่ระบบอัตโนมัติเมื่อใช้โปรแกรม DoliDroid มือถือ)
 NbMajMin=จำนวนขั้นต่ำของอักขระตัวพิมพ์ใหญ่
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=รายการของการแจ้งเตือนคงที่
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=ไปที่แท็บ "การแจ้งเตือน" ของการติดต่อ thirdparty เพื่อเพิ่มหรือลบการแจ้งเตือนสำหรับรายชื่อ / ที่อยู่
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=ธรณีประตู
 BackupDumpWizard=ตัวช่วยสร้างการสร้างแฟ้มการถ่ายโอนการสำรองฐานข้อมูล
 SomethingMakeInstallFromWebNotPossible=การติดตั้งโมดูลภายนอกเป็นไปไม่ได้จากอินเตอร์เฟซเว็บด้วยเหตุผลต่อไปนี้:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=กด F5 บนแป้นพิมพ์หลังจากเปลี่ยนค่านี้จะมีมันที่มีประสิทธิภาพ
-NotSupportedByAllThemes=จะทำงานร่วมกับธีม Eldy แต่ไม่ได้รับการสนับสนุนจากทุกรูปแบบ
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=สีพื้นหลัง
 TopMenuBackgroundColor=สีพื้นหลังสำหรับเมนูยอดนิยม
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=สีพื้นหลังสำหรับเมนูด้านซ้าย
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=สีพื้นหลังสำหรับสายตารางแปลก
@@ -1569,7 +1596,7 @@ MailToSendIntervention=ในการส่งการแทรกแซง
 MailToSendSupplierRequestForQuotation=ในการส่งคำขอใบเสนอราคาในการจัดจำหน่าย
 MailToSendSupplierOrder=ในการส่งคำสั่งผู้จัดจำหน่าย
 MailToSendSupplierInvoice=ในการส่งใบแจ้งหนี้จัดจำหน่าย
-MailToThirdparty=ในการส่งอีเมล์จากหน้า thirdparty
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 8d91d829a14..09b1ee9a48c 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -27,13 +27,9 @@ AllTime=จากจุดเริ่มต้น
 Reconciliation=การประนีประนอม
 RIB=หมายเลขบัญชีธนาคาร
 IBAN=IBAN จำนวน
-IbanValid=IBAN เป็นที่ถูกต้อง
-IbanNotValid=IBAN ไม่สามารถใช้ได้
 BIC=BIC / จำนวน SWIFT
-SwiftValid=BIC / SWIFT เป็นที่ถูกต้อง
-SwiftNotValid=BIC / SWIFT ไม่สามารถใช้ได้
-StandingOrders=ยืนคำสั่งซื้อ
-StandingOrder=เพื่อยืน
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=ใบแจ้งยอดบัญชี
 AccountStatementShort=คำแถลง
 AccountStatements=งบบัญชี
@@ -78,6 +74,7 @@ AccountToCredit=บัญชีเครดิต
 AccountToDebit=บัญชีเดบิต
 DisableConciliation=ปิดใช้งานคุณลักษณะการปรองดองสำหรับบัญชีนี้
 ConciliationDisabled=คุณลักษณะสมานฉันท์ปิดการใช้งาน
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=เปิด
 StatusAccountClosed=ปิด
 AccountIdShort=จำนวน
@@ -87,6 +84,8 @@ AddBankRecordLong=เพิ่มการทำธุรกรรมด้ว
 ConciliatedBy=โดยคืนดี
 DateConciliating=วันที่ตกลงกัน
 BankLineConciliated=การทำธุรกรรมคืนดี
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=การชำระเงินของลูกค้า
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=การชำระเงินการถอนเงิ
 SocialContributionPayment=สังคม / ชำระภาษีการคลัง
 BankTransfer=โอนเงินผ่านธนาคาร
 BankTransfers=ธนาคารโอน
-TransferDesc=โอนเงินจากบัญชีหนึ่งไปยังอีกที่หนึ่ง Dolibarr จะเขียนบันทึกสอง (เดบิตในบัญชีของแหล่งที่มาและเครดิตในบัญชีเป้าหมายของปริมาณที่เท่ากัน. ป้ายชื่อเดียวกันและวันที่จะใช้สำหรับการทำธุรกรรมนี้)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=จาก
 TransferTo=ไปยัง
 TransferFromToDone=<b>การถ่ายโอนจาก% s% s% s%</b> s ได้รับการบันทึก
@@ -129,7 +129,7 @@ FutureTransaction=การทำธุรกรรมในอนาคต ว
 SelectChequeTransactionAndGenerate=เลือก / การตรวจสอบตัวกรองที่จะรวมเข้าไปในการรับฝากเช็คและคลิกที่ "สร้าง"
 InputReceiptNumber=เลือกบัญชีธนาคารที่เกี่ยวข้องกับการเจรจาต่อรอง ใช้ค่าตัวเลขจัดเรียง: YYYYMM หรือ YYYYMMDD
 EventualyAddCategory=ในที่สุดระบุหมวดหมู่ในการที่จะจำแนกบันทึก
-ToConciliate=ประนีประนอม?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=จากนั้นให้ตรวจสอบสายที่มีอยู่ในบัญชีเงินฝากธนาคารและคลิก
 DefaultRIB=เริ่มต้นบ้าน
 AllRIB=บ้านทั้งหมด
@@ -142,3 +142,6 @@ ConfirmRejectCheck=คุณแน่ใจหรือว่าต้องก
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index c0ac989e261..35ad0bb12d7 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=ข้อผิดพลาด
 BillFrom=จาก
 BillTo=ไปยัง
 ActionsOnBill=การดำเนินการในใบแจ้งหนี้
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=ส่วนลดที่นำเสนอ (ชำระเ
 EscompteOfferedShort=Discount
 SendBillRef=ส่งใบแจ้งหนี้% s
 SendReminderBillRef=การส่งใบแจ้งหนี้ s% (เตือน)
-StandingOrders=ยืนคำสั่งซื้อ
-StandingOrder=เพื่อยืน
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=ไม่มีใบแจ้งหนี้ร่าง
 NoOtherDraftBills=ไม่มีใบแจ้งหนี้ร่างอื่น ๆ
 NoDraftInvoices=ไม่มีใบแจ้งหนี้ร่าง
@@ -351,8 +351,8 @@ VarAmount=ปริมาณ (ทีโอที %%.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=คำสั่งของธนาคาร
-PaymentTypeShortPRE=คำสั่งของธนาคาร
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=เงินสด
 PaymentTypeShortLIQ=เงินสด
 PaymentTypeCB=เครดิตการ์ด
@@ -381,6 +381,7 @@ ExtraInfos=ข่าวสารพิเศษ
 RegulatedOn=ในการควบคุม
 ChequeNumber=ตรวจสอบไม่มี°
 ChequeOrTransferNumber=ตรวจสอบ / โอนไม่มี°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=ธนาคารแห่งตรวจสอบ
 CheckBank=ตรวจสอบ
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=การชำระเงินโดยการชำระเงินนี้
 ClosePaidInvoicesAutomatically=จำแนก "ชำระเงิน" ทุกมาตรฐานสถานการณ์หรือการเปลี่ยนใบแจ้งหนี้การชำระเงินทั้งหมด
 ClosePaidCreditNotesAutomatically=จำแนก "ชำระเงิน" ทั้งหมดบันทึกเครดิตการชำระเงินทั้งหมดกลับ
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=ใบแจ้งหนี้ทั้งหมดที่มียังคงไม่มีที่จะจ่ายจะปิดโดยอัตโนมัติเพื่อให้สถานะ "ชำระเงิน"
 ToMakePayment=จ่ายเงิน
 ToMakePaymentBack=คืนทุน
 ListOfYourUnpaidInvoices=รายการของใบแจ้งหนี้ที่ค้างชำระ
 NoteListOfYourUnpaidInvoices=หมายเหตุ: รายการนี​​้จะมีใบแจ้งหนี้เฉพาะบุคคลที่สามคุณจะเชื่อมโยงกับการเป็นตัวแทนขาย
 RevenueStamp=อากรแสตมป์
-YouMustCreateInvoiceFromThird=ตัวเลือกนี้จะใช้ได้เฉพาะเมื่อมีการสร้างใบแจ้งหนี้จากแท็บ "ลูกค้า" ของ thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=ใบแจ้งหนี้แม่แบบ PDF Crabe แม่แบบใบแจ้งหนี้ฉบับสมบูรณ์ (แนะนำ Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/th_TH/boxes.lang b/htdocs/langs/th_TH/boxes.lang
index 9a98860719b..33dc0e6ce39 100644
--- a/htdocs/langs/th_TH/boxes.lang
+++ b/htdocs/langs/th_TH/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=ที่เก่าแก่ที่สุดที่หมดอายุการใช้งานบริการ
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=กิจกรรมทั่วโลก (ใบแจ้งหนี้, ข้อเสนอ, การสั่งซื้อ)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=ข้อเสนอต่อเดือน
 NoTooLowStockProducts=ไม่มีสินค้าภายใต้ขีด จำกัด ของหุ้นต่ำ
 BoxProductDistribution=สินค้า / บริการกระจาย
 BoxProductDistributionFor=การแพร่กระจายของ% s% s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=ใบแจ้งหนี้ลูกค้า
 ForCustomersOrders=คำสั่งซื้อของลูกค้า
 ForProposals=ข้อเสนอ
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/th_TH/cashdesk.lang b/htdocs/langs/th_TH/cashdesk.lang
index 49297d80bbe..8a8f1e2295a 100644
--- a/htdocs/langs/th_TH/cashdesk.lang
+++ b/htdocs/langs/th_TH/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=บน
 CashDeskThirdParty=บุคคลที่สาม
 ShoppingCart=รถเข็น
 NewSell=ขายใหม่
-BackOffice=สำนักงานกลับ
 AddThisArticle=เพิ่มบทความนี้
 RestartSelling=กลับไปขาย
-SellFinished=ขายเสร็จแล้ว
+SellFinished=Sale complete
 PrintTicket=ตั๋วพิมพ์
 NoProductFound=บทความไม่พบ
 ProductFound=สินค้าที่พบ
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index fffb86a684a..8368a40da79 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=ลูกค้าแท็ก / พื้นที่
 MembersCategoriesArea=แท็กสมาชิก / พื้นที่ประเภท
 ContactsCategoriesArea=แท็กติดต่อ / พื้นที่ประเภท
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=หมวดหมู่ย่อย
 CatList=รายการของแท็ก / ประเภท
 NewCategory=แท็กใหม่ / หมวดหมู่
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=นี้บุคคลที่สามมี
 MemberIsInCategories=สมาชิกนี้จะถูกเชื่อมโยงกับสมาชิกต่อไปนี้แท็ก / ประเภท
 ContactIsInCategories=ติดต่อนี้มีการเชื่อมโยงต่อไปนี้แท็กรายชื่อ / ประเภท
 ProductHasNoCategory=สินค้า / บริการนี​​้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
-CompanyHasNoCategory=thirdparty นี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=สมาชิกท่านนี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
 ContactHasNoCategory=ติดต่อนี้ไม่ได้อยู่ในแท็กใด ๆ / ประเภท
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=เพิ่มแท็ก / หมวดหมู่
 NotCategorized=โดยไม่ต้องแท็ก / หมวดหมู่
 CategoryExistsAtSameLevel=ประเภทนี้มีอยู่แล้วที่มีการอ้างอิงนี้
@@ -56,12 +58,14 @@ ProductsCategoriesShort=แท็กสินค้า / ประเภท
 MembersCategoriesShort=แท็กสมาชิก / ประเภท
 ContactCategoriesShort=แท็กติดต่อ / ประเภท
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=ประเภทนี้ไม่ได้มีผลิตภัณฑ์ใด ๆ
 ThisCategoryHasNoSupplier=ประเภทนี้ไม่ได้มีผู้จัดจำหน่ายใด ๆ
 ThisCategoryHasNoCustomer=ประเภทนี้ไม่ได้มีลูกค้า
 ThisCategoryHasNoMember=ประเภทนี้ไม่ได้มีสมาชิกใด ๆ
 ThisCategoryHasNoContact=ประเภทนี้จะไม่ได้มีการติดต่อใด ๆ
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag / รหัสหมวดหมู่
 CatSupList=รายการของแท็กผู้จัดจำหน่าย / ประเภท
 CatCusList=รายชื่อลูกค้า / โอกาสแท็ก / ประเภท
@@ -71,6 +75,7 @@ CatContactList=รายการของแท็กติดต่อ / ป
 CatSupLinks=การเชื่อมโยงระหว่างซัพพลายเออร์และแท็ก / ประเภท
 CatCusLinks=การเชื่อมโยงระหว่างลูกค้า / ลูกค้าและแท็ก / ประเภท
 CatProdLinks=การเชื่อมโยงระหว่างผลิตภัณฑ์ / บริการและแท็ก / ประเภท
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=ลบออกจากแท็ก / หมวดหมู่
 ExtraFieldsCategories=คุณลักษณะที่สมบูรณ์
 CategoriesSetup=แท็ก / ประเภทการติดตั้ง
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 696f39878d5..ee0208c00fb 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=ใหม่เอกชน
 NewCompany=บริษัท ใหม่ (โอกาสลูกค้าซัพพลายเออร์)
 NewThirdParty=บุคคลที่สามใหม่ (โอกาสลูกค้าซัพพลายเออร์)
 CreateDolibarrThirdPartySupplier=สร้างบุคคลที่สาม (ซัพพลายเออร์)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=พื้นที่ prospection
 IdThirdParty=Id ของบุคคลที่สาม
 IdCompany=Id บริษัท
@@ -38,7 +40,7 @@ ThirdPartySuppliers=ซัพพลายเออร์
 ThirdPartyType=ประเภทของบุคคลที่สาม
 Company/Fundation=บริษัท / มูลนิธิ
 Individual=เอกชน
-ToCreateContactWithSameName=โดยอัตโนมัติจะสร้างการติดต่อทางกายภาพที่มีข้อมูลเดียวกัน
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=บริษัท แม่
 Subsidiaries=บริษัท ย่อย
 ReportByCustomers=รายงานจากลูกค้า
@@ -47,7 +49,7 @@ CivilityCode=รหัสสุภาพ
 RegisteredOffice=สำนักงานที่สมัครสมาชิก
 Lastname=นามสกุล
 Firstname=ชื่อแรก
-PostOrFunction=โพสต์ / ฟังก์ชั่น
+PostOrFunction=Job position
 UserTitle=ชื่อเรื่อง
 Address=ที่อยู่
 State=รัฐ / จังหวัด
@@ -64,7 +66,7 @@ Chat=พูดคุย
 PhonePro=โทรศัพท์ศ.
 PhonePerso=Pers โทรศัพท์
 PhoneMobile=มือถือ
-No_Email=อย่าส่งจดหมายอิเล็กทรอนิกส์มวล
+No_Email=Refuse mass e-mailings
 Fax=แฟกซ์
 Zip=รหัสไปรษณีย์
 Town=เมือง
@@ -73,7 +75,7 @@ Poste= ตำแหน่ง
 DefaultLang=ภาษาโดยปริยาย
 VATIsUsed=ภาษีมูลค่าเพิ่มถูกนำมาใช้
 VATIsNotUsed=ภาษีมูลค่าเพิ่มที่ไม่ได้ใช้
-CopyAddressFromSoc=กรอกที่อยู่ที่อยู่ thirdparty
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=ภาษีมูลค่าเพิ่มจำนวน
 VATIntraShort=ภาษีมูลค่าเพิ่มจำนวน
 VATIntraSyntaxIsValid=ไวยากรณ์ที่ถูกต้อง
-VATIntraValueIsValid=ค่าที่ถูกต้อง
 ProspectCustomer=Prospect / ลูกค้า
 Prospect=โอกาส
 CustomerCard=บัตรของลูกค้า
@@ -261,7 +262,9 @@ AddContactAddress=สร้างการติดต่อ / ที่อย
 EditContact=ติดต่อแก้ไข
 EditContactAddress=ติดต่อแก้ไข / ที่อยู่
 Contact=ติดต่อ
+ContactId=Contact id
 ContactsAddresses=รายชื่อ / ที่อยู่
+FromContactName=Name:
 NoContactDefinedForThirdParty=ติดต่อไม่มีกำหนดไว้สำหรับบุคคลที่สามนี้
 NoContactDefined=ติดต่อไม่มีกำหนด
 DefaultContact=ติดต่อเริ่มต้น / ที่อยู่
@@ -284,7 +287,7 @@ CompanyDeleted=บริษัท "% s" ลบออกจากฐานข้
 ListOfContacts=รายชื่อผู้ติดต่อ / ที่อยู่
 ListOfContactsAddresses=รายชื่อผู้ติดต่อ / adresses
 ListOfThirdParties=รายชื่อของบุคคลที่สาม
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=แสดงรายชื่อผู้ติดต่อ
 ContactsAllShort=ทั้งหมด (ไม่กรอง)
 ContactType=ประเภทติดต่อ
@@ -294,6 +297,7 @@ ContactForProposals=ติดต่อข้อเสนอของ
 ContactForContracts=ติดต่อสัญญา
 ContactForInvoices=การติดต่อของใบแจ้งหนี้
 NoContactForAnyOrder=การติดต่อที่ไม่สามารถติดต่อสำหรับการสั่งซื้อใด ๆ
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=ติดต่อนี้ไม่ได้ติดต่อสำหรับข้อเสนอการค้าใด ๆ
 NoContactForAnyContract=การติดต่อที่ไม่สามารถติดต่อสำหรับการทำสัญญาใด ๆ
 NoContactForAnyInvoice=ติดต่อนี้ไม่ได้ติดต่อสำหรับใบแจ้งหนี้ใด ๆ
@@ -352,9 +356,9 @@ ExportCardToFormat=การ์ดส่งออกไปยังรูปแ
 ContactNotLinkedToCompany=ติดต่อไม่ได้เชื่อมโยงกับบุคคลที่สาม
 DolibarrLogin=เข้าสู่ระบบ Dolibarr
 NoDolibarrAccess=ไม่สามารถเข้าถึง Dolibarr
-ExportDataset_company_1=บุคคลที่สาม (บริษัท / มูลนิธิ / คนทางกายภาพ) และคุณสมบัติ
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=รายชื่อและคุณสมบัติ
-ImportDataset_company_1=บุคคลที่สาม (บริษัท / มูลนิธิ / คนทางกายภาพ) และคุณสมบัติ
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=รายชื่อ / ที่อยู่ (จาก thirdparties หรือไม่) และคุณลักษณะ
 ImportDataset_company_3=ธนาคารรายละเอียด
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties ได้รับการรวม
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index d852cff8809..59354934e19 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=ภาษีทางสังคมหรือทางก
 SocialContributions=ภาษีทางสังคมหรือทางการคลัง
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=ค่าใช้จ่ายพิเศษ
 MenuTaxAndDividends=ภาษีและเงินปันผล
 MenuSocialContributions=สังคม / ภาษีการคลัง
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 752ec742b70..b59b5ddfb2d 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = ลบงานที่กำหนด
 Permission23104 = การดำเนินงานที่กำหนด
 # Admin
 CronSetup= กำหนดเวลาการตั้งค่าการจัดการงาน
-URLToLaunchCronJobs=URL ที่จะตรวจสอบและเปิดงาน cron ถ้าจำเป็น
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=หรือเพื่อตรวจสอบและการเปิดตัวงานที่เฉพาะเจาะจง
 KeyForCronAccess=กุญแจสำคัญในการรักษาความปลอดภัยสำหรับ URL ที่จะเปิดตัวงาน cron
 FileToLaunchCronJobs=บรรทัดคำสั่งที่จะเปิดตัวงาน cron
@@ -23,7 +23,7 @@ CronCommand=คำสั่ง
 CronList=งานที่กำหนดเวลาไว้
 CronDelete=ลบงานที่กำหนดไว้
 CronConfirmDelete=คุณแน่ใจหรือว่าต้องการลบงานที่กำหนดไว้เหล่านี้หรือไม่
-CronExecute=งานเปิดตัวที่กำหนดไว้
+CronExecute=Launch scheduled job
 CronConfirmExecute=คุณแน่ใจหรือว่าต้องการที่จะดำเนินงานที่กำหนดไว้เหล่านี้ตอนนี้หรือไม่
 CronInfo=โมดูลงานตามกำหนดการอนุญาตให้มีการดำเนินงานที่ได้รับการวางแผน
 CronTask=งาน
@@ -39,7 +39,7 @@ CronMethod=วิธี
 CronModule=โมดูล
 CronNoJobs=ไม่มีงานที่ลงทะเบียน
 CronPriority=ลำดับความสำคัญ
-CronLabel=ลักษณะ
+CronLabel=Label
 CronNbRun=nb ยิง
 CronMaxRun=Max nb. launch
 CronEach=ทุกๆ
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 91b53d1ac14..ade73c737e3 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=ข้อผิดพลาด, PHP <b>ของคุณต
 ErrorOpenIDSetupNotComplete=คุณติดตั้ง Dolibarr ไฟล์ config ที่จะช่วยให้การตรวจสอบ OpenID แต่ URL ของ OpenID บริการไม่ได้ถูกกำหนดลงไปใน s% คงที่
 ErrorWarehouseMustDiffers=แหล่งที่มาและคลังสินค้าเป้าหมายต้องแตกต่าง
 ErrorBadFormat=รูปแบบที่ไม่ดี!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=ข้อผิดพลาดของสมาชิกนี้ไม่ได้เชื่อมโยงยัง thirdparty ใด ๆ สมาชิกเชื่อมโยงไปยังบุคคลที่สามที่มีอยู่หรือสร้าง thirdparty ใหม่ก่อนที่จะสร้างการสมัครสมาชิกกับใบแจ้งหนี้
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=ข้อผิดพลาดที่มีการส่งมอบบางอย่างที่เชื่อมโยงกับการจัดส่งนี้ ลบปฏิเสธ
 ErrorCantDeletePaymentReconciliated=ไม่สามารถลบการชำระเงินที่ได้สร้างการทำธุรกรรมของธนาคารที่ได้รับการ conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=ไม่สามารถลบการชำระเงินที่ใช้ร่วมกันอย่างน้อยหนึ่งใบแจ้งหนี้ที่มีสถานะ payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index db378b7a2e7..eb4ba59db1e 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP นี้สนับสนุนการประชุ
 PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
 PHPSupportPOSTGETKo=มันเป็นไปได้ที่การตั้งค่า PHP ของคุณไม่สนับสนุนตัวแปร POST และ / หรือได้รับ ตรวจสอบ <b>variables_order</b> พารามิเตอร์ใน php.ini
 PHPSupportGD=การสนับสนุนนี้ PHP GD ฟังก์ชั่นกราฟิก
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=นี้สนับสนุน PHP ฟังก์ชั่ UTF8
 PHPMemoryOK=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง%</b> s นี้ควรจะเพียงพอ
 PHPMemoryTooLow=หน่วยความจำสูงสุด PHP <b>เซสชั่นของคุณตั้ง% s</b> ไบต์ นี้ควรจะต่ำเกินไป เปลี่ยน <b>php.ini</b> ของคุณเพื่อตั้งค่าพารามิเตอร์ <b>memory_limit อย่างน้อย% s</b> ไบต์
 Recheck=คลิกที่นี่เพื่อทดสอบเพิ่มเติม significative
 ErrorPHPDoesNotSupportSessions=การติดตั้ง PHP ของคุณไม่สนับสนุนการประชุม คุณลักษณะนี้เป็นสิ่งจำเป็นที่จะทำให้การทำงาน Dolibarr ตรวจสอบการติดตั้ง PHP ของคุณ
 ErrorPHPDoesNotSupportGD=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่นกราฟิก GD กราฟจะไม่สามารถใช้ได้
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่น UTF8 Dolibarr ไม่สามารถทำงานได้อย่างถูกต้อง แก้ปัญหานี้ก่อนการติดตั้ง Dolibarr
 ErrorDirDoesNotExists=สารบบ% s ไม่ได้อยู่
 ErrorGoBackAndCorrectParameters=ย้อนกลับไปและแก้ไขพารามิเตอร์ที่ไม่ถูกต้อง
@@ -133,6 +135,10 @@ ActivateModule=เปิดใช้งานโมดูล% s
 ShowEditTechnicalParameters=คลิกที่นี่เพื่อแสดง / แก้ไขพารามิเตอร์ขั้นสูง (โหมดผู้เชี่ยวชาญ)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=รุ่นฐานข้อมูลของคุณ% s แต่ก็มีข้อผิดพลาดที่สำคัญทำให้การสูญเสียข้อมูลถ้าคุณทำการเปลี่ยนแปลงโครงสร้างฐานข้อมูลของคุณเหมือนว่ามันจะถูกต้องตามกระบวนการโยกย้าย ด้วยเหตุผลของการย้ายถิ่นจะไม่ได้รับอนุญาตจนกว่าคุณจะอัพเกรดฐานข้อมูลของคุณไปเป็นรุ่นที่คงที่ที่สูงขึ้น (รายชื่อที่รู้จักกันร้องรุ่น:% s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=ปรับปรุงข้อมูลเกี
 MigrationPaymentMode=การโยกย้ายข้อมูลสำหรับโหมดการชำระเงิน
 MigrationCategorieAssociation=การย้ายถิ่นของประเภท
 MigrationEvents=การย้ายถิ่นของเหตุการณ์ที่จะเพิ่มเจ้าของเหตุการณ์ลงในตาราง assignement
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=แสดงตัวเลือกที่มีอยู่ไม่ได้
 HideNotAvailableOptions=ซ่อนตัวเลือกที่มีอยู่ไม่ได้
diff --git a/htdocs/langs/th_TH/interventions.lang b/htdocs/langs/th_TH/interventions.lang
index 912c5ca68db..0c0a5427279 100644
--- a/htdocs/langs/th_TH/interventions.lang
+++ b/htdocs/langs/th_TH/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=ติดตามการติดต
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=การแทรกแซงที่เกิดจากคำสั่งซื้อ
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/th_TH/ldap.lang b/htdocs/langs/th_TH/ldap.lang
index 9cca806133c..51a4fb78249 100644
--- a/htdocs/langs/th_TH/ldap.lang
+++ b/htdocs/langs/th_TH/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=วันที่สมัครสมาชิ
 LDAPFieldFirstSubscriptionAmount=จำนวนการสมัครสมาชิกครั้งแรก
 LDAPFieldLastSubscriptionDate=วันที่สมัครสมาชิกล่าสุด
 LDAPFieldLastSubscriptionAmount=จำนวนการสมัครสมาชิกล่าสุด
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=ผู้ใช้ตรงกัน
 GroupSynchronized=กลุ่มตรงกัน
 MemberSynchronized=สมาชิกตรงกัน
diff --git a/htdocs/langs/th_TH/mails.lang b/htdocs/langs/th_TH/mails.lang
index 518eb78c123..313879f4025 100644
--- a/htdocs/langs/th_TH/mails.lang
+++ b/htdocs/langs/th_TH/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=อ่าน
 YourMailUnsubcribeOK=<b>อีเมล% s</b> ถูกต้อง unsubcribe จากรายการทางไปรษณีย์
 ActivateCheckReadKey=ที่สำคัญที่ใช้ในการเข้ารหัส URL ที่ใช้ในการ "อ่านใบเสร็จรับเงิน" และ "Unsubcribe" คุณสมบัติ
 EMailSentToNRecipients=อีเมลที่ส่งไปยังผู้รับ% s
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>ผู้รับ% s</b> เพิ่มเข้าไปในรายชื่อเป้าหมาย
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index aa3596e1d19..ea0a42ae35b 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -67,6 +67,7 @@ SelectDate=เลือกวันที่
 SeeAlso=ดูยัง% s
 SeeHere=ดูที่นี่
 BackgroundColorByDefault=สีพื้นหลังเริ่มต้น
+FileRenamed=The file was successfully renamed
 FileUploaded=ไฟล์อัพโหลดประสบความสำเร็จ
 FileWasNotUploaded=ไฟล์ที่ถูกเลือกสำหรับสิ่งที่แนบมา แต่ยังไม่ได้อัปโหลดยัง คลิกที่ "แนบไฟล์" สำหรับเรื่องนี้
 NbOfEntries=nb ของรายการ
@@ -245,6 +246,10 @@ DateBuild=รายงานวันที่สร้าง
 DatePayment=วันที่ชำระเงิน
 DateApprove=วันที่อนุมัติ
 DateApprove2=วันที่อนุมัติ (ที่สองได้รับการอนุมัติ)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=ปี
 DurationMonth=เดือน
 DurationWeek=สัปดาห์
@@ -256,6 +261,7 @@ DurationDays=วัน
 Year=ปี
 Month=เดือน
 Week=สัปดาห์
+WeekShort=Week
 Day=วัน
 Hour=ชั่วโมง
 Minute=นาที
@@ -278,6 +284,7 @@ MonthOfDay=เดือนของวัน
 HourShort=H
 MinuteShort=ล้าน
 Rate=ประเมิน
+CurrencyRate=Currency conversion rate
 UseLocalTax=รวมภาษี
 Bytes=ไบต์
 KiloBytes=กิโลไบต์
@@ -565,8 +572,11 @@ BackToList=กลับไปยังรายการ
 GoBack=กลับไป
 CanBeModifiedIfOk=สามารถแก้ไขได้ถ้าถูกต้อง
 CanBeModifiedIfKo=สามารถแก้ไขได้ถ้าไม่ถูกต้อง
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=บันทึกแก้ไขเรียบร้อย
 RecordsModified=% s บันทึกการแก้ไข
+RecordsDeleted=%s records deleted
 AutomaticCode=รหัสอัตโนมัติ
 FeatureDisabled=ปิดใช้งานคุณลักษณะ
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=คุณไม่ได้รับอนุญาตส
 SessionName=ชื่อเซสชั่น
 Method=วิธี
 Receive=ได้รับ
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=เป็นบางส่วน
 TotalWoman=ทั้งหมด
 NeverReceived=ไม่เคยได้รับ
@@ -598,6 +609,7 @@ DisabledModules=โมดูลพิการ
 For=สำหรับ
 ForCustomer=สำหรับลูกค้า
 Signature=ลายเซ็น
+DateOfSignature=Date of signature
 HidePassword=แสดงคำสั่งที่มีรหัสผ่านที่ซ่อน
 UnHidePassword=แสดงคำสั่งที่แท้จริงด้วยรหัสผ่านที่ชัดเจน
 Root=ราก
@@ -641,6 +653,15 @@ NewAttribute=คุณลักษณะใหม่
 AttributeCode=รหัสแอตทริบิวต์
 URLPhoto=URL ของภาพ / โลโก้
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=สร้างร่าง
 SetToDraft=กลับไปร่าง
 ClickToEdit=คลิกเพื่อแก้ไข
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=วันจันทร์
 Tuesday=วันอังคาร
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index 79fbb620561..01fd23e2d10 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=อัตราจะต้องเป็นค่าตั
 markRateShouldBeLesserThan100=อัตรามาร์คควรจะต่ำกว่า 100
 ShowMarginInfos=แสดงขอบข่าวสาร
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/th_TH/oauth.lang b/htdocs/langs/th_TH/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/th_TH/oauth.lang
+++ b/htdocs/langs/th_TH/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 170da7acc9c..b9ae3b23a61 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=คำสั่งของคุณได้ถูกสร้า
 OrderFail=ข้อผิดพลาดที่เกิดขึ้นในระหว่างการสร้างคำสั่งของคุณ
 CreateOrders=สร้างคำสั่งซื้อ
 ToBillSeveralOrderSelectCustomer=การสร้างใบแจ้งหนี้สำหรับการสั่งซื้อหลายคลิกแรกบนลูกค้าแล้วเลือก "% s"
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/th_TH/printing.lang b/htdocs/langs/th_TH/printing.lang
index 6c623d7d1e3..468dc4869bf 100644
--- a/htdocs/langs/th_TH/printing.lang
+++ b/htdocs/langs/th_TH/printing.lang
@@ -18,10 +18,6 @@ UserConf=การติดตั้งต่อผู้ใช้
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=ไดรเวอร์นี้อนุญาตให้มีการส่งเอกสารโดยตรงไปยังเครื่องพิมพ์กับ Google Cloud Print ได้
 GCP_Name=ชื่อ
 GCP_displayName=ชื่อที่ใช้แสดง
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index d90db439d47..41507131048 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -8,8 +8,8 @@ Batch=จัดสรร / อนุกรม
 atleast1batchfield=กินตามวันที่หรือขายโดยวันที่หรือ Lot / หมายเลข Serial
 batch_number=Lot / หมายเลข Serial
 BatchNumberShort=จัดสรร / อนุกรม
-l_eatby=กินตามวันที่
-l_sellby=ขายตามวันที่
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=จัดสรร / รายละเอียดอนุกรม
 DetailBatchFormat=จัดสรร / อนุกรม:% s - กินโดย:% s - ขายโดย:% s (จำนวน:% d)
 printBatch=จัดสรร / อนุกรม:% s
@@ -19,3 +19,6 @@ printQty=จำนวน:% d
 AddDispatchBatchLine=เพิ่มบรรทัดสำหรับอายุการเก็บรักษาการฝึกอบรม
 WhenProductBatchModuleOnOptionAreForced=เมื่อโมดูลจัดสรร / อนุกรมอยู่บนเพิ่มขึ้น / ลดโหมดหุ้นถูกบังคับให้ต้องเลือกสุดท้ายและไม่สามารถแก้ไขได้ ตัวเลือกอื่น ๆ สามารถกำหนดได้ตามที่คุณต้องการ
 ProductDoesNotUseBatchSerial=ผลิตภัณฑ์นี้ไม่ได้ใช้มาก / หมายเลขซีเรีย
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index c683cdc07ad..31aba7c777d 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=การเปลี่ยนแปลงภาษีม
 ProductVatMassChangeDesc=หน้านี้สามารถนำมาใช้ในการปรับเปลี่ยนอัตราภาษีมูลค่าเพิ่มที่กำหนดไว้เกี่ยวกับผลิตภัณฑ์หรือบริการจากมูลค่าให้กับอีกคนหนึ่ง คำเตือนการเปลี่ยนแปลงนี้จะทำในฐานข้อมูลทั้งหมด
 MassBarcodeInit=init บาร์โค้ดมวล
 MassBarcodeInitDesc=หน้านี้สามารถนำมาใช้ในการเริ่มต้นบาร์โค้ดบนวัตถุที่ไม่ได้มีการกำหนดบาร์โค้ด ก่อนที่จะตรวจสอบการตั้งค่าของบาร์โค้ดโมดูลที่เสร็จสมบูรณ์
-ProductAccountancyBuyCode=รหัสบัญชี (ซื้อ)
-ProductAccountancySellCode=รหัสบัญชี (ขาย)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=สินค้าหรือบริการ
 ProductsAndServices=สินค้าและบริการ
 ProductsOrServices=ผลิตภัณฑ์หรือบริการ
@@ -59,6 +59,8 @@ SellingPriceHT=ราคาขาย (สุทธิจากภาษี)
 SellingPriceTTC=ราคาขาย (รวมภาษี).
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=ราคาใหม่
 MinPrice=นาที ราคาขาย
 CantBeLessThanMinPrice=ราคาขายไม่สามารถจะต่ำกว่าขั้นต่ำที่ได้รับอนุญาตสำหรับสินค้านี้ (% s โดยไม่มีภาษี) ข้อความนี้ยังสามารถปรากฏขึ้นถ้าคุณพิมพ์ส่วนลดสำคัญมากเกินไป
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=พิมพ์สติกเกอร์หลาย
 BuildPageToPrint=สร้างหน้าในการพิมพ์
 FillBarCodeTypeAndValueManually=กรอกประเภทบาร์โค้ดและความคุ้มค่าด้วยตนเอง
 FillBarCodeTypeAndValueFromProduct=กรอกประเภทบาร์โค้ดและความคุ้มค่าจากบาร์โค้ดของผลิตภัณฑ์
-FillBarCodeTypeAndValueFromThirdParty=กรอกประเภทบาร์โค้ดและความคุ้มค่าจากบาร์โค้ดของ thirdparty
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=ความหมายของประเภทหรือมูลค่าของบาร์โค้ดไม่สมบูรณ์สำหรับผลิตภัณฑ์% s
-DefinitionOfBarCodeForThirdpartyNotComplete=ความหมายของประเภทหรือมูลค่าของบาร์โค้ดที่ไม่สมบูรณ์แบบสำหรับ thirdparty% s
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=ข้อมูลบาร์โค้ดของผลิตภัณฑ์% s:
-BarCodeDataForThirdparty=ข้อมูลบาร์โค้ดของ thirdparty% s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=กำหนดค่าบาร์โค้ดสำหรับระเบียนทั้งหมด (นี้ยังจะตั้งค่าบาร์โค้ดที่กำหนดไว้แล้วด้วยค่าใหม่)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 12dfb073b23..7cd8b4bc24c 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=รายชื่อของข้อเสนอในเชิงพาณิชย์ที่เกี่ยวข้องกับโครงการ
-ListOrdersAssociatedProject=รายชื่อของการสั่งซื้อของลูกค้าที่เกี่ยวข้องกับโครงการ
-ListInvoicesAssociatedProject=รายการของใบแจ้งหนี้ของลูกค้าที่เกี่ยวข้องกับโครงการ
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=รายชื่อของคำสั่งของซัพพลายเออร์ที่เกี่ยวข้องกับโครงการ
-ListSupplierInvoicesAssociatedProject=รายการของใบแจ้งหนี้ของซัพพลายเออร์ที่เกี่ยวข้องกับโครงการ
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=รายการของสัญญาที่เกี่ยวข้องกับโครงการ
 ListFichinterAssociatedProject=รายชื่อของการแทรกแซงที่เกี่ยวข้องกับโครงการ
 ListExpenseReportsAssociatedProject=รายชื่อของรายงานค่าใช้จ่ายที่เกี่ยวข้องกับการโครงการ
@@ -123,6 +123,7 @@ ProjectReportDate=เปลี่ยนวันงานโครงการ
 ErrorShiftTaskDate=เป็นไปไม่ได้ที่จะเปลี่ยนวันงานตามโครงการใหม่วันที่เริ่มต้น
 ProjectsAndTasksLines=โครงการและงาน
 ProjectCreatedInDolibarr=โครงการสร้าง% s
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=งาน% s สร้าง
 TaskModifiedInDolibarr=งาน% s การแก้ไข
 TaskDeletedInDolibarr=งาน% s ลบ
@@ -153,7 +154,7 @@ PlannedWorkload=ภาระงานที่วางแผนไว้
 PlannedWorkloadShort=จำนวนงาน
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=โครงการจะต้องผ่านการตรวจสอบครั้งแรก
-FirstAddRessourceToAllocateTime=เชื่อมโยงทรัพยากรที่จัดสรรเวลา
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=การป้อนข้อมูลต่อวัน
 InputPerWeek=การป้อนข้อมูลต่อสัปดาห์
 InputPerAction=การป้อนข้อมูลต่อการกระทำ
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=สถิติในโครงการ / โอกาสในการขาย
 TaskAssignedToEnterTime=งานที่ได้รับมอบหมาย เข้าครั้งในงานนี้จะเป็นไปได้
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index d6fc963ba6b..b42271e74a8 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=การชำระเงินเงินเดือนใ
 SalaryPayment=การชำระเงินเงินเดือน
 SalariesPayments=การชำระเงินเงินเดือน
 ShowSalaryPayment=แสดงการชำระเงินเงินเดือน
-THM=ราคาเฉลี่ยรายชั่วโมง
-TJM=ราคาเฉลี่ยรายวัน
+THM=Average hourly rate
+TJM=Average daily rate
 CurrentSalary=เงินเดือนปัจจุบัน
 THMDescription=ค่านี้อาจจะใช้ในการคำนวณค่าใช้จ่ายของเวลาที่ใช้ในโครงการที่ป้อนโดยผู้ใช้หากโครงการโมดูลถูกนำมาใช้
 TJMDescription=ค่านี้เป็นในปัจจุบันเป็นข้อมูลเท่านั้นและไม่ได้ใช้ในการคำนวณใด ๆ
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 22febf71d89..03af2b24a8b 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=ลบส่ง
 Stock=สต็อกสินค้า
 Stocks=หุ้น
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=การเคลื่อนไหว
 ErrorWarehouseRefRequired=ชื่ออ้างอิงคลังสินค้าจะต้อง
 ListOfWarehouses=รายชื่อของคลังสินค้า
@@ -43,6 +45,7 @@ PMPValue=ราคาเฉลี่ยถ่วงน้ำหนัก
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=ค่าโกดัง
 UserWarehouseAutoCreate=สร้างคลังสินค้าโดยอัตโนมัติเมื่อมีการสร้างผู้ใช้
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=สต็อกสินค้าและสต็อก subproduct เป็นอิสระ
 QtyDispatched=ปริมาณส่ง
 QtyDispatchedShort=จำนวนส่ง
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/th_TH/supplier_proposal.lang b/htdocs/langs/th_TH/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/th_TH/supplier_proposal.lang
+++ b/htdocs/langs/th_TH/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index 269a958293b..9ab252ed4dd 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -7,13 +7,13 @@ History=ประวัติศาสตร์
 ListOfSuppliers=รายชื่อของซัพพลายเออร์
 ShowSupplier=แสดงผู้จัดจำหน่าย
 OrderDate=วันที่สั่งซื้อ
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=บางผลิตภัณฑ์ย่อยได้ไม่มีราคาที่กำหนดไว้
-AddSupplierPrice=เพิ่มราคาผู้ผลิต
-ChangeSupplierPrice=การเปลี่ยนแปลงของราคาผู้ผลิต
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=ผู้จัดจำหน่ายอ้างอิงนี้จะเชื่อมโยงกับการอ้างอิง:% s
 NoRecordedSuppliers=ซัพพลายเออร์ที่ไม่มีการบันทึกไว้
 SupplierPayment=การชำระเงินผู้ผลิต
@@ -36,8 +36,8 @@ ListOfSupplierOrders=รายชื่อผู้จัดจำหน่า
 MenuOrdersSupplierToBill=คำสั่งผู้ผลิตใบแจ้งหนี้
 NbDaysToDelivery=ความล่าช้าในการจัดส่งสินค้าในวันที่
 DescNbDaysToDelivery=ที่ใหญ่ที่สุดของการส่งมอบล่าช้าของผลิตภัณฑ์ที่ได้จากคำสั่งนี้
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/th_TH/users.lang b/htdocs/langs/th_TH/users.lang
index 006232107e4..0ee4b6156e8 100644
--- a/htdocs/langs/th_TH/users.lang
+++ b/htdocs/langs/th_TH/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=สัปดาห์ชั่วโมง
 ColorUser=สีของผู้ใช้
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/th_TH/website.lang b/htdocs/langs/th_TH/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/th_TH/website.lang
+++ b/htdocs/langs/th_TH/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/th_TH/withdrawals.lang b/htdocs/langs/th_TH/withdrawals.lang
index c6d392e31ed..181ffe639e6 100644
--- a/htdocs/langs/th_TH/withdrawals.lang
+++ b/htdocs/langs/th_TH/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=ลูกค้าที่ยืนอยู่ในพื้นที่การสั่งซื้อ
-StandingOrders=ยืนคำสั่งซื้อ
-StandingOrder=ยืนคำสั่งซื้อ
-NewStandingOrder=เพื่อยืนใหม่
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=ในการประมวลผล
-WithdrawalsReceipts=ใบเสร็จรับเงินการถอนเงิน
-WithdrawalReceipt=ใบเสร็จรับเงินการถอนเงิน
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=การถอนเส้น
-RequestStandingOrderToTreat=ขอยืนคำสั่งในการประมวลผล
-RequestStandingOrderTreated=ขอยืนสั่งการประมวลผล
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=ยังไม่ได้เป็นไปได้ สถานะถอนจะต้องตั้งค่า 'เครดิต' ก่อนที่จะประกาศปฏิเสธสายที่เฉพาะเจาะจง
-NbOfInvoiceToWithdraw=nb ของใบแจ้งหนี้ถอนคำขอ
-NbOfInvoiceToWithdrawWithInfo=nb ของใบแจ้งหนี้ถอนคำขอสำหรับลูกค้าที่มีข้อมูลบัญชีธนาคารที่กำหนดไว้
-InvoiceWaitingWithdraw=ใบแจ้งหนี้รอให้ถอนตัว
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=จำนวนเงินที่จะถอนตัว
-WithdrawsRefused=ปฏิเสธที่จะถอนตัวออก
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=ไม่มีใบแจ้งหนี้ลูกค้าในโหมดการชำระเงิน "ถอนตัว" กำลังรอ ไปที่แท็บ 'ถอน' บนการ์ดใบแจ้งหนี้ที่จะทำให้การร้องขอ
 ResponsibleUser=ผู้ใช้ที่มีความรับผิดชอบ
-WithdrawalsSetup=การถอนการติดตั้ง
-WithdrawStatistics=ถอนสถิติ
-WithdrawRejectStatistics=ถอนสถิติปฏิเสธของ
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=จะขอถอนตัว
 ThirdPartyBankCode=รหัสธนาคารของบุคคลที่สาม
 NoInvoiceCouldBeWithdrawed=ใบแจ้งหนี้ไม่มี withdrawed กับความสำเร็จ ตรวจสอบใบแจ้งหนี้ที่อยู่ใน บริษัท ที่มีบ้านที่ถูกต้อง
@@ -46,7 +47,7 @@ StatusRefused=ปฏิเสธ
 StatusMotif0=ยังไม่ระบุ
 StatusMotif1=เงินไม่เพียงพอ
 StatusMotif2=ขอเข้าร่วมแข่งขัน
-StatusMotif3=ไม่มีการถอนคำสั่ง
+StatusMotif3=No direct debit payment order
 StatusMotif4=สั่งซื้อของลูกค้า
 StatusMotif5=RIB ใช้ไม่ได้
 StatusMotif6=บัญชีโดยไม่สมดุล
@@ -61,28 +62,43 @@ NotifyCredit=การถอนเครดิต
 NumeroNationalEmetter=จำนวนเครื่องส่งสัญญาณแห่งชาติ
 WithBankUsingRIB=สำหรับบัญชีเงินฝากธนาคารโดยใช้ RIB
 WithBankUsingBANBIC=สำหรับบัญชีเงินฝากธนาคารโดยใช้ IBAN / BIC / SWIFT
-BankToReceiveWithdraw=บัญชีธนาคารที่จะได้รับถอนตัว
+BankToReceiveWithdraw=Bank account to receive direct debit
 CreditDate=เกี่ยวกับบัตรเครดิต
 WithdrawalFileNotCapable=ไม่สามารถสร้างไฟล์ใบเสร็จรับเงินการถอนเงินสำหรับประเทศ% s ของคุณ (ประเทศของคุณไม่ได้รับการสนับสนุน)
 ShowWithdraw=แสดงถอน
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=แต่ถ้าใบแจ้งหนี้ที่มีอย่างน้อยหนึ่งการชำระเงินการถอนเงินยังไม่ได้ดำเนินการก็จะไม่ได้รับการกำหนดให้เป็นจ่ายเพื่อให้การจัดการถอนก่อน
-DoStandingOrdersBeforePayments=แท็บนี้จะช่วยให้คุณสามารถที่จะขอคำสั่งยืน เมื่อเสร็จแล้วให้ไปที่เมนู Bank-> การถอนตัวในการจัดการคำสั่งยืน เมื่อยืนอยู่เพื่อที่จะปิดการชำระเงินในใบแจ้งหนี้จะถูกบันทึกไว้โดยอัตโนมัติและใบแจ้งหนี้ที่เหลือถ้าปิดจะจ่ายเป็นโมฆะ
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=ตั้งสถานะ "แฟ้มส่ง"
 ThisWillAlsoAddPaymentOnInvoice=นอกจากนี้ยังจะใช้การชำระเงินให้กับใบแจ้งหนี้และจะจัดให้เป็น "การชำระเงิน"
 StatisticsByLineStatus=สถิติตามสถานะของสาย
-RUM=รัม
-RUMWillBeGenerated=จำนวนรัมจะถูกสร้างขึ้นครั้งเดียวข้อมูลบัญชีธนาคารจะถูกบันทึกไว้
-WithdrawMode=ถอนโหมด (frst หรือเกิดขึ้นอีก)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=จำนวนเงินที่ถอนคำขอ:
 WithdrawRequestErrorNilAmount=ไม่สามารถสร้างถอนการร้องขอสำหรับจำนวนเงินที่ศูนย์
+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
 
 ### Notifications
-InfoCreditSubject=การชำระเงินเพื่อการยืน% s โดยธนาคาร
-InfoCreditMessage=เพื่อยืน% s ได้รับการชำระเงินจากธนาคาร <br> ข้อมูลการชำระเงิน:% s
-InfoTransSubject=การส่งคำสั่งยืน% s ไปที่ธนาคาร
-InfoTransMessage=เพื่อยืน% s ได้ถูกส่งไปยังธนาคารโดย% s% s <br><br>
+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>
 InfoTransData=จำนวนเงิน:% s <br> วิธีการ:% s <br> วันที่:% s
-InfoRejectSubject=เพื่อยืนปฏิเสธ
-InfoRejectMessage=สวัสดี <br><br> เพื่อยืนใบแจ้งหนี้% s ที่เกี่ยวข้องกับ บริษัท % s ที่มีปริมาณของ% s ได้รับการปฏิเสธจากธนาคาร <br><br> - <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
 ModeWarning=ตัวเลือกสำหรับโหมดจริงไม่ได้ตั้งค่าเราหยุดหลังจากจำลองนี้
diff --git a/htdocs/langs/th_TH/workflow.lang b/htdocs/langs/th_TH/workflow.lang
index 9b3b7b73866..dafe5ef391d 100644
--- a/htdocs/langs/th_TH/workflow.lang
+++ b/htdocs/langs/th_TH/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=เวิร์กโฟลว์การติดตั้งโมดูล
 WorkflowDesc=โมดูลนี้ถูกออกแบบมาเพื่อปรับเปลี่ยนพฤติกรรมของการกระทำโดยอัตโนมัติลงในใบสมัคร โดยค่าเริ่มต้นขั้นตอนการทำงานจะเปิด (คุณสามารถทำสิ่งที่อยู่ในลำดับที่คุณต้องการ) คุณสามารถเปิดใช้การกระทำโดยอัตโนมัติคุณมีความสนใจใน
 ThereIsNoWorkflowToModify=ไม่มีการปรับเปลี่ยนขั้นตอนการทำงานที่มีอยู่กับโมดูลเปิดใช้งานคือ
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=จำแนกข้อเสนอแหล่งที่มาเชื่อมโยงกับการเรียกเก็บเงินเมื่อสั่งซื้อของลูกค้ามีการตั้งค่าที่จะจ่ายเงิน
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=จำแนกแหล่งที่มาสั่งซื้อของลูกค้าที่เชื่อมโยง (s) เพื่อเรียกเก็บเงินเมื่อใบแจ้งหนี้ลูกค้าถูกตั้งค่าให้จ่าย
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=จำแนกแหล่งที่มาสั่งซื้อของลูกค้าที่เชื่อมโยง (s) เพื่อเรียกเก็บเงินเมื่อใบแจ้งหนี้ของลูกค้าจะถูกตรวจสอบ
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index 7b4f383ac25..8c3e4c636a1 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Günlükler
 JournalFinancial=Mali günlükler
 BackToChartofaccounts=Hesap planı cirosu
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Hesap planı seç
 Addanaccount=Muhasebe hesabı ekle
 AccountAccounting=Muhasebe hesabı
 AccountAccountingShort=Hesap
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Analiz
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Muhasebe
-CustomersVentilation=Müşteri analizi
-SuppliersVentilation=Tedarikçi analizi
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Raporlar
 NewAccount=Yeni muhasebe hesabı
 Create=Oluştur
-CreateMvts=Hareket oluştur
-UpdateMvts=Bir hareketin değiştirilmesi
-WriteBookKeeping=Büyük defter hesap kayıtları
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Büyük Defter
 AccountBalance=Hesap bakiyesi
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Analiz edilecek fatura kalemleri
-InvoiceLinesDone=Analiz edilen fatura kalemleri
-IntoAccount=Muhasebe hesapları analizi
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Analiz
+Ventilate=Bind
 
 Processing=İşleme
 EndProcessing=İşleme sonu
-AnyLineVentilate=Analiz edilecek herhangi bir satır
+AnyLineVentilate=Any lines to bind
 SelectedLines=Seçilen satırlar
 Lineofinvoice=Fatura satırı
-VentilatedinAccount=Muhasebe hesabında başarıyla analiz edildi
-NotVentilatedinAccount=Muhasebe hesabında analiz edilmedi.
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Analiz syfasında gösterilecek öğe sayısı (önerilen ençok:50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Analiz sayfalarında "Analiz edileceklerin" sıralandırılmasını en son öğelerden göre başlatın
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Analiz sayfalarında "Analiz edilmişlerin" sıralandırılmasını en son öğelerden göre başlatın
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Listelemede ürün & hizmet tanımlaması için yer uzunluğu (En iyi = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Listelemede ürün & hizmet hesap tanımlama formu için yer uzunluğu (En iyi = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Genel hesapların uzunluğu
-ACCOUNTING_LENGTH_AACCOUNT=Üçüncü parti hesaplarının uzunluğu
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Bir muhasebe hesabı sonunda sıfır kullanın. Bazı ülkelerde gerelidir. Varsayılan olarak engelleyin.  "Hesapların uzunluğu" işlevinde dikkatli olun.
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Satış günlüğü
 ACCOUNTING_PURCHASE_JOURNAL=Alış günlüğü
@@ -81,32 +102,31 @@ Sens=Sens (borsa haberleri yayınlama günlüğü)
 Codejournal=Günlük
 NumPiece=Parça sayısı
 AccountingCategory=Muhasebe kategorisi
-
 NotMatch=Ayarlanmamış
-
 DeleteMvt=Büyük defter satırı sil
 DelYear=Silinecek yıl
 DelJournal=Silinecek günlük
-ConfirmDeleteMvt=Bu, büyük defterde yıl için ve/veya belirli bir günlükten tüm satırları siecektir.
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Büyük defter kayıtlarını sil
-
 DescSellsJournal=Satış günlüğü
 DescPurchasesJournal=Alış günlüğü
 FinanceJournal=Finance journal
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Müşteri faturası ödemesi
-
 ThirdPartyAccount=Üçüncü taraf hesabı
-
-NewAccountingMvt=Yeni hareket
-NumMvts=Hareket sayısı
-ListeMvts=Hareket listesi
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz
 
-ReportThirdParty=Üçüncü taraf hesabını listele
-DescThirdPartyReport=Burada üçüncü taraf müşterileri ve tedarikçileri ile onların muhasebe hesaplarının listesine bakın
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Muhasebe hesapları listesi
 
@@ -114,22 +134,29 @@ Pcgtype=Hesap sınıfı
 Pcgsubtype=Hesap sınıfı altında
 Accountparent=Hesabın kökü
 
-DescVentilCustomer=Müşteri faturalarınızın yıllık hesap analizi için buraya danışın
 TotalVente=Vergi öncesi toplam gelir
 TotalMarge=Toplam satışlar kar oranı
-DescVentilDoneCustomer=Burada müşteri faturaları satırlarına ve onların muhasebe hesaplarının listesine bakın.
-DescVentilTodoCustomer=Bir muhasebe hesabıyla müşteri faturanızın kalemlerini analiz edin
-ChangeAccount=Muhasebe hesabını, hesap tarafından seçilen satırlar için değiştirin:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Tedarikçi faturalarınızın yıllık hesap analizi için buraya danışın
-DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Otomatikman doğrula
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
 MvtNotCorrectlyBalanced=Hareket doğru denkleştirilmemiş. Alacak = %s. Borç = %s
-FicheVentilation=Analiz kartı
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=İşlemler büyük deftere yazılır
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Toplu kategori uygula
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Cogilog'a dışaaktar
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Muhasebe başlangıcı
-InitAccountancyDesc=Bu sayfa, satışlar ve satınalmalar için muhasebe hesabı tanımlanmamış ürünler ve hizmetlere muhasebe hesabı başlatmak üzere kullanılabilir.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Seçenekler
 OptionModeProductSell=Satış modu
 OptionModeProductBuy=Satınalma modu
 OptionModeProductSellDesc=Satışlar için muhasebe hesabı tanımlanmamış tüm ürünleri göster.
 OptionModeProductBuyDesc=Satınalmalar için muhasebe hesabı tanımlanmamış tüm ürünleri göster.
+CleanFixHistory=Hesap planında bulunmayan muhasebe kodlarını satırlardan kaldırın
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Muhasebe hesabı aralığı
@@ -167,3 +196,9 @@ Formula=Formül
 ErrorNoAccountingCategoryForThisCountry=Bu ülke için mevcut muhasebe kategorisi yok
 ExportNotSupported=Ayarlanan dışaaktarım biçimi bu sayfada desteklenmiyor
 BookeppingLineAlreayExists=Satırlar zaten muhasebede bulunmaktadır
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 13b648f434a..d1ddbfe4425 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Deneysel
 VersionDevelopment=Geliştirme
 VersionUnknown=Bilinmeyen
 VersionRecommanded=Önerilen
-FileCheck=Dosya Bütünlüğü
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Eksik dosyalar
 FilesUpdated=Güncellenmiş Dosyalar
-FileCheckDolibarr=Dolibarr Dosya Bütünlüğünü Denetle
-XmlNotFound=Dolibarr Bütünlüğü Xml Dosyası Bulınamadı
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Oturum Kimliği
 SessionSaveHandler=Oturum kayıt yürütücüsü
 SessionSavePath=Kayıt oturumu konumlandırma
@@ -38,9 +43,9 @@ ExternalUsers=Dış kullanıcılar
 GUISetup=Ekran
 SetupArea=Ayarlar alanı
 FormToTestFileUploadForm=Dosya yükleme deneme formu (ayarlara göre)
-IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinse evet etkilidir.
-RemoveLock=Bu dosyayı <b>%s</b> eğer güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
-RestoreLock=Bu dosyayı <b>%s</b> eğer güncelleme aracının her hangi bir kullanımını engellemek için, yalnızca okuma izniyle değiştirin.
+IfModuleEnabled=Not: yalnızca <b>%s</b> modülü etkinleştirildiğinde evet etkilidir.
+RemoveLock=<b>%s</b> dosyasını, eğer güncelleme aracının kullanımına izin vermek için belirmişse kaldırın.
+RestoreLock=<b>%s</b> dosyasını, yalnızca okuma izniyle, güncelleme aracının kullanımını engellemek için sıfırlayın.
 SecuritySetup=Güvenlik ayarları
 SecurityFilesDesc=Burada dosya yükleme konusunda güvenlikle ilgili seçenekleri tanımlayın.
 ErrorModuleRequirePHPVersion=Hata, bu modül %s veya daha yüksek PHP sürümü gerektirir.
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Hata, <b>%s</b> den daha yüksek doğruluk de
 DictionarySetup=Sözlük ayarları
 Dictionary=Sözlükler
 Chartofaccounts=Hesap planı
-Fiscalyear=Mali yıllar
+Fiscalyear=Mali yıl
 ErrorReservedTypeSystemSystemAuto='system' ve 'systemauto' değerleri tür için ayrılmıştır. 'kullanıcı'yı kendi kayıtlarınıza eklemek için değer olarak kullanabilirsiniz
 ErrorCodeCantContainZero=Kod 0 değerini içeremez
 DisableJavascript=Javascript ve Ajax fonksiyonlarını engelle (Görme engelli kişiler ve metin tarayıcılar için önerilir)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Üçüncü taraf içeriği açılır listesini y
 DelaiedFullListToSelectContact=Açılır liste içeriğini yüklemek için bir düğmeye basmadan önce bekleyin (Çok sayıda üçüncü parti varsa, beklemek performansı arttıracaktır)
 NumberOfKeyToSearch=Aramayı başlatacak karakter sayısı: %s
 NotAvailableWhenAjaxDisabled=Ajax devre dışı olduğunda kullanılamaz
-AllowToSelectProjectFromOtherCompany=Bir üçüncü taraf belgesinde, başka bir üçüncü tarafa bağlantılı bir proje seçilebilir
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript devre dışı
 UsePreviewTabs=Önizleme sekmesi kullan
 ShowPreview=Önizleme göster
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=İkili veriyi onaltılık olarak kodla
 IgnoreDuplicateRecords=Çifte kayıt hatalarını gözardı et (GÖZARDI ET EKLE)
 AutoDetectLang=Otoalgıla (tarayıcı dili)
 FeatureDisabledInDemo=Özellik demoda devre dışıdır
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=İzinler
 BoxesDesc=Ekran etiketleri, sayfaları kişiselleştirmek için ekleyeceğiniz bazı bilgiler gösteren ekran araçlarıdır. Bu ekran etiketlerini gösterip göstermemeyi seçebilirsiniz ya da hedef sayfayı seçip 'Etkinleştir'e tıklayabilir ya da engellemek için çöp kutusuna tıklayabilirsiniz.
 OnlyActiveElementsAreShown=Yalnızca <ahref="modules.php">etkinleştirilmiş modüllerin</a> öğeleri gösterilmiştir.
-ModulesDesc=Dolibarr modülleri, yazılımda hangi özelliğin devreye alınacağını tanımlar. Modül devreye alındıktan sonra kullanıcıya bazı izinler vermeniz gerekir. Bir modülü/özelliği devreye almak için “Durum” sütunundaki aç/kapa düğmesinde aça tıklayın.
+ModulesDesc=Dolibarr modülleri, yazılımda hangi özelliğin devreye alınacağını tanımlar. Modül devreye alındıktan sonra kullanıcıya bazı izinler vermeniz gerekir. Bir modülü/özelliği etkinleştirmek için aç/kapa düğmesini tıklayın.
 ModulesMarketPlaceDesc=Internette dış web sitelerinde indirmek için daha çok modül bulabilirsiniz...
 ModulesMarketPlaces=Daha çok modül...
 DoliStoreDesc=DoliStore, Dolibarr ERP/CRM dış modülleri için resmi pazar yeri
@@ -273,9 +279,10 @@ YouCanSubmitFile=Bu adımda paketi göndermek için kullanacağınız araç: Mod
 CurrentVersion=Dolibarr geçerli sürümü
 CallUpdatePage=Veritabanı yapısını ve verileri güncelleyen sayfaya git: %s.
 LastStableVersion=Son kararlı sürüm
+LastActivationDate=Son etkinleştirme tarihi
 UpdateServerOffline=Güncelleme sunucusu çevrimdışı
 GenericMaskCodes=Herhangi bir numaralandırma maskesi girebilirsiniz. Bu maskede alttaki etiketler kullanılabilir: <br><b>{000000}</ b> her %s te artırılacak bir numaraya karşılık gelir. Sayacın istenilen uzunluğu kadar çok sıfır girin. Sayaç, maskedeki kadar çok sayıda sıfır olacak şekilde soldan sıfırlarla tamamlanacaktır.<br><b>{000000+000}</b> önceki ile aynıdır fakat + işaretinin sağındaki sayıya denk gelen bir sapma ilk %s ten itibaren uygulanır.<br><b>{000000@x}</b> önceki ile aynıdır fakat sayaç x aya ulaşıldığında sıfırlanır (x= 1 ve 12 arasındadır veya yapılandırmada tanımlanan mali yılın ilk aylarını kullanmak için 0 dır). Bu seçenek kullanılırsa ve x= 2 veya daha yüksekse, {yyyy}{mm} veya {yyyy}{mm} dizisi de gereklidir.<br><b>{dd}</b> gün (01 ila 31).<br><b> {mm}</b> ay (01 ila 12).<br><b>{yy}</b>, <b>{yyyy}</b> veya <b>{y}</b> yıl 2, 4 veya 1 sayıları üzerindedir.<br>
-GenericMaskCodes2=<b>{cccc}</b> n Karakterdeki istemci kodu <br><b>{cccc000}</b> n Karakterdeki istemci kodu müşteri için özel bir sayaç tarafından takip edilmektedir. Müşteriye ayrılan bu sayaç, genel sayaçla aynı anda sıfırlanır.<br><b>{tttt}</b> n Karakterdeki üçüncü taraf türü kodu (bakınız sözlük-şirket türleri).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=Maskede diğer tüm karakterler olduğu gibi kalır.<br>Boşluklara izin verilmez.<br>
 GenericMaskCodes4a=<u>Üçüncü partinin 99 uncu %s örneği Firma 2007/01/31 de yapıldı:</u><br>
 GenericMaskCodes4b=<u>2007/03/01 tarihinde oluşturulan üçüncü parti örneği:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=URL güvenliği için parametreler
 SecurityTokenIsUnique=Her URL için benzersiz bir güvenlik anahtarı kullan
 EnterRefToBuildUrl=Nesen %s için hata referansı
 GetSecuredUrl=Hesaplanan URL al
-ButtonHideUnauthorized=Yetkisiz işlemler için düğmeleri engelli göstermek yerine gizleHide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Eski KDV oranı
 NewVATRates=Yeni KDV oranı
 PriceBaseTypeToChange=Buna göre tanımlanan temel referans değerli fiyatları değiştir
@@ -349,6 +356,7 @@ ExtrafieldMail = Eposta
 ExtrafieldSelect = Liste seç
 ExtrafieldSelectList = Tablodan seç
 ExtrafieldSeparator=Ayırıcı
+ExtrafieldPassword=Parola
 ExtrafieldCheckBox=Onay kutusu
 ExtrafieldRadio=Onay düğmesi
 ExtrafieldCheckBoxFromList= Tablodan açılır kutu
@@ -383,11 +391,14 @@ EnableFileCache=Dosya önbelliğini etkinleştir
 ShowDetailsInPDFPageFoot=PDF dosyalarının sayfa altlığına daha çok ayrıntı ekle, firma adresiniz, yönetici isimleri gibi (meslek numara bilgileri, sermaye Vergi numarasıyla tamamlayabilirsiniz).
 NoDetails=Sayfa altığında daha fazla bilgi yok
 DisplayCompanyInfo=Firma adresini göster
-DisplayCompanyInfoAndManagers=Firma ve yönetici isimlerini göster
+DisplayCompanyManagers=Yönetici isimlerini göster
+DisplayCompanyInfoAndManagers=Firma adresini ve yönetici isimlerini göster
 EnableAndSetupModuleCron=Eğer bu yinelenen faturanın otomatik olarak oluşturulmasını istiyorsanız, *%s* modülü etkinleştirilmeli ve doğru olarak ayarlanmış olmalı. Aksi durumda, faturaların oluşturulması *Oluştur* düğmesi ile bu şablondan elle yapılmalıdır. Otomatik oluşturmayı etkinleştirmiş olsanız bile yine elle oluşturmayı güvenli bir şekilde yapabilirsiniz. Aynı sırada kopya oluşturma mümkün olmaz.
 ModuleCompanyCodeAquarium=Oluşturulan bir muhasebe kodunu gir:<br>%s 'i muhasebe koduna ait bir üçüncü parti tedarikçi firma kodu izler, <br>%s 'i muhasebe koduna ait bir üçüncü parti müşteri kodu için izler .
 ModuleCompanyCodePanicum=Boş bir muhasebe kodu girin.
 ModuleCompanyCodeDigitaria=Muhasebe kodu üçüncü parti koduna bağlıdır. Kod üçüncü parti kodunun ilk 5 karakterini izleyen birinci konumda "C" karakterinden oluşmaktadır.
+Use3StepsApproval=Satınalma Siparişleri, varsayılan olarak 2 ayrı kullanıcı tarafından oluşturulmalı ve onaylanmalıdır (birinci adım/kullanıcı oluşturmak ve diğer adım/kullanıcı ise onaylamak içindir. Eğer bir kullanıcı her iki izine de sahipse bir adım/kullanıcı yeterli olacaktır). Bu seçenekle eğer tutar belirtilen değerden daha yüksekse onaylama için bir üçüncü adım/kullanıcı isteyebilirsiniz (böylece 3 adım gerekecektir: 1=doğrulama, 2=ilk onaylama, 3=eğer miktar yeterliyse ikinci onaylama).<br>Eğer bir onaylama (2 adımlı) gerekliyse bunu boş bırakın, eğer ikinci onay sürekli gerekiyorsa bunu çok düşük bir değere (0.1) ayarlayın.
+UseDoubleApproval=Tutar (vergi öncesi) bu tutardan yüksekse 3 aşamalı bir onaylama kullanın...
 
 # Modules
 Module0Name=Kullanıcılar & gruplar
@@ -428,8 +439,8 @@ Module55Name=Barkodlar
 Module55Desc=Barkod yönetimi
 Module56Name=Telefon
 Module56Desc=Telefon entegrasyonu
-Module57Name=Ödeme talimatları
-Module57Desc=Ödeme talimatları ve para çekme yönetimi. Aynı zamanda Avrupa ülkeleri için SEPA belgelerinin oluşturulmasını da içerir.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=TıklaAra
 Module58Desc=TıklaAra entegrasyonu
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Web Takvimi
 Module410Desc=WebT akvimi entegrasyonu
 Module500Name=Özel giderler
 Module500Desc=Özel giderlerin yönetimi (vergiler, sosyal ya da mali vergiler, kar payları)
-Module510Name=Ücretler
-Module510Desc=Çalışanların maaş ve ödeme yönetimi
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Borç
 Module520Desc=Borçların yönetimi
 Module600Name=Duyurlar
-Module600Desc=Kullanıcılara (her kullanıcı için ayarlar tanımlanmıştır), üçüncü taraf kişilerine (her üçüncü taraf için ayarlar tanımlanmıştır) Eposta bildirimleri (bazı Dolibarr iş etkinlikleriyle başlatılan), ya da sabit postalar gönderin.
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Bağışlar
 Module700Desc=Bağış yönetimi
 Module770Name=Gider raporları
@@ -606,10 +617,10 @@ Permission142=Bütün proje ve görevleri oluştur/düzenle (aynı zamanda ilgil
 Permission144=Bütün proje ve görevleri sil (aynı zamanda ilgilisi olmadığım özel projeleri de)
 Permission146=Sağlayıcıları oku
 Permission147=İstatistikleri oku
-Permission151=Ödeme talimatlarını oku
-Permission152=Ödeme talimatı isteği oluştur/değiştir
-Permission153=Ödeme talimatı fişleri aktarımı
-Permission154=Ödeme talimatı fişleri alacaklandır/reddet
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Sözleşme/abonelik oku
 Permission162=Sözleşme/abonelik oluştur/değiştir
 Permission163=Bir sözleşmeye ait bir hizmet/abonelik etkinleştir
@@ -747,6 +758,7 @@ Permission1236=Tedarikçi faturalarını, özniteliklerini ve ödemelerini dış
 Permission1237=Tedarikçi siparişi ve ayrıntılarını dışaaktar
 Permission1251=Dış verilerin veritabanına toplu olarak alınmasını çalıştır (veri yükle)
 Permission1321=Müşteri faturalarını, özniteliklerin ve ödemelerini dışaaktar
+Permission1322=Reopen a paid bill
 Permission1421=Müşteri siparişleri ve özniteliklerini dışaaktar
 Permission20001=İzin isteklerini oku (senin ve astlarının)
 Permission20002=Kendi izin isteklerini oluştur/düzenle
@@ -780,6 +792,10 @@ Permission55002=Anket oluştur/düzenle
 Permission59001=Ticari kar oranı oku
 Permission59002=Ticari kar oranı tanımla
 Permission59003=Her müşterinin kar oranını oku
+Permission63001=Kaynak oku
+Permission63002=Kaynak oluştur/düzenle
+Permission63003=Kaynak sil
+Permission63004=Gündem etkinliklerine kaynak bağlantıla
 DictionaryCompanyType=Üçüncü taraf türleri
 DictionaryCompanyJuridicalType=Üçüncü taraf yasal formları
 DictionaryProspectLevel=Aday potansiyel düzeyi
@@ -853,6 +869,7 @@ LabelUsedByDefault=Hiçbir çeviri kodu bulunmuyorsa varsayılan olarak kullanı
 LabelOnDocuments=Belgeler üzerindeki etiket
 NbOfDays=Gün Sayısı
 AtEndOfMonth=Ay sonunda
+CurrentNext=Current/Next
 Offset=Sapma
 AlwaysActive=Her zaman etkin
 Upgrade=Yükselt
@@ -950,7 +967,7 @@ LogEventDesc=Burada Dolibarr güvenlik etkinlikleri için günlük etkinleştire
 AreaForAdminOnly=Bu özellikler yalnız <b>yönetici kullanıcılar</b> tarafından kullanılabilir.
 SystemInfoDesc=Sistem bilgileri sadece okuma modunda ve yöneticiler için görüntülenen çeşitli teknik bilgilerdir.
 SystemAreaForAdminOnly=Bu alan yalnız yönetici kullanıcılar için kullanılabilir. Hiçbir Dolibarr izini bu sınırı azaltamaz.
-CompanyFundationDesc=Bu sayfada şirket veya dernekle ilgili bilinen bütün bilgileri düzenleyebilirsiniz. (Bunun için sayfanın en altındaki “Değiştir” düğmesine basın).
+CompanyFundationDesc=Bu sayfada yönetmek istediğiniz şirket veya dernekle ilgili bilinen bütün bilgileri düzenleyebilirsiniz. (Bunun için sayfanın en altındaki “Değiştir” ya da "Kaydet" düğmesine basın).
 DisplayDesc=Dolibarr ile ilgili her bir parametreyi seçebilirsiniz
 AvailableModules=Varolan modüller
 ToActivateModule=Modülleri etkinleştirmek için, ayarlar alanına gidin (Giriş->Ayarlar>Modüller).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Uyarı, bazı Linux sistemlerinde, epostanızdan epost
 PathToDocuments=Belgelerin yolu
 PathDirectory=Dizin
 SendmailOptionMayHurtBuggedMTA="PHP doğrudan posta" yöntemini kullanarak postalar gönderme özelliği bazı posta alıcısı sunucuları tarafından doğru olarak çözümlenemeyen bir posta iletisi oluşturur. Sonuç ise bazı postaların hatalı platformlar tarafından barındırılan kişiler tarafından okunamaz olmasıdır. Bu durum bazı İnternet sağlayıcılarına özgüdür (Örn: Fransa’daki Orange gibi). Bu Dolibarr ya da PHP için bir sorun değildir ama alıcı posta sunucusu için sorundur. Ancak Dolibarr’ı bundan korumak için Kurulum->Diğer de MAIN_FIX_FOR_BUGGED_MTA yı 1 yapma seçeneğini ekleyebilirsiniz. Ancak SMTP standartlarına sıkıca uyan diğer servislerde sorunla karşılaşabilirsiniz. Diğer bir çözüm (önerilen) ise hiçbir sakıncası olmayan "SMTP soket kütüphanesi" ni kullanmaktır.
-TranslationSetup=Çeviri yapılandırması
-TranslationDesc=Ekran görüntüsündeki dilin nasıl değiştirilebileceği<br>* Tüm sistemde bu menüden: <strong>Giriş - Ayarlar - Ekran</strong><br>* Her kullanıcı için: <strong>Kullanıcı ekranı ayarları</strong> sekmesindeki kullanıcı sekmesinden (ekranın tepesindeki kullanıcı adına tıklayın).
-TranslationOverwriteDesc=Ayrıca aşağıdaki tabloyu doldurarak dizeleri geçersiz kılabilirsiniz. Dilinizi "%s" açılır tablosundan seçin, (langs/xx_XX/somefile.lang) dosyasında bulunan anahtar kelimeyi "%s" içine ekleyin ve yeni çevirinizi de "%s" içine ekleyin.
+TranslationSetup=Çeviri ayarları
+TranslationKeySearch=Çeviri anahtarı veya dizesi ara
+TranslationOverwriteKey=Çeviri dizesinin üzerine yaz
+TranslationDesc=Ekran görüntü dilinin nasıl değiştirileceği :<br>* Tüm sistemde: <strong>Giriş - Ayarlar - Ekran</strong><br>* Her kullanıcı için: <strong>Kullanıcı ekranı ayarları</strong> kullanıcı kartı sekmesindeki (ekranın tepesindeki kullanıcı adına tıklayın).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Çeviri dizesi
+CurrentTranslationString=Geçerli çeviri dizesi
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=Gösterilecek yeni çeviri dizesi
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Etkinleştirilmiş özel modül toplam sayısı: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
 ClassNotFoundIntoPathWarning=Sınıf %s PHP youlnda bulunamadı
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=TLS
 LDAPServerUseTLSExample=LDAP sunucusu TLS
 LDAPServerDn=Sunucu DN
 LDAPAdminDn=Yönetici DN
-LDAPAdminDnExample=Komple DN (örn: cn = adminldap, dc = toplum, DC = com)
+LDAPAdminDnExample=Komple DN (ex: cn=admin, dc=örnek, dc=com or cn=Yönetici, cn=kullanmak, dc=örnek, dc=com etkin dizin için)
 LDAPPassword=Yönetici parolası
 LDAPUserDn=Kullanıcıların DN si
 LDAPUserDnExample=Komple DN (örn: ou = Users, DC = toplum, DC = com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Örnek: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Örnek: objectsid
 LDAPFieldEndLastSubscription=Abonelik tarihi sonu
-LDAPFieldTitle=Görev/İşlev
+LDAPFieldTitle=İş pozisyonu
 LDAPFieldTitleExample=Örnek: unvan
 LDAPSetupNotComplete=LDAP kurulumu tamamlanmamış (diğer sekmelere git)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Hiçbir yönetici veya parola verilmiştir. LDAP erişimi anonim ve salt okunur modunda olacaktır.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Ürünler ve Hizmetler modüllerinin kurulumu
 NumberOfProductShowInSelect=Açılır seçim (combo) listelerindeki ençok ürün sayısı (0 = sınır yok)
 ViewProductDescInFormAbility=Formlarda ürün tanımlarının görselleştirilmesi (aksi durumda açılır araç ipucu olarak)
 MergePropalProductCard=Eğer ürün/hizmet teklifte varsa Ekli Dosyalar sekmesinde ürün/hizmet seçeneğini etkinleştirin, böylece ürün PDF belgesini PDF azur teklifine birleştirirsiniz
-ViewProductDescInThirdpartyLanguageAbility=Ürün açıklamalarının üçüncü taraf dilinde gösterilmesi
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Ayrıca çok fazla sayıda ürününüz varsa (>100 000), Kurulum->Diğer den PRODUCT_DONOTSEARCH_ANYWHERE değişmezini 1 e ayarlayarak hızı arttırabilirsiniz. Sonra arama dizenin başlamasıyla sınırlı olacaktır.
 UseSearchToSelectProduct=Bir ürün seçmek için arama formu kullanın (liste kutusu yerine).
 SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar kodu oluşturma komut satırı aracı (bazı bar kodu tü
 BarcodeInternalEngine=İç motor
 BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
 ##### Prelevements #####
-WithdrawalsSetup=Para çekme modülü kurulumu
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Dışardan RSS alma kurulumu
 NewRSS=Yeni RSS beslemesi
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Açık mali yıl
 CloseFiscalYear=Kapalı mali yıl
 DeleteFiscalYear=Mali yıl sil
 ConfirmDeleteFiscalYear=Bu mali yılın silmek istediğinizden emin misiniz?
+ShowFiscalYear=Mali yılı göster
 AlwaysEditable=Her zaman düzenlenebilir
 MAIN_APPLICATION_TITLE=Uygulamanın görünür adına zorla (uyarı: burada kendi adınızı ayarlamanız, DoliDoid mobil uygulamasını kullanırken, kullanıcı adını oto doldur özelliğini durdurabilir)
 NbMajMin=Enaz sayıdaki büyük harf karakteri
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=Kullanıcı başına bildirimler listesi*
 ListOfNotificationsPerUserOrContact=Kullanıcı başına veya kişi başına bildirimler listesi**
 ListOfFixedNotifications=Sabit bildirimler listesi
 GoOntoUserCardToAddMore=Kullanıcılardan bildirimleri kaldırmak veya eklemek için kullanıcının "Bildirimler" sekmesine git
-GoOntoContactCardToAddMore=Kişilerden/adreslerden bildirimleri kaldırmak için üçüncü taraf kişileri "Bildirimler" sekmesine git
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Sınır
 BackupDumpWizard=Veritabanı yedekleme döküm dosyası oluşturma sihirbazı
 SomethingMakeInstallFromWebNotPossible=Web arayüzünden dış modül kurulumu aşağıdaki nedenden ötürü olanaksızdır:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Fare üzerinden geçerken satır rengini vurgula (vurgulanma
 TextTitleColor=Sayfa başlık rengi
 LinkColor=Bağlantıların rengi
 PressF5AfterChangingThis=Bu değeri değiştirdikten sonra etkin olması için klavyede F5 tuşuna basın
-NotSupportedByAllThemes=Yalnızca eldy teması ile çalışır ancak tüm temalar tarafından desteklenmez
+NotSupportedByAllThemes=Yalnızca çekirdek temaları ile çalışır ancak dış temalar tarafından desteklenmez
 BackgroundColor=Arka plan rengi
 TopMenuBackgroundColor=Üst menü için arka plan rengi
+TopMenuDisableImages=Üst menüdeki görüntüleri gizle
 LeftMenuBackgroundColor=Sol menü için arka plan rengi
 BackgroundTableTitleColor=Tablo satırı başlığı için arka plan rengi
 BackgroundTableLineOddColor=Tabloda tek satırlar için arka plan rengi
@@ -1569,7 +1596,7 @@ MailToSendIntervention=Müdahale göndermek için
 MailToSendSupplierRequestForQuotation=Tedarikçiye teklif isteği göndermek için
 MailToSendSupplierOrder=Tedarikçi siparişi göndermek için
 MailToSendSupplierInvoice=Tedarikçi faturası göndermek için
-MailToThirdparty=Üçüncü taraf sayfasından eposta göndermek için
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Liste görünümünde varsayılana göre göster
 YouUseLastStableVersion=Son kararlı sürümü kullanın
 TitleExampleForMajorRelease=Bu ana sürümü duyurmak için kullanabileceğiniz mesaj örneği (web sitenizde rahatça kullanabilirsiniz)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=API kullanmak için işaretlenecek URL (işaretlenir işare
 ListOfAvailableAPIs=Mevcut API listesi
 activateModuleDependNotSatisfied="%s" Modülü eksik olan "%s" modülüne bağlıdır, yani "%1$s" düzgün çalışmayabilir. Lütfen  "%2$s" modülünü kurun ya da herhangi bir sürprizle karşılaşmamak için  "%1$s" modülünü devre dışı bırakın.
 CommandIsNotInsideAllowedCommands=Çalıştırmaya çalıştığınız komut, <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> parametre dosyası içindeki izin verilen komutlar olarak tanımlanan listede yoktur.
+LandingPage=Açılış sayfası
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=Kullanıcının tanımlanmış izni yok
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index f4518ed01c1..2f949995dc1 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -27,13 +27,9 @@ AllTime=Başlangıç
 Reconciliation=Uzlaşma
 RIB=Banka Hesap Numarası
 IBAN=IBAN numarası
-IbanValid=IBAN Geçerli
-IbanNotValid=IBAN Geçersiz
 BIC=BIC/SWIFT numarası
-SwiftValid=BIC/SWIFT Geçerli
-SwiftNotValid=BIC/SWIFT Geçersiz
-StandingOrders=Ödeme talimatları
-StandingOrder=Ödeme talimatı
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Hesap özeti
 AccountStatementShort=Özet
 AccountStatements=Hesap özetleri
@@ -78,6 +74,7 @@ AccountToCredit=Alacak hesabı
 AccountToDebit=Borç hesabı
 DisableConciliation=Bu hesap için uzlaşma özelliğini engelle
 ConciliationDisabled=Uzlaşma özelliği engelli
+LinkedToAConciliatedTransaction=Uzlaştırılmış bir işleme bağlantılı
 StatusAccountOpened=Açık
 StatusAccountClosed=Kapalı
 AccountIdShort=Numarası
@@ -87,6 +84,8 @@ AddBankRecordLong=Elle işlem ekle
 ConciliatedBy=Uzlaştıran
 DateConciliating=Uzlaştırma tarihi
 BankLineConciliated=İşlem uzlaştırılmış
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Müşteri ödemesi
 SupplierInvoicePayment=Tedarikçi ödemesi
 SubscriptionPayment=Abonelik ödemesi
@@ -94,7 +93,8 @@ WithdrawalPayment=Para çekme ödemesi
 SocialContributionPayment=Sosyal/mali vergi ödemesi
 BankTransfer=Banka havalesi
 BankTransfers=Banka havaleleri
-TransferDesc=Bir hesaptan başka bir hesaba transfer sırasında Dolibarr iki kayıt yazacaktır (aynı tutarda olmak üzere kaynak hesaba borç ve hedef hesaba alacak. Bu işlem için aynı etiket ve tarih kullanılacaktır).
+MenuBankInternalTransfer=İç aktarım
+TransferDesc=Bir hesaptan başka bir hesaba transfer sırasında Dolibarr iki kayıt yazacaktır (kaynak hesaba borç ve hedef hesaba alacak. Bu işlem için aynı tutar (işareti hariç), açıklama ve tarih kullanılacaktır).
 TransferFrom=Kimden
 TransferTo=Kime
 TransferFromToDone=<b>%s</b> den <b>%s</b> nin <b>%s</b> %s ne bir transfer kaydedildi.
@@ -129,7 +129,7 @@ FutureTransaction=Gelecekteki işlem. Hiçbir şekilde uzlaştırılamaz.
 SelectChequeTransactionAndGenerate=Çek tahsilat makbuzunun içereceği çekleri seç/süz ve “Oluştur” a tıkla.
 InputReceiptNumber=Uzlaştırma ile ilişkili banka hesap özetini seç. Sıralanabilir bir sayısal değer kullan: YYYYMM ya da YYYYMMDD
 EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin
-ToConciliate=Uzlaştırılacak mı?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Sonra, banka hesap özetindeki kalemleri işaretleyin ve tıklayın
 DefaultRIB=Varsayılan BAN
 AllRIB=Tüm BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Bu çeki reddedildi olarak işaretlemek istediğinizden emin
 RejectCheckDate=Dönen çekin tarihi
 CheckRejected=Çek döndü
 CheckRejectedAndInvoicesReopened=Çek döndü ve fatura yeniden açık yapıldı
+BankAccountModelModule=Banka hesapları için belge şablonları
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 00a6c8fc622..c758ace285a 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Hata, halen taslak durumunda ola
 BillFrom=Kimden
 BillTo=Kime
 ActionsOnBill=Fatura üzerindeki eylemler
-RecurringInvoiceTemplate=Yinelenen fatura
+RecurringInvoiceTemplate=Şablon/Yinelenen faturalar
 NoQualifiedRecurringInvoiceTemplateFound=Oluşturmak için gerekli nitelikte yinelenen fatura şablonu yok.
 FoundXQualifiedRecurringInvoiceTemplate=Oluşturmak için gerekli nitelikte %s yinelenen fatura(lar) şablonu bulundu.
 NotARecurringInvoiceTemplate=Bir yinelenen fatura şablonu değil
@@ -209,8 +209,8 @@ EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
 EscompteOfferedShort=İndirim
 SendBillRef=%s faturasının gönderilmesi
 SendReminderBillRef=%s faturasının gönderilmesi (anımsatma)
-StandingOrders=Ödeme talimatları
-StandingOrder=Ödeme talimatı
+StandingOrders=Otomatik ödeme talimatları
+StandingOrder=Otomatik ödeme talimatı
 NoDraftBills=Hiç taslak fatura yok
 NoOtherDraftBills=Başka taslak fatura yok
 NoDraftInvoices=Taslak fatura yok
@@ -351,8 +351,8 @@ VarAmount=Değişken tutar (%% top.)
 # PaymentType
 PaymentTypeVIR=Banka havalesi
 PaymentTypeShortVIR=Banka havalesi
-PaymentTypePRE=Banka ödeme emri
-PaymentTypeShortPRE=Banka ödeme emri
+PaymentTypePRE=Otomatik ödeme talimatı
+PaymentTypeShortPRE=Borç ödeme talimatı
 PaymentTypeLIQ=Nakit
 PaymentTypeShortLIQ=Nakit
 PaymentTypeCB=Kredi kartı
@@ -381,6 +381,7 @@ ExtraInfos=Ek bilgiler
 RegulatedOn=Buna göre düzenlenmiş
 ChequeNumber=Çek No
 ChequeOrTransferNumber=Çek/Havale No
+ChequeBordereau=Programı denetle
 ChequeMaker=Çek/Havale gönderen
 ChequeBank=Çekin Bankası
 CheckBank=Çek
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Uzlaşılmış ödeme silinemiyor
 PayedByThisPayment=Bu ödeme ile ödenmiş
 ClosePaidInvoicesAutomatically=Tamamı ödenmiş bütün standart ve değiştirilmiş faturaları "Ödendi" olarak sınıflandır.
 ClosePaidCreditNotesAutomatically=Tamamı ödenmiş iade faturalarını "Ödendi" olarak sınıflandır.
+ClosePaidContributionsAutomatically=Tamamı ödenmiş tüm sosyal ve mali katkı paylarını "Ödendi" olarak sınıflandır.
 AllCompletelyPayedInvoiceWillBeClosed=Bakiyesi kalmayan bütün faturalar otomatikmen kapatılarak "Ödendi" durumuna getirilecektir.
 ToMakePayment=Öde
 ToMakePaymentBack=Geri öde
 ListOfYourUnpaidInvoices=Ödenmemiş fatura listesi
 NoteListOfYourUnpaidInvoices=Not: Bu liste, satış temsilcisi olarak bağlı olduğunuz üçüncü partilere ait faturaları içerir.
 RevenueStamp=Bandrol
-YouMustCreateInvoiceFromThird=Bu seçenek, yalnızca fatura oluştururken, üçüncü taraf *müşteri* sekmesinde belirir
+YouMustCreateInvoiceFromThird=Üçüncü tarafa ait "müşteri" sekmesinden fatura oluşturulduğunda seçenek geçerlidir
+YouMustCreateInvoiceFromSupplierThird=Üçüncü tarafa ait "tedarikçi" sekmesinden fatura oluşturulduğunda seçenek geçerlidir
 YouMustCreateStandardInvoiceFirstDesc=Yeni bir fatura şablonu oluşturmak için önce bir standart fatura oluşturmalı ve onu "şablona" dönüştürmelisiniz
 PDFCrabeDescription=Fatura PDF şablonu Crabe. Tam fatura şablonu  (Önerilen şablon)
 PDFCrevetteDescription=Fatura PDF şablonu Crevette. Durum faturaları için eksiksiz bir fatura şablonu
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Hata : Faturanın bu satırı üzerindeki
 ToCreateARecurringInvoice=Bu sözleşme için yinelenen fattura oluşturmak için önce bu taslak faturayı oluşturun sonra onu bir fatura şablonuna dönüştürün ve sonraki faturaların oluşması için süre tanımlayın.
 ToCreateARecurringInvoiceGene=Gelecekteki faturaları düzenli ve manuel olarak oluşturmak için yalnızca <strong>%s - %s - %s</strong> menüsüne gidin.
 ToCreateARecurringInvoiceGeneAuto=Eğer böyle otomatik oluşturulan faturalara gereksinim duyuyorsanız, yöneticinizden <strong>%s</strong> modülünü etkinleştirmesini ve ayarlamasını isteyin. Her iki yöntemin (manuel ve otomatik) tekrarlama riski olmadan birlikte kullanılabileceğini unutmayın.
+DeleteRepeatableInvoice=Fatura şablonunu sil
+ConfirmDeleteRepeatableInvoice=Fatura şablonunu silmek istediğinizden emin misiniz?
 
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 89e6cb334ec..889c1c80aab 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=Son %s yerimim
 BoxOldestExpiredServices=Süresi dolmuş en eski etkin hizmetler
 BoxLastExpiredServices=Etkin hizmet süresi dolmuş son %s kişi
 BoxTitleLastActionsToDo=Yapılacak son %s eylem
-BoxTitleLastContracts=Son %s sözleşme
+BoxTitleLastContracts=Değiştirilen son %s sözleşme
 BoxTitleLastModifiedDonations=Değiştirilen son %s bağış
 BoxTitleLastModifiedExpenses=Değiştirilen son %s gider raporu
 BoxGlobalActivity=Genel etkinlik (faturalar, teklifler, siparişler)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Aylık teklifler
 NoTooLowStockProducts=Düşük stok seviyesi altında stok yok
 BoxProductDistribution=Ürün/Hizmet dağılımı
 BoxProductDistributionFor=%sin %s içindeki dağılımı
+BoxTitleLastModifiedSupplierBills=Son değiştirilen %s tedarikçi faturası
+BoxTitleLatestModifiedSupplierOrders=Son değiştirilen %s tedarikçi siparişi
+BoxTitleLastModifiedCustomerBills=Son değiştirilen %s müşteri faturası
+BoxTitleLastModifiedCustomerOrders=Son değiştirilen %s müşteri siparişi
+BoxTitleLastModifiedPropals=Son değiştirilen %s teklif
 ForCustomersInvoices=Müşteri faturaları
 ForCustomersOrders=Müşteri siparişleri
 ForProposals=Teklifler
 LastXMonthRolling=Devreden son %s ay
-ChooseBoxToAdd=Kontrol panelinize ekran etiketi ekleyin...
+ChooseBoxToAdd=Kontrol panelinize kutu ekleyin
diff --git a/htdocs/langs/tr_TR/cashdesk.lang b/htdocs/langs/tr_TR/cashdesk.lang
index 34913878da0..d0c7e563068 100644
--- a/htdocs/langs/tr_TR/cashdesk.lang
+++ b/htdocs/langs/tr_TR/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=açık
 CashDeskThirdParty=Üçüncü parti
 ShoppingCart=Alışveriş sepeti
 NewSell=Yeni satış
-BackOffice=Arka ofis
 AddThisArticle=Bu malı ekle
 RestartSelling=Satışa geri dön
-SellFinished=Satış bitti
+SellFinished=Satış tamamlandı
 PrintTicket=Fiş yazdır
 NoProductFound=Hiç mal bulunamadı
 ProductFound=ürün bulundu
diff --git a/htdocs/langs/tr_TR/categories.lang b/htdocs/langs/tr_TR/categories.lang
index c4310129bc7..8e57385bae7 100644
--- a/htdocs/langs/tr_TR/categories.lang
+++ b/htdocs/langs/tr_TR/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Müşteri etiketleri/kategorileri alanı
 MembersCategoriesArea=Üyeler etiketleri/kategorileri alanı
 ContactsCategoriesArea=Kişi etiketleri/kategorileri alanı
 AccountsCategoriesArea=Hesap etiketleri/kategorileri alanı
+ProjectsCategoriesArea=Proje etiket/kategori alanı
 SubCats=Alt kategoriler
 CatList= Etiketler/kategoriler listesi
 NewCategory=Yeni etiket/kategori
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=Bu üçüncü parti aşağıdaki tedarikçi etike
 MemberIsInCategories=Bu üye aşağıdaki üye etiketlerine/kategorilerine bağlantılandı
 ContactIsInCategories=Bu kişi aşağıdaki kişi etiketlerine/kategorilerine bağlantılı
 ProductHasNoCategory=Bu ürün/hizmet hiçbir etikette/kategoride yoktur
-CompanyHasNoCategory=Bu üçüncü taraf hiç bir  etikette/kategoride yok
+CompanyHasNoCategory=Bu kişi hiçbir etikette/kategoride yok
 MemberHasNoCategory=Bu üye hiçbir etikette/kategoride yoktur
 ContactHasNoCategory=Bu kişi hiçbir etikette/kategoride yok
+ProjectHasNoCategory=Bu proje hiçbir etikette/kategoride yok
 ClassifyInCategory=Etikete/kategoriye ekle
 NotCategorized=Etiketsiz/kategorisiz
 CategoryExistsAtSameLevel=Bu kategori zaten bu ilgi ile var
@@ -56,12 +58,14 @@ ProductsCategoriesShort=ürün etiketleri/kategorileri
 MembersCategoriesShort=Üye etiketleri/kategorileri
 ContactCategoriesShort=Kişi etiketleri/kategorileri
 AccountsCategoriesShort=Hesap etiketleri/kategorileri
+ProjectsCategoriesShort=Proje etiketi/kategorisi
 ThisCategoryHasNoProduct=Bu kategori herhangi bir ürün içermiyor.
 ThisCategoryHasNoSupplier=Bu kategori herhangi bir tedarikçi içermiyor.
 ThisCategoryHasNoCustomer=Bu kategori herhangi bir müşteri içermiyor.
 ThisCategoryHasNoMember=Bu kategori herhangi bir üye içermiyor.
 ThisCategoryHasNoContact=Bu kategori herhangi bir kişi içermiyor.
 ThisCategoryHasNoAccount=Bu kategori hiçbir hesap içermiyor.
+ThisCategoryHasNoProject=Bu kategori herhangi bir proje içermiyor.
 CategId=Etiket/kategori kimliği
 CatSupList=Tedarikçi etiketleri/kategorileri listesi
 CatCusList=Müşteri/beklenti etiketleri/kategorileri listesi
@@ -71,6 +75,7 @@ CatContactList=Kişi etiketleri/kategorileri listesi
 CatSupLinks=Tedarikçiler ve etiketler/kategoriler arasındaki bağlantılar
 CatCusLinks=Müşteriler/beklentiler ve etiketler/kategoriler arasındaki bağlantılar
 CatProdLinks=Ürünler/hizmetler ve etiketler/kategoriler arasındaki bağlantılar
+CatProJectLinks=Projeler ve etiketler/kategoriler arasındaki bağlantılar
 DeleteFromCat=Etiketlerden/kategorilerden kaldır
 ExtraFieldsCategories=Tamamlayıcı öznitelikler
 CategoriesSetup=Etiket/kategori ayarları
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 0f94932902f..5eba4e2c87d 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Yeni özel şahıs
 NewCompany=Yeni firma (aday, müşteri, tedarikçi)
 NewThirdParty=Yeni üçüncü parti (aday, müşteri, tedarikçi)
 CreateDolibarrThirdPartySupplier=Bir üçüncü parti oluştur (tedarikçi)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Aday alanı
 IdThirdParty=Üçüncü parti kimliği
 IdCompany=Firma kimliği
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Tedarikçiler
 ThirdPartyType=Üçüncü parti türü
 Company/Fundation=Firma/Dernek
 Individual=Özel şahıs
-ToCreateContactWithSameName=Aynı bilgilerle otomatikman bir fiziksel kişi oluşturacaktır
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Ana firma
 Subsidiaries=Bağlı firmalar
 ReportByCustomers=Müşteriye göre rapor
@@ -47,7 +49,7 @@ CivilityCode=Hitap kodu
 RegisteredOffice=Kayıtlı Ofisi
 Lastname=Soyadı
 Firstname=İlk Adı
-PostOrFunction=Görevi/İşlevi
+PostOrFunction=İş pozisyonu
 UserTitle=Unvan
 Address=Adresi
 State=Eyaleti/İli
@@ -64,7 +66,7 @@ Chat=Sohbet
 PhonePro=İş Telefonu
 PhonePerso=Kişi. telefonu
 PhoneMobile=Mobil
-No_Email=Toplu e-posta gönderme
+No_Email=Toplu e-postaları reddet
 Fax=Faks
 Zip=Posta Kodu
 Town=İlçesi
@@ -73,7 +75,7 @@ Poste= Durumu
 DefaultLang=Varsayılan dili
 VATIsUsed=KDV kullanılır
 VATIsNotUsed=KDV kullanılmaz
-CopyAddressFromSoc=Adresi üçüncü taraf adreslerinden doldur
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Üçüncü taraf ne müşteri ne de tedarikçidir, bağlanacak uygun bir öğe yok.
 ##### Local Taxes #####
 LocalTax1IsUsed=İkinci vergiyi kullan
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Vergi numarası
 VATIntraShort=Vergi numarası
 VATIntraSyntaxIsValid=Sözdizimi geçerli
-VATIntraValueIsValid=Değer geçerlidir
 ProspectCustomer=Aday/Müşteri
 Prospect=Aday
 CustomerCard=Müşteri Kartı
@@ -261,7 +262,9 @@ AddContactAddress=Kişi/adres oluştur
 EditContact=Kişi düzenle
 EditContactAddress=Kişi/adres düzenle
 Contact=Kişi
+ContactId=Kişi kimliği
 ContactsAddresses=Kişiler/adresler
+FromContactName=Name:
 NoContactDefinedForThirdParty=Bu üçüncü parti için tanımlı kişi yok
 NoContactDefined=Bu üçüncü parti için kişi tanımlanmamış
 DefaultContact=Varsayılan kişi
@@ -284,7 +287,7 @@ CompanyDeleted="%s" Firması veritabanından silindi.
 ListOfContacts=Kişi/adres listesi
 ListOfContactsAddresses=Kişiler/adresler listesi
 ListOfThirdParties=Üçüncü partiler listesi
-ShowCompany=Üçüncü taraf göster
+ShowCompany=Show third party
 ShowContact=Kişi göster
 ContactsAllShort=Hepsi (süzmeden)
 ContactType=Kişi tipi
@@ -294,6 +297,7 @@ ContactForProposals=Teklif yetkilisi
 ContactForContracts=Sözleşme yetkilisi
 ContactForInvoices=Fatura yetkilisi
 NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir
+NoContactForAnyOrderOrShipments=Bu kişi herhangi bir sipariş veya sevkiyat için değildir
 NoContactForAnyProposal=Bu kişi herhangi bir teklifin yetkilisi değildir
 NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir
 NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir
@@ -352,9 +356,9 @@ ExportCardToFormat=Biçimlenip dışaaktarılacak kart
 ContactNotLinkedToCompany=Kişi herhangi bir üçüncü partiye bağlı değil
 DolibarrLogin=Dolibarr kullanıcı adı
 NoDolibarrAccess=Dolibarr erişimi yok
-ExportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Kişiler ve özellikleri
-ImportDataset_company_1=Üçüncü partiler (Firmalar/dernekler/kişiler) ve özellikleri
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Kişiler/Adresler (üçüncü taraflara ait ya da değil) ve öznitelikleri
 ImportDataset_company_3=Banka ayrıntıları
 ImportDataset_company_4=Üçüncü partiler/Satış temsilcileri (satış temsilcileri firma kullanıcılarını etkiler)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Üçüncü taraflar birleştirilmiştir
 SaleRepresentativeLogin=Satış temsilcisinin kullanıcı adı
 SaleRepresentativeFirstname=Satış temsilcisinin ilkadı
 SaleRepresentativeLastname=Satış temsilcisinin soyadı
+ErrorThirdpartiesMerge=Üçüncü taraf silinirken bir hata oluştu. Lütfen kayıtları inceleyin. Değişiklikler geri alındı.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 6fbcfb9ee8a..a41e1fde611 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Sosyal ya da mali vergi
 SocialContributions=Sosyal ya da mali vergiler
 SocialContributionsDeductibles=İndirilecek sosyal ya da mali vergiler
 SocialContributionsNondeductibles=İndirilemeyen sosyal ya da mali vergiler
+LabelContrib=Katkı payı etiketi
+TypeContrib=Katkı payı türü
 MenuSpecialExpenses=Özel giderler
 MenuTaxAndDividends=Vergiler ve kar payları
 MenuSocialContributions=Sosyal/mali vergiler
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index e8c59c1e89d..bf06ba93a52 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Planlı iş sil
 Permission23104 = Planlı iş yürüt
 # Admin
 CronSetup= Planlı iş yönetimi ayarları
-URLToLaunchCronJobs=Gerekliyse, Cron işlerini denetleyen ve başlatan İnternet adresi
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Ya da özel bir işi denetlemek ve başlatmak için
 KeyForCronAccess=Cron işlerini başlatacak URL için güvenlik anahtarı
 FileToLaunchCronJobs=Cron işlerini başlatacak komut satırı
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Gi
 JobDisabled=İş engellendi
 MakeLocalDatabaseDumpShort=Yerel veritabanı yedeklemesi
 MakeLocalDatabaseDump=Yerel bir veritabanı dökümü oluştur
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 68dc0f9f050..5f9ca9b2bd6 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Hata, bu özelliği kulanmak için PHP nizde <b>%s</b> modül
 ErrorOpenIDSetupNotComplete=Dolibarr yapılandırma dosyasını OpenID kimlik doğrulamaya izin verecek şekilde ayarladınız, ancak OpenID hizmetine ait URL, %s değişmezine tanımlanmamıştır
 ErrorWarehouseMustDiffers=Kaynak ve hedef depo farklı olmalıdır
 ErrorBadFormat=Hatalı biçim!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü tarafa bağlanmamıştır. Üyeyi varolan bir üçüncü tarafa bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü taraf oluşturun.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz henüz hiç bir üçüncü tarafa bağlantılanmamış. Üyeyi mevcut olan bir üçüncü tarafa bağlantılayın veya bu faturayla yeni bir abonelik oluşturmadan önce yeni bir üçüncü taraf oluşturun.
 ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi.
 ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez
 ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Yeni bir siparişe ürün eklemek için
 ErrorStockIsNotEnoughToAddProductOnInvoice=Yeni bir faturaya ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
 ErrorStockIsNotEnoughToAddProductOnShipment=Yeni bir sevkiyata ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
 ErrorStockIsNotEnoughToAddProductOnProposal=Yeni bir teklife ürün eklemek için %s ürünü stok düzeyi yeterli değildir.
+ErrorFailedToLoadLoginFileForMode=Mod '%s' için kullanıcı girişi dosyası alınamadı.
+ErrorModuleNotFound=Modül dosyası bulunamadı.
 
 # Warnings
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak eposta adresi de kullanılabilir.
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index a61fef045e1..ef1e97cda01 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=Bu PHP oturumları destekliyor.
 PHPSupportPOSTGETOk=Bu PHP GÖNDER ve AL değişkenlerini destekliyor.
 PHPSupportPOSTGETKo=Bu PHP kurulumunun GÖNDER ve AL  değişkenlerini desteklememesi mümkündür. Php.ini içindeki <b>variables_order</b> parametresini kontrol edin.
 PHPSupportGD=Bu PHP GD grafik işlevlerini destekliyor.
+PHPSupportCurl=Bu PHP Curl. destekliyor.
 PHPSupportUTF8=Bu PHP UTF8 işlevlerini destekliyor.
 PHPMemoryOK=PHP nizin ençok oturum belleği <b>%s</b> olarak ayarlanmış. Bu yeterli olacaktır.
 PHPMemoryTooLow=PHP nizin ençok oturum belleği <b>%s</b> bayt olarak ayarlanmış. Bu çok düşük olabilir. <b>php.ini</b> dosyanızdaki <b>memory_limit</b> parametresi ayarını enaz <b>%s</b> bayt olacak şekilde değiştirin.
 Recheck=Daha belirleyici bir test için burayı tıklayın
 ErrorPHPDoesNotSupportSessions=PHP kurulumunuz oturumları desteklemiyor. Bu özellik Dolibarr 'ın çalışması için gereklidir. PHP kurulumunuzu kontrol edin.
 ErrorPHPDoesNotSupportGD=PHP kurulumunuz GD grafik işlevini desteklemiyor. Hiçbir grafik görüntülenemeyecektir.
+ErrorPHPDoesNotSupportCurl=PHP kurulumunuz Curl. desteklemiyor
 ErrorPHPDoesNotSupportUTF8=PHP kurulumunuz UTF8 işlevlerini desteklemiyor. Dolibarr düzgün çalışamaz. Dolibarr'ı yüklemeden önce bunu çözün.
 ErrorDirDoesNotExists=%s Dizini yoktur.
 ErrorGoBackAndCorrectParameters=Geri gidin ve yanlış parametreleri düzeltin.
@@ -133,6 +135,10 @@ ActivateModule=%s modülünü etkinleştir
 ShowEditTechnicalParameters=Gelişmiş parametreleri (uzman modu) göstermek/düzenlemek için burayı tıklayın
 WarningUpgrade=Uyarı: Önce bir veritabanı yedeklemesi yaptınız mı?\nBu şiddetle önerilir: örneğin; veritabanı sistemindeki bazı hatalar nedeniyle (örneğin mysql sürüm 5.5.40/41/42/43) bu işlem sırasında bazı veriler ve tablolar kaybolabilir, bu yüzden taşımaya başlamadan önce veritabanının tam bir dökümünün alınması şiddetle önerilir.\n\nTaşıma işlemini başlatmak için Tamam'a tıklayın...
 ErrorDatabaseVersionForbiddenForMigration=Veritabanınızın sürümü %s. Veritabanınızın yapısını değiştirirseniz veri kaybı yapacak bir kritik hata vardır, taşıma işlemi tarafından istenmesi gibi. Bu nedenle, veritabanınızı daha yüksek kararlı bir sürüme yükseltinceye kadar taşımaya izin verilmeyecektir (bilinen hatalar listesi sürümü: %s)
+KeepDefaultValuesWamp=DoliWamp üzerinden Dolibarr kurulum sihirbazını kullanın, burada sunulan değerler hali hazırda optimize edilmiştir. Yalnızca ne yapacağınızı biliyorsanız bunları değiştirin.
+KeepDefaultValuesDeb=Bir Linux paketi (Ubuntu, Debian, Fedora ...) üzerinden Dolibarr kurulum sihirbazını kullanın, burada sunulan değerler hali hazırda optimize edilmiştir. Yalnızca veritabanı sahibinin parolasının tamamlanması gerekir. Yalnızca ne yapacağınızı biliyorsanız parametreleri değiştirin.
+KeepDefaultValuesMamp=DoliMamp üzerinden Dolibarr kurulum sihirbazını kullanın, burada sunulan değerler hali hazırda optimize edilmiştir. Yalnızca ne yapacağınızı biliyorsanız bunları değiştirin.
+KeepDefaultValuesProxmox=Proxmox sanal aygıt  üzerinden Dolibarr kurulum sihirbazını kullanın, burada sunulan değerler hali hazırda optimize edilmiştir. Yalnızca ne yapacağınızı biliyorsanız bunları değiştirin.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Eylemlere ilişkin veri güncellemesi
 MigrationPaymentMode=Ödeme biçimi için veri taşıma
 MigrationCategorieAssociation=Kategorilerin taşınması
 MigrationEvents=Atama tablosuna etkinlik sahibi eklemek için gerekli taşıma eylemleri
+MigrationRemiseEntity=value of llx_societe_remise varlık alanını güncelle
+MigrationRemiseExceptEntity=llx_societe_remise_except varlık alanını güncelle
 MigrationReloadModule=Modülü yeniden yükle %s
 ShowNotAvailableOptions=Kullanılamayacak seçenekler görüntülensin
 HideNotAvailableOptions=Kullanılamayacak seçenekler gizlensin
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index 55760d1bc8c..5dda2e8706a 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Müşteri izleme yetkilisi
 # Modele numérotation
 PrintProductsOnFichinter=Müdahale kartında "ürün" türü (yalnızca hizmetleri değil) satırını da yazdır.
 PrintProductsOnFichinterDetails=Siparişlerden oluşturulan müdahaleler
+UseServicesDurationOnFichinter=Siparişlerden oluşturulan müdahaleler için hizmet sürelerini kullan
 InterventionStatistics=Müdahale istatistikleri
 NbOfinterventions=Müdahale kartları sayısı
 NumberOfInterventionsByMonth=Aylık (doğrulama tarihi) müdahale kartları sayısı
diff --git a/htdocs/langs/tr_TR/ldap.lang b/htdocs/langs/tr_TR/ldap.lang
index 2884414801e..c69d9132a2a 100644
--- a/htdocs/langs/tr_TR/ldap.lang
+++ b/htdocs/langs/tr_TR/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=İlk abonelik tarihi
 LDAPFieldFirstSubscriptionAmount=İlk abonelik tutarı
 LDAPFieldLastSubscriptionDate=Son abonelik tarihi
 LDAPFieldLastSubscriptionAmount=Son abonelik tutarı
+LDAPFieldSkype=Skype kimliği
+LDAPFieldSkypeExample=Örnek: skypeAdı
 UserSynchronized=Kullanıcı senkronize edildi
 GroupSynchronized=Grup senkronize edildi
 MemberSynchronized=Üye senkronize edildi
diff --git a/htdocs/langs/tr_TR/mails.lang b/htdocs/langs/tr_TR/mails.lang
index c0ee8956682..98e99992d1b 100644
--- a/htdocs/langs/tr_TR/mails.lang
+++ b/htdocs/langs/tr_TR/mails.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - mails
-Mailing=Eposta
-EMailing=Eposta
-EMailings=Epostalar
+Mailing=Epostalama
+EMailing=Epostalama
+EMailings=Epostalamalar
 AllEMailings=Tüm Epostalar
 MailCard=Eposta kartı
 MailRecipients=Alıcılar
@@ -67,8 +67,9 @@ MailingStatusRead=Okundu
 YourMailUnsubcribeOK=<b>%s</b> Epostası postalama listesinden başarıyla çıkarıldı
 ActivateCheckReadKey="Okuma Alındısı" ve "Abonelik İptali" için kullanılan URL şifrelemesi içi Anahtar
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=Eposta gönderilen öğeler: %s.
 XTargetsAdded=<b>%s</b> alıcılar listesine eklendi
-OnlyPDFattachmentSupported=Eğer fatura için zaten PDF belgesi oluşturulduysa, epostaya eklenecektir. Eğer oluşturulmadıysa, hçbir eposta gönderilmeyecektir (aynı zamanda, bu sürümün toplu posta gönderiminde ek olarak yalnızca pdf faturaların desteklendiğini unutmayın).
+OnlyPDFattachmentSupported=Eğer gönderilecek belge için zaten PDF belgesi oluşturulduysa, epostaya eklenecektir. Eğer oluşturulmadıysa, hçbir eposta gönderilmeyecektir (aynı zamanda, bu sürümün toplu posta gönderiminde ek olarak yalnızca pdf faturaların desteklendiğini unutmayın).
 AllRecipientSelected=Seçilen tüm üçüncü taraflar, bir eposta kuruluysa.
 ResultOfMailSending=Toplu Eposta gönderimi sonuçu
 NbSelected=Seçilen sayısı
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 7d04fe00da2..f76cef6b294 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -67,6 +67,7 @@ SelectDate=Bir tarih seç
 SeeAlso=Buna da bakın %s
 SeeHere=Buraya bak
 BackgroundColorByDefault=Varsayılan arkaplan rengi
+FileRenamed=Dosya adı değiştirilmesi başarılı
 FileUploaded=Dosya yüklemesi başarılı
 FileWasNotUploaded=Bu ekleme için bir dosya seçildi ama henüz gönderilmedi. Bunun için “Dosya ekle” ye tıklayın.
 NbOfEntries=Kayıt sayısı
@@ -245,6 +246,10 @@ DateBuild=Oluşturma tarihi raporu
 DatePayment=Ödeme tarihi
 DateApprove=Onaylama tarihi
 DateApprove2=Onaylama tarihi (ikinci onaylama)
+UserCreation=Oluşturan kullanıcı
+UserModification=Değiştiren kullanıcı
+UserCreationShort=Oluş kullanıcı
+UserModificationShort=Değiş. kullanıcı
 DurationYear=yıl
 DurationMonth=ay
 DurationWeek=hafta
@@ -256,6 +261,7 @@ DurationDays=gün
 Year=Yıl
 Month=Ay
 Week=Hafta
+WeekShort=Hafta
 Day=Gün
 Hour=Saat
 Minute=Dakika
@@ -278,6 +284,7 @@ MonthOfDay=Ayın günü
 HourShort=H
 MinuteShort=ay
 Rate=Oran
+CurrencyRate=Para birimi çevirme oranı
 UseLocalTax=Vergi dahil
 Bytes=Bayt
 KiloBytes=Kilobayt
@@ -565,8 +572,11 @@ BackToList=Listeye dön
 GoBack=Geri dön
 CanBeModifiedIfOk=Geçerliyse değiştirilebilir
 CanBeModifiedIfKo=Geçerli değilse değiştirilebilir
+ValueIsValid=Değer geçerlidir
+ValueIsNotValid=Değer geçerli değildir
 RecordModifiedSuccessfully=Kayıt başarıyla değiştirildi
 RecordsModified=%s kayıt değiştirildi
+RecordsDeleted=%s kayıt silindi
 AutomaticCode=Otomatik kod
 FeatureDisabled=Özellik devre dışı
 MoveBox=Ekran etiketini taşı
@@ -575,6 +585,7 @@ NotEnoughPermissions=Bu eylem için izininiz yok
 SessionName=Oturum adı
 Method=Yöntem
 Receive=Al
+CompleteOrNoMoreReceptionExpected=Tamamlandı ya da yapılacak başka şey yok
 PartialWoman=Kısmi
 TotalWoman=Toplam
 NeverReceived=Hiç alınmadı
@@ -598,6 +609,7 @@ DisabledModules=Engelli modüller
 For=İçin
 ForCustomer=Müşteriler için
 Signature=İmza
+DateOfSignature=İmza tarihi
 HidePassword=Komutu gizli parola ile göster
 UnHidePassword=Gerçek komutu açık parola ile göster
 Root=Kök
@@ -641,6 +653,15 @@ NewAttribute=Yeni bir öznitelik
 AttributeCode=Öznitelik kodu
 URLPhoto=Fotoğraf/logo İnternet adresi
 SetLinkToAnotherThirdParty=Başka bir üçüncü partiye bağlantı
+LinkTo=Buna bağlantıla
+LinkToProposal=Teklife bağlantıla
+LinkToOrder=Siparişe bağlantıla
+LinkToInvoice=Faturaya bağlantıla
+LinkToSupplierOrder=Tedarikçi siparişine bağlantıla
+LinkToSupplierProposal=Tedarikçi teklifine bağlantıla
+LinkToSupplierInvoice=Tedarikçi faturasına bağlantıla
+LinkToContract=Kişiye bağlantıla
+LinkToIntervention=Müdahaleye bağlantıla
 CreateDraft=Taslak oluştur
 SetToDraft=Taslağa geri dön
 ClickToEdit=Düzenlemek için tıklayın
@@ -701,6 +722,9 @@ RelatedObjects=İlgili Nesneler
 ClassifyBilled=Faturalandı olarak sınıflandır
 Progress=İlerleme
 ClickHere=Buraya tıkla
+FrontOffice=Ön ofis
+BackOffice=Arka ofis
+View=İzle
 # Week day
 Monday=Pazartesi
 Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index 2c63f720b8d..854f9eb3d0b 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Kar oran sayısal bir değer olmalı
 markRateShouldBeLesserThan100=Yayınlanmış kar oranı 100 den daha düşük olmalı
 ShowMarginInfos=Kar oranı bilgisi göster
 CheckMargins=Kar oranı ayrıntıları
+MarginPerSaleRepresentativeWarning=Kullanıcı başına kar oranı raporu, üçüncü taraflarla ve kullanıcı başına kar oranı hesaplanacak satış temsilcisi arasındaki bağlantıyı kullanır. Çünkü bazı üçüncü partiler herhangi bir satış temsilcisine bağlantılanmamış ve bazı üçüncü taraflar birçok kullanıcıya bağlantılanmış olabilir, bazı kar oranları bu raporlarda görünmeyebilir veya birçok farklı satırda görünebilir.
diff --git a/htdocs/langs/tr_TR/oauth.lang b/htdocs/langs/tr_TR/oauth.lang
index 607c576e454..88052e5670a 100644
--- a/htdocs/langs/tr_TR/oauth.lang
+++ b/htdocs/langs/tr_TR/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Yapılandırma
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=Yerel veritabanına kayıtlı erişim belirteçi yok
 HasAccessToken=Bir belirteç oluşturuldu ve yerel veritabanına kaydedildi
 NewTokenStored=Belirteç kabul edildi ve kaydedildi
@@ -9,7 +11,16 @@ RequestAccess=Erişim ve kaydedilecek yeni bir belirteç alma isteği/yenilemesi
 DeleteAccess=Belirteçi silmek için burayı tıkla
 UseTheFollowingUrlAsRedirectURI=OAuth sağlayıcınız üzerinde kimlik oluştururken Yönlendirme URI olarak aşağıdaki URL'yi kullanın:
 ListOfSupportedOauthProviders=OAuth2 sağlayıcınız tarafınıdan verilen kimlik bilgilerini burada girin. Burada yalnızca desteklenen OAuth2 sağlayıcılar görünür. Bu ayarlar OAuth2 kimlik doğrulaması gerektiren diğer modüller tarafından da kullanılabilir.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Parolası
-OAUTH_GOOGLE_DESC=<a href="https://console.developers.google.com/" target="_blank">Bu sayfayı açarak</a> Oauth kimlik bilgilerini oluşturmak için Credentials bölümüne gidin
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 80b02af36a0..7a1ca424787 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Siparişleriniz oluşturulmuştur
 OrderFail=Siparişiniz oluşturulması sırasında hata oluştu
 CreateOrders=Sipariş oluştur
 ToBillSeveralOrderSelectCustomer=Birden çok siparişe fatura oluşturmak için, önce müşteriye tıkla, sonra "%s" seç
+CloseReceivedSupplierOrdersAutomatically=Bütün ürünler teslim alındıysa siparişi "%s" olarak kapat.
diff --git a/htdocs/langs/tr_TR/printing.lang b/htdocs/langs/tr_TR/printing.lang
index 405b2d5f296..d1894400ee6 100644
--- a/htdocs/langs/tr_TR/printing.lang
+++ b/htdocs/langs/tr_TR/printing.lang
@@ -18,10 +18,6 @@ UserConf=Kişi başına ayarlar
 PRINTGCP_INFO=Google OAuth API ayarları
 PRINTGCP_AUTHLINK=Kimlik doğrulama
 PRINTGCP_TOKEN_ACCESS=Google Bulut Yazdırma OAuth Belirteçi
-PRINTGCP_TOKEN_REFRESH=Belirteç Yenilemesi Mevcuttur
-PRINTGCP_TOKEN_EXPIRED=Belirteç Sona ermiş
-PRINTGCP_TOKEN_EXPIRE_AT=Belirteç sonlanması
-PRINTGCP_DELETE_TOKEN=Kayıtlı belrteçi sil
 PrintGCPDesc=Bu sürücü belgelerin Google Bulut Yazdırma ile doğrudan bir yazıcıya gönderilmesini sağlar.
 GCP_Name=Adı
 GCP_displayName=Adı göster
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index fd0a54dbd34..41670c77e53 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Parti/Seri
 atleast1batchfield=Son Tüketme tarihi ya da Son Satma tarihi ya da Parti/Seri numarası
 batch_number=Parti/Seri numarası
 BatchNumberShort=Parti/Seri
-l_eatby=Son yenme tarihi
-l_sellby=Son satış tarihi
+EatByDate=Tüketim tarihi
+SellByDate=Satış tarihi
 DetailBatchNumber=Parti/Seri ayrıntısı
 DetailBatchFormat=Parti/Seri: %s - Son Tüketme: %s - Son Satma: %s (Mik: %d)
 printBatch=Parti/Seri: %s
@@ -19,3 +19,6 @@ printQty=Mik: %d
 AddDispatchBatchLine=Dağıtımda bir Raf Ömrü satırı ekle
 WhenProductBatchModuleOnOptionAreForced=Parti/Seri modülü açıkken, stok arttırma/eksiltme modu son seçime zorlanır ve düzenlenemez. Diğer seçenekler isteğinize göre düzenlenebilir.
 ProductDoesNotUseBatchSerial=Bu ürün parti/seri numarası kullanmıyor
+ProductLotSetup=Parti/seri modülü ayarları
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index c62781facd8..93c603130f4 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -18,7 +18,7 @@ ProductVatMassChange=Toplu KDV değiştir
 ProductVatMassChangeDesc=Bu sayfa, ürünler ve hizmetler için tanımlanmış KDV oranının bir değerden başka bir değere değiştirilmesi için kullanılır. Uyarı, bu değişiklik tüm veritabanına uygulanır.
 MassBarcodeInit=Toplu barkod başlatma
 MassBarcodeInitDesc=Bu sayfa, barkod tanımlanmamış nesneler üzerinde barkod başlatmak için kullanılabilir. Önce barkod modülü kurulumunun tamamlandığını denetleyin.
-ProductAccountancyBuyCode=Muhasebe kodu (alış)
+ProductAccountancyBuyCode=Muhasebe kodu (satınalma)
 ProductAccountancySellCode=Muhasebe kodu (satış)
 ProductOrService=Ürün veya Hizmet
 ProductsAndServices=Ürünler ve Hizmetler
@@ -59,6 +59,8 @@ SellingPriceHT=Satış Fiyatı (vergisiz net)
 SellingPriceTTC=Satış Fiyatı (vergi dahil)
 CostPriceDescription=Bu fiyat (vergisiz), bu ürünün firmanıza olan ortalama maliyetini kaydetmek için kullanılabilir. Kendinize hesapladığınız herhangi bir fiyat olabilir, örneğin; ortalama alış fiyatı artı ortalama üretim ve dağıtım maliyeti.
 CostPriceUsage=İleriki bir sürümde bu değer kar oranı hesaplanmasında kullanılabilir.
+SoldAmount=Satılan tutar
+PurchasedAmount=Satınalınan tutar
 NewPrice=Yeni fiyat
 MinPrice=En düş. satış fiyatı
 CantBeLessThanMinPrice=Satış fiyatı bu ürün için izin verilen en düşük fiyattan az olamaz (%s vergi hariç). Bu mesaj, çok fazla indirim yaparsanız da belirir.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Bir barkod için birçok etiket yazdır
 BuildPageToPrint=Yazdırılacak sayfa oluştur
 FillBarCodeTypeAndValueManually=Barkod türünü girin ve el ile değer yazın.
 FillBarCodeTypeAndValueFromProduct=Barkod türünü girin ve ürün barkodundan değer girin.
-FillBarCodeTypeAndValueFromThirdParty=Barkod türünü girin ve bir üçüncü taraf barkodundan değer girin.
+FillBarCodeTypeAndValueFromThirdParty=Barkod türü ve üçüncü taraf barkodundan değer girin
 DefinitionOfBarCodeForProductNotComplete=Barkod türü tanımı ve değeri %s ürünü için tam değildir.
-DefinitionOfBarCodeForThirdpartyNotComplete=Barkod türü tanımı ve değeri %s üçüncü tarafı için tamamlanmamıştır.
+DefinitionOfBarCodeForThirdpartyNotComplete=%s Üçüncü tarafı için barkod türü tanımı ve değeri tamamlanmıştır.
 BarCodeDataForProduct=%s Ürünü için barkod bilgisi :
-BarCodeDataForThirdparty=%s Üçüncü taraf için barkod bilgisi :
+BarCodeDataForThirdparty=%s üçüncü tarafı için barkod bilgileri :
 ResetBarcodeForAllRecords=Bütün kayıtlar için barkod değeri tanımla (bu işlem halihazırda yeni değerler tanımlanmış barkod değerlerini sıfırlayacaktır)
 PriceByCustomer=Her müşteri için farklı fiyatlar
 PriceCatalogue=Her ürün/hizmet için tek bir satış fiyatı
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 9db24c2475a..49168dde13a 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=Görevler listesi
 GoToListOfTimeConsumed=Tüketilen süre listesine git
 GoToListOfTasks=Görevler listesine git
 ListProposalsAssociatedProject=Proje ile ilgili tekliflerin listesi
-ListOrdersAssociatedProject=Proje ile ilgili müşteri siparişleri listesi
-ListInvoicesAssociatedProject=Proje ile ilgili müşteri faturaları listesi
-ListPredefinedInvoicesAssociatedProject=Bu projeyle ilişkili müşteri faturaları şablonu listesi
-ListSupplierOrdersAssociatedProject=Proje ile ilgili tedarikçi siparişlerinin listesi
-ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarının listesi
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
 ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
 ListExpenseReportsAssociatedProject=Bu proje ile ilişkili gider raporları listesi
@@ -123,6 +123,7 @@ ProjectReportDate=Görevi proje başlama tarihine göre değiştir
 ErrorShiftTaskDate=Görev tarihini yeni proje başlama tarihine göre kaydırmak olası değil
 ProjectsAndTasksLines=Projeler ve görevler
 ProjectCreatedInDolibarr=%s projesi oluşturuldu
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=%s görev oluşturuldu
 TaskModifiedInDolibarr=%s görev değiştirildi
 TaskDeletedInDolibarr=%s görev silindi
@@ -153,7 +154,7 @@ PlannedWorkload=Planlı işyükü
 PlannedWorkloadShort=İşyükü
 ProjectReferers=İlgili öğeler
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
-FirstAddRessourceToAllocateTime=Zaman tahsisi için bir kaynak ilişkilendir
+FirstAddRessourceToAllocateTime=Zaman tahsisi için göreve bir kullanıcı kaynağı ilişkilendir
 InputPerDay=Günlük giriş
 InputPerWeek=Haftalık giriş
 InputPerAction=Eylem başına giriş
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Fırsat durumuna göre açık proje/aday
 ProjectsStatistics=Projeler/adaylar için istatistikler
 TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmalı.
 IdTaskTime=Görev zamanı kimliği
-YouCanCompleteRef=Eğer referansı bazı bilgilerle tamamlamak isterseniz (arama süzgeçleri olarak kullanmak üzere), ayırmak için bir karakter eklemeniz önerilir, böylece otomatik numaralandırma sonraki projeler için de çalışacaktır. Örneğin; %s-ABC. Etikete arama anahtarları da eklemeyi yeğleyebilirsiniz.
+YouCanCompleteRef=Eğer referansı bazı bilgilerle tamamlamak isterseniz (arama süzgeçleri olarak kullanmak üzere), ayırmak için bir - karakteri eklemeniz önerilir, böylece otomatik numaralandırma sonraki projeler için de çalışacaktır. Örneğin; %s-ABC. Etikete arama anahtarları da eklemeyi yeğleyebilirsiniz. Ama en iyisi özel bir alan olarak da adlandırılan tamamlayıcı özellikler eklemek olabilir.
 OpenedProjectsByThirdparties=Üçüncü partilere göre açık projeler
 OnlyOpportunitiesShort=Yalnızca fırsatlar
 OpenedOpportunitiesShort=Açık fırsatlar
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 960cd1ed092..9889ed42443 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Gönderim sil
 Stock=Stok
 Stocks=Stoklar
 StocksByLotSerial=Partiye/ürüne göre stoklar
+LotSerial=i/Seri
+LotSerialList=Parti/seri listesi
 Movements=Hareketler
 ErrorWarehouseRefRequired=Depo referans adı gereklidir
 ListOfWarehouses=Depo listesi
@@ -43,6 +45,7 @@ PMPValue=Ağırlıklı ortalama fiyat
 PMPValueShort=AOF
 EnhancedValueOfWarehouses=Depolar değeri
 UserWarehouseAutoCreate=Bir kullanıcı oluştururken otomatik olarak bir stok oluştur
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Ürün stoku ve yan ürün stoku bağımsızdır
 QtyDispatched=Sevkedilen miktar
 QtyDispatchedShort=Dağıtılan mik
@@ -132,3 +135,9 @@ OpenAll=Bütün işlemler için açık
 OpenInternal=İç işlemler için açık
 OpenShipping=Sevkiyatlar için açık
 OpenDispatch=Gönderim için açık
+UseDispatchStatus=Dağıtım durumunu kullan (onayla/reddet)
+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
diff --git a/htdocs/langs/tr_TR/supplier_proposal.lang b/htdocs/langs/tr_TR/supplier_proposal.lang
index fd00db7f27f..e8e25e742a9 100644
--- a/htdocs/langs/tr_TR/supplier_proposal.lang
+++ b/htdocs/langs/tr_TR/supplier_proposal.lang
@@ -33,7 +33,7 @@ SupplierProposalStatusSignedShort=Kabul edildi
 SupplierProposalStatusNotSignedShort=Reddedildi
 CopyAskFrom=Varolan bir isteği kopyalayarak fiyat isteği oluştur
 CreateEmptyAsk=Boş istek oluştur
-CloneAsk=Fiya isteği kopyala
+CloneAsk=Fiyat isteği kopyala
 ConfirmCloneAsk=<b>%s</b> Fiyat isteğini kopyalamak istediğinizden emin misiniz ?
 ConfirmReOpenAsk=<b>%s</b> Fiyat isteğini geri açmak istediğinizden emin misiniz ?
 SendAskByMail=Fiyat isteğini postayla gönder
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Varsayılan model oluşturma
 DefaultModelSupplierProposalToBill=Bir fiyat isteğini kapatma sırasında (kabul edilmiş) varsayılan şablon
 DefaultModelSupplierProposalClosed=Bir fiyat isteğini kapatma sırasında (reddedilmiş) varsayılan şablon 
 ListOfSupplierProposal=Tedarikçi teklif istekleri listesi
+ListSupplierProposalsAssociatedProject=Proje ile ilişkili tedarikçi teliflerinin listesi
 SupplierProposalsToClose=Kapatılacak tedarikçi teklifleri
 SupplierProposalsToProcess=İşlenecek tedarikçi teklifleri
 LastSupplierProposals=Son fiyat istekleri
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 580db3d4172..905ba8d2f26 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -7,13 +7,13 @@ History=Geçmiş
 ListOfSuppliers=Tedarikçi listesi
 ShowSupplier=Tedarikçi göster
 OrderDate=Sipariş tarihi
-BuyingPriceMin=En düşük satınalma fiyatı
-BuyingPriceMinShort=En düş. satınalma fiyatı
-TotalBuyingPriceMinShort=Altürün satınalma fiyatlarının toplamı
-TotalSellingPriceMinShort=Altürün satış fiyatlarının toplamı
+BuyingPriceMin=En iyi alış fiyatı
+BuyingPriceMinShort=En iyi alış fiyatı
+TotalBuyingPriceMinShort=Yan ürün alış fiyatları toplamı
+TotalSellingPriceMinShort=Yan ürün satış fiyatları toplamı 
 SomeSubProductHaveNoPrices=Bazı altürünlerin fiyatı yok
-AddSupplierPrice=Tedarikçi fiyatı ekle
-ChangeSupplierPrice=Tedarikçi fiyatı değiştir
+AddSupplierPrice=Alış fiyatı ekle
+ChangeSupplierPrice=Alış fiyatı değiştir
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Bu referanslı tedarikçi zaten bu referans ile ilişkili: %s
 NoRecordedSuppliers=Kayıtlı tedarikçi yok
 SupplierPayment=Tedarikçi ödemesi
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Tedarikçi siparişleri listesi
 MenuOrdersSupplierToBill=Faturalanacak tedarikçi siparişleri
 NbDaysToDelivery=Gün olarak teslim süresi
 DescNbDaysToDelivery=Bu siparişteki en büyük teslimat gecikmesi olan ürünler
-UseDoubleApproval=Tutar (vergisiz) daha yüksekse çifte onaylama kullan (İkinci onay izin atanmış herhangi bir kullanıcı tarafından yapılabilir. Çifte onaylama olmaması için 0 a ayarlayın)
 SupplierReputation=Tedarikçi itibarı
 DoNotOrderThisProductToThisSupplier=Sipariş verme
 NotTheGoodQualitySupplier=Hatalı kalite
 ReputationForThisProduct=İtibar
+BuyerName=Alıcı adı
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 16e59c6cd51..0438696dedf 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Haftalık saatler
 ColorUser=Kullanıcı rengi
 DisabledInMonoUserMode=Bakım modunda devre dışıdır
 UserAccountancyCode=Kullanıcı muhasebe kodu
+UserLogoff=Kullanıcı çıktı
+UserLogged=Kullanıcı bağlandı
+DateEmployment=İşe Giriş Tarihi
diff --git a/htdocs/langs/tr_TR/website.lang b/htdocs/langs/tr_TR/website.lang
index b5ce6af4bc9..3945e67cae5 100644
--- a/htdocs/langs/tr_TR/website.lang
+++ b/htdocs/langs/tr_TR/website.lang
@@ -12,6 +12,7 @@ EditMenu=Menü düzenle
 EditPageMeta=Meta Düzenle
 EditPageContent=İçerik Düzenle
 Website=Web sitesi
+Webpage=Web sayfası
 AddPage=Sayfa ekle
 PreviewOfSiteNotYetAvailable=Web sitenizin <strong>%s</strong> önizlemesi henüz hazır değil. Önce bir sayfa eklemelisiniz.
 RequestedPageHasNoContentYet=İstenen %s kimlikli sayfa henüz içeriğe sahip değil veya önbellek dosyası .tpl.php silinmiş. Bunu çözümlemek için içeriği düzenleyin.
@@ -22,4 +23,6 @@ ViewPageInNewTab=Siteyi yeni sekmede izle
 SetAsHomePage=Giriş Sayfası olarak ayarla
 RealURL=Gerçek URL
 ViewWebsiteInProduction=Web sitesini giriş URL si kullanarak izle
-SetHereVirtualHost=Eğer web sunucunuzda <strong>%s</strong> üzerinde bir kök dizine sahip özel sanal host ayarlayabilirseniz, burada sanal host adını tanımlayın, böylece; önizleme Dolibarr URL sarıcısı yerine direkt olarak buradan yapılabilir.
+SetHereVirtualHost=Eğer <strong>%s</strong> web sunucunuz üzerinde bir kök dizine sahip özel sanal host kurabiliyorsanız, burada sanal host adını tanımlayın, böylece; önizleme yalnızca Dolibarr URL sunucusuyla değil aynı zamanda doğrudan bu web sunucusu erişimi ile de yapılabilir.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/tr_TR/withdrawals.lang b/htdocs/langs/tr_TR/withdrawals.lang
index 073e030ecf7..eebab4ccc06 100644
--- a/htdocs/langs/tr_TR/withdrawals.lang
+++ b/htdocs/langs/tr_TR/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Müşteri ödeme talimatları alanı
-StandingOrders=Ödeme talimatları
-StandingOrder=Ödeme talimatları
-NewStandingOrder=Yeni ödeme talimatı
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=İşlenecek
-WithdrawalsReceipts=Para çekme makbuzları
-WithdrawalReceipt=Para çekme makbuzu
-LastWithdrawalReceipts=Son %s para çekme makbuzu
-WithdrawalsLines=Para çekme satırları
-RequestStandingOrderToTreat=İşlenecek ödeme talimatı isteği
-RequestStandingOrderTreated=İşlenemiş ödeme talimatı isteği
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Henüz olası değil. Özel satırlarda reddedildi olarak bildirilmeden önce paraçekme durumu 'alacaklandırıldı' olarak ayarlkanmalıdır.
-NbOfInvoiceToWithdraw=Para çekme istekli fatura sayısı
-NbOfInvoiceToWithdrawWithInfo=Banka hesabı tanımlı müşterilere ait para çekme istekli fatura sayısı
-InvoiceWaitingWithdraw=Fatura tahsilat için bekliyor
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Çekilecek tutar
-WithdrawsRefused=Reddedilen para çekmeler
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw="Para çekme" ödeme biçiminde bekleyen hiç müşteri faturasıyok. Fatura kartında 'Para çekme' sekmesine bir istek yapın.
 ResponsibleUser=Sorumlu kullanıcı
-WithdrawalsSetup=Para çekme kurulumu
-WithdrawStatistics=Para çekme istatistikleri
-WithdrawRejectStatistics=Para çekme reddedilme istatistikleri
-LastWithdrawalReceipt=Son %s para çekme makbuzu
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Bir para çekme isteği oluştur
 ThirdPartyBankCode=Üçüncü parti banka kodu
 NoInvoiceCouldBeWithdrawed=Hiçbir fatura için para çekme işlemi başarılamadı. Firma faturalarının geçerli bir BAN'ı olduğunu kontrol edin.
@@ -46,7 +47,7 @@ StatusRefused=Reddedildi
 StatusMotif0=Belirtilmemiş
 StatusMotif1=Bakiye yetersiz
 StatusMotif2=İsteğe itiraz edildi
-StatusMotif3=Çekme talimatı yok
+StatusMotif3=No direct debit payment order
 StatusMotif4=Müşteri siparişi
 StatusMotif5=RIB kullanılamaz
 StatusMotif6=Bakiyesiz hesap
@@ -61,28 +62,43 @@ NotifyCredit=Kredi çekme
 NumeroNationalEmetter=Ulusal İletim Numarası
 WithBankUsingRIB=RIB kullanan banka hesapları için
 WithBankUsingBANBIC=IBAN/BIC/SWIFT kullanan banka hesapları için
-BankToReceiveWithdraw=Para çekilecek banka hesabı
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=Bu sekme bir ödeme talimatı yapmanızı sağlar. Talimatı yaptıktan sonra, ödeme talimatını yürütmek için Banka->Para çekme menüsüne gidin. Ödeme talimatı kapatıldıktan sonra faturanın ödemesi otomatik olarak kaydedilecek ve kalan bakiye sıfır ise fatura kapatılacaktır.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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
 ThisWillAlsoAddPaymentOnInvoice=Bu aynı zamanda faturalara ödeme oluşturur ve onları "ödendi" olarak sınıflandırır
 StatisticsByLineStatus=Durum satırlarına göre istatistkler
-RUM=RUM
-RUMWillBeGenerated=Banka hesabı bilgisi kaydedildikten sonra RUM sayısı oluşturulacaktır
-WithdrawMode=Para çekme biçimi (FRST ya da RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Para çekme isteği tutarı:
 WithdrawRequestErrorNilAmount=Tutar boş olduğu için para çekme işlemi oluşturulamıyor.
+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
 
 ### Notifications
-InfoCreditSubject=Banka tarafından ödenen %s ödeme talimatı
-InfoCreditMessage=%s Ödeme talimatı banka tarafından ödenmiştir<br>Ödeme tarihi: %s
-InfoTransSubject=%s Ödeme talimatının bankaya iletilmesi
-InfoTransMessage=%s ödeme talimatı bankaya %s %s tarafından iletilmiştir.<br><br>
+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>
 InfoTransData=Tutarı: %s<br> Yöntemi: %s<br>Tarihi: %s
-InfoRejectSubject=Ödeme talimatı reddedildi
-InfoRejectMessage=Merhaba,<br><br>Aşağıda ayrıntıları verilen ödeme talimatı reddedilmiştir: Fatura %s, Firma %s, Tutar %s, Banka<br><br>--<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
 ModeWarning=Gerçek mod için seçenek ayarlanmamış, bu simülasyondan sonra durdururuz
diff --git a/htdocs/langs/tr_TR/workflow.lang b/htdocs/langs/tr_TR/workflow.lang
index 855e04a4b64..d8aa88d1861 100644
--- a/htdocs/langs/tr_TR/workflow.lang
+++ b/htdocs/langs/tr_TR/workflow.lang
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Bir müşteri siparişi kapatıldıktan so
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Bir müşteri siparişi ödenmiş olarak güncellendiğinde ilgili kaynak teklif faturalandı olarak dosyalansın
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Müşteri faturası ödendi olarak ayarlandığında bağlantılı kaynak sipariş(ler)ini faturalandı olarak sınıflandır
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Müşteri faturası doğrulandığında bağlantılı kaynak sipariş(ler)ini faturalandı olarak sınıflandır
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Müşteri faturası doğrulandığında  bağlantılı teklif kaynağını faturalandı olarak sınıflandır
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 7545c888763..ed4ad430cd1 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Експериментальна
 VersionDevelopment=Розробча
 VersionUnknown=Невизначена
 VersionRecommanded=Рекомендована
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID Сессії
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index be3284b5c93..15d9c339a82 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Помилка, неможлив
 BillFrom=Продавець
 BillTo=Покупець
 ActionsOnBill=Дії з рахунком-фактурою
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Надана знижка (за достроковий плат
 EscompteOfferedShort=Discount
 SendBillRef=Представлення рахунку %s
 SendReminderBillRef=Представлення рахунку %s (нагадування)
-StandingOrders=Регламенти
-StandingOrder=Регламент
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Немає проектів рахунків-фактур
 NoOtherDraftBills=Немає інших проектів рахунків-фактур
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Готівка
 PaymentTypeShortLIQ=Готівка
 PaymentTypeCB=Кредитна картка
@@ -381,6 +381,7 @@ ExtraInfos=Додаткова інформація
 RegulatedOn=Regulated on
 ChequeNumber=Чек №
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Банк чека
 CheckBank=Перевірити
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Повернення платежу
 ListOfYourUnpaidInvoices=Список неоплачених рахунків
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index d881ffaadd0..83555fecdd1 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Замовлення клієнтів
 ForProposals=Пропозиції
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/uk_UA/interventions.lang
+++ b/htdocs/langs/uk_UA/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/uk_UA/ldap.lang b/htdocs/langs/uk_UA/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/uk_UA/ldap.lang
+++ b/htdocs/langs/uk_UA/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 4531a0dd89e..21d0ef5c255 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Читати
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index c927fa75425..72503b620bd 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -8,21 +8,21 @@ FONTFORPDF=freemono
 FONTSIZEFORPDF=8
 SeparatorDecimal=,
 SeparatorThousand=None
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
+FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
-FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
+FormatHourShortDuration=ЧЧ:ММ
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d.%m.%Y %H:%M
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%b %d, %Y, %I:%M %p
-FormatDateHourText=%B %d, %Y, %I:%M %p
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Підключеня до Бази Данних
 NoTemplateDefined=No template defined for this email type
 AvailableVariables=Available substitution variables
@@ -36,19 +36,19 @@ ErrorFieldRequired=Поле '%s' є обов'язковим
 ErrorFieldFormat=Поле '%s' містить помилкове значення
 ErrorFileDoesNotExists=Файл %s не існує
 ErrorFailedToOpenFile=Неможливо відкрити файл %s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=Неможливо створити каталог %s
+ErrorCanNotReadDir=Неможливо прочитати каталог %s
 ErrorConstantNotDefined=Параметр %s не було визначено
 ErrorUnknown=Невідома помилка
 ErrorSQL=Помилка SQL
 ErrorLogoFileNotFound=Файл логотипу '%s' не знайдено
-ErrorGoToGlobalSetup=Go to 'Company/Foundation' setup to fix this
-ErrorGoToModuleSetup=Go to Module setup to fix this
+ErrorGoToGlobalSetup=Перейти до налаштувань 'Компанія/Організація', щоб це виправити
+ErrorGoToModuleSetup=Перейти до Модулю налаштувань, щоб це виправити
 ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
-ErrorFileNotUploaded=File was not uploaded. Check that size does not exceed maximum allowed, that free space is available on disk and that there is not already a file with same name in this directory.
-ErrorInternalErrorDetected=Error detected
-ErrorWrongHostParameter=Wrong host parameter
-ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form.
+ErrorFileNotUploaded=Файл не завантажений. Переконайтеся, що розмір не перевищує максимально допустимий, що достатньо вільного місця на диску і що не існує вже файл з таким же ім'ям в цій директорії.
+ErrorInternalErrorDetected=Виявлено помилку
+ErrorWrongHostParameter=Неправильний параметр хосту
+ErrorYourCountryIsNotDefined=Ваша країна не визначена. Перейти до Головна-Налаштування-Редагувати і знову відправте форму.\n
 ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least one child records.
 ErrorWrongValue=Wrong value
 ErrorWrongValueForParameterX=Wrong value for parameter %s
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -101,30 +102,30 @@ TechnicalID=Technical ID
 NotePublic=Note (public)
 NotePrivate=Note (private)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr was setup to limit precision of unit prices to <b>%s</b> decimals.
-DoTest=Test
-ToFilter=Filter
+DoTest=Тест
+ToFilter=Фільтер
 NoFilter=No filter
 WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance delay.
-yes=yes
-Yes=Yes
-no=no
-No=No
-All=All
-Home=Home
-Help=Help
-OnlineHelp=Online help
-PageWiki=Wiki page
+yes=так
+Yes=Так
+no=ні
+No=Ні
+All=Всі
+Home=Головна
+Help=Допомога
+OnlineHelp=Он-лайн допомога
+PageWiki=Wiki сторінка
 MediaBrowser=Media browser
-Always=Always
-Never=Never
-Under=under
-Period=Period
-PeriodEndDate=End date for period
-Activate=Activate
-Activated=Activated
-Closed=Closed
-Closed2=Closed
-Enabled=Enabled
+Always=Завжди
+Never=Ніколи
+Under=Під
+Period=Період
+PeriodEndDate=Кінцева дата періоду
+Activate=Активувати
+Activated=Активовано
+Closed=Зачинено
+Closed2=Зачинено
+Enabled=Дозволено
 Deprecated=Deprecated
 Disable=Disable
 Disabled=Disabled
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/uk_UA/oauth.lang b/htdocs/langs/uk_UA/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/uk_UA/oauth.lang
+++ b/htdocs/langs/uk_UA/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/uk_UA/printing.lang b/htdocs/langs/uk_UA/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/uk_UA/printing.lang
+++ b/htdocs/langs/uk_UA/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index f9d91faa7ca..e1290a192a8 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index af313850ba1..9967530b1d2 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Experimental
 VersionDevelopment=Development
 VersionUnknown=Unknown
 VersionRecommanded=Recommended
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=Session ID
 SessionSaveHandler=Handler to save sessions
 SessionSavePath=Storage session localization
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is n
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=Nbr of characters to trigger search: %s
 NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=JavaScript disabled
 UsePreviewTabs=Use preview tabs
 ShowPreview=Show preview
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Autodetect (browser language)
 FeatureDisabledInDemo=Feature disabled in demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Permissions
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Only elements from <a href="%s">enabled modules</a> are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=More modules...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Dolibarr current version
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Parameters to secure URLs
 SecurityTokenIsUnique=Use a unique securekey parameter for each URL
 EnterRefToBuildUrl=Enter reference for object %s
 GetSecuredUrl=Get calculated URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Users & groups
@@ -428,8 +439,8 @@ Module55Name=Barcodes
 Module55Desc=Barcode management
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Standing orders
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar integration
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=Notifications
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Donations
 Module700Desc=Donation management
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Read providers
 Permission147=Read stats
-Permission151=Read standing orders
-Permission152=Create/modify a standing orders request
-Permission153=Transmission standing orders receipts
-Permission154=Credit/refuse standing orders receipts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=Export supplier invoices, attributes and payments
 Permission1237=Export supplier orders and their details
 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 customer orders and attributes
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
 LabelOnDocuments=Label on documents
 NbOfDays=Nb of days
 AtEndOfMonth=At end of month
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Path to documents
 PathDirectory=Directory
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Administrator password
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Example : o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Example : objectsid
 LDAPFieldEndLastSubscription=Date of subscription end
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Products and Services modules setup
 NumberOfProductShowInSelect=Max number of products in combos select lists (0=no limit)
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=Withdrawal module setup
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=External RSS imports setup
 NewRSS=New RSS Feed
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index b868967b10b..d04f64eb153 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=Reconciliation
 RIB=Bank Account Number
 IBAN=IBAN number
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC/SWIFT number
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Account statement
 AccountStatementShort=Statement
 AccountStatements=Account statements
@@ -78,6 +74,7 @@ AccountToCredit=Account to credit
 AccountToDebit=Account to debit
 DisableConciliation=Disable reconciliation feature for this account
 ConciliationDisabled=Reconciliation feature disabled
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Closed
 AccountIdShort=Number
@@ -87,6 +84,8 @@ AddBankRecordLong=Add transaction manually
 ConciliatedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Transaction reconciled
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Withdrawal payment
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Bank transfer
 BankTransfers=Bank transfers
-TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account, of the same amount. The same label and date will be used for this transaction)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=From
 TransferTo=To
 TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
@@ -129,7 +129,7 @@ FutureTransaction=Transaction in futur. No way to conciliate.
 SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index 28a8ee4f110..3a5f888d304 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice t
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Discount offered (payment before term)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=Standing orders
-StandingOrder=Standing order
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=No draft invoices
 NoOtherDraftBills=No other draft invoices
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Bank's order
-PaymentTypeShortPRE=Bank's order
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Cash
 PaymentTypeShortLIQ=Cash
 PaymentTypeCB=Credit card
@@ -381,6 +381,7 @@ ExtraInfos=Extra infos
 RegulatedOn=Regulated on
 ChequeNumber=Check N°
 ChequeOrTransferNumber=Check/Transfer N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Bank of Check
 CheckBank=Check
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Paid by this payment
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Paid".
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (recommended Template)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index ff20b6afb1c..98970318e85 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Customers invoices
 ForCustomersOrders=Customers orders
 ForProposals=Proposals
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 7b80d1a6f47..69db60c0cc3 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=on
 CashDeskThirdParty=Third party
 ShoppingCart=Shopping cart
 NewSell=New sell
-BackOffice=Back office
 AddThisArticle=Add this article
 RestartSelling=Go back on sell
-SellFinished=Sell finished
+SellFinished=Sale complete
 PrintTicket=Print ticket
 NoProductFound=No article found
 ProductFound=product found
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 976c8a50d93..1615697ed9d 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Subcategories
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=This category already exists with this ref
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=This category does not contain any product.
 ThisCategoryHasNoSupplier=This category does not contain any supplier.
 ThisCategoryHasNoCustomer=This category does not contain any customer.
 ThisCategoryHasNoMember=This category does not contain any member.
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 44de76d2130..763a2c9a0e8 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=New private individual
 NewCompany=New company (prospect, customer, supplier)
 NewThirdParty=New third party (prospect, customer, supplier)
 CreateDolibarrThirdPartySupplier=Create a third party (supplier)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Prospection area
 IdThirdParty=Id third party
 IdCompany=Company Id
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Suppliers
 ThirdPartyType=Third party type
 Company/Fundation=Company/Foundation
 Individual=Private individual
-ToCreateContactWithSameName=Will create automatically a physical contact with same informations
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Parent company
 Subsidiaries=Subsidiaries
 ReportByCustomers=Report by customers
@@ -47,7 +49,7 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
-PostOrFunction=Post/Function
+PostOrFunction=Job position
 UserTitle=Title
 Address=Address
 State=State/Province
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Don't send mass e-mailings
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Zip Code
 Town=City
@@ -73,7 +75,7 @@ Poste= Position
 DefaultLang=Language by default
 VATIsUsed=VAT is used
 VATIsNotUsed=VAT is not used
-CopyAddressFromSoc=Fill address with thirdparty address
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=VAT number
 VATIntraShort=VAT number
 VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
 ProspectCustomer=Prospect / Customer
 Prospect=Prospect
 CustomerCard=Customer Card
@@ -261,7 +262,9 @@ AddContactAddress=Create contact/address
 EditContact=Edit contact
 EditContactAddress=Edit contact/address
 Contact=Contact
+ContactId=Contact id
 ContactsAddresses=Contacts/Addresses
+FromContactName=Name:
 NoContactDefinedForThirdParty=No contact defined for this third party
 NoContactDefined=No contact defined
 DefaultContact=Default contact/address
@@ -284,7 +287,7 @@ CompanyDeleted=Company "%s" deleted from database.
 ListOfContacts=List of contacts/addresses
 ListOfContactsAddresses=List of contacts/adresses
 ListOfThirdParties=List of third parties
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Show contact
 ContactsAllShort=All (No filter)
 ContactType=Contact type
@@ -294,6 +297,7 @@ ContactForProposals=Proposal's contact
 ContactForContracts=Contract's contact
 ContactForInvoices=Invoice's contact
 NoContactForAnyOrder=This contact is not a contact for any order
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=This contact is not a contact for any commercial proposal
 NoContactForAnyContract=This contact is not a contact for any contract
 NoContactForAnyInvoice=This contact is not a contact for any invoice
@@ -352,9 +356,9 @@ ExportCardToFormat=Export card to format
 ContactNotLinkedToCompany=Contact not linked to any third party
 DolibarrLogin=Dolibarr login
 NoDolibarrAccess=No Dolibarr access
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Contacts and properties
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
 ImportDataset_company_3=Bank details
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index ce2ef616ab4..7c1689af933 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=Taxes and dividends
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index eb0811a2e38..cb68b31c80f 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=Method
 CronModule=Module
 CronNoJobs=No jobs registered
 CronPriority=Priority
-CronLabel=Description
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 364d60bf6b8..29e1c7e6228 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index ce41ae75a30..1789723a565 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=This PHP supports sessions.
 PHPSupportPOSTGETOk=This PHP supports variables POST and GET.
 PHPSupportPOSTGETKo=It's possible your PHP setup does not support variables POST and/or GET. Check your parameter <b>variables_order</b> in php.ini.
 PHPSupportGD=This PHP support GD graphical functions.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=This PHP support UTF8 functions.
 PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
 PHPMemoryTooLow=Your PHP max session memory is set to <b>%s</b> bytes. This should be too low. Change your <b>php.ini</b> to set <b>memory_limit</b> parameter to at least <b>%s</b> bytes.
 Recheck=Click here for a more significative test
 ErrorPHPDoesNotSupportSessions=Your PHP installation does not support sessions. This feature is required to make Dolibarr working. Check your PHP setup.
 ErrorPHPDoesNotSupportGD=Your PHP installation does not support graphical function GD. No graph will be available.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr can't work correctly. Solve this before installing Dolibarr.
 ErrorDirDoesNotExists=Directory %s does not exist.
 ErrorGoBackAndCorrectParameters=Go backward and correct wrong parameters.
@@ -133,6 +135,10 @@ ActivateModule=Activate module %s
 ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Update data on actions
 MigrationPaymentMode=Data migration for payment mode
 MigrationCategorieAssociation=Migration of categories
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Show not available options
 HideNotAvailableOptions=Hide not available options
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index fb1b0b09362..cad0806282e 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Following-up customer contact
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index 23f0df862b9..a17019d00fb 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=First subscription date
 LDAPFieldFirstSubscriptionAmount=First subscription amount
 LDAPFieldLastSubscriptionDate=Last subscription date
 LDAPFieldLastSubscriptionAmount=Last subscription amount
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=User synchronized
 GroupSynchronized=Group synchronized
 MemberSynchronized=Member synchronized
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index ffe7d5735d1..b9ae873bff0 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Read
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 5eaed1496e8..e1068d4e818 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -67,6 +67,7 @@ SelectDate=Select a date
 SeeAlso=See also %s
 SeeHere=See here
 BackgroundColorByDefault=Default background color
+FileRenamed=The file was successfully renamed
 FileUploaded=The file was successfully uploaded
 FileWasNotUploaded=A file is selected for attachment but was not yet uploaded. Click on "Attach file" for this.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Report build date
 DatePayment=Date of payment
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=year
 DurationMonth=month
 DurationWeek=week
@@ -256,6 +261,7 @@ DurationDays=days
 Year=Year
 Month=Month
 Week=Week
+WeekShort=Week
 Day=Day
 Hour=Hour
 Minute=Minute
@@ -278,6 +284,7 @@ MonthOfDay=Month of the day
 HourShort=H
 MinuteShort=mn
 Rate=Rate
+CurrencyRate=Currency conversion rate
 UseLocalTax=Include tax
 Bytes=Bytes
 KiloBytes=Kilobytes
@@ -565,8 +572,11 @@ BackToList=Back to list
 GoBack=Go back
 CanBeModifiedIfOk=Can be modified if valid
 CanBeModifiedIfKo=Can be modified if not valid
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=You don't have permission for this action
 SessionName=Session name
 Method=Method
 Receive=Receive
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Partial
 TotalWoman=Total
 NeverReceived=Never received
@@ -598,6 +609,7 @@ DisabledModules=Disabled modules
 For=For
 ForCustomer=For customer
 Signature=Signature
+DateOfSignature=Date of signature
 HidePassword=Show command with password hidden
 UnHidePassword=Show real command with clear password
 Root=Root
@@ -641,6 +653,15 @@ NewAttribute=New attribute
 AttributeCode=Attribute code
 URLPhoto=URL of photo/logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Create draft
 SetToDraft=Back to draft
 ClickToEdit=Click to edit
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Monday
 Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 12a61c146be..64e1a87864d 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index e56ebb5c9ee..abcfcc55905 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/uz_UZ/printing.lang b/htdocs/langs/uz_UZ/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/uz_UZ/printing.lang
+++ b/htdocs/langs/uz_UZ/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index c515b6972a6..a80dc8a558b 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=Accountancy code (buy)
-ProductAccountancySellCode=Accountancy code (sell)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Product or Service
 ProductsAndServices=Products and Services
 ProductsOrServices=Products or Services
@@ -59,6 +59,8 @@ SellingPriceHT=Selling price (net of tax)
 SellingPriceTTC=Selling price (inc. tax)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=New price
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=The selling price can't be lower than minimum allowed for this product (%s without tax). This message can also appears if you type a too important discount.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index fe21b3558ba..b3cdd8007fc 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=List of the commercial proposals associated with the project
-ListOrdersAssociatedProject=List of customer's orders associated with the project
-ListInvoicesAssociatedProject=List of customer's invoices associated with the project
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=List of supplier's orders associated with the project
-ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=List of contracts associated with the project
 ListFichinterAssociatedProject=List of interventions associated with the project
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 8d2d1739a69..3a6e3f4a034 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Delete sending
 Stock=Stock
 Stocks=Stocks
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Movements
 ErrorWarehouseRefRequired=Warehouse reference name is required
 ListOfWarehouses=List of warehouses
@@ -43,6 +45,7 @@ PMPValue=Weighted average price
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Warehouses value
 UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Quantity dispatched
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 10b4a5e60c8..766e4a9bfe9 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -7,13 +7,13 @@ History=History
 ListOfSuppliers=List of suppliers
 ShowSupplier=Show supplier
 OrderDate=Order date
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=Add supplier price
-ChangeSupplierPrice=Change supplier price
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=This reference supplier is already associated with a reference: %s
 NoRecordedSuppliers=No suppliers recorded
 SupplierPayment=Supplier payment
@@ -36,8 +36,8 @@ ListOfSupplierOrders=List of supplier orders
 MenuOrdersSupplierToBill=Supplier orders to invoice
 NbDaysToDelivery=Delivery delay in days
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index a8447504235..d013d6acb90 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index ad63525ee64..68599cd3b91 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Customers standing orders area
-StandingOrders=Standing orders
-StandingOrder=Standing orders
-NewStandingOrder=New standing order
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=To process
-WithdrawalsReceipts=Withdrawal receipts
-WithdrawalReceipt=Withdrawal receipt
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Withdrawal lines
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=Invoice waiting for withdraw
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Amount to withdraw
-WithdrawsRefused=Withdraws refused
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=No customer invoice in payment mode "withdraw" is waiting. Go on 'Withdraw' tab on invoice card to make a request.
 ResponsibleUser=Responsible user
-WithdrawalsSetup=Withdrawal setup
-WithdrawStatistics=Withdraw's statistics
-WithdrawRejectStatistics=Withdraw reject's statistics
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+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 withdraw request
 ThirdPartyBankCode=Third party bank code
 NoInvoiceCouldBeWithdrawed=No invoice withdrawed with success. Check that invoice are on companies with a valid BAN.
@@ -46,7 +47,7 @@ StatusRefused=Refused
 StatusMotif0=Unspecified
 StatusMotif1=Insufficient funds
 StatusMotif2=Request contested
-StatusMotif3=No Withdrawal order
+StatusMotif3=No direct debit payment order
 StatusMotif4=Customer Order
 StatusMotif5=RIB unusable
 StatusMotif6=Account without balance
@@ -61,28 +62,43 @@ 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 withdraws
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Payment of standing order %s by the bank
-InfoCreditMessage=The standing order %s has been paid by the bank<br>Data of payment: %s
-InfoTransSubject=Transmission of standing order %s to bank
-InfoTransMessage=The standing order %s has been sent to bank by %s %s.<br><br>
+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>
 InfoTransData=Amount: %s<br>Method: %s<br>Date: %s
-InfoRejectSubject=Standing order refused
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=Option for real mode was not set, we stop after this simulation
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 014c1887415..2c0c082c011 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Workflow module setup
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 75664fb2db5..aae8c4d1e5c 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - en_US - Accounting Expert
-ACCOUNTING_EXPORT_SEPARATORCSV=Column separator for export file
-ACCOUNTING_EXPORT_DATE=Date format for export file
+ACCOUNTING_EXPORT_SEPARATORCSV=Dấu ngăn cách cột trong file xuất ra
+ACCOUNTING_EXPORT_DATE=Định dạng ngày trong file xuất ra
 ACCOUNTING_EXPORT_PIECE=Export the number of piece
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
 ACCOUNTING_EXPORT_LABEL=Export label
@@ -14,48 +14,69 @@ Journaux=Tạp chí
 JournalFinancial=Tạp chí tài chính
 BackToChartofaccounts=Quay trở lại biểu đồ của tài khoản
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Chọn một biểu đồ của tài khoản
 Addanaccount=Thêm một tài khoản kế toán
 AccountAccounting=Tài khoản kế toán
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Báo cáo
 NewAccount=Tài khoản kế toán mới
 Create=Tạo
-CreateMvts=Create movement
-UpdateMvts=Sửa đổi của một thay đổi
-WriteBookKeeping=Tài khoản ghi trong sổ kế toán tổng
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=Sổ cái tổng hợp
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Dòng hoá đơn được ventilation
-InvoiceLinesDone=Đường ventilation hóa đơn
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilation
+Ventilate=Bind
 
 Processing=Chế biến
 EndProcessing=Sự kết thúc của chế biến
-AnyLineVentilate=Bất kỳ dòng để ventilation
+AnyLineVentilate=Any lines to bind
 SelectedLines=Đường lựa chọn
 Lineofinvoice=Dòng của hóa đơn
-VentilatedinAccount=Ventilation thành công trong các tài khoản kế toán
-NotVentilatedinAccount=Không ventilation trong tài khoản kế toán
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Chiều dài của các tài khoản tổng hợp
-ACCOUNTING_LENGTH_AACCOUNT=Chiều dài của các tài khoản của bên thứ ba
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Bán tạp chí
 ACCOUNTING_PURCHASE_JOURNAL=Mua tạp chí
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Tạp chí
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Xóa các bản ghi của sổ kế toán tổng
-
 DescSellsJournal=Bán tạp chí
 DescPurchasesJournal=Mua tạp chí
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Thanh toán hóa đơn của khách hàng
-
 ThirdPartyAccount=Tài khoản của bên thứ ba
-
-NewAccountingMvt=Thay đổi mới
-NumMvts=Số thay đổi
-ListeMvts=Danh sách của thay đổi
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Thẻ ghi nợ và tín dụng không thể có một giá trị cùng một lúc
 
-ReportThirdParty=Danh sách tài khoản của bên thứ ba
-DescThirdPartyReport=Tham khảo ý kiến ​​ở đây là danh sách các khách hàng của bên thứ ba và các nhà cung cấp và các tài khoản kế toán
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=Danh sách các tài khoản kế toán
 
@@ -114,22 +134,29 @@ Pcgtype=Lớp tài khoản
 Pcgsubtype=Trong lớp học của các tài khoản
 Accountparent=Gốc của tài khoản
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Lợi nhuận tổng doanh thu
-DescVentilDoneCustomer=Tham khảo ý kiến ​​ở đây là danh sách các dòng hoá đơn cho khách hàng và tài khoản kế toán
-DescVentilTodoCustomer=Ventilation cho đường dây của bạn hóa đơn của khách hàng với một tài khoản kế toán
-ChangeAccount=Thay đổi tài khoản kế toán cho dòng lựa chọn tài khoản:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
-DescVentilDoneSupplier=Tham khảo ý kiến ​​ở đây là danh sách các dòng nhà cung cấp hoá đơn, tài khoản kế toán
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Tự động xác nhận
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 3a399186d22..2d8992607f3 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -8,11 +8,16 @@ VersionExperimental=Thử nghiệm
 VersionDevelopment=Phát triển
 VersionUnknown=Không rõ
 VersionRecommanded=Khuyên dùng
-FileCheck=Files toàn vẹn
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=File thất lạc
 FilesUpdated=File đã cập nhật
-FileCheckDolibarr=Kiểm tra toàn vẹn file Dolibarr
-XmlNotFound=Xml file của Dolibarr toàn vẹn Không tìm thấy
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=ID phiên làm việc
 SessionSaveHandler=Quản lý lưu phiên làm việc
 SessionSavePath=Lưu trữ phiên làm việc bản địa hóa
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=Lỗi, thao tác này có độ ưu tiên cao
 DictionarySetup=Cài đặt từ điển
 Dictionary=Từ điển
 Chartofaccounts=Biểu đồ tài khoản
-Fiscalyear=Năm tài chính
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Giá trị 'hệ thống' và 'systemauto đối với loại được dành riêng. Bạn có thể sử dụng "người dùng" giá trị để thêm vào bản ghi chính mình
 ErrorCodeCantContainZero=Mã lệnh không thể chứa giá trị 0
 DisableJavascript=Vô hiệu hóa chức năng JavaScript và Ajax (Đề xuất cho người mù hoặc văn bản trình duyệt)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Chờ bạn nhấn một phím trước khi tải
 DelaiedFullListToSelectContact=Chờ bạn nhấn một phím trước khi tải nội dung của danh sách liên lạc combo (Điều này có thể làm tăng hiệu suất nếu bạn có một số lượng lớn các liên lạc)
 NumberOfKeyToSearch=Nbr của characters để kích hoạt tìm kiếm: %s
 NotAvailableWhenAjaxDisabled=Hiện không có sẵn khi Ajax bị vô hiệu
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=Vô hiệu JavaScript
 UsePreviewTabs=Sử dụng chế độ xem sơ lược tab
 ShowPreview=Hiển thị xem trước
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=Encode binary data in hexadecimal
 IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
 AutoDetectLang=Tự động phát hiện (ngôn ngữ trình duyệt)
 FeatureDisabledInDemo=Tính năng đã vô hiệu hóa trong bản demo
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=Phân quyền
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=Chỉ có các yếu tố từ <a href="%s">module kích hoạt</a> được hiển thị.
-ModulesDesc=Module Dolibarr xác định các chức năng được kích hoạt trong phần mềm. Một số module yêu cầu phân quyền mà bạn phải cấp cho người sử dụng, sau khi kích hoạt module. Click vào nút on / off trong cột "Trạng thái" để mở một mô-đun / tính năng.
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=Nhiều mô-đun ...
 DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=Phiên bản hiện tại Dolibarr
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Cập nhật server offline
 GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=All other characters in the mask will remain intact.<br>Spaces are not allowed.<br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany done 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Example on third party created on 2007-03-01:</u><br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=Các thông số để bảo mật URL
 SecurityTokenIsUnique=Sử dụng một tham số securekey duy nhất cho mỗi URL
 EnterRefToBuildUrl=Nhập tham chiếu cho đối tượng %s
 GetSecuredUrl=Nhận URL được tính
-ButtonHideUnauthorized=Ẩn nút mà không được phân quyền, thay vì hiển thị các nút đã vô hiệu
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Thuế suất VAT cũ
 NewVATRates=Thuế suất VAT mới
 PriceBaseTypeToChange=Sửa đổi về giá với giá trị tham chiếu cơ sở được xác định trên
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Lựa chọn danh sách
 ExtrafieldSelectList = Chọn từ bảng
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox từ bảng
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=Người dùng & nhóm
@@ -428,8 +439,8 @@ Module55Name=Mã vạch
 Module55Desc=Quản lý mã vạch
 Module56Name=Telephony
 Module56Desc=Telephony integration
-Module57Name=Ủy nhiệm chi
-Module57Desc=Quản lý ủy nhiệm chi và rút tiền. Cũng bao gồm việc tạo ra file SEPA đối với các nước châu Âu.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Lịch trên web
 Module410Desc=Tích hợp lịch trên web
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Lương
-Module510Desc=Quản lý lương nhân viên và thanh toán
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Cho vay
 Module520Desc=Quản lý cho vay
 Module600Name=Thông báo
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=Tài trợ
 Module700Desc=Quản lý tài trợ
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=Xem nhà cung cấp
 Permission147=Xem thống kê
-Permission151=Xem ủy nhiệm chi
-Permission152=Tạo/chỉnh sửa yêu cầu ủy nhiệm chi
-Permission153=Chuyển giao chứng từ ủy nhiệm chi
-Permission154=Ghi có/từ chối chứng từ ủy nhiệm chi
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Xem hợp đồng/thuê bao
 Permission162=Tạo/chỉnh sửa hợp đồng/thuê bao
 Permission163=Kích hoạt dịch vụ/thuê bao của hợp đồng
@@ -747,6 +758,7 @@ Permission1236=Xuất dữ liệu hóa đơn nhà cung cấp, thuộc tính và
 Permission1237=Xuất dữ liệu đơn hàng nhà cung cấp và chi tiết của nó
 Permission1251=Chạy nhập dữ liệu khối cho dữ liệu bên ngoài vào cơ sở dữ liệu (tải dữ liệu)
 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=Xuất dữ liệu Đơn hàng và các thuộc tính
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Tạo/chỉnh sửa các thăm dò
 Permission59001=Xem lợi nhuận thương mại
 Permission59002=Xác định lợi nhuận thương mại
 Permission59003=Xem lợi nhuận mỗi người dùng
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Mức khách hàng tiềm năng
@@ -853,6 +869,7 @@ LabelUsedByDefault=Nhãn được sử dụng bởi mặc định nếu không c
 LabelOnDocuments=Nhãn trên các tài liệu
 NbOfDays=Nb của ngày
 AtEndOfMonth=Vào cuối tháng
+CurrentNext=Current/Next
 Offset=Offset
 AlwaysActive=Luôn hoạt động
 Upgrade=Nâng cấp
@@ -950,7 +967,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Những tính năng này có thể được sử dụng bởi những <b>người dùng quản trị.</b>
 SystemInfoDesc=Hệ thống thông tin là thông tin kỹ thuật linh tinh bạn nhận được trong chế độ chỉ đọc và có thể nhìn thấy chỉ cho quản trị viên.
 SystemAreaForAdminOnly=Khu vực này hiện có sẵn cho những người dùng quản trị. Không ai trong số phân quyền Dolibarr có thể làm giảm giới hạn này.
-CompanyFundationDesc=Chỉnh sửa trên trang này được biết tất cả thông tin của công ty hoặc tổ chức bạn cần quản lý (Đối với điều này, nhấn vào nút "Chỉnh sửa" ở dưới cùng của trang)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=Bạn có thể chọn từng thông số liên quan đến Dolibarr nhìn và cảm thấy ở đây
 AvailableModules=Module có sẵn
 ToActivateModule=Để kích hoạt mô-đun, đi vào Cài đặt Khu vực (Nhà-> Cài đặt-> Modules).
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=Warning, on some Linux systems, to send email from you
 PathToDocuments=Đường dẫn đến tài liệu
 PathDirectory=Thư mục
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
 ClassNotFoundIntoPathWarning=Lớp %s không tìm thấy con đường vào PHP
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=Use TLS
 LDAPServerUseTLSExample=Your LDAP server use TLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Mật khẩu quản trị
 LDAPUserDn=Users' DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=Ví dụ: o
 LDAPFieldSid=SID
 LDAPFieldSidExample=Ví dụ: objectsid
 LDAPFieldEndLastSubscription=Ngày đăng ký cuối cùng
-LDAPFieldTitle=Post/Function
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Ví dụ: tiêu đề
 LDAPSetupNotComplete=LDAP setup not complete (go on others tabs)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=No administrator or password provided. LDAP access will be anonymous and in read only mode.
@@ -1293,7 +1318,7 @@ ProductServiceSetup=Cài đặt module Sản phẩm và Dịch vụ
 NumberOfProductShowInSelect=Số lượng tối đa của sản phẩm trong danh sách combo chọn (0 = không giới hạn)
 ViewProductDescInFormAbility=Hình ảnh hóa của mô tả sản phẩm bằng trong các biểu mẫu (nếu không bật lên cửa sổ tooltip)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=Hình ảnh hóa của mô tả sản phẩm trong ngôn ngữ của bên thứ ba
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Sử dụng một form tìm kiếm để chọn một sản phẩm (chứ không phải là một danh sách thả xuống).
 SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Engine nội bộ
 BarCodeNumberManager=Quản lý số mã vạch xác định tự động
 ##### Prelevements #####
-WithdrawalsSetup=Cài đặt module rút tiền
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=Cài đặt nhập dữ liệu RSS bên ngoài
 NewRSS=Nguồn cấp RSS Mới
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Mở năm tài chính
 CloseFiscalYear=Đóng năm tài chính
 DeleteFiscalYear=Xóa năm tài chính
 ConfirmDeleteFiscalYear=Bạn chắc muốn xóa năm tài chính này?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Luôn luôn có thể được chỉnh sửa
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Số lượng tối thiểu của các ký tự chữ hoa
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=Danh sách thông báo cố định
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Vào tab "Thông báo" của liên hệ bên thứ ba để thêm hoặc bỏ thông báo cho liên lạc/địa chỉ
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Thủ thuật tạo file dump sao lưu dự phòng cơ sở dữ liệu
 SomethingMakeInstallFromWebNotPossible=Cài đặt module bên ngoài là không thể từ giao diện web với các lý do sau:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index b6ace14bef6..ddaf3c68913 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -27,13 +27,9 @@ AllTime=Từ đầu
 Reconciliation=Hòa giải
 RIB=Số tài khoản ngân hàng
 IBAN=Số IBAN
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=BIC / SWIFT số
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=Đứng đơn đặt hàng
-StandingOrder=Lệnh chuyển tiền định
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=Sao kê tài khoản
 AccountStatementShort=Trữ
 AccountStatements=Báo cáo tài khoản
@@ -78,6 +74,7 @@ AccountToCredit=Tài khoản tín dụng
 AccountToDebit=Tài khoản ghi nợ
 DisableConciliation=Vô hiệu hoá tính năng hòa giải cho tài khoản này
 ConciliationDisabled=Tính năng hòa giải bị vô hiệu hóa
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
 StatusAccountOpened=Open
 StatusAccountClosed=Đóng
 AccountIdShort=Số
@@ -87,6 +84,8 @@ AddBankRecordLong=Thêm giao dịch bằng tay
 ConciliatedBy=Hòa giải bởi
 DateConciliating=Ngày hòa giải
 BankLineConciliated=Giao dịch hòa giải
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=Thanh toán của khách hàng
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=Thanh toán rút
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=Chuyển khoản ngân hàng
 BankTransfers=Chuyển khoản ngân hàng
-TransferDesc=Chuyển từ một tài khoản với nhau, Dolibarr sẽ viết hai bản ghi (ghi nợ trong tài khoản nguồn và tín dụng trong tài khoản mục tiêu, số tiền tương tự. Cùng một nhãn và ngày sẽ được sử dụng cho giao dịch này)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=Từ
 TransferTo=Để
 TransferFromToDone=Việc chuyển giao từ <b>%s</b> đến <b>%s</b> của <b>%s</b> %s đã được ghi nhận.
@@ -129,7 +129,7 @@ FutureTransaction=Giao dịch trong futur. Không có cách nào để hoà gi
 SelectChequeTransactionAndGenerate=Chọn / kiểm tra bộ lọc để đưa vào nhận tiền gửi kiểm tra và bấm vào "Create".
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
-ToConciliate=Hoà giải?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp
 DefaultRIB=Mặc định BAN
 AllRIB=Tất cả BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index 0a2f913e548..96967c1053c 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=Lỗi, không thể hủy bỏ m
 BillFrom=Từ
 BillTo=Đến
 ActionsOnBill=Hành động trên hoá đơn
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -209,8 +209,8 @@ EscompteOffered=Giảm giá được tặng (thanh toán trước hạn)
 EscompteOfferedShort=Discount
 SendBillRef=Nộp hóa đơn %s
 SendReminderBillRef=Nộp hóa đơn %s (nhắc nhở)
-StandingOrders=Ủy nhiệm chi
-StandingOrder=Ủy nhiệm chi
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=Không có hóa đơn dự thảo
 NoOtherDraftBills=Không có hóa đơn dự thảo khác
 NoDraftInvoices=Không có hóa đơn dự thảo
@@ -351,8 +351,8 @@ VarAmount=Số tiền thay đổi (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Lệnh gửi ngân hàng
-PaymentTypeShortPRE=Lệnh gửi ngân hàng
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=Tiền mặt
 PaymentTypeShortLIQ=Tiền mặt
 PaymentTypeCB=Thẻ tín dụng
@@ -381,6 +381,7 @@ ExtraInfos=Thông tin thêm
 RegulatedOn=Quy định trên
 ChequeNumber=Kiểm tra N°
 ChequeOrTransferNumber=Kiểm tra/Chuyển N°
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=Ngân hàng của Séc
 CheckBank=Séc
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=Đã trả bởi khoản thanh toán này
 ClosePaidInvoicesAutomatically=Phân loại "Đã trả" tất cả các hóa đơn chuẩn, hóa đơn tình huống hoặc hóa đơn thay thế đã trả đủ.
 ClosePaidCreditNotesAutomatically=Phân loại các "Đã trả" tất cả các giấy báo có đã trả đủ trở lại.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=Tất cả hóa đơn chưa trả sẽ được tự động đóng sang trạng thái "Đã trả".
 ToMakePayment=Trả
 ToMakePaymentBack=Trả lại
 ListOfYourUnpaidInvoices=Danh sách các hoá đơn chưa trả
 NoteListOfYourUnpaidInvoices=Ghi chú: Danh sách này chỉ chứa các hoá đơn cho bên thứ ba mà bạn liên quan như là một đại diện bán hàng.
 RevenueStamp=Doanh thu đóng dấu
-YouMustCreateInvoiceFromThird=Tùy chọn này chỉ có sẵn khi tạo hóa đơn từ tab "khách hàng" của của bên thứ ba
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=Hóa đơn mẫu PDF Crabe. Một mẫu hóa đơn đầy đủ (mẫu đề nghị)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/vi_VN/boxes.lang b/htdocs/langs/vi_VN/boxes.lang
index 0031d2e23ce..7b73fb42ac5 100644
--- a/htdocs/langs/vi_VN/boxes.lang
+++ b/htdocs/langs/vi_VN/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=Dịch vụ lâu đời nhất đã hết hạn hoạt động
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Hoạt động toàn cầu (hoá đơn, đề xuất, đơn đặt hàng)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Đề xuất mỗi tháng
 NoTooLowStockProducts=Không có sản phẩm trong giới hạn cổ phiếu thấp
 BoxProductDistribution=Sản phẩm / Dịch vụ phân phối
 BoxProductDistributionFor=Phân phối %s cho %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=Khách hàng hoá đơn
 ForCustomersOrders=Khách hàng đặt hàng
 ForProposals=Đề xuất
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/vi_VN/cashdesk.lang b/htdocs/langs/vi_VN/cashdesk.lang
index 65bbcbf2e3e..4683fa238da 100644
--- a/htdocs/langs/vi_VN/cashdesk.lang
+++ b/htdocs/langs/vi_VN/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=trên
 CashDeskThirdParty=Bên thứ ba
 ShoppingCart=Giỏ hàng
 NewSell=Bán mới
-BackOffice=Trở lại văn phòng
 AddThisArticle=Thêm bài viết này
 RestartSelling=Quay trở lại trên bán
-SellFinished=Bán thành phẩm
+SellFinished=Sale complete
 PrintTicket=In vé
 NoProductFound=Không có bài viết được tìm thấy
 ProductFound=sản phẩm tìm thấy
diff --git a/htdocs/langs/vi_VN/categories.lang b/htdocs/langs/vi_VN/categories.lang
index 41b7931e6e3..26052d82eb3 100644
--- a/htdocs/langs/vi_VN/categories.lang
+++ b/htdocs/langs/vi_VN/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=Tiểu thể loại
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=Thể loại này đã tồn tại với ref này
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=Thể loại này không chứa bất kỳ sản phẩm.
 ThisCategoryHasNoSupplier=Thể loại này không chứa bất kỳ nhà cung cấp.
 ThisCategoryHasNoCustomer=Thể loại này không chứa bất kỳ khách hàng.
 ThisCategoryHasNoMember=Thể loại này không chứa bất kỳ thành viên.
 ThisCategoryHasNoContact=Thể loại này không chứa bất kỳ liên lạc.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Thuộc tính bổ sung
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 0d9cfef5bcd..d74617ecfe2 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=Cá nhân mới
 NewCompany=Công ty mới (KH tiềm năng, khách hàng, nhà cung cấp)
 NewThirdParty=Bên thứ ba mới (KH tiềm năng, khách hàng, nhà cung cấp)
 CreateDolibarrThirdPartySupplier=Tạo bên thứ ba (nhà cung cấp)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=Khu vực khảo sát
 IdThirdParty=ID bên thứ ba
 IdCompany=ID công ty
@@ -38,7 +40,7 @@ ThirdPartySuppliers=Nhà cung cấp
 ThirdPartyType=Loại bên thứ ba
 Company/Fundation=Công ty/Tổ chức
 Individual=Cá nhân
-ToCreateContactWithSameName=Sẽ tự động tạo liên lạc thực với cùng thông tin
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=Công ty mẹ
 Subsidiaries=Các chi nhánh
 ReportByCustomers=Báo cáo theo khách hàng
@@ -47,7 +49,7 @@ CivilityCode=Mã Civility
 RegisteredOffice=Trụ sở đăng ký
 Lastname=Họ
 Firstname=Tên
-PostOrFunction=Bài/Chức năng
+PostOrFunction=Job position
 UserTitle=Tiêu đề
 Address=Địa chỉ
 State=Bang/Tỉnh
@@ -64,7 +66,7 @@ Chat=Chat
 PhonePro=Prof. phone
 PhonePerso=Pers. phone
 PhoneMobile=Mobile
-No_Email=Không gửi email hàng loạt
+No_Email=Refuse mass e-mailings
 Fax=Fax
 Zip=Mã Zip
 Town=Thành phố
@@ -73,7 +75,7 @@ Poste= Chức vụ
 DefaultLang=Ngôn ngữ mặc định
 VATIsUsed=Thuế VAT được dùng
 VATIsNotUsed=Thuế VAT không được dùng
-CopyAddressFromSoc=Điền địa chỉ với địa chỉ của bên thứ ba
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=Số VAT
 VATIntraShort=Số VAT
 VATIntraSyntaxIsValid=Cú pháp hợp lệ
-VATIntraValueIsValid=Giá trị hợp lệ
 ProspectCustomer=KH tiềm năng/khách hàng
 Prospect=KH tiềm năng
 CustomerCard=Thẻ khách hàng
@@ -261,7 +262,9 @@ AddContactAddress=Tạo liên lạc/địa chỉ
 EditContact=Sửa liên lạc
 EditContactAddress=Sửa liên lạc/địa chỉ
 Contact=Liên lạc
+ContactId=Contact id
 ContactsAddresses=Liên lạc/địa chỉ
+FromContactName=Name:
 NoContactDefinedForThirdParty=Không có liên lạc được xác định cho bên thứ ba này
 NoContactDefined=Không liên lạc được xác định
 DefaultContact=Liên lạc/địa chỉ mặc định
@@ -284,7 +287,7 @@ CompanyDeleted=Công ty "%s" đã xóa khỏi cơ sở dữ liệu.
 ListOfContacts=Danh sách liên lạc/địa chỉ
 ListOfContactsAddresses=Danh sách liên lạc/địa chỉ
 ListOfThirdParties=Danh sách các bên thứ ba
-ShowCompany=Show thirdparty
+ShowCompany=Show third party
 ShowContact=Hiện liên lạc
 ContactsAllShort=Tất cả (không lọc)
 ContactType=Loại liên lạc
@@ -294,6 +297,7 @@ ContactForProposals=Liên lạc đơn hàng đề xuất
 ContactForContracts=Liên lạc hợp đồng
 ContactForInvoices=Liên lạc hóa đơn
 NoContactForAnyOrder=Liên lạc này không phải cho bất kỳ đơn hàng nào
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=Liên lạc này không phải cho bất kỳ đơn hàng đề xuất nào
 NoContactForAnyContract=Liên lạc này không phải cho bất kỳ hợp đồng nào
 NoContactForAnyInvoice=Liên lạc này không phải cho bất kỳ hóa đơn nào
@@ -352,9 +356,9 @@ ExportCardToFormat=Thẻ xuất để định dạng
 ContactNotLinkedToCompany=Liên lạc không liên quan đến bất kỳ bên thứ ba
 DolibarrLogin=Đăng nhập Dolibarr
 NoDolibarrAccess=Không truy cập Dolibarr
-ExportDataset_company_1=Bên thứ ba (Công ty/Tổ chức/Cá nhân) và các thuộc tính
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=Liên lạc và các thuộc tính
-ImportDataset_company_1=Bên thứ ba (Công ty/Tổ chức/Cá nhân) và các thuộc tính
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=Liên lạc/địa chỉ (của bên thứ ba hay không) và các thuộc tính
 ImportDataset_company_3=Chi tiết ngân hàng
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=Thirdparties have been merged
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/vi_VN/compta.lang b/htdocs/langs/vi_VN/compta.lang
index c69dea12737..e68ccc78d72 100644
--- a/htdocs/langs/vi_VN/compta.lang
+++ b/htdocs/langs/vi_VN/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Chi phí đặc biệt
 MenuTaxAndDividends=Thuế và cổ tức
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index 1a6cf26b9bc..79b3717f462 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Theo lịch trình thiết lập quản lý công việc
-URLToLaunchCronJobs=URL để kiểm tra và khởi động công việc cron nếu được yêu cầu
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Hoặc để kiểm tra và khởi động một công việc cụ thể
 KeyForCronAccess=Khóa bảo mật cho URL để khởi động công việc cron
 FileToLaunchCronJobs=Dòng lệnh để khởi động công việc cron
@@ -23,7 +23,7 @@ CronCommand=Lệnh
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Công việc
@@ -39,7 +39,7 @@ CronMethod=Phương pháp
 CronModule=Mô-đun
 CronNoJobs=Không có công ăn việc làm đăng ký
 CronPriority=Ưu tiên
-CronLabel=Mô tả
+CronLabel=Label
 CronNbRun=Nb. ra mắt
 CronMaxRun=Max nb. launch
 CronEach=Mỗi
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index c4d050a8d43..c1e5dbe9ede 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Lỗi, PHP của bạn phải có <b>mô-đun% s</b> được
 ErrorOpenIDSetupNotComplete=Bạn thiết lập Dolibarr tập tin cấu hình để cho phép xác thực OpenID, nhưng URL của dịch vụ OpenID không được xác định vào liên tục% s
 ErrorWarehouseMustDiffers=Nguồn và đích kho phải có khác nhau
 ErrorBadFormat=Bad định dạng!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Lỗi, thành viên này chưa được liên kết với bất kỳ của bên thứ ba. Liên kết thành viên với một bên thứ ba hiện có hoặc tạo mới của bên thứ ba trước khi tạo đăng ký với hóa đơn.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Lỗi, có một số việc giao hàng có liên quan đến lô hàng này. Xóa từ chối.
 ErrorCantDeletePaymentReconciliated=Không thể xóa một khoản thanh toán đã tạo ra một giao dịch ngân hàng đã được hoà giải
 ErrorCantDeletePaymentSharedWithPayedInvoice=Không thể xóa một khoản thanh toán được chia sẻ bởi ít nhất một hóa đơn với tình trạng payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 4ec612a0ab9..5fad5caf992 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=PHP này hỗ trợ phiên.
 PHPSupportPOSTGETOk=PHP này hỗ trợ các biến POST và GET.
 PHPSupportPOSTGETKo=Có thể thiết lập PHP của bạn không hỗ trợ các biến POST và / hoặc GET. Kiểm tra <b>variables_order</b> tham số của bạn trong php.ini.
 PHPSupportGD=Điều này hỗ trợ PHP GD chức năng đồ họa.
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=PHP hỗ trợ chức năng này UTF8.
 PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b>. Điều này là đủ.
 PHPMemoryTooLow=PHP bộ nhớ phiên tối đa của bạn được thiết lập <b>%s</b> byte. Điều này cần được quá thấp. Thay đổi <b>php.ini</b> của bạn để thiết lập thông số <b>memory_limit</b> ít nhất <b>%s</b> byte.
 Recheck=Nhấn vào đây để kiểm tra significative hơn
 ErrorPHPDoesNotSupportSessions=Cài đặt PHP của bạn không hỗ trợ phiên. Tính năng này là cần thiết để làm cho Dolibarr làm việc. Kiểm tra thiết lập PHP của bạn.
 ErrorPHPDoesNotSupportGD=Cài đặt PHP của bạn không hỗ trợ chức năng đồ họa GD. Không có đồ thị sẽ có sẵn.
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ chức năng UTF8. Dolibarr không thể làm việc một cách chính xác. Giải quyết này trước khi cài đặt Dolibarr.
 ErrorDirDoesNotExists=Thư mục %s không tồn tại.
 ErrorGoBackAndCorrectParameters=Tới lạc hậu và chính xác các thông số sai.
@@ -133,6 +135,10 @@ ActivateModule=Kích hoạt module %s
 ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=Cập nhật dữ liệu về các hoạt động
 MigrationPaymentMode=Di chuyển dữ liệu cho phương thức thanh toán
 MigrationCategorieAssociation=Di chuyển các loại
 MigrationEvents=Migration of events to add event owner into assignement table
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=Hiển thị tùy chọn không có sẵn
 HideNotAvailableOptions=Ẩn các tùy chọn không có sẵn
diff --git a/htdocs/langs/vi_VN/interventions.lang b/htdocs/langs/vi_VN/interventions.lang
index e1cf778795a..b279faa0091 100644
--- a/htdocs/langs/vi_VN/interventions.lang
+++ b/htdocs/langs/vi_VN/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=Theo dõi liên lạc của khách hàng
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/vi_VN/ldap.lang b/htdocs/langs/vi_VN/ldap.lang
index cd06e55bd51..ce62c20d8b8 100644
--- a/htdocs/langs/vi_VN/ldap.lang
+++ b/htdocs/langs/vi_VN/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=Ngày đăng ký đầu tiên
 LDAPFieldFirstSubscriptionAmount=Số lượng thuê bao đầu tiên
 LDAPFieldLastSubscriptionDate=Cuối ngày đăng ký
 LDAPFieldLastSubscriptionAmount=Số lượng đăng ký cuối cùng
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=Sử dụng đồng bộ
 GroupSynchronized=Nhóm đồng bộ
 MemberSynchronized=Thành viên đồng bộ
diff --git a/htdocs/langs/vi_VN/mails.lang b/htdocs/langs/vi_VN/mails.lang
index 780ff80592d..e503d9f1c9f 100644
--- a/htdocs/langs/vi_VN/mails.lang
+++ b/htdocs/langs/vi_VN/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=Đọc
 YourMailUnsubcribeOK=Email <b>%s</b> là đúng unsubcribe từ danh sách gửi thư
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=Thư điện tử gửi đến người nhận %s.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=Người nhận <b>%s</b> thêm vào danh sách mục tiêu
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 8fd951f9892..28eb6eba085 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -67,6 +67,7 @@ SelectDate=Chọn một ngày
 SeeAlso=Xem thêm %s
 SeeHere=Xem ở đây
 BackgroundColorByDefault=Màu nền mặc định
+FileRenamed=The file was successfully renamed
 FileUploaded=Các tập tin được tải lên thành công
 FileWasNotUploaded=Một tập tin được chọn để đính kèm nhưng vẫn chưa được tải lên. Bấm vào nút "Đính kèm tập tin" cho việc này.
 NbOfEntries=Nb of entries
@@ -245,6 +246,10 @@ DateBuild=Ngày làm báo cáo
 DatePayment=Ngày thanh toán
 DateApprove=Approving date
 DateApprove2=Approving date (second approval)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=năm
 DurationMonth=tháng
 DurationWeek=tuần
@@ -256,6 +261,7 @@ DurationDays=ngày
 Year=Năm
 Month=Tháng
 Week=Tuần
+WeekShort=Week
 Day=Ngày
 Hour=Giờ
 Minute=Phút
@@ -278,6 +284,7 @@ MonthOfDay=Tháng của ngày
 HourShort=H
 MinuteShort=mn
 Rate=Tỷ lệ
+CurrencyRate=Currency conversion rate
 UseLocalTax=Gồm thuế
 Bytes=Bytes
 KiloBytes=Kilobyte
@@ -565,8 +572,11 @@ BackToList=Trở lại danh sách
 GoBack=Quay trở lại
 CanBeModifiedIfOk=Có thể được điều chỉnh nếu hợp lệ
 CanBeModifiedIfKo=Có thể được điều sửa nếu không hợp lệ
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=Bản ghi được điều chỉnh thành công
 RecordsModified=% bản ghi đã điều chỉnh
+RecordsDeleted=%s records deleted
 AutomaticCode=Mã tự động
 FeatureDisabled=Tính năng bị vô hiệu hóa
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=Bạn không có quyền cho hành động này
 SessionName=Tên phiên
 Method=Phương pháp
 Receive=Nhận
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=Một phần
 TotalWoman=Tổng
 NeverReceived=Chưa từng nhận
@@ -598,6 +609,7 @@ DisabledModules=Module đã tắt
 For=Cho
 ForCustomer=cho khách hàng
 Signature=Chữ ký
+DateOfSignature=Date of signature
 HidePassword=Hiện lệnh với mật khẩu ẩn
 UnHidePassword=Hiển thị lệnh thực với mật khẩu rõ ràng
 Root=Gốc
@@ -641,6 +653,15 @@ NewAttribute=Thuộc tính mới
 AttributeCode=Mã thuộc tính
 URLPhoto=URL của hình ảnh / logo
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=Tạo dự thảo
 SetToDraft=Trở về dự thảo
 ClickToEdit=Nhấn vào để sửa
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=Thứ Hai
 Tuesday=Thứ Ba
diff --git a/htdocs/langs/vi_VN/margins.lang b/htdocs/langs/vi_VN/margins.lang
index 09d9f24d7d9..fdfe1e35c84 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Tỷ giá phải là một giá trị số
 markRateShouldBeLesserThan100=Đánh dấu suất phải thấp hơn 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 0b8d6e470b9..7d396711422 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -6,10 +6,10 @@ Member=Thành viên
 Members=Thành viên
 ShowMember=Hiện thẻ thành viên
 UserNotLinkedToMember=Người sử dụng không liên quan đến một thành viên
-ThirdpartyNotLinkedToMember=Của bên thứ ba không liên quan đến một thành viên
+ThirdpartyNotLinkedToMember=Bên thứ ba không liên quan đến một thành viên
 MembersTickets=Thành viên Vé
 FundationMembers=Thành viên sáng lập
-ListOfValidatedPublicMembers=Danh sách xác nhận thành viên công cộng
+ListOfValidatedPublicMembers=Danh sách thành viên công khai hợp lệ
 ErrorThisMemberIsNotPublic=Thành viên này không được công khai
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Một thành viên khác <b>(tên:% s,</b> đăng <b>nhập:% s)</b> đã được liên kết với một bên thứ <b>ba% s.</b> Hủy bỏ liên kết này đầu tiên bởi vì một bên thứ ba không thể được liên kết với chỉ một thành viên (và ngược lại).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Vì lý do bảo mật, bạn phải được cấp phép để chỉnh sửa tất cả người dùng để có thể liên kết một thành viên cho một người dùng mà không phải là của bạn.
@@ -26,10 +26,10 @@ MembersListNotUpToDate=Danh sách thành viên hợp lệ với các mô tả tr
 MembersListResiliated=Danh sách thành viên resiliated
 MembersListQualified=Danh sách các thành viên đủ điều kiện
 MenuMembersToValidate=Dự thảo các thành viên
-MenuMembersValidated=Các thành viên xác nhận
+MenuMembersValidated=Thành viên hợp lệ
 MenuMembersUpToDate=Lên đến các thành viên ngày
-MenuMembersNotUpToDate=Trong số các thành viên ngày
-MenuMembersResiliated=Thành viên Resiliated
+MenuMembersNotUpToDate=Thành viên hết hạn
+MenuMembersResiliated=Thành viên giải trừ
 MembersWithSubscriptionToReceive=Thành viên có đăng ký để nhận được
 DateSubscription=Ngày đăng ký
 DateEndSubscription=Ngày kết thúc đăng ký
@@ -39,7 +39,7 @@ MemberId=Thành viên id
 NewMember=Thành viên mới
 MemberType=Kiểu thành viên
 MemberTypeId=Kiểu thành viên id
-MemberTypeLabel=Kiểu thành viên nhãn
+MemberTypeLabel=Nhãn loại thành viên
 MembersTypes=Loại thành viên
 MemberStatusDraft=Dự thảo (cần phải được xác nhận)
 MemberStatusDraftShort=Dự thảo
@@ -49,7 +49,7 @@ MemberStatusActiveLate=mô tả hết hạn
 MemberStatusActiveLateShort=Hết hạn
 MemberStatusPaid=Đăng ký cập nhật
 MemberStatusPaidShort=Cho đến nay
-MemberStatusResiliated=Thành viên Resiliated
+MemberStatusResiliated=Thành viên giải trừ
 MemberStatusResiliatedShort=Resiliated
 MembersStatusToValid=Dự thảo các thành viên
 MembersStatusResiliated=Thành viên Resiliated
@@ -141,7 +141,7 @@ LastSubscriptionAmount=Số lượng đăng ký cuối cùng
 MembersStatisticsByCountries=Thành viên thống kê của đất nước
 MembersStatisticsByState=Thành viên thống kê của tiểu bang / tỉnh
 MembersStatisticsByTown=Thành viên thống kê của thị trấn
-MembersStatisticsByRegion=Thành viên thống kê theo vùng
+MembersStatisticsByRegion=Thống kê thành viên theo vùng
 NbOfMembers=Số lượng thành viên
 NoValidatedMemberYet=Không có thành viên xác nhận tìm thấy
 MembersByCountryDesc=Màn hình này hiển thị cho bạn số liệu thống kê về các thành viên của các nước. Tuy nhiên đồ họa phụ thuộc vào dịch vụ Google đồ thị trực tuyến và chỉ có nếu một kết nối internet là được làm việc.
diff --git a/htdocs/langs/vi_VN/oauth.lang b/htdocs/langs/vi_VN/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/vi_VN/oauth.lang
+++ b/htdocs/langs/vi_VN/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 9b0a812dcb6..0ee90c5015e 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -157,3 +157,4 @@ OrderCreated=Đơn hàng của bạn đã được tạo
 OrderFail=Một lỗi đã xảy ra khi tạo đơn hàng của bạn
 CreateOrders=Tạo đơn hàng
 ToBillSeveralOrderSelectCustomer=Để tạo một hóa đơn cho nhiều đơn hàng, đầu tiên nhấp vào khách hàng, sau đó chọn "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/vi_VN/printing.lang b/htdocs/langs/vi_VN/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/vi_VN/printing.lang
+++ b/htdocs/langs/vi_VN/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 8bce4b9a218..ad12027c755 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Ăn theo ngày
-l_sellby=Bán theo ngày
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=SL: %d
 AddDispatchBatchLine=Thêm 1 line cho Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index 6b9cb6df316..14e1848daaf 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Thay đổi thuế GTGT hàng loạt
 ProductVatMassChangeDesc=Trang này có thể được dùng để điều chỉnh một thuế suất thuế GTGT được xác định trên sản phẩm hoặc dịch vụ từ một giá trị khác. Cảnh báo, sự thay đổi này được thực hiện trên tất cả các cơ sở dữ liệu.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=Trang này có thể được sử dụng để khởi tạo một mã vạch trên các đối tượng mà không có mã vạch xác định. Kiểm tra xem trước đó thiết lập các mô-đun mã vạch hoàn tất chưa.
-ProductAccountancyBuyCode=Mã kế toán (mua)
-ProductAccountancySellCode=Mã kế toán (bán)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=Sản phẩm hoặc dịch vụ
 ProductsAndServices=Sản phẩm và dịch vụ
 ProductsOrServices=Sản phẩm hoặc dịch vụ
@@ -59,6 +59,8 @@ SellingPriceHT=Giá bán (chưa thuế)
 SellingPriceTTC=Giá bán (đã có thuế.)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=Giá mới
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=Giá bán không thấp hơn mức tối thiểu được cho phép của sản phẩm này (%s chưa thuế). Thông điệp này chỉ xuất hiện khi bạn nhập giảm giá quá lớn.
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=In nhiều nhãn cho một mã vạch
 BuildPageToPrint=Xuất trang để in
 FillBarCodeTypeAndValueManually=Điền loại mã vạch và giá trị bằng tay.
 FillBarCodeTypeAndValueFromProduct=Điền loại mã vạch và giá trị từ mã vạch của sản phẩm.
-FillBarCodeTypeAndValueFromThirdParty=Điền loại mã vạch và giá trị từ mã vạch của một của bên thứ ba.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không đầy đủ cho sản phẩm %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Định nghĩa của loại hoặc giá trị của mã vạch không hoàn chỉnh cho %s của bên thứ ba.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Thông tin mã vạch của sản phẩm %s:
-BarCodeDataForThirdparty=Thông tin mã vạch của bên thứ ba của %s:
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Xác định giá trị mã vạch cho tất cả các bản ghi (điều này cũng sẽ cài lại giá trị mã vạch đã xác định với các giá trị mới)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index a10fbbef9a8..718507b4a94 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=Danh sách các đơn hàng đề xuất được gắn với dự án
-ListOrdersAssociatedProject=Danh sách các đơn hàng khách hàng được gắn với dự án
-ListInvoicesAssociatedProject=Danh sách các hóa đơn khách hàng được gắn với dự án
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=Danh sách các đơn hàng nhà cung cấp được gắn với dự án
-ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn nhà cung cấp được gắn với dự án
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=Danh sách các hợp đồng được gắn với dự án
 ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn với dự án
 ListExpenseReportsAssociatedProject=Danh sách các báo cáo chi phí liên quan đến dự án
@@ -123,6 +123,7 @@ ProjectReportDate=Thay đổi ngày tác vụ theo ngày bắt đầu dự án
 ErrorShiftTaskDate=Không thể dịch chuyển ngày của tác vụ theo ngày bắt đầu của dự án mới
 ProjectsAndTasksLines=Các dự án và tác vụ
 ProjectCreatedInDolibarr=Dự án %s đã được tạo
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Tác vụ %s được tạo
 TaskModifiedInDolibarr=Tác vụ %s đã chỉnh sửa
 TaskDeletedInDolibarr=Tác vụ %s đã xóa
@@ -153,7 +154,7 @@ PlannedWorkload=Khối lượng công việc dự tính
 PlannedWorkloadShort=Khối lượng công việc
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Dự án phải được xác nhận trước
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Đầu vào mỗi ngày
 InputPerWeek=Đầu vào mỗi tuần
 InputPerAction=Đầu vào mỗi hành động
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index 2f41cebd404..87c6770ebb5 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=Thanh toán tiền lương mới
 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=Giá trung bình theo giờ
-TJM=Giá trung bình hàng ngày
+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
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 50ce2fbc633..5240ee4a015 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=Xóa gửi
 Stock=Tồn kho
 Stocks=Tồn kho
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=Danh sách chuyển kho
 ErrorWarehouseRefRequired=Tên tài liệu tham khảo kho là cần thiết
 ListOfWarehouses=Danh sách kho
@@ -43,6 +45,7 @@ PMPValue=Giá bình quân gia quyền
 PMPValueShort=WAP
 EnhancedValueOfWarehouses=Các kho hàng giá trị
 UserWarehouseAutoCreate=Tạo một kho tự động khi tạo một người sử dụng
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=Số lượng cử
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/vi_VN/supplier_proposal.lang b/htdocs/langs/vi_VN/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/vi_VN/supplier_proposal.lang
+++ b/htdocs/langs/vi_VN/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index bb43f31ed3a..2979278c0aa 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -7,13 +7,13 @@ History=Lịch sử
 ListOfSuppliers=Danh sách nhà cung cấp
 ShowSupplier=Hiện nhà cung cấp
 OrderDate=Ngày đặt hàng
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Một vài sản phẩm con không có giá xác định
-AddSupplierPrice=Thêm giá nhà cung cấp
-ChangeSupplierPrice=Thay đổi giá nhà cung cấp
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=Cung cấp thông tin này đã được liên kết với một tham chiếu: %s
 NoRecordedSuppliers=Không có nhà cung cấp được ghi nhận
 SupplierPayment=Thanh toán của nhà cung cấp
@@ -36,8 +36,8 @@ ListOfSupplierOrders=Danh sách các đơn hàng nhà cung cấp
 MenuOrdersSupplierToBill=Chuyển các đơn hàng nhà cung cấp sang hóa đơn
 NbDaysToDelivery=Số ngày giao hàng
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 8eaf28e5a21..16a8d134b8e 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Giờ hàng tuần
 ColorUser=Màu của người dùng
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/vi_VN/website.lang b/htdocs/langs/vi_VN/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/vi_VN/website.lang
+++ b/htdocs/langs/vi_VN/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/vi_VN/withdrawals.lang b/htdocs/langs/vi_VN/withdrawals.lang
index a5fb15e346a..390b05365dd 100644
--- a/htdocs/langs/vi_VN/withdrawals.lang
+++ b/htdocs/langs/vi_VN/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Khách hàng đứng đơn đặt hàng khu vực
-StandingOrders=Đứng đơn đặt hàng
-StandingOrder=Đứng đơn đặt hàng
-NewStandingOrder=Để đứng mới
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=Để xử lý
-WithdrawalsReceipts=Biên lai thu hồi
-WithdrawalReceipt=Nhận thu hồi
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=Đường rút
-RequestStandingOrderToTreat=Yêu cầu đứng đơn đặt hàng để xử lý
-RequestStandingOrderTreated=Yêu cầu cho các đơn hàng thường trực xử lý
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. hóa đơn với rút lại yêu cầu
-NbOfInvoiceToWithdrawWithInfo=Nb. hóa đơn với rút lại yêu cầu cho khách hàng có thông tin tài khoản ngân hàng được xác định
-InvoiceWaitingWithdraw=Hóa đơn chờ rút
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=Số tiền rút
-WithdrawsRefused=Rút từ chối
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=Không có hoá đơn thanh toán của khách hàng trong chế độ "rút" được chờ đợi. Đi vào tab 'Rút' trên thẻ hóa đơn để thực hiện một yêu cầu.
 ResponsibleUser=Người sử dụng có trách nhiệm
-WithdrawalsSetup=Thiết lập thu hồi
-WithdrawStatistics=Số liệu thống kê thu hồi của
-WithdrawRejectStatistics=Thu hồi số liệu thống kê từ chối của
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=Thực hiện một rút lại yêu cầu
 ThirdPartyBankCode=Mã ngân hàng của bên thứ ba
 NoInvoiceCouldBeWithdrawed=Không có hoá đơn Đã rút thành công. Kiểm tra hóa đơn được trên công ty với một BAN hợp lệ.
@@ -46,7 +47,7 @@ StatusRefused=Từ chối
 StatusMotif0=Không quy định
 StatusMotif1=Không đủ tiền
 StatusMotif2=Yêu cầu tranh chấp
-StatusMotif3=Không có lệnh thu hồi
+StatusMotif3=No direct debit payment order
 StatusMotif4=Khách hàng tự
 StatusMotif5=RIB không sử dụng được
 StatusMotif6=Tài khoản mà không cân bằng
@@ -61,28 +62,43 @@ 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=Tài khoản ngân hàng để nhận Bỏ cuộc
+BankToReceiveWithdraw=Bank account to receive direct debit
 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.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=Điều này cũng sẽ áp dụng chi trả cho các hóa đơn và sẽ phân loại là "Đã thanh toán"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=Thanh toán đứng thứ tự% s của ngân hàng
-InfoCreditMessage=Trình tự đứng% s đã được thanh toán của ngân hàng <br> Dữ liệu thanh toán:% s
-InfoTransSubject=Truyền tải đứng thứ tự% s cho ngân hàng
-InfoTransMessage=Trình tự đứng% s đã được gửi đến ngân hàng bởi% s% s. <br><br>
+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>
 InfoTransData=Số tiền:% s <br> Phương pháp:% s <br> Ngày:% s
-InfoRejectSubject=Lệnh chuyển tiền định từ chối
-InfoRejectMessage=Xin chào, <br><br> thứ tự đứng hóa đơn% s liên quan đến công ty% s, với số tiền% s đã bị từ chối bởi các ngân hàng. <br><br> - <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
 ModeWarning=Lựa chọn cho chế độ thực sự không được thiết lập, chúng tôi dừng lại sau khi mô phỏng này
diff --git a/htdocs/langs/vi_VN/workflow.lang b/htdocs/langs/vi_VN/workflow.lang
index c45124943b9..b994a702912 100644
--- a/htdocs/langs/vi_VN/workflow.lang
+++ b/htdocs/langs/vi_VN/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Thiết lập mô-đun công việc
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Phân loại đề xuất nguồn liên quan đến hóa đơn khi đơn đặt hàng được thiết lập để trả
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Phân loại đơn đặt hàng nguồn liên kết (s) để tính tiền khi hóa đơn khách hàng được thiết lập để trả
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Phân loại theo thứ tự liên kết nguồn khách hàng (s) để tính tiền khi hóa đơn của khách hàng được xác nhận
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 3f12d3ae9a8..9376a970e49 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -1,71 +1,92 @@
 # Dolibarr language file - en_US - Accounting Expert
 ACCOUNTING_EXPORT_SEPARATORCSV=列分隔符的导出文件
 ACCOUNTING_EXPORT_DATE=日期格式导出文件
-ACCOUNTING_EXPORT_PIECE=Export the number of piece
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export with global account
-ACCOUNTING_EXPORT_LABEL=Export label
-ACCOUNTING_EXPORT_AMOUNT=Export amount
-ACCOUNTING_EXPORT_DEVISE=Export currency
-Selectformat=Select the format for the file
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specify the prefix for the file name
-
-ConfigAccountingExpert=配置会计专家模块
+ACCOUNTING_EXPORT_PIECE=导出件数
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=导出全局账号
+ACCOUNTING_EXPORT_LABEL=导出标签
+ACCOUNTING_EXPORT_AMOUNT=导出数量
+ACCOUNTING_EXPORT_DEVISE=导出货币
+Selectformat=请选择文件格式
+ACCOUNTING_EXPORT_PREFIX_SPEC=文件唯一前缀
+
+ConfigAccountingExpert=配置财务会计专家模块
 Journaux=日记帐
-JournalFinancial=财政日帐
+JournalFinancial=财务日记帐
 BackToChartofaccounts=返回科目表
 
-Selectchartofaccounts=选择会计科目表
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
+Selectchartofaccounts=请选择会计科目表
 Addanaccount=添加一个会计帐户
 AccountAccounting=会计账户
-AccountAccountingShort=Account
-AccountAccountingSuggest=Accounting account suggest
-Ventilation=明细核算
-
-MenuAccountancy=Accountancy
-CustomersVentilation=客户明细
-SuppliersVentilation=供应商明细
-Reports=报告
-NewAccount=”新建“会计账户
+AccountAccountingShort=账户
+AccountAccountingSuggest=建议会计账户
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
+
+MenuAccountancy=会计
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
+Reports=报表
+NewAccount=新建会计账户
 Create=创建
-CreateMvts=创建运动
-UpdateMvts=对一个”活动“进行修改
-WriteBookKeeping=在”总账“中的”账户记录“
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=总帐
-AccountBalance=Account balance
+AccountBalance=账目平衡
 
-CAHTF=Total purchase supplier before tax
-InvoiceLines=发票行进行通风
-InvoiceLinesDone=发票通风线
-IntoAccount=Ventilate in the accounting account
+CAHTF=税前供应商采购总计
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=通风
+Ventilate=Bind
 
 Processing=处理
 EndProcessing=处理的结束
-AnyLineVentilate=任何行通风
-SelectedLines=选系
+AnyLineVentilate=Any lines to bind
+SelectedLines=选定的行
 Lineofinvoice=发票行
-VentilatedinAccount=在会计账户成功通风
-NotVentilatedinAccount=不通风的会计账户
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=元素个数是逐页显示击穿(最大推荐:50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=开始故障页的排序“有击穿”由最近的元素
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=由最近的元素开始破裂页“故障”的分类
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=长度在房源展示产品及服务介绍(最佳= 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=长度在列表显示的产品与服务帐户说明的形式(最佳= 50)
-ACCOUNTING_LENGTH_GACCOUNT=一般账户长度
-ACCOUNTING_LENGTH_AACCOUNT=第三方账户的长度
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=在管理会计科目中结尾的零。一些国家需要。默认禁用。小心函数“帐户的长度”。
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=卖杂志
 ACCOUNTING_PURCHASE_JOURNAL=购买杂志
 ACCOUNTING_MISCELLANEOUS_JOURNAL=其他杂志
-ACCOUNTING_EXPENSEREPORT_JOURNAL=费用报告日记
+ACCOUNTING_EXPENSEREPORT_JOURNAL=费用报表日记
 ACCOUNTING_SOCIAL_JOURNAL=社交杂志
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=转账账户
 ACCOUNTING_ACCOUNT_SUSPENSE=等待帐户
-DONATION_ACCOUNTINGACCOUNT=Account to register donations
+DONATION_ACCOUNTINGACCOUNT=注册捐款帐户
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=会计帐户默认情况下,购买产品(如在产品表没有定义)
 ACCOUNTING_PRODUCT_SOLD_ACCOUNT=会计帐户默认情况下为销售的产品(如在产品表没有定义)
@@ -75,95 +96,109 @@ ACCOUNTING_SERVICE_SOLD_ACCOUNT=会计帐户默认情况下为卖服务(如果
 Doctype=文件类型
 Docdate=日期
 Docref=参考
-Code_tiers=第三方
+Code_tiers=合伙人
 Labelcompte=标签帐户
 Sens=SENS
 Codejournal=日记帐
-NumPiece=Piece number
-AccountingCategory=Accounting category
-
-NotMatch=Not Set
-
-DeleteMvt=Delete general ledger lines
-DelYear=Year to delete
-DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+NumPiece=件数
+AccountingCategory=会计分类
+NotMatch=未设定
+DeleteMvt=删除常规分类账清单
+DelYear=删除整年
+DelJournal=删除整月
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=删除总帐的记录
-
 DescSellsJournal=出售的”日记帐“
 DescPurchasesJournal=购买的”日记帐“
-FinanceJournal=Finance journal
-DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+FinanceJournal=财务账
+DescFinanceJournal=财务账包括全部银行账户付款类型
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=付款发票的客户
-
-ThirdPartyAccount=第三方账户
-
-NewAccountingMvt=创建新的活动
-NumMvts=移动号码
-ListeMvts=”活动“的列表
+ThirdPartyAccount=合伙人账户
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值
 
-ReportThirdParty=列出第三方账户
-DescThirdPartyReport=在这里请教第三方客户及供应商,其会计账目清单
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=会计账目清单
 
 Pcgtype=账户类
 Pcgsubtype=在类账户
-Accountparent=该帐户的根
+Accountparent=Root帐户
 
-DescVentilCustomer=在这里,请咨询您的发票客户每年的分项核算
 TotalVente=Total turnover before tax
 TotalMarge=总销售利润率
-DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表
-DescVentilTodoCustomer=与会计帐户通风客户发票行
-ChangeAccount=变化的账户选择行会计帐户:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=在这里,请咨询您的发票的供应商每年的分项核算
-DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=自动验证
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=错误,你不能删除这个会计帐户,因为它是用来
-MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=击穿卡
+MvtNotCorrectlyBalanced=不正确的移转调拨。 Credit = %s. Debit = %s
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
-ApplyMassCategories=Apply mass categories
+ApplyMassCategories=应用批量类别
 
 ## Export
-Exports=出口
-Export=出口
-Modelcsv=出口型号
-OptionsDeactivatedForThisExportModel=对于这种出口模式,选项被禁用
-Selectmodelcsv=选择一个导出模型
+Exports=导出
+Export=导出
+Modelcsv=导出型号
+OptionsDeactivatedForThisExportModel=对于这种导出模式,选项被禁用
+Selectmodelcsv=请选择一个导出模板
 Modelcsv_normal=典型的导出
 Modelcsv_CEGID=Export towards CEGID Expert Comptabilité
-Modelcsv_COALA=Export towards Sage Coala
-Modelcsv_bob50=Export towards Sage BOB 50
-Modelcsv_ciel=Export towards Sage Ciel Compta or Compta Evolution
-Modelcsv_quadratus=Export towards Quadratus QuadraCompta
-Modelcsv_ebp=Export towards EBP
-Modelcsv_cogilog=Export towards Cogilog
+Modelcsv_COALA=向Sage Coala导出
+Modelcsv_bob50=向 Sage BOB 导出 50
+Modelcsv_ciel=向 Sage Ciel Compta 或 Compta Evolution导出
+Modelcsv_quadratus=向 Quadratus QuadraCompta导出
+Modelcsv_ebp=向 EBP导出
+Modelcsv_cogilog=导出到 Cogilog
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancy=初始化会计
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=选项
 OptionModeProductSell=销售模式
-OptionModeProductBuy=Mode purchases
-OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
-OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+OptionModeProductBuy=采购模式
+OptionModeProductSellDesc=显示所有没有定义为销售的会计帐户的产品。
+OptionModeProductBuyDesc=显示所有没有定义为采购的会计帐户的产品。
+CleanFixHistory=从不存在的会计图表中删除科目代码
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
-Formula=Formula
+Range=会计科目范围
+Calculated=计算
+Formula=公式
 
 ## Error
-ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
-ExportNotSupported=The export format setuped is not supported into this page
-BookeppingLineAlreayExists=Lines already existing into bookeeping
+ErrorNoAccountingCategoryForThisCountry=这个国家没有可用的会计分类
+ExportNotSupported=本页不支持设置导出格式
+BookeppingLineAlreayExists=已存在的账簿明细行
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index f235df47386..9b13a705948 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -2,17 +2,22 @@
 Foundation=机构
 Version=版本
 VersionProgram=程序版本
-VersionLastInstall=初始安装版
-VersionLastUpgrade=最新升级版
-VersionExperimental=实验
+VersionLastInstall=初始安装版本
+VersionLastUpgrade=最新版本升级
+VersionExperimental=试验
 VersionDevelopment=开发
 VersionUnknown=未知
 VersionRecommanded=推荐
-FileCheck=文件的完整性
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=缺少文件
 FilesUpdated=已更新的文件
-FileCheckDolibarr=检查 Dolibarr 文件的完整性
-XmlNotFound=无法找到 Xml 文件或者 Dolibarr 文件完整性
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=会话 ID
 SessionSaveHandler=会话保存处理程序
 SessionSavePath=存储会话本地化
@@ -30,12 +35,12 @@ DBStoringCharset=数据库保存数据的字符编码
 DBSortingCharset=数据库数据排序的字符编码
 WarningModuleNotActive=<b> %s </b>模块必须启用
 WarningOnlyPermissionOfActivatedModules=仅与已启用模块相关的权限显示在此。您可以在 主页->设定->模块页面中启用其它模块。
-DolibarrSetup=Dolibarr 的安装或更新
+DolibarrSetup=Dolibarr安装或升级向导
 InternalUser=内部员工用户
-ExternalUser=外部人员用户
+ExternalUser=外部用户
 InternalUsers=内部员工用户
-ExternalUsers=外部人员用户
-GUISetup=显示界面
+ExternalUsers=外部用户
+GUISetup=主题
 SetupArea=设置区
 FormToTestFileUploadForm=文件上传功能测试
 IfModuleEnabled=注:“是”仅在模块 <b>%s</b> 启用时有效
@@ -49,17 +54,17 @@ ErrorDecimalLargerThanAreForbidden=错误,不支持超过 <b>%s</b> 的精度
 DictionarySetup=词典的设置
 Dictionary=字典库
 Chartofaccounts=会计科目表
-Fiscalyear=财务年度
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=类型值 'system' 与 'systemauto' 是系统保留值。不能以'user'为值添加您的记录
 ErrorCodeCantContainZero=编码不能包含 0
 DisableJavascript=禁用JavaScript和Ajax功能(推荐 盲人或文本浏览器)
 UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
-UseSearchToSelectContactTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant CONTACT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectContactTooltip=同样地如果你有大批量的合伙人 (> 100 000), 你也可以通过设置常数 CONTACT_DONOTSEARCH_ANYWHERE 来提高速度到 1 在设置->其他菜单下设置。 搜索将被限制为字符串开始。
 DelaiedFullListToSelectCompany=Wait you press a key before loading content of thirdparties combo list (This may increase performance if you have a large number of thirdparties)
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=触发搜索的字符数量:%s
 NotAvailableWhenAjaxDisabled=Ajax 禁用时不可用
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=禁用 JavaScript
 UsePreviewTabs=使用预览标签
 ShowPreview=显示预览
@@ -78,7 +83,7 @@ NextValueForInvoices=下一个发票编码
 NextValueForCreditNotes=下一个票据编码
 NextValueForDeposit=下一值(存款)
 NextValueForReplacements=下一值(替换)
-MustBeLowerThanPHPLimit=注意:无论这个参数值是多少,您的 PHP 参数已经限制每个上传文件大小为 <b>%s</b> %s
+MustBeLowerThanPHPLimit=注意:无论这个参数值是多少,您的 PHP 参数已经限制每个上传文件大小为<b>%s</b> %s,
 NoMaxSizeByPHPLimit=注:您的 PHP 配置参数中没有设置限制
 MaxSizeForUploadedFiles=上传文件的最大大小 (0 表示禁止上传)
 UseCaptchaCode=登陆页面启用图形验证码
@@ -88,15 +93,15 @@ AntiVirusParam= 更多命令行参数
 AntiVirusParamExample= ClamWin 示例: --database
 ComptaSetup=会计模块设置
 UserSetup=用户管理设置
-MultiCurrencySetup=Multi-currency setup
-MenuLimits=范围和精度
+MultiCurrencySetup=多币种设置
+MenuLimits=精确度
 MenuIdParent=父菜单ID
 DetailMenuIdParent=父菜单ID (空表示顶级菜单)
 DetailPosition=排序编号,以确定菜单位置
-AllMenus=所有
+AllMenus=全部
 NotConfigured=模块未配置
 Active=启用
-SetupShort=设定
+SetupShort=设置
 OtherOptions=其他选项
 OtherSetup=其他设置
 CurrentValueSeparatorDecimal=小数位分隔符
@@ -107,21 +112,21 @@ IdPermissions=权限ID
 Modules=模块
 LanguageBrowserParameter=参数 %s
 LocalisationDolibarrParameters=本地化参数
-ClientTZ=客户端时区(用户侧)
-ClientHour=客户端时间(用户侧)
+ClientTZ=(用户)客户端时区
+ClientHour=(用户)客户端时间
 OSTZ=服务器操作系统时区
 PHPTZ=PHP服务器时区
-DaylingSavingTime=夏令时间(用户)
+DaylingSavingTime=夏令时间
 CurrentHour=PHP 服务器时间
 CurrentSessionTimeOut=当前会话超时
 YouCanEditPHPTZ=要设置不同的PHP时区(不要求),你可以尝试在 .htacces文件添加像这样 "SetEnv TZ 欧洲/巴黎" 一行。
-Box=挂件
-Boxes=挂件
-MaxNbOfLinesForBoxes=Max number of lines for widgets
+Box=插件
+Boxes=插件
+MaxNbOfLinesForBoxes=插件清单最大数值
 PositionByDefault=默认顺序
 Position=位置
-MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
-MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
+MenusDesc=菜单栏管理者设置两个菜单栏内容(包括横向和纵向)
+MenusEditorDesc=菜单编辑栏可以让你自定义菜单设置, 小心使用,避免造成菜单的不稳定和无法连接现象。<br />一些模块添加(<b>所有</b>的参数到菜单栏里)。如果您错误的删除了其中的一些参数,您可以通过关闭和重新启用该模块来还原。
 MenuForUsers=用户菜单
 LangFile=.lang 文件
 System=系统
@@ -129,13 +134,13 @@ SystemInfo=系统信息
 SystemToolsArea=系统工具区
 SystemToolsAreaDesc=此区域提供管理员功能。请点选菜单来管理你想要的内容。
 Purge=清空
-PurgeAreaDesc=This page allows you to delete all files generated or stored by Dolibarr (temporary files or all files in <b>%s</b> directory). Using this feature is not necessary. It is provided as a workaround for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files generated by the web server.
-PurgeDeleteLogFile=Delete log file <b>%s</b> defined for Syslog module (no risk of losing data)
-PurgeDeleteTemporaryFiles=Delete all temporary files (no risk of losing data)
-PurgeDeleteTemporaryFilesShort=Delete temporary files
+PurgeAreaDesc=该页面允许您删除所有由Dolibarr自动生成和储存的文件(临时文件和所有在<b>%s</b>目录里的文件)。不必要使用该功能。它是为那些把Dolibarr安装在第三方的服务器并且没有删除文件权限的使用者提供的一个应急操作。
+PurgeDeleteLogFile=删除系统模块日志文件 <b>%s</b>(无数据丢失风险)
+PurgeDeleteTemporaryFiles=删除临时文件(无数据丢失风险)
+PurgeDeleteTemporaryFilesShort=删除临时文件
 PurgeDeleteAllFilesInDocumentsDir=删除 <b>%s</b> 目录中的所有文件。临时文件、数据库备份转储文件、系统档案条目(第三方、账单)的附件及 电子文档管理 模块中上传的文件。
 PurgeRunNow=立即清空
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=未删除目录或文件
 PurgeNDirectoriesDeleted=<b>%s</b> 个文件或目录删除。
 PurgeAuditEvents=清空所有安全事件
 ConfirmPurgeAuditEvents=您确定要清空所有安全事件?所有安全日志都将被清除,其它数据不动。
@@ -176,24 +181,25 @@ EncodeBinariesInHexa=二进制数据以十六进制编码
 IgnoreDuplicateRecords=忽略重复记录错误(INSERT IGNORE)
 AutoDetectLang=自动检测(浏览器的语言)
 FeatureDisabledInDemo=功能在演示版中已禁用
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=权限
-BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
+BoxesDesc=小组件展示一些可以添加到您个人页面的信息。您可以通过选择目标页面点击“激活”或关闭按钮来选择显示或关闭这些小组件。
 OnlyActiveElementsAreShown=仅显示 <a href="%s">已启用模块</a> 的元素。
-ModulesDesc=Dolibarr 模块版面设定启用软件中的哪些功能。有些模块启用后需要授予权限给用户。单击“状态”列中的开/关按钮来启用模块/功能。
-ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
+ModulesDesc=激活并启用Dolibarr定义的功能模块。部分模块启用后,需要您给予相应用户权限他才能使用到该模块。点击 on/off 来启用/禁用功能/模块。
+ModulesMarketPlaceDesc=你能在外部互联网查找到并下载更多的功能模块...
 ModulesMarketPlaces=更多模块...
 DoliStoreDesc=DoliStore,为 Dolibarr 的 ERP/CRM 的外部模块官方市场
 DoliPartnersDesc=List of companies providing custom developed modules or features (Note: anyone experienced in PHP programming can provide custom development for an open source project)
-WebSiteDesc=Reference websites to find more modules...
+WebSiteDesc=参考网址查找更多模块...
 URL=链接
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=启用页面
-ActiveOn=启用页面
+BoxesAvailable=插件可用
+BoxesActivated=插件已启用
+ActivateOn=启用
+ActiveOn=启用
 SourceFile=来源文件
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=仅当 JavaScript 启用时可用
-Required=必填字段
-UsedOnlyWithTypeOption=Used by some agenda option only
+Required=必须
+UsedOnlyWithTypeOption=仅使用部分日程选项
 Security=安全
 Passwords=密码
 DoNotStoreClearPassword=不在数据库中储存明文密码,只存储加密后的密码(建议启用)
@@ -206,15 +212,15 @@ Feature=功能特色
 DolibarrLicense=授权
 Developpers=开发商/贡献者
 OfficialWebSite=Dolibarr 国际官方网站
-OfficialWebSiteLocal=Local web site (%s)
+OfficialWebSiteLocal=内部网站 (%s)
 OfficialWiki=Dolibarr Wiki 上的文档
 OfficialDemo=Dolibarr在线演示
-OfficialMarketPlace=官方市场提供外部模块/扩展
+OfficialMarketPlace=官方市场提供外部扩展模型/模块
 OfficialWebHostingService=引用网络托管服务(云主机)
 ReferencedPreferredPartners=首选合作伙伴
 OtherResources=其他资源
 ForDocumentationSeeWiki=用户或开发人员用文档(文档,常见问题…),<br>参见 Dolibarr 百科:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=您有任何其他问题/帮助,可以到 Dolibarr 论坛: <br> <b><a href="%s" target="_blank">%s</a></b>
+ForAnswersSeeForum=您有任何其他问题/帮助,可以到 Dolibarr 论坛: <br> <b><a href="%s" target="_blank">%s</a></b>简体中文翻译可到Dolibarr爱好者交流Q群技术交流:206239089
 HelpCenterDesc1=此处可以帮助你获得 Dolibarr 帮助支持服务。
 HelpCenterDesc2=此服务的一些部分,<b>仅有英文</b> 可用。
 CurrentMenuHandler=当前菜单处理程序
@@ -234,28 +240,28 @@ MAIN_MAIL_SENDMODE=电邮发送方法
 MAIN_MAIL_SMTPS_ID=SMTP ID,如果要求验证
 MAIN_MAIL_SMTPS_PW=SMTP 密码,如果要求验证
 MAIN_MAIL_EMAIL_TLS= 使用 TLS(SSL)加密
-MAIN_MAIL_EMAIL_STARTTLS= Use TLS (STARTTLS) encrypt
+MAIN_MAIL_EMAIL_STARTTLS= 使用 TLS(SSL)加密
 MAIN_DISABLE_ALL_SMS=禁用所有短信发送(用于测试目的或演示)
 MAIN_SMS_SENDMODE=短信发送方法
 MAIN_MAIL_SMS_FROM=发送短信的默认发件人号码
 FeatureNotAvailableOnLinux=功能在 Unix 类系统下不可用。请在本地测试您的sendmail程序。
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or for developers on github.com/Dolibarr/dolibarr.
+SubmitTranslation=如果您发现当前语言的翻译不完整或有误,您可以通过编辑 <b>langs/%s</b> 文件更正它,并将修改后的文件提交至  www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=如果您发现当前语言的翻译不完整或有误,您可以通过编辑 <b>langs/%s</b> 文件更正它,并将修改后的文件提交至 dolibarr.org/forum 或github开发者 github.com/Dolibarr/dolibarr.
 ModuleSetup=模块设置
 ModulesSetup=模块设置
 ModuleFamilyBase=系统
 ModuleFamilyCrm=客户关系管理(CRM)
-ModuleFamilySrm=Supplier Relation Management (SRM)
+ModuleFamilySrm=供应商关系管理 (SRM)
 ModuleFamilyProducts=产品管理
-ModuleFamilyHr=人事管理
+ModuleFamilyHr=人力资源管理 (HR)
 ModuleFamilyProjects=项目/协同工作
 ModuleFamilyOther=其他
 ModuleFamilyTechnic=多模块工具
-ModuleFamilyExperimental=实验性模块
-ModuleFamilyFinancial=财务模块(会计/库务)
-ModuleFamilyECM=电子内容管理(ECM)
-ModuleFamilyPortal=Web sites and other frontal application
-ModuleFamilyInterface=Interfaces with external systems
+ModuleFamilyExperimental=试验性模块
+ModuleFamilyFinancial=财务模块(会计/金库)
+ModuleFamilyECM=电子文档管理(ECM)
+ModuleFamilyPortal=网页和其他正面应用程序
+ModuleFamilyInterface=系统外部扩展接口
 MenuHandlers=菜单处理程序
 MenuAdmin=菜单编辑器
 DoNotUseInProduction=请勿用于生产环境
@@ -271,15 +277,16 @@ InfDirAlt=自 v3 版本开始,Dolibarr 可以定义备用根目录地址。这
 InfDirExample=<br>然后在 conf.php 中声明它<br> $dolibarr_main_url_root_alt='http://myserver/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>*这些行已经作为注释行存在,移除注释符"#"即可生效。
 YouCanSubmitFile=在这一步中,你可以使用 选择模块文件 来发送包
 CurrentVersion=Dolibarr 当前版本
-CallUpdatePage=Go to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
+CallUpdatePage=升级更新数据库和数据请到: %s.
+LastStableVersion=最新稳定版
+LastActivationDate=Last activation date
 UpdateServerOffline=离线升级服务器
-GenericMaskCodes=您可自由设置格式掩码。在 %s 格式掩码中, 有如下计数标记可用:<br><b>{000000}</b>表示按顺序递增的序号。序号位数与掩码中0的个数相同,不足自动补零,达最大值后自动归零。<br><b>{000000+000}</b> 同上但 %s 起始序号从 + 后的数值记起。<br><b>{000000@x}</b> 与第一种相同,但序号到X月时自动清零(x=1~12 、0=程序设置中的财年起始月、99=每月清零)。 如果使用此种掩码且 x >= 2 ,则必须同时使用日期掩码 {yy}{mm} 或 {yyyy}{mm}。<br><b>{dd}</b> 天 (01~31)。<br><b>{mm}</b> 月 (01~12)。<br><b>{yy}</b>,<b>{yyyy}</b> 或 <b>{y}</b> 代表 2位, 4位 或 1 位年。<br><br>
-GenericMaskCodes2=<b>{cccc}</b> n个字符,客户端代码<br><b>{cccc000}</b>上的n个字符的客户端代码后面是一个专门用于客户计数器。此计数器将比较全局计数器相同时间为用户进行复位。 <br><b>{tttt}</b>第三方类型的n个字符(见词典第三方类型)的代码。 <br>
+GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:<br><b>{000000}</b> corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask. <br><b>{000000+000}</b> same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s. <br><b>{000000@x}</b> same as previous but the counter is reset to zero when month x is reached (x between 1 and 12, or 0 to use the early months of fiscal year defined in your configuration, or 99 to reset to zero every month). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required. <br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> month (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> year over 2, 4 or 1 numbers. <br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=其它非标记字符将维持不变。<br>不允许使用空格<br>
-GenericMaskCodes4a=<u>例如: 2007-01-31 第三方“TheCompany”的第99笔 %s :</u> <br>
-GenericMaskCodes4b=<u>例如: 2007-03-1 建立的第三方公司:</u><br>
-GenericMaskCodes4c=<u>例如: 于 2007-03-1 建立的产品资讯:</u><br>
+GenericMaskCodes4a=<u>例如第99位 %s 合伙人 TheCompany 已搞定于 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>例如合伙人创建于 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>例如: 于 2007-03-1 建立的产品资料:</u><br>
 GenericMaskCodes5=号码格式: <b>ABC{yy}{mm}-{000000}</b> 将生成 <b>ABC0701-000099</b>格式编号<br> 号码格式:<b>{0000+100}-ZZZ/{dd}/XXX</b> 将生成 <b>0199-ZZZ/31/XXX</b>格式编号
 GenericNumRefModelDesc=根据事先定义的格式掩码,返回一个可定制编号,详见说明。
 ServerAvailableOnIPOrPort=可用服务器地址: <b>%s:</b><b>%s</b>
@@ -300,14 +307,14 @@ ConfirmPurge=你确定要执行该清除? <br>这将删除所有数据文件
 MinLength=最小长度
 LanguageFilesCachedIntoShmopSharedMemory=文件 .lang 已加载到共享内存
 ExamplesWithCurrentSetup=当前运行设置的实例
-ListOfDirectories=OpenDocument 文档模板目录清单
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
-NumberOfModelFilesFound=这些目录中找到的ODT / ODS模板文件数目
-ExampleOfDirectoriesForModelGen=语法格式:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
+ListOfDirectories=开源办公软件文档模板目录列表
+ListOfDirectoriesForModelGenODT=包含开源办公软件的格式的文档的模板目录列表。<br><br>请在此填写完整的目录路径。<br>每填写一个目录路径结尾按回车换行。<br>添加一个 GED 模块目录, 如下 <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>。<br><br>该目录中的文件格式必须是 <b>.odt</b> 格式或 <b>.ods</b>格式。
+NumberOfModelFilesFound=这些目录中发现的 ODT/ODS 格式的模板文件数量
+ExampleOfDirectoriesForModelGen=参考语法格式:<br>c:\\mydir<br>/home/mydir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>了解如何建立和保存ODT文件范本到指定目录,请阅读说明文档:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=姓 /名 位置顺序
-DescWeather=当事件逾期/延误达到以下数值范围时,主看版将显示如下图标:
+DescWeather=当事件逾期/延误达到以下数值范围时,主看板将显示如下图标:
 KeyForWebServicesAccess=使用 SOAP 服务的密钥 (webservices 中的"dolibarrkey"参数)
 TestSubmitForm=可在以下表单输入资料来测试
 ThisForceAlsoTheme=使用此菜单管理器将同时使用其主题,无论用户如何设置。同时此菜单管理器专为智能手机而设计但并不适用于所有手机。如果您的手机上使用有问题请选择其它主题。
@@ -315,31 +322,31 @@ ThemeDir=主题目录
 ConnectionTimeout=连接超时
 ResponseTimeout=响应超时
 SmsTestMessage=测试消息从 __PHONEFROM__ 至 __ PHONETO__
-ModuleMustBeEnabledFirst=Module <b>%s</b> must be enabled first if you need this feature.
+ModuleMustBeEnabledFirst=必须先行激活启用 <b>%s</b> 模块如果你需要使用这个功能的话。
 SecurityToken=保护URL链接的密钥
-NoSmsEngine=无短信发送管理程序可用。SMS sender manager are not installed with default distribution (because they depends on an external supplier) but you can find some on %s
+NoSmsEngine=无短信发送管理程序可用。SMS发件人管理器没有安装默认分布 (因为他们依赖于一个外部供应商) 但你能在这儿找到一些 %s
 PDF=PDF格式
 PDFDesc=你可以设置PDF生成有关的每个全局选项
 PDFAddressForging=PDF 中地址生成规则
 HideAnyVATInformationOnPDF=生成的PDF中隐藏所有有关增值税的信息
 HideDescOnPDF=生成 PDF 中隐藏产品描述信息
 HideRefOnPDF=隐藏生成 PDF 中的产品编号
-HideDetailsOnPDF=Hide product lines details on generated PDF
+HideDetailsOnPDF=在生成的PDF文档中隐藏产品详情
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=资料库
 UrlGenerationParameters=URL地址的保护参数
-SecurityTokenIsUnique=为每个URL使用独特的securekey参数
+SecurityTokenIsUnique=为每个URL使用唯一的securekey参数值
 EnterRefToBuildUrl=输入对象 %s 的编号
 GetSecuredUrl=获取算得的URL地址
-ButtonHideUnauthorized=隐藏无权限操作的按钮,而非禁用。
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=以前的增值税率(VAT)
 NewVATRates=新建增值税率(VAT)
-PriceBaseTypeToChange=修改设置了基本参考价值的产品的价格/ base reference value
+PriceBaseTypeToChange=设置了基本参考价值的产品的价格
 MassConvert=执行批量转换
 String=字符串
-TextLong=长文本
-Int=整数值
-Float=小数值
+TextLong=Long text 长文本型
+Int=整型
+Float=浮点型
 DateAndTime=日期与小时
 Unique=唯一
 Boolean=布尔值 (复选框)
@@ -349,63 +356,67 @@ ExtrafieldMail = 电子邮件
 ExtrafieldSelect = 选择列表
 ExtrafieldSelectList = 从表格中选取
 ExtrafieldSeparator=分隔符
+ExtrafieldPassword=密码
 ExtrafieldCheckBox=复选框
 ExtrafieldRadio=单选框
 ExtrafieldCheckBoxFromList= 表格的勾选框
-ExtrafieldLink=Link to an object
-ExtrafieldParamHelpselect=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>In order to have the list depending on another :<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
-ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpradio=Parameters list have to be like key,value<br><br> for example : <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldLink=连接到项目
+ExtrafieldParamHelpselect=字符列表类似于 key,value<br><br> 举例说明 : <br>1,value1<br>2,value2<br>3,value3<br>等等等...<br><br>为了得到字符列表取决于以下:<br>1,value1|parent_list_code:parent_key<br>2,value2|parent_list_code:parent_key
+ExtrafieldParamHelpcheckbox=字符列表类似于 key,value<br><br> 举例说明 :: <br>1,value1<br>2,value2<br>3,value3<br>等等等...
+ExtrafieldParamHelpradio=字符列表类似于 key,value<br><br> 举例说明 :: <br>1,value1<br>2,value2<br>3,value3<br>等等等...
+ExtrafieldParamHelpsellist=参数列表来自一个表<br>语法 : table_name:label_field:id_field::filter<br>例如 : c_typent:libelle:id::filter<br><br>过滤器可以是一个简单的测试 (eg active=1) 只显示活动值<br>你也可以使用 $ID$ 在当前id过滤器当前对象<br>用 SELECT 过滤器 $SEL$<br>如果你想在 extrafields 过滤器使用语法  extra.fieldcode=... (哪里栏位代码 extrafield)<br><br>为了有列表取决于另一个 :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelpchkbxlst=Parameters list comes from a table<br>Syntax : table_name:label_field:id_field::filter<br>Example : c_typent:libelle:id::filter<br><br>filter can be a simple test (eg active=1) to display only active value<br>You can also use $ID$ in filter witch is the current id of current object<br>To do a SELECT in filter use $SEL$<br>if you want to filter on extrafields use syntaxt  extra.fieldcode=... (where field code is the code of extrafield)<br><br>In order to have the list depending on another :<br>c_typent:libelle:id:parent_list_code|parent_column:filter
 ExtrafieldParamHelplink=Parameters must be ObjectName:Classpath<br>Syntax : ObjectName:Classpath<br>Example : Societe:societe/class/societe.class.php
-LibraryToBuildPDF=Library used for PDF generation
+LibraryToBuildPDF=已使用资料库以支持生成PDF文件
 WarningUsingFPDF=Warning: Your <b>conf.php</b> contains directive <b>dolibarr_pdf_force_fpdf=1</b>. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.<br>To solve this and have a full support of PDF generation, please download <a href="http://www.tcpdf.org/" target="_blank">TCPDF library</a>, then comment or remove the line <b>$dolibarr_pdf_force_fpdf=1</b>, and add instead <b>$dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'</b>
 LocalTaxDesc=一些国家适用于每个发票行2或3的税。如果是这样的情况下,选择的类型的第二和第三税和其速率。可能的类型有: <br> 1:地方税适用的产品和服务,而增值税(localtax的计算量不含税) <br> 2:地方税适用的产品和服务,包括增值税(localtax的计算量+纳税主体) <br> 3:地方税适用的产品不含增值税(localtax的计算量不含税) <br> 4:地方税适用的产品包括增值税(localtax的计算量+主缸) <br> 5:地方税适用于服务,而增值税(localtax的计算量不含税) <br> 6:地方税适用于服务包括增值税(localtax的计算量+税)
-SMS=短信息
-LinkToTestClickToDial=输入一个电话号码来为用户测试 ClickToDial 功能 <strong>%s</strong>
+SMS=短信
+LinkToTestClickToDial=输入一个电话号码来为用户显示网络电话网址测试功能 <strong>%s</strong>
 RefreshPhoneLink=刷新链接
 LinkToTest=为用户生成的可访问链接 strong>%s</strong> (单击电话号码来测试)
 KeepEmptyToUseDefault=不填表示使用默认值
 DefaultLink=默认链接
-SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=警告,此设置可能被用户设置所覆盖(用户可以设置各自的click2dial链接)
+SetAsDefault=设为默认
+ValueOverwrittenByUserSetup=警告,此设置可能被用户设置所覆盖(用户可以设置各自的网络电话链接)
 ExternalModule=附加模块 - 安装于 %s 目录下
-BarcodeInitForThirdparties=Mass barcode init for thirdparties
-BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
+BarcodeInitForThirdparties=合伙人条码批量初始化
+BarcodeInitForProductsOrServices=产品或服务条码批量初始化或重置
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> records on <strong>%s</strong> %s without barcode defined.
 InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=抹掉现存所有条码值
 ConfirmEraseAllCurrentBarCode=你确定要抹掉现存所有条码值?
 AllBarcodeReset=所有现存条码值已经被抹掉
 NoBarcodeNumberingTemplateDefined=条码编号模版在条形码模块中没有被启用。
-EnableFileCache=Enable file cache
+EnableFileCache=启用文件缓存
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
-NoDetails=No more details in footer
-DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+NoDetails=页脚无更多详情
+DisplayCompanyInfo=显示公司地址
+DisplayCompanyManagers=显示管理员名称
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
-ModuleCompanyCodePanicum=Return an empty accountancy code.
+ModuleCompanyCodePanicum=返回一个空的财务会计科目代码
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=用户和组
-Module0Desc=用户和组管理
-Module1Name=客户
-Module1Desc=公司和联络人管理(客户、潜在客户...)
+Module0Desc=用户和群组管理模块
+Module1Name=合伙人
+Module1Desc=公司和联络人管理(客户、准客户潜在客户...等等)模块
 Module2Name=商业交易
 Module2Desc=交易管理
 Module10Name=会计
-Module10Desc=根据数据库内容生成的简易会计报告 (日报, 营业额)。无外部数据对接.
+Module10Desc=根据数据库内容生成的简易会计报表 (日常报表, 营业额)。没有外部数据对接.
 Module20Name=报价
-Module20Desc=报价单管理
-Module22Name=群发电邮
+Module20Desc=报价管理模块
+Module22Name=邮件群发
 Module22Desc=电子邮件群发的管理
 Module23Name=能耗
 Module23Desc=能耗监测
-Module25Name=销售订单
-Module25Desc=销售订单管理
+Module25Name=客户订单
+Module25Desc=客户订单管理模块
 Module30Name=发票
 Module30Desc=客户发票和信用记录管理。供应商发票管理。
 Module40Name=供应商
@@ -418,29 +429,29 @@ Module50Name=产品
 Module50Desc=产品管理
 Module51Name=批量邮寄
 Module51Desc=批量邮寄文件管理
-Module52Name=仓库
+Module52Name=库存
 Module52Desc=产品库存的管理
 Module53Name=服务
 Module53Desc=服务的管理
-Module54Name=合同/订阅
-Module54Desc=合同管理(服务或常规订阅)
+Module54Name=联系人/订阅
+Module54Desc=联系人管理(服务或常规订阅)模块
 Module55Name=条码
 Module55Desc=条码管理
 Module56Name=电话
 Module56Desc=电话整合
-Module57Name=长期订单
-Module57Desc=长期订单及撤销管理以及欧洲国家的国家环保总局文件。
-Module58Name=单击拨号
-Module58Desc=单击拨号系统集成(Asterisk ...)
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
+Module58Name=网络电话
+Module58Desc=网络电话系统集成(Asterisk ...)
 Module59Name=Bookmark4u
 Module59Desc=添加函数从一个Dolibarr帐户生成一个Bookmark4u帐户
 Module70Name=干预
-Module70Desc=干预的管理
+Module70Desc=干预管理模块
 Module75Name=差旅费用记录
 Module75Desc=费用和差旅记录的管理
-Module80Name=发货
-Module80Desc=发货单和交货单管理
-Module85Name=银行及现金
+Module80Name=运输
+Module80Desc=运输和交货单快递单管理模块
+Module85Name=银行和现金
 Module85Desc=银行或现金帐户管理
 Module100Name=外部站点
 Module100Desc=此模块添加外部网站链接或页面到 Dolibarr 的菜单或页面框架中
@@ -451,180 +462,180 @@ Module200Desc=LDAP目录同步
 Module210Name=PostNuke
 Module210Desc=PostNuke 整合
 Module240Name=数据导出
-Module240Desc=Tool to export Dolibarr data (with assistants)
+Module240Desc=将数据从Dolibarr导出的工具(助手)
 Module250Name=数据导入
-Module250Desc=Tool to import data in Dolibarr  (with assistants)
+Module250Desc=将数据导入Dolibarr的工具(助手)
 Module310Name=会员
-Module310Desc=会员管理基础模块
+Module310Desc=机构会员管理模块
 Module320Name=RSS 源
 Module320Desc=添加 RSS 源至 Dolibarr 主屏幕页面
 Module330Name=书签
-Module330Desc=Bookmarks management
-Module400Name=项目/机遇/线索
-Module400Desc=项目、机遇和线索的管理。你可以由此为项目创建发票、订单等然后从项目视图获得横向视图。
+Module330Desc=书签管理
+Module400Name=项目/机会/线索
+Module400Desc=项目,机会和线索管理。您可以为项目创建 (发票, 订单, 询价, intervention, ...) 等,然后从项目视图查看详情。
 Module410Name=Webcalendar
 Module410Desc=Webcalendar 整合
 Module500Name=特殊开支
 Module500Desc=特殊开支管理(税、财政税等)
-Module510Name=薪酬
-Module510Desc=职员薪酬及支付管理
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=贷款
-Module520Desc=贷款管理
+Module520Desc=贷款管理模块
 Module600Name=通知
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=捐赠
-Module700Desc=捐款的管理
-Module770Name=HR费用报表
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=供应商的商业提案
-Module1120Desc=要求供应商的商业提案和价格
+Module700Desc=捐赠管理模块
+Module770Name=费用报表
+Module770Desc=管理和索取费用报表 (交通费, 餐费,等等 ...)模块
+Module1120Name=供应商商业报价
+Module1120Desc=要求供应商商业报价和价格
 Module1200Name=Mantis
 Module1200Desc=Mantis 整合
 Module1400Name=会计
 Module1400Desc=会计管理(双方)
 Module1520Name=文档生成
-Module1520Desc=生成群发电子邮件
+Module1520Desc=生成文档群发邮件
 Module1780Name=标签/分类
 Module1780Desc=创建标签/分类(商品、客户、供应商、联系人或会员)
 Module2000Name=所见即所得编辑器
-Module2000Desc=Allow to edit some text area using an advanced editor (Based on CKEditor)
+Module2000Desc=允许以高级富文本的编辑方式来编辑文本内容(基于 CKEditor)
 Module2200Name=动态定价
 Module2200Desc=允许价格的数学表达式
-Module2300Name=克隆
+Module2300Name=计划任务
 Module2300Desc=排定任务管理
-Module2400Name=Agenda/Events
+Module2400Name=议程/活动
 Module2400Desc=Follow events or rendez-vous. Record manual events into Agendas or let application logs automatic events for tracking purposes.
 Module2500Name=电子内容管理
 Module2500Desc=保存和共享文件
-Module2600Name=API/Web services (SOAP server)
+Module2600Name=API/Web 服务 (SOAP 服务器)
 Module2600Desc=允许 Dolibarr SOAP 服务器提供 API 服务
-Module2610Name=API/Web services (REST server)
+Module2610Name=API/Web 服务 (REST 服务器)
 Module2610Desc=允许 Dolibarr REST 服务器提供 API 服务
 Module2660Name=Call WebServices (SOAP client)
 Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Supplier orders supported only for the moment)
 Module2700Name=Gravatar
 Module2700Desc=使用在线 Gravatar 服务(www.gravatar.com),通过搜索电子邮件地址来显示用户/成员的头像。此功能需要连网。
 Module2800Desc=FTP 客户端
-Module2900Name=GeoIPMaxmind
-Module2900Desc=Maxmind geoip 数据库的转换能力
+Module2900Name=Maxmind网站的GeoIP全球IP地址数据库
+Module2900Desc=Maxmind的geoip数据库的转换能力
 Module3100Name=Skype
-Module3100Desc=Add a Skype button into users / third parties / contacts / members cards
+Module3100Desc=添加 Skype 聊天按钮到用户 / 合伙人 / 联系人 / 会员信息资料卡
 Module4000Name=人事管理
-Module4000Desc=Human resources management
+Module4000Desc=人力资源管理
 Module5000Name=多公司
 Module5000Desc=允许你管理多个公司
 Module6000Name=工作流程
 Module6000Desc=工作流管理
-Module10000Name=Websites
+Module10000Name=网站
 Module10000Desc=Create public websites with a WYSIWG editor. Just setup your web server to point to the dedicated directory to have it online on the Internet.
 Module20000Name=请假申请管理
-Module20000Desc=请假申请提交和跟进
+Module20000Desc=请假申请提交和跟进管理模块
 Module39000Name=产品库
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
-Module50000Name=出纳
+Module39000Desc=产品的批号或序列号,保质期和销售日期管理
+Module50000Name=钱箱
 Module50000Desc=使用 PayBox 提供信用卡网上支付页面的模块
 Module50100Name=POS
-Module50100Desc=Point of sales module (POS).
+Module50100Desc= (POS)POS模块.
 Module50200Name=Paypal
 Module50200Desc=提供信用卡与Paypal网上支付页面的模块
-Module50400Name=财会(高级)
+Module50400Name=会计(高级)
 Module50400Desc=会计管理(双方)
 Module54000Name=IPP打印
 Module54000Desc=不打开文档而使用 Cups IPP 界面直接打印 (打印机必须在服务器可见,Cups 必须安装在服务器上)。
-Module55000Name=民意调查或投票
-Module55000Desc=民意调查或投票生成模块
+Module55000Name=问卷, 调查或投票
+Module55000Desc=该模块将生成在线的问卷, 调查或投票 (类似于 Doodle, Studs, Rdvz, ...)
 Module59000Name=利润空间
 Module59000Desc=利润空间管理模块
 Module60000Name=佣金
 Module60000Desc=佣金管理模块
-Module63000Name=Resources
-Module63000Desc=Manage resources (printers, cars, room, ...) you can then share into events
+Module63000Name=资源
+Module63000Desc=资源管理 (打印机, 车辆, 房间, ...)然后你可以分享到活动中
 Permission11=读取销售账单
-Permission12=创建/修改发票
+Permission12=创建/变更发票
 Permission13=取消确认客户发票
 Permission14=确认客户发票
 Permission15=通过电邮发送发票
 Permission16=添加客户发票付款记录
 Permission19=删除客户发票
 Permission21=读取报价单
-Permission22=建立/修改报价单
+Permission22=创建/变更报价单
 Permission24=确认报价单
 Permission25=发送报价单
 Permission26=关闭报价单
 Permission27=删除报价单
 Permission28=导出报价单
 Permission31=读取产品信息
-Permission32=建立/修改产品信息
+Permission32=创建/变更产品信息
 Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
 Permission41=读取项目和任务(共享的工程和我参与的项目)。还可输入项目所消耗的时间(时间表)
-Permission42=建立/修改项目(共享的项目和我参与的项目)
+Permission42=创建/变更项目(公开项目和私人项目)
 Permission44=删除项目(共享的项目和我参与的项目)
-Permission45=Export projects
+Permission45=导出项目
 Permission61=读取干预
-Permission62=建立/修改干预
+Permission62=创建/变更干预
 Permission64=删除干预
 Permission67=导出干预措施
 Permission71=读取会员
-Permission72=建立/修改会员
+Permission72=创建/变更会员
 Permission74=删除会员
 Permission75=设置会员类型
 Permission76=导出数据
 Permission78=读取订阅
-Permission79=建立/修改订阅
+Permission79=创建/变更订阅
 Permission81=读取客户订单
-Permission82=建立/修改客户订单
+Permission82=创建/变更客户订单
 Permission84=确认客户订单
 Permission86=发送客户订单
 Permission87=关闭客户订单
 Permission88=取消客户订单
 Permission89=删除客户订单
 Permission91=读取财政税和增值税
-Permission92=建立/修改财政税和增值税
+Permission92=创建/变更财政税和增值税
 Permission93=删除财政税和增值税
 Permission94=导出财政税和增值税
-Permission95=读取报告
+Permission95=读取报表
 Permission101=读取发货单信息
-Permission102=建立/修改发货单
-Permission104=确认发货单
+Permission102=创建/变更发货单
+Permission104=确认发送
 Permission106=导出发货单
 Permission109=删除发货单
 Permission111=读取财务帐目
-Permission112=建立/修改/删除和比较交易
+Permission112=创建/变更/删除和比较交易
 Permission113=设置财政账户 (创建和管理分类)
 Permission114=调和交易
 Permission115=导出交易和帐户报表
 Permission116=账户间转账
 Permission117=支票调度管理
-Permission121=读取与用户相关联的客户的信息
-Permission122=建立/修改与用户相关联的客户的信息
-Permission125=删除与用户相关联的客户的信息
-Permission126=导出客户信息
+Permission121=读取合伙人信息关联用户
+Permission122=创建/变更与用户相关联的合伙人信息
+Permission125=删除与用户相关联的合伙人信息
+Permission126=导出合伙人信息
 Permission141=读取所有项目和任务 (包括我未参与的项目)
-Permission142=创建/修改所有项目和项目 (包括我未参与的项目)
+Permission142=创建/变更所有项目和项目 (包括我未参与的项目)
 Permission144=删除所有项目和项目 (包括我未参与的项目)
 Permission146=读取供应商
 Permission147=读取统计
-Permission151=读取长期订单
-Permission152=创建/修改常年订单请求
-Permission153=读取常年订单收据
-Permission154=接受/拒绝常年订单收据
-Permission161=读取合同/订阅
-Permission162=创建/修改合同/订阅
-Permission163=启用合同中的服务/产品
-Permission164=禁用合同中的服务/产品
-Permission165=删除合同/订阅
-Permission167=Export contracts
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
+Permission161=读取联系人/订阅
+Permission162=创建/变更联系人/订阅
+Permission163=启用联系人服务/订阅
+Permission164=禁用联系人服务/订阅
+Permission165=删除联系人/订阅
+Permission167=导出联系人
 Permission171=Read trips and expenses (yours and your subordinates)
-Permission172=创建/修改行程及开支
+Permission172=创建/变更行程及开支
 Permission173=删除行程及开支
 Permission174=读取所有行程和开支
 Permission178=导出形成及开支
-Permission180=读取供应商资讯
+Permission180=读取供应商资料
 Permission181=读取采购订单
-Permission182=建立/修改采购订单
-Permission183=确认供采购订单
+Permission182=创建/变更供应商订单
+Permission183=确认可采购订单
 Permission184=批准采购订单
 Permission185=订购或取消采购订单
 Permission186=接收采购订单
@@ -636,100 +647,100 @@ Permission194=读取
 Permission202=创建 ADSL 连接
 Permission203=订立连接订单
 Permission204=订购连接
-Permission205=管理连接
-Permission206=读取连接
+Permission205=链接管理
+Permission206=读取链接
 Permission211=读取电话
 Permission212=订购线路
-Permission213=激活线路
+Permission213=启用明细
 Permission214=安装电话
 Permission215=安装商
 Permission221=读取邮件
-Permission222=建立/修改邮件(主题,收件人,,,)
+Permission222=创建/变更邮件(主题,收件人,,,)
 Permission223=确认邮寄(允许发送)
 Permission229=删除邮件
 Permission237=查看收件人及信息
 Permission238=手动发送邮件
 Permission239=确认或发送后删除邮件记录
 Permission241=读取分类
-Permission242=建立/修改分类
+Permission242=创建/变更分类
 Permission243=删除分类
 Permission244=查看隐藏类别的内容
-Permission251=读取其他用户和群组资讯
+Permission251=读取其他用户和群组资料
 PermissionAdvanced251=读取其他用户
 Permission252=读取其他用户的使用权限
-Permission253=建立/修改其他用户、群组资讯及其权限
-PermissionAdvanced253=创建/修改内部/外部用户和权限
-Permission254=只能建立/修改外部用户资讯
+Permission253=创建/变更其他用户、群组资料及其权限
+PermissionAdvanced253=创建/变更内部/外部用户和权限
+Permission254=只能创建/变更外部用户资料
 Permission255=修改其他用户密码
 Permission256=删除或暂时关闭其他用户
-Permission262=扩展权限到所有客户(不仅限于与此账户相关联的单位)。对外单位用户无效(他们始终只能访问自己的信息)。
+Permission262=扩展权限到所有合伙人(不仅限于与此账户相关联的单位)。对外单位用户无效(他们始终只能访问自己的信息)。
 Permission271=读取 CA
 Permission272=读取发票
 Permission273=开具发票
-Permission281=读取联络人资讯
-Permission282=建立/修改联络人资讯
-Permission283=删除联络人资讯
-Permission286=导出联络人资讯
+Permission281=读取联络人资料
+Permission282=创建/变更联络人资料
+Permission283=删除联络人资料
+Permission286=导出联络人资料
 Permission291=读取关税
 Permission292=设置关税权限
 Permission293=修改客户关税
 Permission300=读取条码
-Permission301=建立/修改条码
+Permission301=创建/变更条码
 Permission302=删除条码
 Permission311=读取服务
-Permission312=为合同指定服务/订购
+Permission312=为联系人指定服务/订阅
 Permission331=读取书签
-Permission332=建立/修改书签
+Permission332=创建/变更书签
 Permission333=删除书签
-Permission341=读取自己的权限
-Permission342=建立/修改自己的资讯
-Permission343=修改自己的密码
-Permission344=修改自己的权限
+Permission341=读取个人权限
+Permission342=创建/变更个人资料
+Permission343=修改个人密码
+Permission344=修改个人权限
 Permission351=读取组
 Permission352=读取组的权限
-Permission353=建立/修改组
+Permission353=创建/变更群组
 Permission354=删除或禁用组
-Permission358=导出用户资讯
+Permission358=导出用户资料
 Permission401=读取折扣
-Permission402=建立/修改折扣
+Permission402=创建/变更折扣
 Permission403=确认折扣
 Permission404=删除折扣
 Permission510=查看工资
-Permission512=创建/修改工资
+Permission512=创建/变更工资
 Permission514=删除工资
 Permission517=导出工资
 Permission520=读取贷款
-Permission522=创建/修改贷款
+Permission522=创建/变更贷款
 Permission524=删除贷款
 Permission525=访问贷款计算器
 Permission527=导出贷款
 Permission531=读取服务
-Permission532=建立/修改服务
+Permission532=创建/变更服务
 Permission534=删除服务
 Permission536=查看/隐藏服务管理
 Permission538=导出服务
-Permission701=读取捐款资讯
-Permission702=建立/修改捐款资讯
-Permission703=删除捐款资讯
-Permission771=Read expense reports (yours and your subordinates)
-Permission772=创建/修改开支报告
-Permission773=删除开支报告
-Permission774=读取所有开支报告(即使用户没有下属)
-Permission775=通过开支报告
-Permission776=支付开支报告
-Permission779=导出开支报告
-Permission1001=读取仓库信息
-Permission1002=创建/修改仓库
+Permission701=读取捐款资料
+Permission702=创建/变更捐款资料
+Permission703=删除捐款资料
+Permission771=读取费用报表(您以及您下属)
+Permission772=创建/变更费用报表
+Permission773=删除费用报表
+Permission774=读取所有费用报表(即使用户没有下属)
+Permission775=批准费用报表
+Permission776=支付费用报表
+Permission779=导出费用报表
+Permission1001=读取库存信息
+Permission1002=创建/变更仓库
 Permission1003=删除仓库
 Permission1004=读取库存转让
-Permission1005=建立/修改库存转让
+Permission1005=创建/变更库存移转调拨
 Permission1101=读取发货单
-Permission1102=建立/修改发货单
+Permission1102=创建/变更发货单
 Permission1104=确认发货单
 Permission1109=删除发货单
-Permission1181=读取供应商资讯
+Permission1181=读取供应商资料
 Permission1182=读取采购订单
-Permission1183=建立/修改采购订单
+Permission1183=创建/变更采购订单
 Permission1184=确认采购订单
 Permission1185=批准采购订单
 Permission1186=执行采购清单
@@ -737,34 +748,35 @@ Permission1187=确认收到采购订单
 Permission1188=删除采购订单
 Permission1190=审核 (二次审核) 采购订单
 Permission1201=获得导出结果
-Permission1202=建立/修改导出信息
+Permission1202=创建/变更导出信息
 Permission1231=读取采购发票
-Permission1232=建立/修改采购发票
+Permission1232=创建/变更采购发票
 Permission1233=确认采购发票
 Permission1234=删除采购发票
 Permission1235=通过电邮发送采购发票
-Permission1236=导出供应商发票、属性及其付款资讯
+Permission1236=导出供应商发票、属性及其付款资料
 Permission1237=导出采购订单及其详情
 Permission1251=导入大量外部数据到数据库(载入资料)
-Permission1321=导出客户发票、属性及其付款资讯
-Permission1421=导出客户订单及属性资讯
-Permission20001=Read leave requests (yours and your subordinates)
-Permission20002=Create/modify your leave requests
-Permission20003=Delete leave requests
-Permission20004=Read all leave requests (even user not subordinates)
-Permission20005=Create/modify leave requests for everybody
-Permission20006=Admin leave requests (setup and update balance)
+Permission1321=导出客户发票、属性及其付款资料
+Permission1322=Reopen a paid bill
+Permission1421=导出客户订单及属性资料
+Permission20001=读取请假申请 (您以及您的下属)
+Permission20002=创建/变更你的请假申请
+Permission20003=删除请假申请
+Permission20004=读取全部请假申请 (即使用户不是下属)
+Permission20005=创建/变更全体人员的请假申请
+Permission20006=管理员请假申请 (setup and update balance)
 Permission23001=读取排定任务
 Permission23002=创建/更新排定任务
 Permission23003=删除排定任务
 Permission23004=执行排定任务
 Permission2401=读取关联至此用户账户的动作(事件或任务)
-Permission2402=建立/修改关联至此用户账户的动作(事件或任务)
+Permission2402=创建/变更关联至此用户账户的动作(事件或任务)
 Permission2403=删除关联至此用户账户的动作(事件或任务)
 Permission2411=读取他人的动作(事件或任务)
-Permission2412=建立/修改他人的动作(事件或任务)
+Permission2412=创建/变更他人的动作(事件或任务)
 Permission2413=删除他人的动作(事件或任务)
-Permission2414=Export actions/tasks of others
+Permission2414=导出其他动作/任务
 Permission2501=读取/下载文档
 Permission2502=下载文档
 Permission2503=提交或删除的文档
@@ -776,40 +788,44 @@ Permission50201=读取交易
 Permission50202=导入交易
 Permission54001=打印
 Permission55001=读取调查
-Permission55002=创建/修改调查
+Permission55002=创建/变更调查
 Permission59001=查看商业利润
 Permission59002=确定商业利润
-Permission59003=Read every user margin
-DictionaryCompanyType=Types of thirdparties
-DictionaryCompanyJuridicalType=Legal forms of thirdparties
-DictionaryProspectLevel=潜在客户级别
-DictionaryCanton=State/Province
+Permission59003=读取每位用户利润
+Permission63001=读取资源
+Permission63002=创建/变更资源
+Permission63003=删除资源
+Permission63004=Link resources to agenda events
+DictionaryCompanyType=合伙人类型
+DictionaryCompanyJuridicalType=合伙人法律条款
+DictionaryProspectLevel=准客户级别
+DictionaryCanton=州/省
 DictionaryRegion=地区
 DictionaryCountry=国家
 DictionaryCurrency=货币
-DictionaryCivility=Personal and professional titles
-DictionaryActions=Types of agenda events
+DictionaryCivility=个人和专业技术职称
+DictionaryActions=活动议程类型
 DictionarySocialContributions=财政税和增值税类别
 DictionaryVAT=增值税率和消费税率
 DictionaryRevenueStamp=印花税票金额
-DictionaryPaymentConditions=付款协议
+DictionaryPaymentConditions=付款条件
 DictionaryPaymentModes=付款方式
 DictionaryTypeContact=联络人/地址类型
 DictionaryEcotaxe=Ecotax 指令
 DictionaryPaperFormat=纸张格式
-DictionaryFees=Types of fees
-DictionarySendingMethods=送货方式
+DictionaryFees=费用类型
+DictionarySendingMethods=运输方式
 DictionaryStaff=员工
 DictionaryAvailability=送货延迟
 DictionaryOrderMethods=订单类型
-DictionarySource=订单来源方式
-DictionaryAccountancyCategory=Accounting categories
+DictionarySource=报价/订单来源方式
+DictionaryAccountancyCategory=会计分类
 DictionaryAccountancysystem=账户图标模块
 DictionaryEMailTemplates=电子邮件模板
 DictionaryUnits=单位
-DictionaryProspectStatus=展望状态
-DictionaryHolidayTypes=Types of leaves
-DictionaryOpportunityStatus=项目/线索的机遇状态
+DictionaryProspectStatus=准客户状态
+DictionaryHolidayTypes=请假类型
+DictionaryOpportunityStatus=项目/线索的机会状态
 SetupSaved=设置已经成功保存
 BackToModuleList=返回模块列表
 BackToDictionaryList=回到字典库
@@ -819,7 +835,7 @@ VATIsNotUsedDesc=默认情况下,建议的营业税为0,可用于像机构
 VATIsUsedExampleFR=在法国,这意味着这个公司或机构有一个真正的财政体制,这个体制会申报增值税。
 VATIsNotUsedExampleFR=在法国,这意味着在非增值税申报协会或公司、组织或已选择了微型企业的财政体制(VAT特许经营),并支付了特许经营的增值税。此选项将显示参考“Non applicable VAT - art-293B of CGI”的发票。
 ##### Local Taxes #####
-LTRate=率
+LTRate=税率
 LocalTax1IsNotUsed=不使用第二税率
 LocalTax1IsUsedDesc=使用其它类型税率(非增值税)
 LocalTax1IsNotUsedDesc=不使用其它类型税率(非增值税VAT)
@@ -842,19 +858,20 @@ LocalTax2IsUsedDescES= The RE rate by default when creating prospects, invoices,
 LocalTax2IsNotUsedDescES= 默认情况下,建议IRPF为0。规则结束。
 LocalTax2IsUsedExampleES= In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
 LocalTax2IsNotUsedExampleES= In Spain they are bussines not subject to tax system of modules.
-CalcLocaltax=地方税报告
+CalcLocaltax=地税报表
 CalcLocaltax1=销售 - 采购
-CalcLocaltax1Desc=地方税率报告已经分别计算了在销售和采购时所产生的不同税。
+CalcLocaltax1Desc=地税报表已经分别计算了在销售和采购时所产生的不同税。
 CalcLocaltax2=采购
-CalcLocaltax2Desc=地方税报告是采购总计
+CalcLocaltax2Desc=地税报表是采购总计
 CalcLocaltax3=销售
-CalcLocaltax3Desc=地方税报告是销售总计
+CalcLocaltax3Desc=地税报表是销售总计
 LabelUsedByDefault=如果代码没有翻译则默认使用以下标签
 LabelOnDocuments=文档中的标签
 NbOfDays=天数
 AtEndOfMonth=月末
+CurrentNext=Current/Next
 Offset=偏移
-AlwaysActive=始终启用
+AlwaysActive=此项必须始终保持启用状态
 Upgrade=升级
 MenuUpgrade=升级/扩展
 AddExtensionThemeModuleOrOther=添加扩展(主题、模块...)
@@ -865,7 +882,7 @@ IP=IP 地址
 Port=端口
 VirtualServerName=虚拟服务器名称
 OS=操作系统
-PhpWebLink=PHP 网路连结
+PhpWebLink=Web-Php链接
 Browser=浏览器
 Server=服务器
 Database=数据库
@@ -887,29 +904,29 @@ DefaultMenuSmartphoneManager=智能手机菜单管理
 Skin=外观主题
 DefaultSkin=默认外观主题
 MaxSizeList=最大列表长度
-DefaultMaxSizeList=Default max length for lists
+DefaultMaxSizeList=列表默认最大值
 DefaultMaxSizeShortList=Default max length for short lists (ie in customer card)
 MessageOfDay=每日消息
-MessageLogin=登录页面显示消息
+MessageLogin=登陆页面显示消息
 PermanentLeftSearchForm=常驻左侧菜单搜寻框
-DefaultLanguage=默认语言使用(语言代码)
+DefaultLanguage=默认语言(语言代码)
 EnableMultilangInterface=启用多语言界面
-EnableShowLogo=左侧菜单中显示公司标志
-CompanyInfo=公司资讯
+EnableShowLogo=左侧菜单中显示LOGO公司标志
+CompanyInfo=公司/机构资料信息
 CompanyIds=公司/机构的编号
 CompanyName=名称
 CompanyAddress=地址
 CompanyZip=邮编
 CompanyTown=城镇
 CompanyCountry=国家
-CompanyCurrency=主要货币
-CompanyObject=该公司目标
-Logo=标志
+CompanyCurrency=通行货币
+CompanyObject=公司愿景
+Logo=LOGO标志
 DoNotSuggestPaymentMode=不提示
 NoActiveBankAccountDefined=没有定义有效的银行帐户
 OwnerOfBankAccount=银行帐户 %s 的户主
 BankModuleNotActive=银行账户模块没有启用
-ShowBugTrackLink=显示lian'jie "<strong>%s</strong>"
+ShowBugTrackLink=显示链接 "<strong>%s</strong>"
 Alerts=警告
 DelaysOfToleranceBeforeWarning=超时警告前延迟的阀值
 DelaysOfToleranceDesc=这里您可以设置主看板区出现逾期提醒 (带有%s图标) 前的逾期时间。
@@ -928,31 +945,31 @@ Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=银行对账推迟最大逾期时
 Delays_MAIN_DELAY_MEMBERS=会员费用最大逾期时间 (天) 
 Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=支票兑现最大逾期时间 (天) 
 Delays_MAIN_DELAY_EXPENSEREPORTS=Tolerance delay (in days) before alert for expense reports to approve
-SetupDescription1=The setup area is for initial setup parameters before starting to use Dolibarr.
-SetupDescription2=The two most important setup steps are the first two in the setup menu on the left: Company/foundation setup page and Modules setup page:
-SetupDescription3=Parameters in menu <a href="%s">Setup -> Company/foundation</a> are required because submitted data are used on Dolibarr displays and to customize the default behaviour of the software (for country-related features for example).
-SetupDescription4=Parameters in menu <a href="%s">Setup -> Modules</a> are required because Dolibarr is not a monolithic ERP/CRM but a collection of several modules, all more or less independent. New features will be added to menus for every module you'll enable.
-SetupDescription5=其他菜单项管理可选参数。
+SetupDescription1=在开始使用Dolibarr之前请先进行初始化设置相关参数。
+SetupDescription2=两个最重要的设置步骤是在左边的设置菜单中的前两个:公司/机构和模块:
+SetupDescription3=该参数的设置菜单是 <a href="%s">设置 -> 公司/机构</a> 需要您首先设定好的原因是因为显示特定信息必须事先设定好此参数 (例如国家税费相关的信息).
+SetupDescription4=该参数的设置菜单是 <a href="%s">设置 -> 模块</a> 需要您首先设定好的原因是Dolibarr采用的是目前最先进优化的模块化设计 ERP/CRM 系统.这种设计非常棒,未来我们开发新功能将以模块的形式启用到系统菜单中.
+SetupDescription5=其他管理菜单可选参数。
 LogEvents=安全稽核事件
 Audit=安全稽核
 InfoDolibarr=关于Dolibarr
-InfoBrowser=About Browser
+InfoBrowser=关于浏览器
 InfoOS=关于OS
 InfoWebServer=关于WEB服务器
 InfoDatabase=关于数据库
 InfoPHP=关于PHP
-InfoPerf=About Performances
+InfoPerf=关于性能
 BrowserName=浏览器名称
 BrowserOS=浏览器操作系统
 ListOfSecurityEvents=安全事件清单
 SecurityEventsPurged=安全事件清除
 LogEventDesc=这里您可以启用 Dolibarr 的安全事件日志记录。管理员可以通过<b>系统工具-稽核</b>查看其内容。警告,此功能会消耗大量的数据库空间。
-AreaForAdminOnly=这些功能仅供<b>管理员用户</b> 使用。
+AreaForAdminOnly=此功能仅供<b>管理员用户</b> 使用。
 SystemInfoDesc=系统信息指以只读方式显示的其它技术信息,只对系统管理员可见。
 SystemAreaForAdminOnly=此区仅供管理员用户使用。Dolibarr 中没有权限可越过此限制。
-CompanyFundationDesc=在此页面底部单击"修改"按钮来维护您公司/机构的所有已知信息
+CompanyFundationDesc=在本页面输入详细的公司或机构的初始资料 (然后点击页面底部的 "变更" 或 "保存" 按钮)
 DisplayDesc=这里可以选择 Dolibarr 外观效果相关的所有参数
-AvailableModules=可用的模块
+AvailableModules=本地可用模块
 ToActivateModule=要启用模块,请到“设定”区 (首页->设定->模块)。
 SessionTimeOut=会话超时
 SessionExplanation=This number guarantee that session will never expire before this delay, if the session cleaner is done by Internal PHP session cleaner (and nothing else). Internal PHP session cleaner does not guaranty that session will expire just after this delay. It will expire, after this delay, and when the session cleaner is ran, so every <b>%s/%s</b> access, but only during access made by other sessions.<br>Note: on some servers with an external session cleaning mechanism (cron under debian, ubuntu ...), the sessions can be destroyed after a period defined by the default <strong>session.gc_maxlifetime</strong>, no matter what the value entered here.
@@ -963,17 +980,17 @@ TriggerDisabledAsModuleDisabled=此文件中的触发器将在<b>%s</b>模块禁
 TriggerAlwaysActive=无论 Dolibarr 的各模块是否启用,此文件中的触发器一直处于启用状态。
 TriggerActiveAsModuleActive=此文件中的触发器将于 <b>%s</b> 模块启用后启用。
 GeneratedPasswordDesc=在此设定新密码的生成规则,如果您选择使用自动生成的密码。
-DictionaryDesc=Insert all reference data. You can add your values to the default.
+DictionaryDesc=输入全部参考数据.你能添加你的参数值为默认值。
 ConstDesc=This page allows you to edit all other parameters not available in previous pages. These are mostly reserved parameters for developers or advanced troubleshooting.
-MiscellaneousDesc=All other security related parameters are defined here.
-LimitsSetup=限制及精准度
+MiscellaneousDesc=所有其他安全相关的参数定义在这里。
+LimitsSetup=范围及精确度
 LimitsDesc=这里您可以设置 Dolibarr 的范围、精度和优化参数。
 MAIN_MAX_DECIMALS_UNIT=单价小数位
 MAIN_MAX_DECIMALS_TOT=总价小数位
 MAIN_MAX_DECIMALS_SHOWN=屏幕显示小数位(如果你希望系统内部数值显示时遇到小数位截断的情况下显示<b>...</b>,请在此数值后加上<b>...</b>)
 MAIN_ROUNDING_RULE_TOT=Step of rounding range (for countries where rounding is done on something else than base 10. For example, put 0.05 if rounding is done by 0.05 steps)
 UnitPriceOfProduct=税前单价
-TotalPriceAfterRounding=四舍五入的总价 (税前价/增值税/税后价)
+TotalPriceAfterRounding=四舍五入后的总价 (税前价/增值税/税后价)
 ParameterActiveForNextInputOnly=参数仅在下次输入数值起生效。
 NoEventOrNoAuditSetup=尚无安全事件被记录。“设置 - 安全 - 稽核”页面的稽核功能未启用则属于正常现象。
 NoEventFoundWithCriteria=未发现符合搜索条件的安全事件。
@@ -999,40 +1016,48 @@ SimpleNumRefModelDesc=依照 %syymm-nnnn 的格式返回引用编号,其中yy
 ShowProfIdInAddress=文件中显示专业编号及地址
 ShowVATIntaInAddress=隐藏增值税代码
 TranslationUncomplete=部分翻译
-SomeTranslationAreUncomplete=有一些语言可能只是被部分翻译,而且可能包含错误。如果你发现了错误,你可以在 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.网页修复该错误。
+SomeTranslationAreUncomplete=卖个小萌:有一些语言可能只是被部分翻译,而且可能包含错误。如果你发现了错误,你可以在 <a href="http://transifex.com/projects/p/dolibarr/" target="_blank">http://transifex.com/projects/p/dolibarr/</a>.在线修复该错误或加QQ群:206239089交流反馈讨论Dolibarr简体中文汉化交流。
 MAIN_DISABLE_METEO=禁用天气图标
-TestLoginToAPI=测试 API 登录
+TestLoginToAPI=测试 API 登陆
 ProxyDesc=Dolibarr 的一些功能需要互联网连接。请在此设置联网参数。如果 Dolibarr 服务器上网需要代理服务器,请设置下面的代理参数。
 ExternalAccess=外部访问
 MAIN_PROXY_USE=使用代理服务器(否则直接访问互联网)
 MAIN_PROXY_HOST=代理服务器的名称/地址
 MAIN_PROXY_PORT=代理服务器的端口
-MAIN_PROXY_USER=登录使用代理服务器
+MAIN_PROXY_USER=登陆使用代理服务器
 MAIN_PROXY_PASS=使用代理服务器的密码
 DefineHereComplementaryAttributes=此处定义所有默认安装中没有,但您又希望能在 %s 中使用的属性。
 ExtraFields=自定义属性
-ExtraFieldsLines=增补属性 (行列)
+ExtraFieldsLines=自定义属性 (行列)
 ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
-ExtraFieldsThirdParties=增补属性 (往来单位)
-ExtraFieldsContacts=增补属性 (联系人/地址)
-ExtraFieldsMember=增补属性 (会员)
-ExtraFieldsMemberType=增补属性 (会员类型)
-ExtraFieldsCustomerInvoices=增补的属性(发票)
-ExtraFieldsSupplierOrders=增补属性 (订单)
-ExtraFieldsSupplierInvoices=增补属性 (账单)
-ExtraFieldsProject=增补属性 (项目)
-ExtraFieldsProjectTask=增补属性 (任务)
+ExtraFieldsSupplierInvoicesLines=自定义属性(发票明细)
+ExtraFieldsThirdParties=自定义属性 (合伙人)
+ExtraFieldsContacts=自定义属性 (联系人/地址)
+ExtraFieldsMember=自定义属性 (会员)
+ExtraFieldsMemberType=自定义属性 (会员类型)
+ExtraFieldsCustomerInvoices=自定义属性(发票)
+ExtraFieldsSupplierOrders=自定义属性 (订单)
+ExtraFieldsSupplierInvoices=自定义属性 (账单)
+ExtraFieldsProject=自定义属性 (项目)
+ExtraFieldsProjectTask=自定义属性 (任务)
 ExtraFieldHasWrongValue=属性 %s 有一个错误的值。
-AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
+AlphaNumOnlyLowerCharsAndNoSpace=仅限英文大小写字母不含空格
 SendmailOptionNotComplete=Warning, on some Linux systems, to send email from your email, sendmail execution setup must contains option -ba (parameter mail.force_extra_parameters into your php.ini file). If some recipients never receive emails, try to edit this PHP parameter with mail.force_extra_parameters = -ba).
 PathToDocuments=文件路径
 PathDirectory=目录
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
-TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
+TranslationSetup=翻译设置
+TranslationKeySearch=搜索翻译键值或字符串
+TranslationOverwriteKey=覆盖翻译字符串
+TranslationDesc=如何设置显示的应用程序的语言 :<br>* 系统侧边栏: 菜单 <strong>主页 - 设置 - 主题</strong><br>* 用户个性主题: <strong>用户看板设置</strong> 菜单在用户个人资料信息卡中 (点击屏幕右上角的用户名).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=翻译字符串
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=显示新翻译字符串
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
+TotalNumberOfActivatedModules=启用的功能模块总共: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您必须至少启用 1 个模块
 ClassNotFoundIntoPathWarning=PHP 路径中未发现 类 %s
 YesInSummer=是(在夏天)
@@ -1040,7 +1065,7 @@ OnlyFollowingModulesAreOpenedToExternalUsers=注意,只有以下模块会开
 SuhosinSessionEncrypt=会话存储空间已用 Suhosin 加密
 ConditionIsCurrently=当前条件为 %s
 YouUseBestDriver=你使用的驱动程序 %s 就是目前最佳驱动程式。
-YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
+YouDoNotUseBestDriver=你用的驱动是 %s 但驱动 %s 才是最佳驱动.
 NbOfProductIsLowerThanNoPb=你只有 %s  的产品/服务在数据库。这并不需要任何特别的优化。
 SearchOptim=搜索优化
 YouHaveXProductUseSearchOptim=你有 %s 产品进入数据库。你应该加常数PRODUCT_DONOTSEARCH_ANYWHERE 1到 首页-设置-其他,你将限制数据库开始搜索范围索引的使用字符串,你应该得到即时响应。
@@ -1055,34 +1080,34 @@ FillThisOnlyIfRequired=例如:+2 (请只在时区错误问题出现时填写)
 GetBarCode=获取条码
 ##### Module password generation
 PasswordGenerationStandard=返回一个根据 Dolibarr 内部算法生成的密码:8个字符,包含小写数字和字母。
-PasswordGenerationNone=Do not suggest any generated password. Password must be typed in manually.
-PasswordGenerationPerso=Return a password according to your personally defined configuration.
+PasswordGenerationNone=不生成任何的密码。必须手动输入一个密码。
+PasswordGenerationPerso=返回一个字符串用于设置你的个人密码。
 SetupPerso=According to your configuration
 PasswordPatternDesc=Password pattern description
 ##### Users setup #####
 RuleForGeneratedPasswords=生成推荐密码和验证密码的规则
-DisableForgetPasswordLinkOnLogonPage=登陆页面不显示“忘记密码”链接
+DisableForgetPasswordLinkOnLogonPage=禁用登陆页面的“找回密码”功能超链接
 UsersSetup=用户模块设置
-UserMailRequired=新用户创建时需要输入电子邮件
+UserMailRequired=新创建用户时需要输入电子邮箱地址
 ##### HRM setup #####
-HRMSetup=HRM module setup
+HRMSetup=人力资源管理模块设置
 ##### Company setup #####
 CompanySetup=客户/供应商模块及其相关参数设置
-CompanyCodeChecker=客户编号生成与检验模块 (客户或供应商)
-AccountCodeManager=会计编号产生及检查模块设定(客户或供应商)
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
+CompanyCodeChecker=合伙人编号生成与检验模块 (客户或供应商)
+AccountCodeManager=会计科目代码生成模块(客户或供应商)
+NotificationsDesc=Email邮件提醒通知功能允许你给一些Dolibarr活动,自动发送提醒通知邮件。提醒通知的目标可定义:
 NotificationsDescUser=* per users, one user at time.
 NotificationsDescContact=* per third parties contacts (customers or suppliers), one contact at time.
 NotificationsDescGlobal=* or by setting global target emails in module setup page.
 ModelModules=文件模板
-DocumentModelOdt=从开放文档模板软件(OpenOffice, KOffice, TextEdit,...等)生成(.ODT,.ODS)模板文档。
+DocumentModelOdt=生成开源办公软件专用格式的(如OpenOffice, KOffice, TextEdit,...等的.ODT格式,.ODS格式)的模板文档。
 WatermarkOnDraft=为草稿文档加水印
-JSOnPaimentBill=激活在线支付功能来自动填充付款的形式
-CompanyIdProfChecker=Professional Id 规则
-MustBeUnique=必须是唯一 ID 吗?
-MustBeMandatory=强制创建客户?
-MustBeInvoiceMandatory=强制验证发票?
-Miscellaneous=杂项设定
+JSOnPaimentBill=激活启用在线支付功能来自动填充付款的形式
+CompanyIdProfChecker=专业ID号码规则
+MustBeUnique=是否唯一
+MustBeMandatory=创建合伙人时是否必填 ?
+MustBeInvoiceMandatory=发票验证时是否必填?
+Miscellaneous=各项设定
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>格式的导出文件可以通过链接 %s 下载
 ##### Invoices #####
@@ -1096,32 +1121,32 @@ SuggestedPaymentModesIfNotDefinedInInvoice=如果发票中未设置付款方式
 SuggestPaymentByRIBOnAccount=根据账户的提款方式来建议付款方式
 SuggestPaymentByChequeToAddress=根据支票地址来建议付款方式
 FreeLegalTextOnInvoices=发票中的额外说明文本
-WatermarkOnDraftInvoices=发票草稿加水印(如果空)
-PaymentsNumberingModule=Payments numbering model
-SuppliersPayment=Suppliers payments
-SupplierPaymentSetup=Suppliers payments setup
+WatermarkOnDraftInvoices=发票草稿加水印(无则留空)
+PaymentsNumberingModule=付款编号模式
+SuppliersPayment=供应商付款
+SupplierPaymentSetup=供应商付款设置
 ##### Proposals #####
 PropalSetup=报价单模块设置
 ProposalsNumberingModules=报价单编号模块
 ProposalsPDFModules=报价单文档模板
 FreeLegalTextOnProposal=报价单中的额外说明文本
-WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空)
+WatermarkOnDraftProposal=为商业计划书草案添加水印(无则留空)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=询问银行账户
 ##### SupplierProposal #####
-SupplierProposalSetup=Price requests suppliers module setup
-SupplierProposalNumberingModules=Price requests suppliers numbering models
-SupplierProposalPDFModules=Price requests suppliers documents models
-FreeLegalTextOnSupplierProposal=Free text on price requests suppliers
-WatermarkOnDraftSupplierProposal=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ask for bank account destination of price request
+SupplierProposalSetup=供应商询价申请模块设置
+SupplierProposalNumberingModules=供应商询价申请编号模型
+SupplierProposalPDFModules=供应商询价申请文档模型
+FreeLegalTextOnSupplierProposal=供应商询价申请额外说明文字
+WatermarkOnDraftSupplierProposal=给供应商询价申请加盖水印 (无则留空)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=询问目标询价申请的银行账号
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Orders #####
 OrdersSetup=订单管理设置
 OrdersNumberingModules=订单编号模块
 OrdersModelModule=订单文档模板
 FreeLegalTextOnOrders=订单中的额外说明文本
-WatermarkOnDraftOrders=为订单草稿加水印(如果空)
-ShippableOrderIconInList=如果订单是可以送货的则添加一个标志用于提醒
+WatermarkOnDraftOrders=为订单草稿添加水印(无则留空)
+ShippableOrderIconInList=如果订单是可以送货的则添加一个标记用于提醒
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=为账单询问银行卡账户
 ##### Clicktodial #####
 ClickToDialSetup=点击拨号模块设置
@@ -1134,16 +1159,16 @@ FicheinterNumberingModules=干预编号模块
 TemplatePDFInterventions=干预信息卡文档模板
 WatermarkOnDraftInterventionCards=干预卡文档加水印(如果有)
 ##### Contracts #####
-ContractsSetup=合同/订阅模块设置
+ContractsSetup=联系人/订阅模块设置
 ContractsNumberingModules=合同编号模块
 TemplatePDFContracts=合同文档模块
 FreeLegalTextOnContracts=合同自由文本
-WatermarkOnDraftContractCards=为合同草案添加水印 (如果空)
+WatermarkOnDraftContractCards=为合同草案添加水印 (无则留空)
 ##### Members #####
 MembersSetup=会员模块设置
 MemberMainOptions=主要选项
-AdherentLoginRequired= 管理人员登录
-AdherentMailRequired=创建新会员时要求输入电子邮件
+AdherentLoginRequired= 管理人员登陆
+AdherentMailRequired=创建新会员时要求填写电子邮箱地址
 MemberSendInformationByMailByDefault=设置向会员发送邮件确认(会员确认或添加订阅)复选框默认为启用
 ##### LDAP setup #####
 LDAPSetup=LDAP 设置
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=使用 TLS
 LDAPServerUseTLSExample=您的 LDAP 服务器使用 TLS
 LDAPServerDn=服务器的 DN
 LDAPAdminDn=管理员的 DN
-LDAPAdminDnExample=完整的 DN (例如:cn=admin,dc=example,dc=com)
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=管理员密码
 LDAPUserDn=用户的 DN
 LDAPUserDnExample=完整的 DN (例如:ou=users,dc=example,dc=com)
@@ -1207,32 +1232,32 @@ LDAPSynchroKO=同步测试失败
 LDAPSynchroKOMayBePermissions=同步测试失败。请检查连接服务器已经正确设置并允许LDAP更新
 LDAPTCPConnectOK=TCP 连接到 LDAP 服务器连接成功 (服务器=%s, 端口=%s)
 LDAPTCPConnectKO=TCP 连接到 LDAP 服务器连接失败 (服务器=%s, 端口=%s)
-LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindOK=连接/认证 LDAP 服务器成功(服务器=%s, 端口=%s, 账号=%s, 密码=%s)
 LDAPBindKO=LDAP 服务器连接/认证 失败(服务器=%s,用户=%s,密码=%s)
 LDAPSetupForVersion3=LDAP服务器版本配置为 v3
 LDAPSetupForVersion2=LDAP服务器版本配置为 v2
 LDAPDolibarrMapping=Dolibarr 映射
 LDAPLdapMapping=LDAP 映射
-LDAPFieldLoginUnix=登录 (Unix)
+LDAPFieldLoginUnix=登陆 (Unix)
 LDAPFieldLoginExample=例如:UID
-LDAPFilterConnection=搜索过滤器
+LDAPFilterConnection=筛选搜索
 LDAPFilterConnectionExample=例如: &(objectClass=inetOrgPerson)
-LDAPFieldLoginSamba=登录 (samba,activedirectory)
-LDAPFieldLoginSambaExample=例如: samaccountname
+LDAPFieldLoginSamba=登陆 (samba,activedirectory)
+LDAPFieldLoginSambaExample=例如: sam账号名
 LDAPFieldFullname=全名
-LDAPFieldFullnameExample=例如: CN
+LDAPFieldFullnameExample=例如: 中国
 LDAPFieldPasswordNotCrypted=明文密码
 LDAPFieldPasswordCrypted=加密密码
-LDAPFieldPasswordExample=例如:userPassword
-LDAPFieldCommonNameExample=例如: CN
+LDAPFieldPasswordExample=例如:用户密码
+LDAPFieldCommonNameExample=例如: 中国
 LDAPFieldName=名称
-LDAPFieldNameExample=例如:SN
+LDAPFieldNameExample=例如:sn
 LDAPFieldFirstName=名
-LDAPFieldFirstNameExample=例如:张
+LDAPFieldFirstNameExample=例如:曾用名
 LDAPFieldMail=电邮地址
 LDAPFieldMailExample=例如:邮件
 LDAPFieldPhone=办公电话号码
-LDAPFieldPhoneExample=例如:5131654
+LDAPFieldPhoneExample=例如:010-1234-5678
 LDAPFieldHomePhone=个人电话号码
 LDAPFieldHomePhoneExample=例如:010-1234-5678
 LDAPFieldMobile=手机
@@ -1240,11 +1265,11 @@ LDAPFieldMobileExample=例如:138-0013-8000
 LDAPFieldFax=传真
 LDAPFieldFaxExample=例如: 010-8765-4321
 LDAPFieldAddress=街道
-LDAPFieldAddressExample=例如:西二旗大街
+LDAPFieldAddressExample=例如:南山街道
 LDAPFieldZip=邮编
 LDAPFieldZipExample=例如:100085
 LDAPFieldTown=城镇
-LDAPFieldTownExample=例如 :橙县
+LDAPFieldTownExample=例如 : l
 LDAPFieldCountry=国家
 LDAPFieldDescription=描述
 LDAPFieldDescriptionExample=例如 :备注描述等等
@@ -1254,12 +1279,12 @@ LDAPFieldGroupMembers= 群组成员
 LDAPFieldGroupMembersExample= 例如:成员1
 LDAPFieldBirthdate=生日
 LDAPFieldCompany=公司
-LDAPFieldCompanyExample=例如:埃克森美孚
+LDAPFieldCompanyExample=例如: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=例如:objectSID
+LDAPFieldSidExample=例如:项目ID
 LDAPFieldEndLastSubscription=订阅结束日期
-LDAPFieldTitle=职位/角色
-LDAPFieldTitleExample=例如: CXO
+LDAPFieldTitle=岗位
+LDAPFieldTitleExample=例如: 标题
 LDAPSetupNotComplete=LDAP 的安装程序不完整的 (请检查其他选项卡)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=未提供管理员名称或密码LDAP 将以只读模式匿名访问。
 LDAPDescContact=此页面中可以定义 Dolibarr 联系人各项数据在 LDAP 树中的 LDAP 属性名称。
@@ -1267,7 +1292,7 @@ LDAPDescUsers=此页面中可以定义 Dolibarr 用户各项数据在 LDAP 树
 LDAPDescGroups=此页面中可以定义 Dolibarr 中用户组各项数据在 LDAP 树中的 LDAP 属性名称。
 LDAPDescMembers=此页面中可以定义 Dolibarr 会员各项数据在 LDAP 树中的 LDAP 属性名称。
 LDAPDescValues=例值以载入如下模式的 <b>OpenLDAP</b>为例:<b>core.schema, cosine.schema, inetorgperson.schema</b>)如果您使用OpenLDAP和这些例值,请修改您的 LDAP 配置文件<b>slapd.conf</b>来载入全部这些模式。
-ForANonAnonymousAccess=存取访问要求验证, (例如写访问)
+ForANonAnonymousAccess=存取访问要求验证, (例如读写访问)
 PerfDolibarr=性能设置/优化报告
 YouMayFindPerfAdviceHere=你会发现此页面上的一些性能相关的检查或建议。
 NotInstalled=没有安装,所以你的服务器没有减慢。
@@ -1290,23 +1315,23 @@ TestNotPossibleWithCurrentBrowsers=这种自动检测在该浏览器中不适用
 ProductSetup=产品模块设置
 ServiceSetup=服务模块设置
 ProductServiceSetup=产品和服务模块的设置
-NumberOfProductShowInSelect=下拉菜单中的最大产品数量(0=无限制)
-ViewProductDescInFormAbility=表单中是否可以直接显示产品描述资讯(如果关闭则用弹出工具提示显示)
+NumberOfProductShowInSelect=下拉列表中的产品最大笔数(0=无限制)
+ViewProductDescInFormAbility=表单中是否可以直接显示产品描述资料(如果关闭则用弹出工具提示显示)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=是否可以直接显示其他语系的产品描述资讯
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=此外,如果你有大量的产品(> 10万),你可以通过设置 - >其他不变PRODUCT_DONOTSEARCH_ANYWHERE设置为1,提高速度。搜索将被限制在开始的字符串。
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=默认的条码类型
-SetDefaultBarcodeTypeThirdParties=客户默认条码类型
+SetDefaultBarcodeTypeThirdParties=合伙人默认条码类型
 UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
-ProductCodeChecker= 产品/服务编号的生成与检查模块
+ProductCodeChecker= (产品或服务)编号的生成与检查模块
 ProductOtherConf= 产品/服务 配置
-IsNotADir=is not a directory!
+IsNotADir=这不是目录!
 ##### Syslog #####
 SyslogSetup=系统日志模块设置
 SyslogOutput=日志输出
 SyslogFacility=记录设备
-SyslogLevel=水平
+SyslogLevel=级别
 SyslogFilename=文件名称和路径
 YouCanUseDOL_DATA_ROOT=您可以使用 DOL_DATA_ROOT/dolibarr.log 来表示“documents”目录下的日志文件。您可以设置不同的路径来保存此文件。
 ErrorUnknownSyslogConstant=常量 %s 不是已知的 Syslog 常数
@@ -1327,13 +1352,13 @@ BarcodeDescUPC=通用产品条码(UPC)
 BarcodeDescISBN=ISBN 书籍条码
 BarcodeDescC39=Code 39 条码
 BarcodeDescC128=Code 128 条码
-BarcodeDescDATAMATRIX=Datamatrix 条码类型
-BarcodeDescQRCODE=QR码 类型
+BarcodeDescDATAMATRIX=二维条形码类型
+BarcodeDescQRCODE=二维码类型
 GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
 BarcodeInternalEngine=内部引擎
 BarCodeNumberManager=自动定义条形码管理器
 ##### Prelevements #####
-WithdrawalsSetup=提款模块设置
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=外部 RSS 的导入设置
 NewRSS=新增 RSS 源
@@ -1346,15 +1371,15 @@ MailingEMailError=对错误的电子邮件发送错误通知邮件(慎用避免
 MailingDelay=在发送下一条信息时等待几秒
 ##### Notification #####
 NotificationSetup=EMail 通知模块设置
-NotificationEMailFrom=通知模块所使用的邮件发件人
-FixedEmailTarget=固定的电子邮件
+NotificationEMailFrom=邮件发送者 (From) 提醒通知发送
+FixedEmailTarget=修复目标邮件
 ##### Sendings #####
-SendingsSetup=发货单模块设置
-SendingsReceiptModel=发货单模板
-SendingsNumberingModules=发货单编号模块
+SendingsSetup=运输模块设置
+SendingsReceiptModel=运输模板
+SendingsNumberingModules=运输编号模块
 SendingsAbility=支持为客户送货时采用发货单
 NoNeedForDeliveryReceipts=通常发货单同时被用来作为发货清单和收货回执,由客户接收并签字。所以产品收货回执/交付回执是此功能的重复,很少使用。
-FreeLegalTextOnShippings=发货单中的额外说明文本
+FreeLegalTextOnShippings=运单中的额外说明文本
 ##### Deliveries #####
 DeliveryOrderNumberingModules=收货回执编号模块
 DeliveryOrderModel=收货回执模块
@@ -1386,7 +1411,7 @@ NewMenu=新建菜单
 Menu=菜单的选择
 MenuHandler=菜单处理程序
 MenuModule=源模块
-HideUnauthorizedMenu= 隐藏未经授权的菜单 (灰色)
+HideUnauthorizedMenu= 是否隐藏未经授权的菜单 (灰色为不可用)
 DetailId=菜单编号
 DetailMenuHandler=菜单处理程序 (决定何处显示新菜单)
 DetailMenuModule=模块名称 (如果菜单项来自模块)
@@ -1396,9 +1421,9 @@ DetailUrl=菜单指向的URL (绝对链接或尾部链接,以http://开头)
 DetailEnabled=菜单是否显示的条件
 DetailRight=菜单显示为变灰禁用的条件
 DetailLangs=标签翻译使用的 .lang 文件名
-DetailUser=内部/外部/全部
+DetailUser=内部 / 外部 / 全部
 Target=目标
-DetailTarget=目标链接 (_blank top 开新窗口)
+DetailTarget=目标链接 (_blank代码来打开新窗口)
 DetailLevel=级 (-1:顶部菜单,0:头菜单,> 0菜单和子菜单)
 ModifMenu=菜单变化
 DeleteMenu=删除选单项
@@ -1420,14 +1445,14 @@ SupposedToBeInvoiceDate=所用账单日期
 Buy=采购
 Sell=销售
 InvoiceDateUsed=所用账单日期
-YourCompanyDoesNotUseVAT=贵公司已被定义为不使用增值税 (首页->设定->公司/基金会),所以没有设置增值税的选项。
-AccountancyCode=会计代码
+YourCompanyDoesNotUseVAT=贵公司已被定义为不含增值税 (首页->设定->公司/机构),所以没有设置增值税的选项。
+AccountancyCode=科目代码
 AccountancyCodeSell=销售账户代码
 AccountancyCodeBuy=采购账户代码
 ##### Agenda #####
 AgendaSetup=事件及行程模块设置
 PasswordTogetVCalExport=导出链接的授权密钥
-PastDelayVCalExport=不导出旧于这个日期的时间
+PastDelayVCalExport=不导出早于这个日期的时间
 AGENDA_USE_EVENT_TYPE=使用事件类型 (前往设置->字典库->事件类型)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Set automatically this default value for type of event into event create form
 AGENDA_DEFAULT_FILTER_TYPE=Set automatically this type of event into search filter of agenda view
@@ -1435,12 +1460,12 @@ AGENDA_DEFAULT_FILTER_STATUS=Set automatically this status for events into searc
 AGENDA_DEFAULT_VIEW=Which tab do you want to open by default when selecting menu Agenda
 ##### ClickToDial #####
 ClickToDialDesc=This module allows to make phone numbers clickable. A click on this icon will call make your phone to call the phone number. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
-ClickToDialUseTelLink=Use just a link "tel:" on phone numbers
+ClickToDialUseTelLink=在电话号码上链接 "tel:" 
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface installed on same computer than the browser, and called when you click on a link in your browser that start with "tel:". If you need a full server solution (no need of local software installation), you must set this to "No" and fill next field.
 ##### Point Of Sales (CashDesk) #####
 CashDesk=POS
 CashDeskSetup=POS 模块设置
-CashDeskThirdPartyForSell=默认的通用的客户使用的销售
+CashDeskThirdPartyForSell=使用默认通用合伙人来销售
 CashDeskBankAccountForSell=接收现金付款的默认帐户
 CashDeskBankAccountForCheque= 接收支票付款的默认帐户
 CashDeskBankAccountForCB= 接收信用卡支付的默认帐户
@@ -1462,9 +1487,9 @@ EndPointIs=SOAP客户端发送请求至 Dolibarr 的必需通过链接
 ApiSetup=API模块设置
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 ApiProductionMode=Enable production mode (this will activate use of a caches for services management)
-ApiExporerIs=You can explore the APIs at url
+ApiExporerIs=你可浏览 APIs 地址
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
+ApiKey=API的Key
 ##### Bank #####
 BankSetupModule=银行模块设置
 FreeLegalTextOnChequeReceipts=支票回执中的额外说明文本
@@ -1479,23 +1504,23 @@ ChequeReceiptsNumberingModule=Cheque Receipts Numbering module
 MultiCompanySetup=多公司模块设置
 ##### Suppliers #####
 SuppliersSetup=供应商模块设置
-SuppliersCommandModel=采购合同的完整模板(标识...)
-SuppliersInvoiceModel=采购账单的完整模板(标识...)
+SuppliersCommandModel=采购合同的完整模板(LOGO标识...)
+SuppliersInvoiceModel=采购账单的完整模板(LOGO标识...)
 SuppliersInvoiceNumberingModel=采购账单编号模块
 IfSetToYesDontForgetPermission=如果选择"是",请不要忘记为用户和组设置二次审核的权限
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Maxmind Geoip 模块设置
-PathToGeoIPMaxmindCountryDataFile=包含Maxmind 国家/IP转换库的文件路径。<br>例如: /usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
+PathToGeoIPMaxmindCountryDataFile=Maxmind网站的全球地址数据库文件的路径。<br>例如: <br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat
 NoteOnPathLocation=注意此数据文件所处目录您的PHP必需能读取(检查您 PHP 的 open_basedir 设置和文件系统权限)。
-YouCanDownloadFreeDatFileTo=您可以下载 Maxmind GeoIP 的 <b>免费演示版</b> 国家数据文件,位置在 %s。
-YouCanDownloadAdvancedDatFileTo=您也可以下载<b>更加完整更新更快</b>的 Maxmind GeoIP 国家文件版本,位置在 %s。
+YouCanDownloadFreeDatFileTo=您可以下载 Maxmind网站的GeoIP全球IP地址数据库 <b>免费演示版</b> 的国家地理位置数据文件,地址是 %s。
+YouCanDownloadAdvancedDatFileTo=您也可以下载<b>更加完整更新更快的</b> Maxmind GeoIP 国家文件版本,地址是 %s。
 TestGeoIPResult=测试保留 IP->国家
 ##### Projects #####
 ProjectsNumberingModules=项目编号模块
 ProjectsSetup=项目模块设置
 ProjectsModelModule=项目报告文档模板
 TasksNumberingModules=任务编号模块
-TaskModelModule=任务报告文档模型
+TaskModelModule=任务报告文档模板
 UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
 ##### ECM (GED) #####
 ##### Fiscal Year #####
@@ -1506,7 +1531,8 @@ OpenFiscalYear=打开财务年度
 CloseFiscalYear=关闭财务年度
 DeleteFiscalYear=删除财务年度
 ConfirmDeleteFiscalYear=您确定要删除本财年?
-AlwaysEditable=可以随时编辑
+ShowFiscalYear=Show fiscal year
+AlwaysEditable=允许编辑
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=最少的大写字符数
 NbNumMin=最少的数字数
@@ -1517,32 +1543,33 @@ SalariesSetup=薪酬模块设置
 SortOrder=排序顺序
 Format=格式
 TypePaymentDesc=0:客户支付类型,1:供应商支付类型,2:客户和供应商的付款方式
-IncludePath=Include path (defined into variable %s)
-ExpenseReportsSetup=HR费用报表模块设置
-TemplatePDFExpenseReports=用于生成开支报告文档的模板
+IncludePath=包含路径 (定义变量 %s)
+ExpenseReportsSetup=费用报表模块设置
+TemplatePDFExpenseReports=用于生成费用报表文件的文件模板
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
-YouMayFindNotificationsFeaturesIntoModuleNotification=要找到 EMail通知 功能,你可能需要在通知模块设置中启用它。
+YouMayFindNotificationsFeaturesIntoModuleNotification=你需要在"Notification"通知模块中设置并启用EMail通知 功能才能使用它 。
 ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=固定通知列表
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=阈值
 BackupDumpWizard=数据库转储备份向导
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is only manual steps a privileged user can do.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMuseContainCustom=Installing an external module from application save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to have option<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
+HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
 HighlightLinesColor=Highlight color of the line when the mouse passes over (keep empty for no highlight)
-TextTitleColor=Color of page title
-LinkColor=Color of links
+TextTitleColor=页面标题颜色
+LinkColor=颜色链接
 PressF5AfterChangingThis=改变这个值后按F5来刷新页面使其生效
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=背景颜色
 TopMenuBackgroundColor=顶部菜单背景颜色
+TopMenuDisableImages=隐藏顶部菜单图片
 LeftMenuBackgroundColor=左侧菜单背景颜色
-BackgroundTableTitleColor=Background color for Table title line
+BackgroundTableTitleColor=清单表格表头背景颜色
 BackgroundTableLineOddColor=表格奇数背景颜色
 BackgroundTableLineEvenColor=表格偶数背景颜色
 MinimumNoticePeriod=最小通知间隔
@@ -1552,7 +1579,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
 PositionIntoComboList=Position of line into combo lists
 SellTaxRate=消费税率
 RecuperableOnly=Yes for VAT "Non Perçue Récupérable" dedicated for some state in France. Keep value to "No" in all other cases.
-UrlTrackingDesc=如果送货公司提供页面来追踪运单状态,你可以将网页输入到这里。你可以在网址中使用 {TRACKID} 字段来替换实际运单号,以便在链接进入时直接进入到该运单的运输状态。
+UrlTrackingDesc=如果运输公司提供页面来追踪运单状态,你可以将网页输入到这里。你可以在网址中使用 {TRACKID} 字段来替换实际运单号,以便在链接进入时直接进入到该运单的运输状态。
 OpportunityPercent=When you create an opportunity, you will defined an estimated amount of project/lead. According to status of opportunity, this amount may be multiplicated by this rate to evaluate global amount all your opportunities may generate. Value is percent (between 0 and 100).
 TemplateForElement=This template record is dedicated to which element
 TypeOfTemplate=模板类型
@@ -1561,7 +1588,7 @@ FixTZ=时区修复
 FillFixTZOnlyIfRequired=例:+2 (只有问题发生时才填写)
 ExpectedChecksum=预计校验
 CurrentChecksum=当前校验
-MailToSendProposal=发送客户提案
+MailToSendProposal=发送客户报价
 MailToSendOrder=发送客户订单
 MailToSendInvoice=发送客户发票
 MailToSendShipment=发送发货单
@@ -1569,34 +1596,39 @@ MailToSendIntervention=发送干预
 MailToSendSupplierRequestForQuotation=发送供应商报价请求
 MailToSendSupplierOrder=发送采购订单
 MailToSendSupplierInvoice=发送供应商发票
-MailToThirdparty=在第三方页面发送电子邮件
-ByDefaultInList=Show by default on list view
-YouUseLastStableVersion=You use the last stable version
+MailToThirdparty=To send email from third party page
+ByDefaultInList=默认显示列表视图
+YouUseLastStableVersion=您正在使用最新稳定版
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
 TitleExampleForMaintenanceRelease=Example of message you can use to announce this maintenance release (feel free to use it on your web sites)
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version %s is a major release with a lot of new features for both users and developers. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so it contains only fixes of bugs. We recommend everybody using an older version to upgrade to this one. As any maintenance release, no new features, nor data structure change is present into this version. You can download it from the download area of http://www.dolibarr.org portal (subdirectory Stable versions). You can read <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several level of prices per product/service" is on, you can define different prices (one per price level) for each product. To save you time, you can enter here rule to have price for each level autocalculated according to price of first level, so you will have to enter only price for first level on each product. This page is here to save you time and can be usefull only if your prices for each leve are relative to first level. You can ignore this page in most cases.
-ModelModulesProduct=Templates for product documents
+ModelModulesProduct=产品文件模板
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate automatically codes, you must first define a manager to auto define barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 AllPublishers=All publishers
 UnknownPublishers=Unknown publishers
-AddRemoveTabs=Add or remove tabs
-AddDictionaries=Add dictionaries
-AddBoxes=Add widgets
-AddSheduledJobs=Add scheduled jobs
-AddHooks=Add hooks
-AddTriggers=Add triggers
-AddMenus=Add menus
-AddPermissions=Add permissions
-AddExportProfiles=Add export profiles
-AddImportProfiles=Add import profiles
-AddOtherPagesOrServices=Add other pages or services
-AddModels=Add document or numbering templates
+AddRemoveTabs=添加或删除标签
+AddDictionaries=添加字典
+AddBoxes=添加插件
+AddSheduledJobs=添加计划任务
+AddHooks=添加钩子
+AddTriggers=添加触发器
+AddMenus=添加菜单
+AddPermissions=添加权限
+AddExportProfiles=添加导出配置
+AddImportProfiles=添加导入配置
+AddOtherPagesOrServices=添加其他页面或服务
+AddModels=添加文档或数据模板
 AddSubstitutions=Add keys substitutions
 DetectionNotPossible=Detection not possible
 UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received it is saved on database user table and will be checked on each future access)
-ListOfAvailableAPIs=List of available APIs
+ListOfAvailableAPIs=可用的API列表
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=加载页
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index eb58f01dce5..6fe95831080 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -4,92 +4,92 @@ Actions=事件
 Agenda=待办事项
 Agendas=待办事项
 Calendar=日历
-LocalAgenda=Internal calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
-AffectedTo=受影响
-Event=Event
+LocalAgenda=内部日历
+ActionsOwnedBy=按用户活动
+ActionsOwnedByShort=用户
+AffectedTo=分配给
+Event=事件
 Events=事件
 EventsNb=事件数
 ListOfActions=事件列表
 Location=位置
-ToUserOfGroup=To any user in group
+ToUserOfGroup=到组内任何用户
 EventOnFullDay=全天事件
 MenuToDoActions=所有未完成的事件
 MenuDoneActions=所有终止事件
 MenuToDoMyActions=我的未完成事件
 MenuDoneMyActions=我的已经终结的事件
-ListOfEvents=List of events (internal calendar)
+ListOfEvents=事件列表(内部日历)
 ActionsAskedBy=记录操作
-ActionsToDoBy=受影响的行动
+ActionsToDoBy=事件分配给
 ActionsDoneBy=做的动作
-ActionAssignedTo=Event assigned to
+ActionAssignedTo=活动分配给
 ViewCal=查看日历
 ViewDay=日视图
 ViewWeek=周视图
-ViewPerUser=Per user view
-ViewPerType=Per type view
-AutoActions= 全自动灌装议程
-AgendaAutoActionDesc= Define here events for which you want Dolibarr to create automatically an event in agenda. If nothing is checked, only manual actions will be included in logged and visible into agenda. Automatic tracking of business actions done on objects (validation, status change) will not be saved.
+ViewPerUser=用户视图
+ViewPerType=用户视图
+AutoActions= 自动化
+AgendaAutoActionDesc= 在这里定义事件,你想让Dolibarr自动生成的日程事件。如果没有检查,只有手动操作将被包括在记录和可见的议程。对象(验证、状态更改)所做的业务操作的自动跟踪将不会被保存。
 AgendaSetupOtherDesc= 这页允许配置议程模块其他参数。
 AgendaExtSitesDesc=此页面允许声明日历的外部来源,从而在Dolibarr待办事项中可以看到他们的事件。
 ActionsEvents=Dolibarr将为其自动创建一个动作的事件
 PropalValidatedInDolibarr=建议%s的验证
 InvoiceValidatedInDolibarr=发票%s的验证
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
-InvoiceBackToDraftInDolibarr=发票的%s去回到草案状态
+InvoiceValidatedInDolibarrFromPos=发票 %s 从 POS验证
+InvoiceBackToDraftInDolibarr=发票 %s 退回草稿状态
 InvoiceDeleteDolibarr=删除  %s  发票
 OrderValidatedInDolibarr=订购%s的验证
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=订单 %s 归类已交货
 OrderCanceledInDolibarr=为了%s取消
-OrderBilledInDolibarr=Order %s classified billed
-OrderApprovedInDolibarr=为了%s批准
-OrderRefusedInDolibarr=Order %s refused
-OrderBackToDraftInDolibarr=为了%s回到草案状态
+OrderBilledInDolibarr=订单 %s 归类已账单
+OrderApprovedInDolibarr=订单 %s 批准
+OrderRefusedInDolibarr=订单 %s 已被拒绝
+OrderBackToDraftInDolibarr=订单 %s 退回草稿状态
 ProposalSentByEMail=商业建议通过电子邮件发送%s
 OrderSentByEMail=客户订单通过电子邮件发送%s
 InvoiceSentByEMail=客户发票通过电子邮件发送%s
 SupplierOrderSentByEMail=供应商的订单通过电子邮件发送%s
 SupplierInvoiceSentByEMail=供应商的发票通过电子邮件发送%s
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
-ProposalDeleted=Proposal deleted
-OrderDeleted=Order deleted
-InvoiceDeleted=Invoice deleted
-NewCompanyToDolibarr= 客户已创建
+ShippingSentByEMail=通过Email电子邮件发送 %s 运输
+ShippingValidated= 运输 %s 已验证
+InterventionSentByEMail=干预 %s 发送邮件
+ProposalDeleted=报价已删除
+OrderDeleted=订单已删除
+InvoiceDeleted=发票已删除
+NewCompanyToDolibarr= 合伙人已创建
 DateActionStart= 开始日期
 DateActionEnd= 结束日期
 AgendaUrlOptions1=您还可以添加以下参数来筛选输出:
-AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by or assigned to user <b>%s</b>.
-AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions owned by a user <b>%s</b>.
-AgendaUrlOptions4=<b>logint=%s</b>表示限制只导出使用者与受影响者为<b>%s</b>的待办事项。
-AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> to restrict output to actions associated to project <b>PROJECT_ID</b>.
-AgendaShowBirthdayEvents=Show birthdays of contacts
-AgendaHideBirthdayEvents=Hide birthdays of contacts
+AgendaUrlOptions2=<b>login=%s</b> 限制由或分配给用户的操作的输出 <b>%s</b>.
+AgendaUrlOptions3=<b>logina=%s</b> 限制输出到用户所拥有的动作 <b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b>表示限制只导出使用者与分配给用户<b>%s</b>的待办事项。
+AgendaUrlOptionsProject=<b>project=PROJECT_ID</b> 限制输出到项目相关的操作\n <b>PROJECT_ID</b>.
+AgendaShowBirthdayEvents=显示联系人生日
+AgendaHideBirthdayEvents=隐藏联系人生日
 Busy=忙碌
 ExportDataset_event1=待办事项事件列表
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=默认每周工作时间 (例如: 1-5天, 1-6天)
+DefaultWorkingHours=默认每天的工作时长 (例如: 9-18)
 # External Sites ical
-ExportCal=出口日历
+ExportCal=导出日历
 ExtSites=导入外部日历
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=显示外部日历(定义为全球设置)到议程。不影响由用户定义的外部日历。 
 ExtSitesNbOfAgenda=日历数
 AgendaExtNb=日历NB %s
 ExtSiteUrlAgenda=URL来访问。iCal文件
 ExtSiteNoLabel=无说明
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
-AddEvent=Create event
-MyAvailability=My availability
-ActionType=Event type
-DateActionBegin=Start event date
-CloneAction=Clone event
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
-RepeatEvent=Repeat event
-EveryWeek=Every week
-EveryMonth=Every month
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
+VisibleTimeRange=可见时间范围
+VisibleDaysRange=可见日期范围
+AddEvent=创建事件
+MyAvailability=我的状态
+ActionType=活动类型
+DateActionBegin=活动开始日期
+CloneAction=复制活动
+ConfirmCloneEvent=您确定想要复制这个活动 <b>%s</b> 吗?
+RepeatEvent=重复事件
+EveryWeek=每周
+EveryMonth=每月
+DayOfMonth=每月天数
+DayOfWeek=每周天数
+DateStartPlusOne=日期开始+ 1 小时
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index 424acaab203..c3426d8305b 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -5,63 +5,59 @@ BankName=银行名称
 FinancialAccount=帐户
 BankAccount=银行帐户
 BankAccounts=银行帐户
-ShowAccount=Show Account
-AccountRef=金融帐号
-AccountLabel=金融帐户标签
+ShowAccount=显示帐户
+AccountRef=财务帐号
+AccountLabel=财务帐户标签
 CashAccount=现金帐户
 CashAccounts=现金帐户
 CurrentAccounts=往来帐户
 SavingAccounts=储蓄帐户
-ErrorBankLabelAlreadyExists=金融帐户标签已存在
+ErrorBankLabelAlreadyExists=财务帐户标签已存在
 BankBalance=平衡
 BankBalanceBefore=前次余额
 BankBalanceAfter=本次余额
 BalanceMinimalAllowed=允许的最小平衡
 BalanceMinimalDesired=最低所需的平衡
-InitialBankBalance=初步平衡
+InitialBankBalance=期初平衡
 EndBankBalance=年末余额
 CurrentBalance=当前余额
-FutureBalance=未来的平衡
+FutureBalance=期末平衡
 ShowAllTimeBalance=显示余额开始
-AllTime=From start
+AllTime=从开始
 Reconciliation=和解
 RIB=银行帐号
 IBAN=IBAN号码
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=的BIC / SWIFT的号码
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=常年订单
-StandingOrder=长期订单
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=户口结单
 AccountStatementShort=声明
 AccountStatements=户口结单
 LastAccountStatements=最近帐户报表
 IOMonthlyReporting=每月报告
 BankAccountDomiciliation=帐户地址
-BankAccountCountry=到国家
+BankAccountCountry=国家
 BankAccountOwner=帐户持有人姓名
 BankAccountOwnerAddress=帐户持有人地址
 RIBControlError=值的完整性检查失败。这意味着此帐号的信息不完整或错误(检查国家,数字和IBAN)。
 CreateAccount=创建帐户
 NewAccount=新帐户
-NewFinancialAccount=新的金融帐
-MenuNewFinancialAccount=新的金融帐
+NewFinancialAccount=新建财务账号
+MenuNewFinancialAccount=新建财务账号
 EditFinancialAccount=编辑帐户
 LabelBankCashAccount=银行或现金标签
 AccountType=账户类型
 BankType0=储蓄账户
-BankType1=经常帐
+BankType1=信用卡
 BankType2=现金帐户
 AccountsArea=帐户区
-AccountCard=户口卡
+AccountCard=户口信息
 DeleteAccount=删除帐户
 ConfirmDeleteAccount=你确定要删除此帐户吗?
 Account=帐户
 BankTransactionByCategories=按类别银行交易
 BankTransactionForCategory=类别<b>%,</b>银行交易<b>的</b> S
-RemoveFromRubrique=删除连接类
+RemoveFromRubrique=删除链接分类
 RemoveFromRubriqueConfirm=你确定要删除之间的交易和类别的联系?
 ListBankTransactions=银行交易清单
 IdTransaction=交易ID
@@ -72,29 +68,33 @@ TransactionsToConciliate=交易调和
 Conciliable=可以两全
 Conciliate=调和
 Conciliation=和解
-IncludeClosedAccount=包括关闭账户
-OnlyOpenedAccount=仅开户
+IncludeClosedAccount=包括失效账户
+OnlyOpenedAccount=仅有效账户
 AccountToCredit=帐户信用
 AccountToDebit=帐户转帐
 DisableConciliation=此帐户的禁用和解功能
 ConciliationDisabled=和解功能禁用
+LinkedToAConciliatedTransaction=链接到一个协调的交易 
 StatusAccountOpened=打开
-StatusAccountClosed=关闭
-AccountIdShort=数
+StatusAccountClosed=禁用
+AccountIdShort=数字
 LineRecord=交易
 AddBankRecord=新增交易
 AddBankRecordLong=新增手动交易
 ConciliatedBy=由调和
 DateConciliating=核对日期
 BankLineConciliated=交易和解
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=客户付款
-SupplierInvoicePayment=Supplier payment
-SubscriptionPayment=Subscription payment
+SupplierInvoicePayment=供应商付款
+SubscriptionPayment=认购款项
 WithdrawalPayment=提款支付
-SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=银行汇款
+SocialContributionPayment=支付社保/财政税
+BankTransfer=银行转帐
 BankTransfers=银行转帐
-TransferDesc=从一个帐户转移到另一个,Dolibarr会写两个记录(相同数额的源帐户借记卡和信用卡帐户中的目标。同样的标签和日期将在此交易中使用)
+MenuBankInternalTransfer=内部转移
+TransferDesc=转账到其他账户,Dolibarr将记作两笔(在目标帐户中的借方和贷方帐户。相同金额(除了标志) 标签和日期将用于本次交易)
 TransferFrom=从
 TransferTo=至
 TransferFromToDone=从<b>%s</b>向<b>%s</b>转帐<b>%s</b>已被记录。
@@ -104,7 +104,7 @@ ConfirmValidateCheckReceipt=你确定要验证这个检查后,没有变化将
 DeleteCheckReceipt=删除这张支票收据吗?
 ConfirmDeleteCheckReceipt=你确定要删除这张支票收据吗?
 BankChecks=银行支票
-BankChecksToReceipt=Checks awaiting deposit
+BankChecksToReceipt=等待支票存款
 ShowCheckReceipt=显示检查存单
 NumberOfCheques=支票数
 DeleteTransaction=删除交易
@@ -114,11 +114,11 @@ BankMovements=移动
 PlannedTransactions=计划进行的交易
 Graph=图表
 ExportDataset_banque_1=银行交易和帐户的声明
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=存款单
 TransactionOnTheOtherAccount=交易的其他帐户
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=款项更新成功
 PaymentNumberUpdateFailed=付款数目无法更新
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=付款日期更新成功
 PaymentDateUpdateFailed=付款日期无法更新
 Transactions=交易
 BankTransactionLine=银行交易
@@ -126,19 +126,22 @@ AllAccounts=所有银行/现金帐户
 BackToAccount=回到帐户
 ShowAllAccounts=显示所有帐户
 FutureTransaction=在FUTUR的交易。调解没有办法。
-SelectChequeTransactionAndGenerate=选择/过滤器检查纳入支票存款收据,并单击“创建”。
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
+SelectChequeTransactionAndGenerate=选择/筛选检查纳入支票存款收据,并单击“创建”。
+InputReceiptNumber=选择与税率有关的银行声明。 使用一个合适的数值: YYYYMM 或 YYYYMMDD
 EventualyAddCategory=最后,指定一个范畴对其中的记录进行分类
-ToConciliate=取得谅解?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=然后按一下,连线检查银行对账单。
-DefaultRIB=Default BAN
-AllRIB=All BAN
-LabelRIB=BAN Label
-NoBANRecord=No BAN record
-DeleteARib=Delete BAN record
-ConfirmDeleteRib=Are you sure you want to delete this BAN record ?
-RejectCheck=Check returned
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
-RejectCheckDate=Date the check was returned
-CheckRejected=Check returned
-CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+DefaultRIB=默认BAN
+AllRIB=全部BAN
+LabelRIB=BAN标签
+NoBANRecord=空空如也——没有BAN记录
+DeleteARib=删除BAN记录
+ConfirmDeleteRib=确定您想删除此BAN记录吗?
+RejectCheck=退回的支票
+ConfirmRejectCheck=您确定要将此复选标记标记为被拒绝吗?
+RejectCheckDate=支票被退回的日期
+CheckRejected=退回的支票
+CheckRejectedAndInvoicesReopened=检查退回发票并重新打开发票
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index 4d9100f7270..df7816aa3b4 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -5,13 +5,13 @@ BillsCustomers=客户发票
 BillsCustomer=客户发票
 BillsSuppliers=供应商发票
 BillsCustomersUnpaid=未支付的客户发票
-BillsCustomersUnpaidForCompany=客户 %s 的未支付发票
+BillsCustomersUnpaidForCompany=客户未支付发票 %s
 BillsSuppliersUnpaid=未支付的供应商发票
 BillsSuppliersUnpaidForCompany=供应商 %s 的未支付发票
 BillsLate=逾期付款
 BillsStatistics=客户发票统计
 BillsStatisticsSuppliers=供应商发票统计
-DisabledBecauseNotErasable=Disabled because cannot be erased
+DisabledBecauseNotErasable=禁止删除
 InvoiceStandard=标准发票
 InvoiceStandardAsk=标准发票
 InvoiceStandardDesc=这种发票是一种常见的发票。
@@ -42,7 +42,7 @@ NotConsumed=不消耗
 NoReplacableInvoice=没有替换的发票
 NoInvoiceToCorrect=没有发票,以纠正
 InvoiceHasAvoir=更正后的发票由一个或几个
-CardBill=发票卡
+CardBill=发票信息
 PredefinedInvoices=预定义的发票
 Invoice=发票
 Invoices=发票
@@ -70,17 +70,17 @@ ReceivedCustomersPayments=收到客户付款
 PayedSuppliersPayments=支付给供应商的付款
 ReceivedCustomersPaymentsToValid=收到需要确认的客户付款
 PaymentsReportsForYear=客户 %s 的付款报告
-PaymentsReports=付款报告
+PaymentsReports=付款报表
 PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=付款已完成
 PaymentRule=付款规则
 PaymentMode=付款方式
-IdPaymentMode=Payment type (id)
-LabelPaymentMode=Payment type (label)
-PaymentModeShort=Payment type
-PaymentTerm=付款协议
-PaymentConditions=付款协议
-PaymentConditionsShort=付款协议
+IdPaymentMode=付款方式 (id)
+LabelPaymentMode=付款方式 (标签)
+PaymentModeShort=付款方式
+PaymentTerm=付款条件
+PaymentConditions=付款条件
+PaymentConditionsShort=付款条件
 PaymentAmount=付款金额
 ValidatePayment=确认付款
 PaymentHigherThanReminderToPay=付款金额比需要支付的金额高
@@ -90,11 +90,11 @@ ClassifyPaid=归类为 已支付
 ClassifyPaidPartially=归类分 部分支付
 ClassifyCanceled=归类为 已丢弃
 ClassifyClosed=归类为 已关闭
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=归类 'Unbilled'
 CreateBill=创建发票
-CreateCreditNote=Create credit note
+CreateCreditNote=创建信用记录
 AddBill=创建发票或信用记录
-AddToDraftInvoices=添加到草案发票
+AddToDraftInvoices=添加到发票草稿
 DeleteBill=删除发票
 SearchACustomerInvoice=搜索客户发票
 SearchASupplierInvoice=搜索供应商发票
@@ -119,7 +119,7 @@ BillStatusStarted=开始
 BillStatusNotPaid=未支付
 BillStatusClosedUnpaid=已关闭 (未支付)
 BillStatusClosedPaidPartially=已支付 (部分)
-BillShortStatusDraft=草案
+BillShortStatusDraft=草稿
 BillShortStatusPaid=已支付
 BillShortStatusPaidBackOrConverted=处理完毕
 BillShortStatusConverted=处理完毕
@@ -127,7 +127,7 @@ BillShortStatusCanceled=已丢弃
 BillShortStatusValidated=已确认
 BillShortStatusStarted=开始
 BillShortStatusNotPaid=未支付
-BillShortStatusClosedUnpaid=已关闭
+BillShortStatusClosedUnpaid=禁用
 BillShortStatusClosedPaidPartially=已支付 (部分)
 PaymentStatusToValidShort=需要确认
 ErrorVATIntraNotConfigured=Intracommunautary增值税号码目前尚未定义。
@@ -138,27 +138,27 @@ ErrorInvoiceAlreadyReplaced=错误,您尝试验证发票来取代发票%,但
 ErrorDiscountAlreadyUsed=错误,已经使用优惠
 ErrorInvoiceAvoirMustBeNegative=错误,这种类型的发票必须有一个负数
 ErrorInvoiceOfThisTypeMustBePositive=错误,这种类型的发票必须有一个正数
-ErrorCantCancelIfReplacementInvoiceNotValidated=错误,无法取消一个已经被处于草案状态发票替代的发票
-BillFrom=发票来自
-BillTo=发票接收人
+ErrorCantCancelIfReplacementInvoiceNotValidated=错误,无法取消一个已经被处于草稿状态发票替代的发票
+BillFrom=发送方
+BillTo=接收方
 ActionsOnBill=发票的动作
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
-NewBill=新发票
-LastBills=最新的 %s 份发票
-LastCustomersBills=最近 %s 位客户的发票
-LastSuppliersBills=最近 %s 个供应商的发票
-AllBills=所有发票
+NewBill=新建发票
+LastBills=最近的 %s 份发票
+LastCustomersBills=最近的 %s 份客户发票
+LastSuppliersBills=最近的 %s 份供应商发票
+AllBills=全部发票
 OtherBills=其他发票
-DraftBills=发票草案
-CustomersDraftInvoices=客户发票草案
-SuppliersDraftInvoices=供应商发票草案
+DraftBills=发票草稿
+CustomersDraftInvoices=客户发票草稿
+SuppliersDraftInvoices=供应商发票草稿
 Unpaid=未付
 ConfirmDeleteBill=你确定要删除此发票?
 ConfirmValidateBill=你确定要验证发票 <b>%s</b> 吗?
-ConfirmUnvalidateBill=你确定要将发票<b>%s</b>更改为草案状态吗?
+ConfirmUnvalidateBill=你确定要将发票<b>%s</b>更改为草稿状态吗?
 ConfirmClassifyPaidBill=你确定要将发票<b>%s</b>更改为已支付状态吗?
 ConfirmCancelBill=你确定要取消发票<b>%s</b>吗 ?
 ConfirmCancelBillQuestion=你为何要将该发票更改为已丢弃状态?
@@ -170,7 +170,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid <b>(%s %s)</b> is
 ConfirmClassifyPaidPartiallyReasonBadCustomer=坏顾客
 ConfirmClassifyPaidPartiallyReasonProductReturned=产品部分退回
 ConfirmClassifyPaidPartiallyReasonOther=因其他原因而放弃余额
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=这个选择是可能的,如果您的发票已提供适当的评论。 (例«只有相应的税收已实际支付给权利扣除价格»)
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=这个选择是可能的,如果您的发票已提供适当的说明。 (例«只有相应的税收已实际支付给权利扣除价格»)
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=在一些国家,这种选择是可能的,如果您的发票上只包含正确的说明。
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=使用这个选择,如果所有其他不适合
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>糟糕的客户</b>是一个客户,拒绝支付他的债务。
@@ -204,23 +204,23 @@ RemainderToTake=应付金额
 RemainderToPayBack=应退金额
 Rest=待办
 AmountExpected=索赔额
-ExcessReceived=过量收到
-EscompteOffered=折扣额 (付款协议前付款)
-EscompteOfferedShort=Discount
+ExcessReceived=找零
+EscompteOffered=折扣额 (付款条件前付款)
+EscompteOfferedShort=折扣
 SendBillRef=发票 %s  的提交
 SendReminderBillRef=发票 %s  的提交 (提醒)
-StandingOrders=长期订单
-StandingOrder=长期订单
-NoDraftBills=没有发票草案
-NoOtherDraftBills=没有其他发票草案
-NoDraftInvoices=没有发票草案
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
+NoDraftBills=没有发票草稿
+NoOtherDraftBills=没有其他发票草稿
+NoDraftInvoices=没有发票草稿
 RefBill=发票号
 ToBill=为了法案
 RemainderToBill=其余部分法案
 SendBillByMail=通过电子邮件发送发票
 SendReminderBillByMail=通过电子邮件发送提醒
-RelatedCommercialProposals=有关的商业提案
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedCommercialProposals=相关商业报价
+RelatedRecurringCustomerInvoices=再次关联客户发票
 MenuToValid=需要确认
 DateMaxPayment=付款日期
 DateInvoice=发票日期
@@ -230,9 +230,9 @@ ClassifyBill=分类发票
 SupplierBillsToPay=未付供应商发票
 CustomerBillsUnpaid=客户未付发票
 NonPercuRecuperable=非可收回
-SetConditions=设置付款协议
+SetConditions=设置付款条件
 SetMode=设置支付方式
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=设置印花税
 Billed=帐单
 RecurringInvoices=Recurring invoices
 RepeatableInvoice=模板发票
@@ -246,11 +246,11 @@ CustomersInvoicesAndInvoiceLines=客户发票和发票的路线
 CustomersInvoicesAndPayments=客户发票和付款
 ExportDataset_invoice_1=客户发票清单和发票的路线
 ExportDataset_invoice_2=客户发票和付款
-ProformaBill=备考条例草案:
-Reduction=减价
-ReductionShort=减价
-Reductions=减价
-ReductionsShort=减价
+ProformaBill=形式发票:
+Reduction=降价
+ReductionShort=降价
+Reductions=降价
+ReductionsShort=降价
 Discounts=折扣
 AddDiscount=添加折扣
 AddRelativeDiscount=创建相对折扣
@@ -278,12 +278,12 @@ DiscountOfferedBy=授予人
 DiscountStillRemaining=折扣尚存
 DiscountAlreadyCounted=折扣已经结算
 BillAddress=账单地址
-HelpEscompte=这是给予客户优惠折扣,因为客户在付款协议日期前已经付清全款。
+HelpEscompte=这是给予客户优惠折扣,因为客户在付款条件日期前已经付清全款。
 HelpAbandonBadCustomer=这一数额已被放弃(客户说是一个坏的客户),并作为一个特殊的松散考虑。
 HelpAbandonOther=这一数额已被放弃,因为这是一个错误(错误的顾客或由其他替代例如发票)
 IdSocialContribution=财政税/增值税代码
 PaymentId=付款编号
-PaymentRef=Payment ref.
+PaymentRef=付款编号
 InvoiceId=发票编号
 InvoiceRef=发票编号
 InvoiceDateCreation=发票的创建日期
@@ -292,10 +292,10 @@ InvoiceNote=发票说明
 InvoicePaid=发票已经支付
 PaymentNumber=付款号码
 RemoveDiscount=删除折扣
-WatermarkOnDraftBill=水印草案发票(如果没有空)
-InvoiceNotChecked=没有选择发票
-CloneInvoice=克隆发票
-ConfirmCloneInvoice=你确定要克隆发票<b>%s吗</b> ?
+WatermarkOnDraftBill=基于发票草稿(无则留空)
+InvoiceNotChecked=没有选取发票
+CloneInvoice=复制发票
+ConfirmCloneInvoice=你确定要复制发票 <b>%s</b> 吗 ?
 DisabledBecauseReplacedInvoice=发票已经被取代,动作被拒绝
 DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payment during the fixed year are included here.
 NbOfPayments=付款号码
@@ -308,23 +308,23 @@ RelatedBill=关联发票
 RelatedBills=关联发票
 RelatedCustomerInvoices=关联客户发票
 RelatedSupplierInvoices=关联供应商发票
-LatestRelatedBill=Latest related invoice
+LatestRelatedBill=最新关联发票
 WarningBillExist=警告,一个或多个发票已经存在
 MergingPDFTool=PDF 合并工具
 AmountPaymentDistributedOnInvoice=Payment amount distributed on invoice
 PaymentOnDifferentThirdBills=Allow payments on different thirdparties bills but same parent company
-PaymentNote=Payment note
+PaymentNote=付款备注
 ListOfPreviousSituationInvoices=List of previous situation invoices
 ListOfNextSituationInvoices=List of next situation invoices
-FrequencyPer_d=Every %s days
-FrequencyPer_m=Every %s months
-FrequencyPer_y=Every %s years
-toolTipFrequency=Examples:<br /><b>Set 7 / day</b>: give a new invoice every 7 days<br /><b>Set 3 / month</b>: give a new invoice every 3 month
+FrequencyPer_d=每 %s 天
+FrequencyPer_m=每 %s 月
+FrequencyPer_y=每 %s 年
+toolTipFrequency=例如:<br /><b>设置 7 / 天</b>: 每 7 天给它一张新发票<br /><b>设置 3 / 个月</b>: 每 3 个月给发一张发票过去
 NextDateToExecution=Date for next invoice generation
 DateLastGeneration=Date of latest generation
-MaxPeriodNumber=Max nb of invoice generation
-NbOfGenerationDone=Nb of invoice generation already done
-MaxGenerationReached=Maximum nb of generations reached
+MaxPeriodNumber=发票生成最大数量
+NbOfGenerationDone=发票生成数量已经存在
+MaxGenerationReached=最大数量代达到
 InvoiceAutoValidate=Validate invoices automatically
 GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
@@ -334,12 +334,12 @@ PaymentConditionShortRECEP=即时
 PaymentConditionRECEP=即时
 PaymentConditionShort30D=30天
 PaymentCondition30D=30天
-PaymentConditionShort30DENDMONTH=30 days of month-end
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentConditionShort30DENDMONTH=30天后的那个月底
+PaymentCondition30DENDMONTH=本月结束后30天内
 PaymentConditionShort60D=60天
 PaymentCondition60D=60天
-PaymentConditionShort60DENDMONTH=60 days of month-end
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentConditionShort60DENDMONTH=60天后的那个月底
+PaymentCondition60DENDMONTH=本月结束后60天内
 PaymentConditionShortPT_DELIVERY=交货
 PaymentConditionPT_DELIVERY=交货时
 PaymentConditionShortPT_ORDER=订单
@@ -349,42 +349,43 @@ PaymentConditionPT_5050=预付50%% ,50%%货到后付款
 FixAmount=固定金额
 VarAmount=可变金额(%% tot.)
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=银行的命令
-PaymentTypeShortPRE=银行的命令
+PaymentTypeVIR=银行转帐
+PaymentTypeShortVIR=银行转帐
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=现金
 PaymentTypeShortLIQ=现金
 PaymentTypeCB=信用卡
 PaymentTypeShortCB=信用卡
 PaymentTypeCHQ=支票
 PaymentTypeShortCHQ=支票
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=TIP (付款交单)
+PaymentTypeShortTIP=TIP款项
 PaymentTypeVAD=在线支付
 PaymentTypeShortVAD=在线支付
-PaymentTypeTRA=Bank draft
-PaymentTypeShortTRA=Draft
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeTRA=银行账单草稿
+PaymentTypeShortTRA=草稿
+PaymentTypeFAC=因素
+PaymentTypeShortFAC=因素
 BankDetails=银行详情
 BankCode=银行代码
 DeskCode=台代码
 BankAccountNumber=帐号
 BankAccountNumberKey=关键
-Residence=Direct debit
+Residence=直接借记
 IBANNumber=IBAN号码
 IBAN=银行IBAN
-BIC=BIC号码 / SWIFT号码
-BICNumber=BIC号码 / SWIFT号码
+BIC=BIC/SWIFT
+BICNumber=BIC/SWIFT 号码
 ExtraInfos=额外信息
 RegulatedOn=规范了
-ChequeNumber=号码
-ChequeOrTransferNumber=支票/转账
-ChequeMaker=Check/Transfer transmitter
+ChequeNumber=Check N°
+ChequeOrTransferNumber=支票/转账 N°
+ChequeBordereau=检查计划任务
+ChequeMaker=查看/追踪物流
 ChequeBank=银行支票
 CheckBank=支票
-NetToBePaid=需要净支付
+NetToBePaid=需要净支出
 PhoneNumber=电话
 FullPhoneNumber=电话
 TeleFax=传真
@@ -393,13 +394,13 @@ IntracommunityVATNumber=社区内数增值税
 PaymentByChequeOrderedTo=支票付款是支付到%s发送到
 PaymentByChequeOrderedToShort=支票付款,须付予
 SendTo=发送到
-PaymentByTransferOnThisBankAccount=付款至以下帐户
+PaymentByTransferOnThisBankAccount=款项转账至以下银行帐户
 VATIsNotUsedForInvoice=* 不得包含增值税, 详见CGI-293B
 LawApplicationPart1=通过对应用的12/05/80法80.335
 LawApplicationPart2=货物仍然是该人士/组织的资产
 LawApplicationPart3=卖方直到完全兑现
 LawApplicationPart4=他们的价格。
-LimitedLiabilityCompanyCapital=SARL公司与资本
+LimitedLiabilityCompanyCapital=有限责任公司(SARL)注册资金
 UseLine=申请
 UseDiscount=使用折扣
 UseCredit=使用信用卡
@@ -415,7 +416,7 @@ Cheques=支票
 DepositId=Id deposit
 NbCheque=Number of checks
 CreditNoteConvertedIntoDiscount=此信用记录或存款发票已经转换为 %s
-UsBillingContactAsIncoiveRecipientIfExist=使用客户账单联络方式而不是第三方联络方式作为发票的接收人
+UsBillingContactAsIncoiveRecipientIfExist=使用客户账单联络方式而不是合伙人的联络方式作为发票的接收人
 ShowUnpaidAll=显示所有未付发票
 ShowUnpaidLateOnly=只显示超时未付发票
 PaymentInvoiceRef=%s的付款发票
@@ -429,21 +430,23 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=已由此付款来支付
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=分类“付费”的所有信贷注意到完全支付。
-AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
+AllCompletelyPayedInvoiceWillBeClosed=全部发票仍然没有支付将被自动关闭状态“支付最高”。
 ToMakePayment=支付
 ToMakePaymentBack=支付
 ListOfYourUnpaidInvoices=未付发票清单
-NoteListOfYourUnpaidInvoices=注:此清单只包含链接到您作为一个销售代表的第三方发票。
+NoteListOfYourUnpaidInvoices=注:此清单只包含链接到您作为一个销售代表的合伙人发票。
 RevenueStamp=印花税票
-YouMustCreateInvoiceFromThird=该选项仅可用于在第三方的‘用户’页所创建的发票
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
-PDFCrabeDescription=发票模型Crabe。一个完整的发票模式(支援增值税选项,折扣,付款条件,标识等..)
+PDFCrabeDescription=发票模板Crabe。一个完整的发票模板(支援增值税选项,折扣,付款条件,标识等..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
-TerreNumRefModelDesc1=返回号码格式%s yy mm-NNNN标准和更换发票%s yy mm-NNNN信贷票据以及%s yy mm-NNNN其中yy是年,mm是月和nnnn是一个没有空格不为0的序列,
+TerreNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
 MarsNumRefModelDesc1=Return number with format %syymm-nnnn for standard invoices, %syymm-nnnn for replacement invoices, %syymm-nnnn for deposit invoices and %syymm-nnnn for credit notes where yy is year, mm is month and nnnn is a sequence with no break and no return to 0
-TerreNumRefModelError=美元的法案syymm起已经存在,而不是与此序列模型兼容。删除或重新命名它激活该模块。
+TerreNumRefModelError=A bill starting with $syymm already exists and is not compatible with this model of sequence. Remove it or rename it to activate this module.
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=代表随访客户发票
+TypeContact_facture_internal_SALESREPFOLL=代表跟进客户发票
 TypeContact_facture_external_BILLING=客户发票联络人
 TypeContact_facture_external_SHIPPING=客户送货联络人
 TypeContact_facture_external_SERVICE=客户服务联络人
@@ -459,7 +462,7 @@ InvoiceSituationAsk=Invoice following the situation
 InvoiceSituationDesc=Create a new situation following an already existing one
 SituationAmount=Situation invoice amount(net)
 SituationDeduction=Situation subtraction
-ModifyAllLines=Modify all lines
+ModifyAllLines=全部变更
 CreateNextSituationInvoice=Create next situation
 NotLastInCycle=This invoice is not the latest in cycle and must not be modified.
 DisabledBecauseNotLastInCycle=The next situation already exists.
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/zh_CN/bookmarks.lang b/htdocs/langs/zh_CN/bookmarks.lang
index 591b0a10f0a..32e1eb887b8 100644
--- a/htdocs/langs/zh_CN/bookmarks.lang
+++ b/htdocs/langs/zh_CN/bookmarks.lang
@@ -2,7 +2,7 @@
 AddThisPageToBookmarks=添加此页面到书签
 Bookmark=书签
 Bookmarks=书签
-NewBookmark=新的书签
+NewBookmark=新建书签
 ShowBookmark=显示书签
 OpenANewWindow=打开一个新窗口
 ReplaceWindow=替换当前窗口
@@ -14,5 +14,5 @@ BehaviourOnClick=点击网址时的行为
 CreateBookmark=创建书签
 SetHereATitleForLink=设置书签标题
 UseAnExternalHttpLinkOrRelativeDolibarrLink=使用外部的HTTP URL或相对Dolibarr网址
-ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=选择链接页面必须在新窗口中打开或不打开
 BookmarksManagement=书签管理
diff --git a/htdocs/langs/zh_CN/boxes.lang b/htdocs/langs/zh_CN/boxes.lang
index bbec3a62e39..476d96679c3 100644
--- a/htdocs/langs/zh_CN/boxes.lang
+++ b/htdocs/langs/zh_CN/boxes.lang
@@ -1,79 +1,84 @@
 # Dolibarr language file - Source file is en_US - boxes
 BoxLastRssInfos=RSS 信息
-BoxLastProducts=Latest %s products/services
-BoxProductsAlertStock=Stock alerts for products
-BoxLastProductsInContract=Latest %s contracted products/services
-BoxLastSupplierBills=Latest supplier invoices
-BoxLastCustomerBills=Latest customer invoices
-BoxOldestUnpaidCustomerBills=Oldest unpaid customer invoices
-BoxOldestUnpaidSupplierBills=Oldest unpaid supplier invoices
-BoxLastProposals=Latest commercial proposals
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Latest modified customers
-BoxLastSuppliers=Latest modified suppliers
-BoxLastCustomerOrders=Latest customer orders
-BoxLastActions=Latest actions
-BoxLastContracts=Latest contracts
-BoxLastContacts=Latest contacts/addresses
-BoxLastMembers=Latest members
-BoxFicheInter=Latest interventions
-BoxCurrentAccounts=Open accounts balance
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Latest %s modified products/services
+BoxLastProducts=最近的 %s 个产品/服务
+BoxProductsAlertStock=产品库存预警
+BoxLastProductsInContract=最新已签了合同的 %s 产品/服务
+BoxLastSupplierBills=最新供应商发票
+BoxLastCustomerBills=最新客户发票
+BoxOldestUnpaidCustomerBills=最早未支付客户发票
+BoxOldestUnpaidSupplierBills=前待付供应商发票
+BoxLastProposals=最新商业报价
+BoxLastProspects=最近变更的准客户
+BoxLastCustomers=最新变更的客户
+BoxLastSuppliers=最近变更的供应商
+BoxLastCustomerOrders=最新客户订单
+BoxLastActions=最近的动作
+BoxLastContracts=最近的合同
+BoxLastContacts=最新联系人/地址
+BoxLastMembers=最新会员
+BoxFicheInter=最新干预
+BoxCurrentAccounts=打开财务会计账单
+BoxTitleLastRssInfos=来自 %s 的最新的 %s 条新闻
+BoxTitleLastProducts=最近变更的 %s 个产品/服务
 BoxTitleProductsAlertStock=库存提醒
-BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
-BoxTitleLastModifiedCustomers=Latest %s modified customers
-BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastSupplierBills=Latest %s supplier's invoices
-BoxTitleLastModifiedProspects=Latest %s modified prospects
-BoxTitleLastModifiedMembers=Latest %s members
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
-BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
-BoxTitleCurrentAccounts=Open accounts balances
-BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
-BoxMyLastBookmarks=My latest %s bookmarks
+BoxTitleLastSuppliers=最近登记的 %s 位供应商
+BoxTitleLastModifiedSuppliers=最近变更的 %s 位供应商
+BoxTitleLastModifiedCustomers=最近变更的 %s 位客户
+BoxTitleLastCustomersOrProspects=最近的 %s 位客户或准客户
+BoxTitleLastCustomerBills=最近的 %s 份客户发票
+BoxTitleLastSupplierBills=最近的 %s 份供应商发票
+BoxTitleLastModifiedProspects=最近变更的 %s 位准客户
+BoxTitleLastModifiedMembers=新进 %s 位会员
+BoxTitleLastFicheInter=最近变更的 %s 条干预
+BoxTitleOldestUnpaidCustomerBills=最早 %s 未支付客户发票
+BoxTitleOldestUnpaidSupplierBills=前待付供应商发票 %s 
+BoxTitleCurrentAccounts=打开财务会计账单
+BoxTitleLastModifiedContacts=最近变更的 %s 条联系人/地址
+BoxMyLastBookmarks=我的最新 %s 书签
 BoxOldestExpiredServices=执行中的逾期时间最长的服务
-BoxLastExpiredServices=Latest %s oldest contacts with active expired services
-BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
-BoxTitleLastModifiedDonations=Latest %s modified donations
-BoxTitleLastModifiedExpenses=Latest %s modified expense reports
+BoxLastExpiredServices=最近 %s 老联系人激活过期服务
+BoxTitleLastActionsToDo=最近的 %s 个动作
+BoxTitleLastContracts=Latest %s modified contracts
+BoxTitleLastModifiedDonations=最近变更的 %s 份捐款
+BoxTitleLastModifiedExpenses=最近变更的 %s 份费用报表
 BoxGlobalActivity=全局活动(账单,报价,订单)
-BoxGoodCustomers=Good customers
-BoxTitleGoodCustomers=%s Good customers
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successfull refresh date: %s
-LastRefreshDate=Latest refresh date
+BoxGoodCustomers=优质客户
+BoxTitleGoodCustomers=%s 优质客户
+FailedToRefreshDataInfoNotUpToDate=刷新 RSS flux失败. 最后成功刷新日期是: %s
+LastRefreshDate=最后刷新日期
 NoRecordedBookmarks=未设置任何书签。
 ClickToAdd=点此添加
-NoRecordedCustomers=无客户记录
+NoRecordedCustomers=空空如也——没有记录
 NoRecordedContacts=无联系人记录
 NoActionsToDo=无待办事项
-NoRecordedOrders=无销售合同记录
-NoRecordedProposals=无报价单记录
-NoRecordedInvoices=无销售账单记录
-NoUnpaidCustomerBills=无未支付的销售账单
+NoRecordedOrders=空空如也——没有销售合同记录
+NoRecordedProposals=空空如也——没有报价单记录
+NoRecordedInvoices=空空如也——没有销售账单记录
+NoUnpaidCustomerBills=没有未支付客户发票
 NoUnpaidSupplierBills=无未支付的采购账单
-NoModifiedSupplierBills=无采购账单记录
-NoRecordedProducts=无产品/服务记录
-NoRecordedProspects=无潜在客户记录
+NoModifiedSupplierBills=空空如也——没有采购账单记录
+NoRecordedProducts=空空如也——没有产品/服务记录
+NoRecordedProspects=空空如也——没有潜在客户记录
 NoContractedProducts=无签订合同的产品
-NoRecordedContracts=无合同记录
-NoRecordedInterventions=没有干预措施的记录
+NoRecordedContracts=空空如也——没有合同记录
+NoRecordedInterventions=空空如也——没有干预措施的记录
 BoxLatestSupplierOrders=最近的采购订单
-NoSupplierOrder=无采购订单记录
+NoSupplierOrder=空空如也——没有采购订单记录
 BoxCustomersInvoicesPerMonth=客户每月发票
 BoxSuppliersInvoicesPerMonth=供应商每月的发票
 BoxCustomersOrdersPerMonth=客户每月的订单
 BoxSuppliersOrdersPerMonth=供应商每月的订单
-BoxProposalsPerMonth=笔报价/月
-NoTooLowStockProducts=无产品触发低库存提醒
-BoxProductDistribution=产品/服务布局
+BoxProposalsPerMonth=每月报价
+NoTooLowStockProducts=空空如也——没有产品触发低库存提醒
+BoxProductDistribution=产品/服务分布图
 BoxProductDistributionFor=%s的%s分布
-ForCustomersInvoices=客户的发票
+BoxTitleLastModifiedSupplierBills=最近变更的 %s 份供应商账单
+BoxTitleLatestModifiedSupplierOrders=最近变更的 %s 份供应商订单
+BoxTitleLastModifiedCustomerBills=最近变更的 %s 份客户账单
+BoxTitleLastModifiedCustomerOrders=最近变更的 %s 份客户订单
+BoxTitleLastModifiedPropals=最近变更的 %s 份报价
+ForCustomersInvoices=客户发票
 ForCustomersOrders=客户订单
 ForProposals=报价
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+LastXMonthRolling=最后 %s 月波动
+ChooseBoxToAdd=点击下拉菜单选择相应视图并添加到你的看板
diff --git a/htdocs/langs/zh_CN/cashdesk.lang b/htdocs/langs/zh_CN/cashdesk.lang
index 36d76d0b576..4ee64548a47 100644
--- a/htdocs/langs/zh_CN/cashdesk.lang
+++ b/htdocs/langs/zh_CN/cashdesk.lang
@@ -2,22 +2,21 @@
 CashDeskMenu=POS
 CashDesk=POS
 CashDeskBankCash=现金账户
-CashDeskBankCB=卡账户
+CashDeskBankCB=银行账户 (card)
 CashDeskBankCheque=支票账户
 CashDeskWarehouse=仓库
 CashdeskShowServices=服务
 CashDeskProducts=产品
 CashDeskStock=库存
 CashDeskOn=之于
-CashDeskThirdParty=客户
+CashDeskThirdParty=合伙人
 ShoppingCart=零售单
 NewSell=新零售单
-BackOffice=返回工作平台
 AddThisArticle=添加项目
 RestartSelling=回去就卖
-SellFinished=零售单完成
+SellFinished=Sale complete
 PrintTicket=打印零售记录
-NoProductFound=没有找到项目
+NoProductFound=空空如也——没有找到项目
 ProductFound=找到产品
 NoArticle=没有项目
 Identification=验证身份
@@ -25,11 +24,11 @@ Article=项目
 Difference=差异
 TotalTicket=总计
 NoVAT=没有为本零售单计算增值税
-Change=过量收到
+Change=找零
 BankToPay=负责账户
 ShowCompany=显示公司
 ShowStock=显示仓库
 DeleteArticle=删除项目
 FilterRefOrLabelOrBC=搜索 (REF /标签)
 UserNeedPermissionToEditStockToUsePos=你已经要求在POS销售时进行库存更新,所以操作POS模块的用户必须有更改库存的权限。
-DolibarrReceiptPrinter=Dolibarr Receipt Printer
+DolibarrReceiptPrinter=Dolibarr 发票打印机
diff --git a/htdocs/langs/zh_CN/categories.lang b/htdocs/langs/zh_CN/categories.lang
index ee918bed3b5..b8009d30055 100644
--- a/htdocs/langs/zh_CN/categories.lang
+++ b/htdocs/langs/zh_CN/categories.lang
@@ -1,81 +1,86 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Tag/Category
-Rubriques=Tags/Categories
-categories=tags/categories
-NoCategoryYet=No tag/category of this type created
+Rubrique=标签/分类
+Rubriques=标签/分类
+categories=标签/分类
+NoCategoryYet=创建的类型无标签/分类
 In=在
 AddIn=加入
-modify=修改
+modify=变更
 Classify=分类
-CategoriesArea=Tags/Categories area
-ProductsCategoriesArea=Products/Services tags/categories area
-SuppliersCategoriesArea=Suppliers tags/categories area
-CustomersCategoriesArea=Customers tags/categories area
-MembersCategoriesArea=Members tags/categories area
-ContactsCategoriesArea=Contacts tags/categories area
-AccountsCategoriesArea=Accounts tags/categories area
+CategoriesArea=标签/分类区
+ProductsCategoriesArea=产品/服务 标签/分类区
+SuppliersCategoriesArea=供应商标签/分类区
+CustomersCategoriesArea=客户标签/类别区
+MembersCategoriesArea=会员标签/分类区
+ContactsCategoriesArea=联系人标签/分类信息区
+AccountsCategoriesArea=账户标签/分类区
+ProjectsCategoriesArea=项目标签/分类区
 SubCats=小类
-CatList=List of tags/categories
-NewCategory=New tag/category
-ModifCat=Modify tag/category
-CatCreated=Tag/category created
-CreateCat=Create tag/category
-CreateThisCat=Create this tag/category
+CatList=标签/分类列表
+NewCategory=新建标签/分类
+ModifCat=变更标签/分类
+CatCreated=标签/分类已创建
+CreateCat=创建标签/分类
+CreateThisCat=创建此标签/分类
 NoSubCat=无子。
 SubCatOf=子类别
-FoundCats=Found tags/categories
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=创建标签/分类
+ImpossibleAddCat=无法添加标签/分类 %s
 WasAddedSuccessfully=<b>%s</b>是添加成功。
-ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-ProductIsInCategories=Product/service is linked to following tags/categories
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=This contact is linked to following contacts tags/categories
-ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
-MemberHasNoCategory=This member is not in any tags/categories
-ContactHasNoCategory=This contact is not in any tags/categories
-ClassifyInCategory=Add to tag/category
-NotCategorized=Without tag/category
+ObjectAlreadyLinkedToCategory=元素已经链接到该标签/分类。
+ProductIsInCategories=产品/服务链接到标签/分类
+CompanyIsInCustomersCategories=此合伙人链接到客户/准客户标签/分类
+CompanyIsInSuppliersCategories=合伙人链接到供应商标签/分类
+MemberIsInCategories=会员链接到会员标签/分类
+ContactIsInCategories=此联系人链接到以下联系人标签/类别
+ProductHasNoCategory=产品/服务未在任何标签/分类中
+CompanyHasNoCategory=This third party is not in any tags/categories
+MemberHasNoCategory=会员未在任何标签/分类中
+ContactHasNoCategory=此联系人未在任何标签/分类中
+ProjectHasNoCategory=项目未在任何标签/分类中
+ClassifyInCategory=添加到标签/分类
+NotCategorized=缺少标签/分类
 CategoryExistsAtSameLevel=此类别已存在此号
 ContentsVisibleByAllShort=所有内容可见
 ContentsNotVisibleByAllShort=所有内容不可见
-DeleteCategory=Delete tag/category
-ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-NoCategoriesDefined=No tag/category defined
-SuppliersCategoryShort=Suppliers tag/category
-CustomersCategoryShort=Customers tag/category
-ProductsCategoryShort=Products tag/category
-MembersCategoryShort=Members tag/category
-SuppliersCategoriesShort=Suppliers tags/categories
-CustomersCategoriesShort=Customers tags/categories
-ProspectsCategoriesShort=Prospects tags/categories
-CustomersProspectsCategoriesShort=Custo. / Prosp。类别
-ProductsCategoriesShort=Products tags/categories
-MembersCategoriesShort=Members tags/categories
-ContactCategoriesShort=Contacts tags/categories
-AccountsCategoriesShort=Accounts tags/categories
+DeleteCategory=删除标签/分类
+ConfirmDeleteCategory=您确定想删除此标签/分类吗?
+NoCategoriesDefined=标签/分类未定义
+SuppliersCategoryShort=供应商标签/分类
+CustomersCategoryShort=客户标签/分类
+ProductsCategoryShort=产品标签/分类
+MembersCategoryShort=会员标签/分类
+SuppliersCategoriesShort=供应商标签/分类
+CustomersCategoriesShort=客户标签/分类
+ProspectsCategoriesShort=有望标签/分类
+CustomersProspectsCategoriesShort=客户/准客户分类
+ProductsCategoriesShort=产品标签/分类
+MembersCategoriesShort=会员标签/分类
+ContactCategoriesShort=联系人标签/分类
+AccountsCategoriesShort=账户标签/分类
+ProjectsCategoriesShort=项目标签/分类
 ThisCategoryHasNoProduct=本分类不包含任何产品。
 ThisCategoryHasNoSupplier=本分类不包含任何供应商。
 ThisCategoryHasNoCustomer=本分类不包含任何客户。
 ThisCategoryHasNoMember=本分类不包含任何成员。
 ThisCategoryHasNoContact=本分类不包含任何联系人。
-ThisCategoryHasNoAccount=This category does not contain any account.
-CategId=Tag/category id
-CatSupList=List of supplier tags/categories
-CatCusList=List of customer/prospect tags/categories
-CatProdList=List of products tags/categories
-CatMemberList=List of members tags/categories
-CatContactList=List of contact tags/categories
-CatSupLinks=Links between suppliers and tags/categories
-CatCusLinks=Links between customers/prospects and tags/categories
-CatProdLinks=Links between products/services and tags/categories
-DeleteFromCat=Remove from tags/category
+ThisCategoryHasNoAccount=此分类未包含任何账号。
+ThisCategoryHasNoProject=此分类未包含任何项目。
+CategId=标签/分类id号码
+CatSupList=供应商标签/分类列表
+CatCusList=客户/准客户标签/分类列表
+CatProdList=产品标签/分类列表
+CatMemberList=会员标签/分类列表
+CatContactList=联系人标签/分类列表
+CatSupLinks=链接供应商与标签/分类
+CatCusLinks=链接客户/准客户与标签/分类
+CatProdLinks=链接产品/服务与标签/分类
+CatProJectLinks=链接项目与标签/分类
+DeleteFromCat=从标签/分类移除
 ExtraFieldsCategories=自定义属性
-CategoriesSetup=Tags/categories setup
-CategorieRecursiv=Link with parent tag/category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
-AddProductServiceIntoCategory=Add the following product/service
-ShowCategory=Show tag/category
-ByDefaultInList=By default in list
+CategoriesSetup=标签/分类设置
+CategorieRecursiv=自动链接到父标签/分类
+CategorieRecursivHelp=如果启动,产品也将与父类的子类添加到
+AddProductServiceIntoCategory=添加下面的产品/服务
+ShowCategory=显示标签/分类
+ByDefaultInList=按默认列表
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 1e8d9f6583c..c27b9b9360b 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=商业
-CommercialArea=商业区
+Commercial=供应商
+CommercialArea=供应商区
 Customer=客户
 Customers=客户
-Prospect=展望
-Prospects=展望
+Prospect=准客户
+Prospects=准客户
 DeleteAction=删除事件
-NewAction=新事件
+NewAction=新建事件
 AddAction=新建事件
 AddAnAction=新建事件
 AddActionRendezVous=新建会议
 ConfirmDeleteAction=你确定要删除这个事件?
 CardAction=事件卡
-ActionOnCompany=Related company
-ActionOnContact=Related contact
+ActionOnCompany=关联公司
+ActionOnContact=关联联系人
 TaskRDVWith=与 %s 会议
 ShowTask=显示任务
 ShowAction=显示事件
 ActionsReport=事件报告
-ThirdPartiesOfSaleRepresentative=丙方销售代表
+ThirdPartiesOfSaleRepresentative=合伙人销售代表
 SalesRepresentative=销售代表
 SalesRepresentatives=销售代表
 SalesRepresentativeFollowUp=销售代表 (跟进)
 SalesRepresentativeSignature=销售代表 (签字)
 NoSalesRepresentativeAffected=未分配特定的销售代表
 ShowCustomer=显示客户
-ShowProspect=显示展望客户
-ListOfProspects=展望客户名单
-ListOfCustomers=客户名单
-LastDoneTasks=Latest %s completed tasks
-LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActions=任务完成,并要做到
-DoneActions=已完成的行动
-ToDoActions=不完整的行动
-SendPropalRef=商业提案 %s 的提交
+ShowProspect=显示准客户
+ListOfProspects=准客户列表
+ListOfCustomers=客户列表
+LastDoneTasks=最近完成的 %s 个任务
+LastActionsToDo=最早的 %s 未完成动作
+DoneAndToDoActions=已完成和未完成任务
+DoneActions=已完成的动作
+ToDoActions=不完整的事件
+SendPropalRef=提交商业报价 %s 
 SendOrderRef=订单 %s 的提交
 StatusNotApplicable=不适用
 StatusActionToDo=需要完成
@@ -49,7 +49,7 @@ ActionAffectedTo=时间影响到
 ActionDoneBy=时间完成人
 ActionAC_TEL=电话
 ActionAC_FAX=发送传真
-ActionAC_PROP=通过邮件发送提案
+ActionAC_PROP=通过邮件发送报价
 ActionAC_EMAIL=发送电子邮件
 ActionAC_RDV=会议
 ActionAC_INT=干预
@@ -66,6 +66,6 @@ ActionAC_OTH_AUTO=其他 (自动插入事件)
 ActionAC_MANUAL=手动插入事件
 ActionAC_AUTO=自动插入事件
 Stats=销售统计
-StatusProsp=展望状态
-DraftPropals=起草商业提案
+StatusProsp=准客户状态
+DraftPropals=起草商业报价
 NoLimit=没有限制
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 06171bba67b..c01ffcde6ef 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -1,111 +1,113 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=公司名称%s已经存在。请使用其它名称。
 ErrorSetACountryFirst=请先设置国家
-SelectThirdParty=选择丙方
+SelectThirdParty=选择业务伙伴
 ConfirmDeleteCompany=你确定要删除本公司及所有关联信息?
 DeleteContact=删除联络人
 ConfirmDeleteContact=你确定要删除这个联系人和所有关联信息?
-MenuNewThirdParty=新建丙方
-MenuNewCustomer=新客户
-MenuNewProspect=新展望客户
-MenuNewSupplier=新供应商
+MenuNewThirdParty=新建合伙人
+MenuNewCustomer=新建客户
+MenuNewProspect=新建准客户
+MenuNewSupplier=新建供应商
 MenuNewPrivateIndividual=新私营个体
-NewCompany=新公司 (潜在客户、客户、供应商)
-NewThirdParty=新的丙方 (潜在客户、客户、供应商)
-CreateDolibarrThirdPartySupplier=Create a third party (supplier)
-ProspectionArea=展望客户区
-IdThirdParty=丙方身份
+NewCompany=新建公司 (准客户,客户,供应商)
+NewThirdParty=新建合伙人 (准客户,客户,供应商)
+CreateDolibarrThirdPartySupplier=创建合伙人(供应商)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
+ProspectionArea=准客户区
+IdThirdParty=合伙人ID号
 IdCompany=公司ID
 IdContact=联络人ID
 Contacts=联络人/地址
-ThirdPartyContacts=丙方联络人
-ThirdPartyContact=丙方联络人/地址
+ThirdPartyContacts=合伙人联络人
+ThirdPartyContact=合伙人联络人/地址
 Company=公司
 CompanyName=公司名称
-AliasNames=Alias name (commercial, trademark, ...)
-AliasNameShort=Alias name
+AliasNames=别名(商号,商标,...)
+AliasNameShort=别名
 Companies=公司
 CountryIsInEEC=国家是欧洲共同体一员
-ThirdPartyName=丙方名称
-ThirdParty=丙方
-ThirdParties=丙方
-ThirdPartyProspects=展望客户
-ThirdPartyProspectsStats=展望客户
+ThirdPartyName=合伙人名称
+ThirdParty=合伙人
+ThirdParties=合伙人
+ThirdPartyProspects=准客户
+ThirdPartyProspectsStats=准客户
 ThirdPartyCustomers=客户
 ThirdPartyCustomersStats=客户
 ThirdPartyCustomersWithIdProf12=与%s或%客户s
 ThirdPartySuppliers=供应商
-ThirdPartyType=丙方类型
+ThirdPartyType=合伙人类型
 Company/Fundation=公司/机构
 Individual=私营个体
-ToCreateContactWithSameName=即将自动创建一个具有相同信息的联络人
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=母公司
 Subsidiaries=附属公司
-ReportByCustomers=客户报告
-ReportByQuarter=报告率
+ReportByCustomers=客户报表
+ReportByQuarter=按报表等级
 CivilityCode=文明守则
 RegisteredOffice=注册给办公室
 Lastname=姓氏
 Firstname=名字
-PostOrFunction=邮政/功能
-UserTitle=称为
+PostOrFunction=工作岗位
+UserTitle=称谓
 Address=地址
 State=州/省
-StateShort=State
+StateShort=国家
 Region=地区
 Country=国家
 CountryCode=国家代码
 CountryId=国家编号
 Phone=电话
-PhoneShort=Phone
+PhoneShort=电话
 Skype=Skype
 Call=Call
 Chat=Chat
 PhonePro=工作电话
 PhonePerso=私人电话
-PhoneMobile=移动
-No_Email=不发送群发邮件
+PhoneMobile=手机
+No_Email=拒绝群发电子邮件
 Fax=传真
 Zip=邮政编码
 Town=城市
 Web=网站
 Poste= 位置
 DefaultLang=默认语言
-VATIsUsed=使用增值税
-VATIsNotUsed=不使用增值税
-CopyAddressFromSoc=填写丙方地址
-ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
+VATIsUsed=含增值税
+VATIsNotUsed=不含增值税
+CopyAddressFromSoc=Fill address with third party address
+ThirdpartyNotCustomerNotSupplierSoNoRef=合伙人无论客户或供应商,都没有对象可参考
 ##### Local Taxes #####
-LocalTax1IsUsed=Use second tax
+LocalTax1IsUsed=使用第二税率
 LocalTax1IsUsedES= 使用可再生能源
 LocalTax1IsNotUsedES= 不使用可再生能源
-LocalTax2IsUsed=Use third tax
+LocalTax2IsUsed=使用第三税率
 LocalTax2IsUsedES= 使用 IRPF
 LocalTax2IsNotUsedES= 不使用 IRPF
 LocalTax1ES=稀土
 LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
+TypeLocaltax1ES=RE 类型
+TypeLocaltax2ES=IRPF 类型
 WrongCustomerCode=客户代码无效
 WrongSupplierCode=供应商代码无效
-CustomerCodeModel=客户代码模型
-SupplierCodeModel=供应商代码模型
+CustomerCodeModel=客户代码模板
+SupplierCodeModel=供应商代码模板
 Gencod=条码
 ##### Professional ID #####
-ProfId1Short=专业ID 1
-ProfId2Short=专业ID 2
-ProfId3Short=专业ID 3
-ProfId4Short=专业ID 4
-ProfId5Short=专业ID 5
+ProfId1Short=Prof. id 1
+ProfId2Short=Prof. id 2
+ProfId3Short=Prof. id 3
+ProfId4Short=Prof. id 4
+ProfId5Short=Prof. id 5
 ProfId6Short=Prof. id 6
-ProfId1=专业ID 1
-ProfId2=专业ID 2
-ProfId3=专业ID 3
-ProfId4=专业ID 4
-ProfId5=专业ID 5
-ProfId6=专业ID 6
-ProfId1AR=专业ID 1 (CUIT / CUIL)
-ProfId2AR=专业ID 2 (Revenu brutes)
+ProfId1=专业ID号码 1
+ProfId2=专业ID号码 2
+ProfId3=专业ID号码 3
+ProfId4=专业ID号码 4
+ProfId5=专业ID号码 5
+ProfId6=专业ID号码 6
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
@@ -116,13 +118,13 @@ ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
 ProfId5AT=-
 ProfId6AT=-
-ProfId1AU=专业ID 1 (ABN)
+ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=专业ID 1 (Professional number)
+ProfId1BE=Prof Id 1 (专业号码)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
@@ -130,62 +132,62 @@ ProfId5BE=-
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE(国家注册)
-ProfId3BR=IM (城市注册)
+ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
 ProfId1CH=-
 ProfId2CH=-
-ProfId3CH=专业ID 1 (联邦数)
-ProfId4CH=专业ID 2 (商业记录数)
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
 ProfId5CH=-
 ProfId6CH=-
-ProfId1CL=专业ID 1 (R.U.T.)
+ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
 ProfId5CL=-
 ProfId6CL=-
-ProfId1CO=教授ID 1(车辙)
+ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=教授ID已1(USt. - IdNr)
-ProfId2DE=教授ID为2(USt.,星期日)
-ProfId3DE=教授ID已3(Handelsregister-Nr.)
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
 ProfId5DE=-
 ProfId6DE=-
-ProfId1ES=教授ID已1(到岸价格/伊阵)
-ProfId2ES=ID为2教授(社会安全号码)
-ProfId3ES=教授ID已3(CNAE)
-ProfId4ES=教授ID已4(高校数量)
+ProfId1ES=Prof Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (社保号)
+ProfId3ES=Prof Id 3 (CNAE)
+ProfId4ES=Prof Id 4 (Collegiate number)
 ProfId5ES=-
 ProfId6ES=-
-ProfId1FR=教授ID已1(警报器)
-ProfId2FR=教授ID为2(锡雷特)
-ProfId3FR=教授ID已3(氟化钠,老超支)
-ProfId4FR=教授ID已4(RCS的/ RM)的
+ProfId1FR=Prof Id 1 (SIREN)
+ProfId2FR=Prof Id 2 (SIRET)
+ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=教授标识5
 ProfId6FR=-
-ProfId1GB=教授ID是1(注册号)
+ProfId1GB=Registration Number
 ProfId2GB=-
-ProfId3GB=教授ID已3(碳化硅)
+ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=ID教授。 1。(RTN)
+ProfId1HN=Id prof. 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=教授ID是1(天)
-ProfId2IN=ID为2教授
-ProfId3IN=教授ID已3
-ProfId4IN=ID四教授
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
 ProfId5IN=教授标识5
 ProfId6IN=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
@@ -194,28 +196,28 @@ ProfId3LU=-
 ProfId4LU=-
 ProfId5LU=-
 ProfId6LU=-
-ProfId1MA=ID教授。 1(RC)的
-ProfId2MA=ID教授。 2(Patente)
-ProfId3MA=ID教授。 3(如果)
-ProfId4MA=ID教授。 4(CNSS)
+ProfId1MA=Id prof. 1 (R.C.)
+ProfId2MA=Id prof. 2 (Patente)
+ProfId3MA=Id prof. 3 (I.F.)
+ProfId4MA=Id prof. 4 (C.N.S.S.)
 ProfId5MA=Id prof. 5 (C.I.C.E.)
 ProfId6MA=-
-ProfId1MX=(RFC)的ID 1教授。
-ProfId2MX=ID 2教授(体育IMSS的河。)
-ProfId3MX=教授ID 3(高职教“宪章”)
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK公司纳默
+ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=-
+ProfId4NL=Burgerservicenummer (BSN)
 ProfId5NL=-
 ProfId6NL=-
-ProfId1PT=教授ID已1(酞菁镍)
-ProfId2PT=ID为2教授(社会安全号码)
-ProfId3PT=教授ID已三(商业记录数)
-ProfId4PT=ID四教授(学院)
+ProfId1PT=Prof Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (社保号)
+ProfId3PT=Prof Id 3 (Commercial Record number)
+ProfId4PT=Prof Id 4 (Conservatory)
 ProfId5PT=-
 ProfId6PT=-
 ProfId1SN=钢筋混凝土
@@ -224,25 +226,24 @@ ProfId3SN=-
 ProfId4SN=-
 ProfId5SN=-
 ProfId6SN=-
-ProfId1TN=教授ID是1(区局)
-ProfId2TN=教授ID为2(财政matricule)
-ProfId3TN=教授ID已3(杜阿纳代码)
-ProfId4TN=教授ID已4(班)
+ProfId1TN=Prof Id 1 (RC)
+ProfId2TN=Prof Id 2 (Fiscal matricule)
+ProfId3TN=Prof Id 3 (Douane code)
+ProfId4TN=Prof Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1RU=教授ID一日(OGRN)
-ProfId2RU=教授ID 2(非专利)
-ProfId3RU=教授ID 3(KPP的)
-ProfId4RU=教授ID 4(玉浦)
+ProfId1RU=Prof Id 1 (OGRN)
+ProfId2RU=Prof Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Prof Id 4 (OKPO)
 ProfId5RU=-
 ProfId6RU=-
 VATIntra=增值税号码
 VATIntraShort=增值税号码
 VATIntraSyntaxIsValid=语法是有效的
-VATIntraValueIsValid=值是有效的
-ProspectCustomer=展望/客户
-Prospect=展望
-CustomerCard=客户卡
+ProspectCustomer=准客户/客户
+Prospect=准客户
+CustomerCard=客户信息
 Customer=客户
 CustomerRelativeDiscount=相对客户折扣
 CustomerRelativeDiscountShort=相对折扣
@@ -256,70 +257,73 @@ CustomerAbsoluteDiscountAllUsers=绝对优惠(所有用户授予)
 CustomerAbsoluteDiscountMy=绝对优惠(由自己授予)
 DiscountNone=无
 Supplier=供应商
-AddContact=Create contact
-AddContactAddress=Create contact/address
+AddContact=创建联系人
+AddContactAddress=创建联系人/地址
 EditContact=编辑联系人/地址
 EditContactAddress=编辑联系人/地址
-Contact=联系
+Contact=联系人
+ContactId=联系人id
 ContactsAddresses=联系方式/地址
-NoContactDefinedForThirdParty=这个丙方没有确定的联系人
-NoContactDefined=丙方未设定联系人
+FromContactName=Name:
+NoContactDefinedForThirdParty=此合伙人未确定联络人
+NoContactDefined=合伙人未设定联系人
 DefaultContact=默认接触
-AddThirdParty=Create third party
+AddThirdParty=创建合伙人
 DeleteACompany=删除公司
 PersonalInformations=个人资料
-AccountancyCode=会计代码
+AccountancyCode=科目代码
 CustomerCode=客户代码
 SupplierCode=供应商代码
-CustomerCodeShort=Customer code
-SupplierCodeShort=Supplier code
-CustomerCodeDesc=客户代码,为所有客户提供独特的
-SupplierCodeDesc=供应商代码,所有供应商的独特
-RequiredIfCustomer=要求丙方是客户或是有盼头的
-RequiredIfSupplier=要求丙方为供应商
+CustomerCodeShort=客户代码
+SupplierCodeShort=供应商代码
+CustomerCodeDesc=客户代码,为所有客户提供唯一的客户代码值
+SupplierCodeDesc=供应商代码,所有供应商的代码均是唯一的
+RequiredIfCustomer=要求合伙人为客户或是准客户
+RequiredIfSupplier=要求合伙人为供应商
 ValidityControledByModule=有效性控制模块
 ThisIsModuleRules=这是本单元的规则
-ProspectToContact=展望接触
+ProspectToContact=准客户到联系人
 CompanyDeleted=公司“%的”从数据库中删除。
-ListOfContacts=联系人名单
+ListOfContacts=联系人列表
 ListOfContactsAddresses=联系人/地址列表
-ListOfThirdParties=丙方名单
-ShowCompany=Show thirdparty
+ListOfThirdParties=合伙人列表
+ShowCompany=Show third party
 ShowContact=显示联系人
-ContactsAllShort=全部(不过滤)
+ContactsAllShort=全部 (不筛选)
 ContactType=联系人类型
 ContactForOrders=订单的联系人
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=提案的联系人
+ContactForOrdersOrShipments=订单或运输联系人
+ContactForProposals=报价的联系人
 ContactForContracts=合同的联系人
 ContactForInvoices=发票的联系人
 NoContactForAnyOrder=不是任何订单的联系人
-NoContactForAnyProposal=不是任何提案的联系人
+NoContactForAnyOrderOrShipments=这种联系是不是任何订单或装运联系
+NoContactForAnyProposal=不是任何报价的联系人
 NoContactForAnyContract=不是任何合同的联系人
 NoContactForAnyInvoice=不是任何发票的联系人
-NewContact=新联系人
-NewContactAddress=新联系人/地址
+NewContact=新建联系人
+NewContactAddress=新建联系人/地址
 MyContacts=我的联系人
-Capital=资本
-CapitalOf=资本 %s
+Capital=注册资金
+CapitalOf=注册资金 %s
 EditCompany=编辑公司
-ThisUserIsNot=这个用户不是潜在客户,客户也不是供应商
+ThisUserIsNot=该用户不是准客户,也不是客户更不是供应商
 VATIntraCheck=支票
 VATIntraCheckDesc=<b>%s的</b>允许该链接要求欧盟增值税检查服务。从服务器的外部网络连接需要这项服务工作。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=欧盟委员会现场检查Intracomunnautary增值税
 VATIntraManualCheck=您也可以手动检查站点从欧洲网站<a href="%s" target="_blank">%s的</a>
 ErrorVATCheckMS_UNAVAILABLE=检查不可能的。检查服务是没有提供的会员国(%s)中。
-NorProspectNorCustomer=非潜在客户,也非客户
-JuridicalStatus=Legal form
-Staff=员工
+NorProspectNorCustomer=不是准客户,也不是客户
+JuridicalStatus=法律条款
+Staff=员工人数
 ProspectLevelShort=潜力
-ProspectLevel=展望潜力
+ProspectLevel=潜在的准客户
 ContactPrivate=私人
-ContactPublic=共享
-ContactVisibility=能见度
-ContactOthers=Other
-OthersNotLinkedToThirdParty=其他,未链接到丙方
+ContactPublic=公开
+ContactVisibility=性质
+ContactOthers=其他
+OthersNotLinkedToThirdParty=其他,未链接到合伙人
 ProspectStatus=潜力状态
 PL_NONE=无
 PL_UNKNOWN=未知
@@ -338,58 +342,60 @@ TE_PRIVATE=私营个体
 TE_OTHER=其他
 StatusProspect-1=不要联系
 StatusProspect0=没有联系过
-StatusProspect1=To be contacted
+StatusProspect1=已联系过
 StatusProspect2=联系过程
 StatusProspect3=联系工作
 ChangeDoNotContact=改为'不要联系'
 ChangeNeverContacted=改为'没有联系过' 
-ChangeToContact=Change status to 'To be contacted'
+ChangeToContact=状态改为 '已联系过'
 ChangeContactInProcess=改为'联系中'
 ChangeContactDone=改为'已联系'
-ProspectsByStatus=按状态展望
+ProspectsByStatus=按准客户状态
 NoParentCompany=无
-ExportCardToFormat=出口卡格式
-ContactNotLinkedToCompany=联系不与任何丙方
-DolibarrLogin=Dolibarr登录
+ExportCardToFormat=导出名片格式
+ContactNotLinkedToCompany=联系人未链接到任何合伙人
+DolibarrLogin=登陆Dolibarr
 NoDolibarrAccess=没有Dolibarr访问
-ExportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ExportDataset_company_2=联系和属性
-ImportDataset_company_1=Third parties (Companies/foundations/physical people) and properties
-ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attributes
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ExportDataset_company_2=联系人和特征
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
+ImportDataset_company_2=联系人/地址 (是否合伙人) 及属性
 ImportDataset_company_3=银行的详细资料
-ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
-PriceLevel=价格水平
+ImportDataset_company_4=第三方/销售代表(影响销售代表用户对公司的销售代表)
+PriceLevel=价格级别
 DeliveryAddress=送货地址
-AddAddress=Add address
-SupplierCategory=供应商类别
-JuridicalStatus200=Independent
+AddAddress=添加地址
+SupplierCategory=供应商分类
+JuridicalStatus200=独立
 DeleteFile=删除文件
 ConfirmDeleteFile=你确定要删除这个文件?
-AllocateCommercial=Assigned to sales representative
+AllocateCommercial=分配给销售代表
 Organization=组织
-FiscalYearInformation=信息财政年度
-FiscalMonthStart=本财年开始一个月
-YouMustAssignUserMailFirst=You must create email for this user first to be able to add emails notifications for him.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
-ListSuppliersShort=供应商名单
-ListProspectsShort=名单前景
-ListCustomersShort=客户名单
-ThirdPartiesArea=Third parties and contact area
-LastModifiedThirdParties=Latest %s modified third parties
-UniqueThirdParties=独特的第三方总计
+FiscalYearInformation=会计年度信息
+FiscalMonthStart=会计年度初始月
+YouMustAssignUserMailFirst=您必须为此账户添加电子邮箱,首先可为他添加电子邮件通知功能。
+YouMustCreateContactFirst=能够添加电子邮件通知, 首先你必须填写合伙人的有效Email地址
+ListSuppliersShort=供应商列表
+ListProspectsShort=准客户列表
+ListCustomersShort=客户列表
+ThirdPartiesArea=合伙人信息区
+LastModifiedThirdParties=最近变更的 %s 位合伙人
+UniqueThirdParties=合伙人小计
 InActivity=打开
-ActivityCeased=关闭
-ProductsIntoElements=List of products/services into %s
-CurrentOutstandingBill=Current outstanding bill
-OutstandingBill=Max. for outstanding bill
-OutstandingBillReached=Max. for outstanding bill reached
+ActivityCeased=禁用
+ProductsIntoElements= %s 的中产品/服务列表
+CurrentOutstandingBill=当前优质账单
+OutstandingBill=优质账单最大值
+OutstandingBillReached=已达到最大优质账单值
 MonkeyNumRefModelDesc=返回格式%syymm为客户代码以及%syymm -○○○○供应商代码其中YY是年numero,MM是月,nnnn是一个没有休息,没有为0返回序列。
 LeopardNumRefModelDesc=客户/供应商代码是免费的。此代码可以随时修改。
-ManagingDirectors=Manager(s) name (CEO, director, president...)
-MergeOriginThirdparty=Duplicate third party (third party you want to delete)
-MergeThirdparties=Merge third parties
-ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
-ThirdpartiesMergeSuccess=Thirdparties have been merged
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=Firstname of sales representative
-SaleRepresentativeLastname=Lastname of sales representative
+ManagingDirectors=公司高管(s)称呼 (CEO, 董事长, 总裁...)
+MergeOriginThirdparty=重复第三方(第三方要删除)
+MergeThirdparties=合并合伙人
+ConfirmMergeThirdparties=你确定要将这第三方合并到当前的一方吗?所有链接的对象(发票,订单,…)将转移到目前的第三方,所以你将能够删除重复的一个。
+ThirdpartiesMergeSuccess=合伙人已合并
+SaleRepresentativeLogin=销售代表登陆
+SaleRepresentativeFirstname=销售代表名字
+SaleRepresentativeLastname=销售代表姓氏
+ErrorThirdpartiesMerge=有一个错误,当删除第三方。请检查日志。改变已被恢复。
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/zh_CN/compta.lang b/htdocs/langs/zh_CN/compta.lang
index c248aee0571..b3476f0964d 100644
--- a/htdocs/langs/zh_CN/compta.lang
+++ b/htdocs/langs/zh_CN/compta.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=金融
+MenuFinancial=财务
 TaxModuleSetupToModifyRules=转到<a href="%s">税务模块</a>设置修改计算规则
-TaxModuleSetupToModifyRulesLT=Go to <a href="%s">Company setup</a> to modify rules for calculation
-OptionMode=期权的会计
+TaxModuleSetupToModifyRulesLT=请到 <a href="%s">公司设置</a> 修改计算规则
+OptionMode=会计选项
 OptionModeTrue=期权投入产出
 OptionModeVirtual=期权学分,转帐
-OptionModeTrueDesc=在这种情况下,营业额计算超过付款(付款日期)。 \\ n此这些数字的有效性是有保证的只有当簿记审议通过输入/通过发票上的帐目输出。
+OptionModeTrueDesc=在这种情况下,营业额计算超过付款(付款日期)。 此这些数字的有效性是有保证的只有当簿记审议通过输入/输出通过发票上的帐目。
 OptionModeVirtualDesc=在这种情况下,营业额计算超过发票(验证的日期)。当这些发票是因为,不论是否已支付或没有,他们在输出中列出的营业额。
 FeatureIsSupportedInInOutModeOnly=功能只在信用额,债务提供会计模式(见会计模块的配置)
 VATReportBuildWithOptionDefinedInModule=这里显示的数额计算使用由税务模块设置定义的规则。
@@ -19,50 +19,52 @@ Income=收入
 Outcome=支出
 ReportInOut=收入/支出
 ReportTurnover=营业额
-PaymentsNotLinkedToInvoice=付款不链接到任何发票,所以无法与任何第三方关联
+PaymentsNotLinkedToInvoice=付款未链接到任何发票,所以无法与任何合伙人关联
 PaymentsNotLinkedToUser=付款不链接到任何用户
 Profit=利润
-AccountingResult=Accounting result
+AccountingResult=会计结果
 Balance=平衡
 Debit=借方
 Credit=贷方
-Piece=会计文档
-AmountHTVATRealReceived=净收
-AmountHTVATRealPaid=净支付
+Piece=会计文档.
+AmountHTVATRealReceived=净收入
+AmountHTVATRealPaid=净支出
 VATToPay=销售增值税
-VATReceived=收到的增值税
+VATReceived=收入增值税
 VATToCollect=采购增值税
 VATSummary=增值税平衡
 LT2SummaryES=IRPF平衡
-LT1SummaryES=RE Balance
-VATPaid=支付的增值税
+LT1SummaryES=RE 平衡
+VATPaid=支出增值税
 LT2PaidES=IRPF通知
-LT1PaidES=RE Paid
+LT1PaidES=RE 已支付
 LT2CustomerES=IRPF销售
 LT2SupplierES=IRPF采购
-LT1CustomerES=RE sales
-LT1SupplierES=RE purchases
+LT1CustomerES=RE 销售
+LT1SupplierES=RE 采购
 VATCollected=增值税征收
 ToPay=待支付
 SpecialExpensesArea=特殊支付区域
-SocialContribution=Social or fiscal tax
-SocialContributions=Social or fiscal taxes
+SocialContribution=社会或财政税
+SocialContributions=社会或财政税
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=其他费用
 MenuTaxAndDividends=税和股息
-MenuSocialContributions=Social/fiscal taxes
-MenuNewSocialContribution=New social/fiscal tax
-NewSocialContribution=New social/fiscal tax
-ContributionsToPay=Social/fiscal taxes to pay
+MenuSocialContributions=社会/财政税
+MenuNewSocialContribution=新建社会/财政税
+NewSocialContribution=新建社会/财政税
+ContributionsToPay=支付社会/财政税
 AccountancyTreasuryArea=会计/库务区
-NewPayment=新的支付
+NewPayment=新建支付
 Payments=付款
 PaymentCustomerInvoice=客户发票付款
-PaymentSocialContribution=Social/fiscal tax payment
+PaymentSocialContribution=社会/财政税款
 PaymentVat=增值税纳税
-ListPayment=付款名单
-ListOfCustomerPayments=客户付款名单
+ListPayment=付款列表
+ListOfCustomerPayments=客户付款列表
 DateStartPeriod=起始日期时期
 DateEndPeriod=结束日期时期
 newLT1Payment=New tax 2 payment
@@ -71,29 +73,29 @@ LT1Payment=Tax 2 payment
 LT1Payments=Tax 2 payments
 LT2Payment=Tax 3 payment
 LT2Payments=Tax 3 payments
-newLT1PaymentES=New RE payment
+newLT1PaymentES=新建RE付款
 newLT2PaymentES=新IRPF付款
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
+LT1PaymentES=RE付款
+LT1PaymentsES=RE付款
 LT2PaymentES=IRPF付款
 LT2PaymentsES=IRPF付款
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
+VATPayment=销售税款
+VATPayments=销售税款
 VATRefund=Sales tax refund Refund
 Refund=Refund
-SocialContributionsPayments=Social/fiscal taxes payments
+SocialContributionsPayments=社会/财政税款
 ShowVatPayment=显示增值税纳税
 TotalToPay=共支付
-CustomerAccountancyCode=客户会计代码
-SupplierAccountancyCode=供应商会计代码
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+CustomerAccountancyCode=客户科目代码
+SupplierAccountancyCode=供应商科目代码
+CustomerAccountancyCodeShort=客户账户代码
+SupplierAccountancyCodeShort=供应商账户代码
 AccountNumber=帐号
 NewAccount=新帐户
 SalesTurnover=销售营业额
 SalesTurnoverMinimum=最低销售额
 ByExpenseIncome=By expenses & incomes
-ByThirdParties=由第三方
+ByThirdParties=由合伙人
 ByUserAuthorOfInvoice=按开具发票者
 CheckReceipt=支票存款
 CheckReceiptShort=支票存款
@@ -101,30 +103,30 @@ LastCheckReceiptShort=Latest %s check receipts
 NewCheckReceipt=新优惠
 NewCheckDeposit=新的支票存款
 NewCheckDepositOn=创建于账户上的存款收据:%s的
-NoWaitingChecks=No checks awaiting deposit.
+NoWaitingChecks=空空如也——没有等待支票存款
 DateChequeReceived=支票接收日期
 NbOfCheques=支票数量
-PaySocialContribution=Pay a social/fiscal tax
-ConfirmPaySocialContribution=Are you sure you want to classify this social or fiscal tax as paid?
-DeleteSocialContribution=Delete a social or fiscal tax payment
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
-ExportDataset_tax_1=Social and fiscal taxes and payments
-CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
+PaySocialContribution=支付社会/财政税
+ConfirmPaySocialContribution=你确定想要归类社会或财政税为支付吗?
+DeleteSocialContribution=删除社会或财政税款
+ConfirmDeleteSocialContribution=你确定要删除这个社会/财政税款吗?
+ExportDataset_tax_1=社会和财政税和付款
+CalcModeVATDebt=模式 <b>%sVAT 关于承诺债务%s</b>.
 CalcModeVATEngagement=模式 <b>%s 增值税收入,支出 %s</b>.
-CalcModeDebt=Mode <b>%sClaims-Debts%s</b> said <b>Commitment accounting</b>.
-CalcModeEngagement=Mode <b>%sIncomes-Expenses%s</b> said <b>cash accounting</b>
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
-CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
-CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
-CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
-CalcModeLT2Debt=Mode <b>%sIRPF on customer invoices%s</b>
-CalcModeLT2Rec= Mode <b>%sIRPF on suppliers invoices%s</b>
+CalcModeDebt=模式 <b>%sClaims-Debts%s</b> 据说 <b>承诺债务</b>.
+CalcModeEngagement=模式 <b>%sIncomes-Expenses%s</b> 据说 <b>现金会计</b>
+CalcModeLT1= 模式 <b>%sRE 客户发票 - 供应商发票%s</b>
+CalcModeLT1Debt=模式 <b>%sRE 客户发票%s</b>
+CalcModeLT1Rec= 模式 <b>%sRE 供应商发票%s</b>
+CalcModeLT2= 模式 <b>%sIRPF 客户发票 - 供应商发票%s</b>
+CalcModeLT2Debt=模式 <b>%sIRPF 供应商发票%s</b>
+CalcModeLT2Rec= 模式 <b>%sIRPF 供应商发票%s</b>
 AnnualSummaryDueDebtMode=年度总结的收支平衡表
 AnnualSummaryInputOutputMode=年度总结的收支平衡表
-AnnualByCompaniesDueDebtMode=平衡各方的收入和开支的三分之一,详细,模式<b>%sClaims,据说承诺债务占%。</b>
-AnnualByCompaniesInputOutputMode=平衡各方的收入和开支的三分之一,详细,模式<b>%sRevenues头奖%据说现金会计</b> 。
-SeeReportInInputOutputMode=见报告<b>%sIncomes头奖%据说占</b>实际支付的<b>现金</b>计算所取得的
-SeeReportInDueDebtMode=见报告<b>%sClaims -%s的债务承担会计</b>说发票计算的颁布
+AnnualByCompaniesDueDebtMode=收支平衡,详细按合伙人,模式<b>%sClaims-Debts%s</b>,据说<b>承诺债务</b>。
+AnnualByCompaniesInputOutputMode=收支平衡,详细按合伙人,模式<b>%sIncomes-Expenses%s</b>,据说<b>现金会计</b>。
+SeeReportInInputOutputMode=见报告<b>%sIncomes-Expenses%s</b> 据说<b>现金会计</b>对实际付款的计算
+SeeReportInDueDebtMode=见报告 <b>%sClaims-Debts%s</b> 据说<b>承诺债务</b>关于开具发票的计算
 RulesAmountWithTaxIncluded=- 所示金额均含税
 RulesResultDue=- It includes outstanding invoices, expenses, VAT, donations whether they are paid or not. Is also includes paid salaries.<br>- It is based on the validation date of invoices and VAT and on the due date for expenses. For salaries defined with Salary module, the value date of payment is used.
 RulesResultInOut=- It includes the real payments made on invoices, expenses, VAT and salaries. <br>- It is based on the payment dates of the invoices, expenses, VAT and salaries. The donation date for donation.
@@ -132,17 +134,17 @@ RulesCADue=- It includes the client's due invoices whether they are paid or not.
 RulesCAIn=- 它包括所有从客户收到发票有效付款。 <br> - 这是对这些发票的付款日期为基础<br>
 DepositsAreNotIncluded=- 不包括存款发票
 DepositsAreIncluded=- 包括存款发票
-LT2ReportByCustomersInInputOutputModeES=按第三方IRPF的报表
-LT1ReportByCustomersInInputOutputModeES=Report by third party RE
-VATReport=VAT report
+LT2ReportByCustomersInInputOutputModeES=按合伙人IRPF的报表
+LT1ReportByCustomersInInputOutputModeES=按合伙人 RE 报表
+VATReport=VAT报告
 VATReportByCustomersInInputOutputMode=每客户增值税征收和支付的报表
 VATReportByCustomersInDueDebtMode=每客户增值税报表征收和支付的报表
 VATReportByQuartersInInputOutputMode=按征收和支出的增值税率的报表
-LT1ReportByQuartersInInputOutputMode=Report by RE rate
-LT2ReportByQuartersInInputOutputMode=Report by IRPF rate
+LT1ReportByQuartersInInputOutputMode=按RE税率报告
+LT2ReportByQuartersInInputOutputMode=按 IRPF 税率报告
 VATReportByQuartersInDueDebtMode=按征收和支出的增值税率的报表
-LT1ReportByQuartersInDueDebtMode=Report by RE rate
-LT2ReportByQuartersInDueDebtMode=Report by IRPF rate
+LT1ReportByQuartersInDueDebtMode=按RE税率报告
+LT2ReportByQuartersInDueDebtMode=按 IRPF 税率报告
 SeeVATReportInInputOutputMode=见报告<b>%sVAT装箱%S</b>的标准计算
 SeeVATReportInDueDebtMode=见报告<b>流量%%sVAT S上</b>的流量计算与一选项
 RulesVATInServices=- 对于服务,该报告包括实际收到或发出的付款日期的基础上规定的增值税。
@@ -158,7 +160,7 @@ InvoiceStats=帐单统计
 Dispatch=调度
 Dispatched=调度
 ToDispatch=待分配
-ThirdPartyMustBeEditAsCustomer=第三方必须定义为顾客
+ThirdPartyMustBeEditAsCustomer=合伙人必须定义为顾客
 SellsJournal=销售日志
 PurchasesJournal=采购日志
 DescSellsJournal=销售日志
@@ -174,29 +176,29 @@ InvoiceLinesToDispatch=待分配的发票行
 ByProductsAndServices=通过产品和服务
 RefExt=外部编码
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
-LinkedOrder=Link to order
+LinkedOrder=链接到订单
 Mode1=方法 1
 Mode2=方法 2
 CalculationRuleDesc=要计算增值税总额,有两种方法: <br>方法1是在每一行四舍五入,然后对它们求和。 <br>方法2是在总结增值税在每一行,然后四舍五入结果。 <br>最后的结果可能不同,从几毛钱。默认模式是:<b>%s</b> 。
 CalculationRuleDescSupplier=According to supplier, choose appropriate method to apply same calculation rule and get same result expected by your supplier.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
 CalculationMode=计算模式
-AccountancyJournal=Accountancy code journal
+AccountancyJournal=科目代码日记账
 ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT (VAT on sales)
 ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT (VAT on purchases)
 ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=第三方客户缺省会计代码
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social/fiscal tax
+ACCOUNTING_ACCOUNT_CUSTOMER=合伙人客户缺省科目代码
+ACCOUNTING_ACCOUNT_SUPPLIER=默认情况下供应商合伙人的科目代码
+CloneTax=复制 social/fiscal tax
 ConfirmCloneTax=Confirm the clone of a social/fiscal tax payment
-CloneTaxForNextMonth=Clone it for next month
-SimpleReport=Simple report
-AddExtraReport=Extra reports
+CloneTaxForNextMonth=复制下一个月
+SimpleReport=简报
+AddExtraReport=完整报告
 OtherCountriesCustomersReport=Foreign customers report
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
 SameCountryCustomersWithVAT=National customers report
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Based on the two first letters of the VAT number being the same as your own company's country code
 LinkedFichinter=Link to an intervention
-ImportDataset_tax_contrib=Import social/fiscal taxes
-ImportDataset_tax_vat=Import vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
+ImportDataset_tax_contrib=导入社会/保险增值税
+ImportDataset_tax_vat=导入VAT付款
+ErrorBankAccountNotFound=错误:银行账号未发现
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index 08434feb59c..efaccf298ee 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -1,26 +1,26 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=合同区
-ListOfContracts=合约名单
+ListOfContracts=联系人列表
 AllContracts=所有合同
-ContractCard=合同卡
+ContractCard=合同信息
 ContractStatusNotRunning=不运行
-ContractStatusDraft=草案
+ContractStatusDraft=草稿
 ContractStatusValidated=验证
-ContractStatusClosed=关闭
+ContractStatusClosed=禁用
 ServiceStatusInitial=不运行
 ServiceStatusRunning=运行
 ServiceStatusNotLate=跑步,没有过期
 ServiceStatusNotLateShort=没有过期
 ServiceStatusLate=跑步,过期
 ServiceStatusLateShort=过期
-ServiceStatusClosed=关闭
-ShowContractOfService=Show contract of service
+ServiceStatusClosed=禁用
+ShowContractOfService=显示联系人或服务
 Contracts=合同
-ContractsSubscriptions=Contracts/Subscriptions
-ContractsAndLine=Contracts and line of contracts
+ContractsSubscriptions=联系人/订阅
+ContractsAndLine=合同及合同明细
 Contract=合同
-ContractLine=Contract line
-Closing=Closing
+ContractLine=合同明细
+Closing=关闭
 NoContracts=没有合同
 MenuServices=服务
 MenuInactiveServices=服务不活跃
@@ -28,10 +28,10 @@ MenuRunningServices=正在运行的服务
 MenuExpiredServices=过期服务
 MenuClosedServices=休息服务
 NewContract=新合同
-NewContractSubscription=New contract/subscription
-AddContract=Create contract
+NewContractSubscription=新建联系人/订阅
+AddContract=创建联系人
 DeleteAContract=删除合同
-CloseAContract=关闭的合同
+CloseAContract=禁用联系人
 ConfirmDeleteAContract=你确定要删除本合同及所有的服务?
 ConfirmValidateContract=你确定要验证这个合同?
 ConfirmCloseContract=这将关闭所有服务(主动或不)。您确定要关闭这个合同?
@@ -43,50 +43,50 @@ RefContract=合同参考
 DateContract=合同日期
 DateServiceActivate=服务激活日期
 ShowContract=查看合同
-ListOfServices=服务名单
-ListOfInactiveServices=名单不主动服务
-ListOfExpiredServices=名单过期的活动服务
-ListOfClosedServices=关闭服务清单
+ListOfServices=服务列表
+ListOfInactiveServices=不主动服务列表
+ListOfExpiredServices=过期活动服务列表
+ListOfClosedServices=禁用服务列表
 ListOfRunningServices=运行服务的列表
 NotActivatedServices=不活跃的服务(除验证合同)
-BoardNotActivatedServices=服务激活验证合同之间
-LastContracts=Latest %s contracts
-LastModifiedServices=Latest %s modified services
+BoardNotActivatedServices=在已确认的合同间激活服务
+LastContracts=最近的 %s 份合同
+LastModifiedServices=最近变更的 %s 个服务
 ContractStartDate=开始日期
 ContractEndDate=结束日期
 DateStartPlanned=计划开始日期
 DateStartPlannedShort=计划开始日期
 DateEndPlanned=计划结束日期
 DateEndPlannedShort=计划结束日期
-DateStartReal=真正的开始日期
-DateStartRealShort=真正的开始日期
-DateEndReal=真正的结束日期
-DateEndRealShort=真正的结束日期
-CloseService=关闭服务
+DateStartReal=实际开始日期
+DateStartRealShort=实际开始日期
+DateEndReal=实际结束日期
+DateEndRealShort=实际结束日期
+CloseService=禁用服务
 BoardRunningServices=过期的运行服务
 ServiceStatus=服务现状
-DraftContracts=草稿合同
+DraftContracts=合同草稿
 CloseRefusedBecauseOneServiceActive=合同不能被关闭,因为至少有一个开放式服务上
 CloseAllContracts=关闭所有合同线
 DeleteContractLine=删除线合同
 ConfirmDeleteContractLine=你确定要删除这个合同线?
 MoveToAnotherContract=移动到另一个合同的服务。
 ConfirmMoveToAnotherContract=我选用新的目标合同,确认我想进入这个合同这项服务。
-ConfirmMoveToAnotherContractQuestion=选择了现有合同(同第三方),你要提出这项服务?
+ConfirmMoveToAnotherContractQuestion=选择了现有合同(同合伙人),你要提出这项服务?
 PaymentRenewContractId=续订合同线(%s的数目)
 ExpiredSince=失效日期
-NoExpiredServices=没有过期的主动服务
+NoExpiredServices=空空如也——没有过期的主动服务
 ListOfServicesToExpireWithDuration=在 %s 天内将期满的服务列表
 ListOfServicesToExpireWithDurationNeg=服务超过 %s 天过期列表
 ListOfServicesToExpire=服务到期列表
-NoteListOfYourExpiredServices=此列表只包含你作为一个销售代表与第三方的服务合同 。
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
-OnlyLinesWithTypeServiceAreUsed=Only lines with type "Service" will be cloned.
+NoteListOfYourExpiredServices=此列表只包含你作为一个销售代表与合伙人的服务合同 。
+StandardContractsTemplate=标准合同模板
+ContactNameAndSignature= %s签名和盖章:
+OnlyLinesWithTypeServiceAreUsed=仅 "Service" 类型明细将被复制。
 
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=销售代表签订合同
-TypeContact_contrat_internal_SALESREPFOLL=销售代表随访合同
+TypeContact_contrat_internal_SALESREPSIGN=签订合同的销售代表
+TypeContact_contrat_internal_SALESREPFOLL=跟进合同的销售代表
 TypeContact_contrat_external_BILLING=结算客户联系
 TypeContact_contrat_external_CUSTOMER=后续的客户联系
-TypeContact_contrat_external_SALESREPSIGN=签约客户的联系
+TypeContact_contrat_external_SALESREPSIGN=签约客户的联系人
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 99b7c58ef0c..591bfe33959 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -1,78 +1,79 @@
 # Dolibarr language file - Source file is en_US - cron
 # About page
 # Right
-Permission23101 = Read Scheduled job
-Permission23102 = Create/update Scheduled job
-Permission23103 = Delete Scheduled job
-Permission23104 = Execute Scheduled job
+Permission23101 = 读取计划任务
+Permission23102 = 创建/更新计划任务
+Permission23103 = 删除计划任务
+Permission23104 = 执行计划任务
 # Admin
-CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
-OrToLaunchASpecificJob=Or to check and launch a specific job
-KeyForCronAccess=Security key for URL to launch cron jobs
-FileToLaunchCronJobs=Command line to launch cron jobs
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
-CronMethodDoesNotExists=Class %s does not contains any method %s
+CronSetup= 计划任务管理设置
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
+OrToLaunchASpecificJob=或者检查并启动一个特别计划任务
+KeyForCronAccess=启动计划任务的URL网址的安全密钥
+FileToLaunchCronJobs=命令行启动计划任务
+CronExplainHowToRunUnix=在Unix环境你可以在命令行下每5分钟执行以下计划任务
+CronExplainHowToRunWin=在微软(tm)Windows操作系统环境下你可以使用控制面板中的计划任务工具每5分钟运行
+CronMethodDoesNotExists=Class类 %s 没有包含任何方法 %s
 # Menu
-EnabledAndDisabled=Enabled and disabled
+EnabledAndDisabled=启用和禁用
 # Page list
 CronLastOutput=最后运行结果
-CronLastResult=Last result code
+CronLastResult=最后结果代码
 CronCommand=命令
-CronList=Scheduled jobs
-CronDelete=Delete scheduled jobs
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
-CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
-CronInfo=Scheduled job module allow to execute job that have been planned
+CronList=计划任务
+CronDelete=删除计划任务
+CronConfirmDelete=您确定想要删除计划任务吗?
+CronExecute=安排计划工作
+CronConfirmExecute=你确定想要现在执行这些计划工作吗?
+CronInfo=计划工作模式允许执行计划好了的工作
 CronTask=工作
 CronNone=无
-CronDtStart=Not before
-CronDtEnd=Not after
+CronDtStart=之前
+CronDtEnd=之后
 CronDtNextLaunch=接下来执行
-CronDtLastLaunch=Start date of latest execution
-CronDtLastResult=End date of latest execution
-CronFrequency=Frequency
-CronClass=Class
+CronDtLastLaunch=最新执行的开始日期
+CronDtLastResult=最新执行的结束日期
+CronFrequency=频率
+CronClass=等级
 CronMethod=方法
-CronModule=模
-CronNoJobs=No jobs registered
-CronPriority=优先
-CronLabel=描述
-CronNbRun=Nb. launch
-CronMaxRun=Max nb. launch
-CronEach=Every
-JobFinished=Job launched and finished
+CronModule=模块
+CronNoJobs=没有工作注册
+CronPriority=优先级
+CronLabel=标签
+CronNbRun=运行编号
+CronMaxRun=最大运行编号
+CronEach=每
+JobFinished=工作启动和完成
 #Page card
-CronAdd= Add jobs
-CronEvery=Execute job each
-CronObject=Instance/Object to create
+CronAdd= 添加工作
+CronEvery=执行每个工作
+CronObject=创建实例/对象
 CronArgs=参数
-CronSaveSucess=Save successfully
-CronNote=评论
-CronFieldMandatory=Fields %s is mandatory
-CronErrEndDateStartDt=End date cannot be before start date
-CronStatusActiveBtn=启用
+CronSaveSucess=保存成功
+CronNote=说明
+CronFieldMandatory=栏位 %s 为必填
+CronErrEndDateStartDt=结束日期不能早过开始日期啊,时光不能倒流呀魂淡
+CronStatusActiveBtn=生效
 CronStatusInactiveBtn=禁用
-CronTaskInactive=This job is disabled
+CronTaskInactive=这个工作已失效
 CronId=Id
 CronClassFile=Classes (filename.class.php)
-CronModuleHelp=Name of Dolibarr module directory (also work with external Dolibarr module). <BR> For exemple to fetch method of Dolibarr Product object /htdocs/<u>product</u>/class/product.class.php, the value of module is <i>product</i>
-CronClassFileHelp=The file name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/<u>product.class.php</u>, the value of class file name is <i>product.class.php</i>
-CronObjectHelp=The object name to load. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of class file name is <i>Product</i>
-CronMethodHelp=The object method to launch. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of method is  is <i>fecth</i>
-CronArgsHelp=The method arguments. <BR> For exemple to fetch method of Dolibarr Product object /htdocs/product/class/product.class.php, the value of paramters can be <i>0, ProductRef</i>
-CronCommandHelp=The system command line to execute.
-CronCreateJob=Create new Scheduled Job
+CronModuleHelp=Dolibarr模块目录名称 (同时也是 Dolibarr 外部模块的工作目录). <BR> 例如 Dolibarr 产品对象 /htdocs/<u>product</u>/class/product.class.php的获取方法, 模块的参数值是 <i>product</i>
+CronClassFileHelp=加载文件名称。 <BR> 例如 Dolibarr 产品对象 /htdocs/product/class/<u>product.class.php</u>的获取方法, 它的参数值 class 文件名称是 <i>product.class.php</i>
+CronObjectHelp=加载对象名称. <BR> 例如 Dolibarr 产品对象 /htdocs/product/class/product.class.php的获取方法, 它的参数值 class 文件名称是 <i>Product</i>
+CronMethodHelp=对象启动方法. <BR> 例如 Dolibarr 产品对象 /htdocs/product/class/product.class.php的启动方法, 它的参数方法是 <i>fecth</i>
+CronArgsHelp=该方法的参数. <BR>例如 Dolibarr 产品对象 /htdocs/product/class/product.class.php的获取方法, 参数值 <i>0, ProductRef</i>
+CronCommandHelp=系统命令行执行。
+CronCreateJob=创建新的计划任务
 CronFrom=From
 # Info
 # Common
-CronType=Job type
+CronType=工作类型
 CronType_method=一个Dolibarr类的调用方法
-CronType_command=Shell command
-CronCannotLoadClass=Cannot load class %s or object %s
-UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
-JobDisabled=Job disabled
-MakeLocalDatabaseDumpShort=Local database backup
-MakeLocalDatabaseDump=Create a local database dump
+CronType_command=命令行
+CronCannotLoadClass=无法加载 class %s 或对象 %s
+UseMenuModuleToolsToAddCronJobs=请到菜单 "主页 - 管理员工具 - 计划任务" 查看和修改计划任务。
+JobDisabled=岗位无效
+MakeLocalDatabaseDumpShort=本地数据库备份
+MakeLocalDatabaseDump=生成一份本地数据库 dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/zh_CN/deliveries.lang b/htdocs/langs/zh_CN/deliveries.lang
index fd17ba0b84a..f0de54b17bf 100644
--- a/htdocs/langs/zh_CN/deliveries.lang
+++ b/htdocs/langs/zh_CN/deliveries.lang
@@ -1,30 +1,30 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=交货
-DeliveryRef=Ref Delivery
-DeliveryCard=交付卡
+DeliveryRef=送达编号
+DeliveryCard=交货信息
 DeliveryOrder=交货单
 DeliveryDate=交货日期
 CreateDeliveryOrder=产生交货单
-DeliveryStateSaved=Delivery state saved
-SetDeliveryDate=出货日期设置
+DeliveryStateSaved=交货状态保存
+SetDeliveryDate=送货日期设置
 ValidateDeliveryReceipt=验证送达回执
 ValidateDeliveryReceiptConfirm=你确定要验证这个交货收据吗?
 DeleteDeliveryReceipt=删除送达回执
 DeleteDeliveryReceiptConfirm=你确定要删除送达回执<b>%s</b>吗?
-DeliveryMethod=送货方式
-TrackingNumber=追踪号码
+DeliveryMethod=运输方式
+TrackingNumber=运单号码
 DeliveryNotValidated=交付未验证
-StatusDeliveryCanceled=Canceled
-StatusDeliveryDraft=Draft
-StatusDeliveryValidated=Received
+StatusDeliveryCanceled=已取消
+StatusDeliveryDraft=草稿
+StatusDeliveryValidated=已接收
 # merou PDF model
-NameAndSignature=姓名及签署:
-ToAndDate=To___________________________________对____ / _____ / __________
-GoodStatusDeclaration=上述货物已收到良好的条件,
+NameAndSignature=签名和盖章:
+ToAndDate=To___________________________________ on ____/_____/__________
+GoodStatusDeclaration=上述货物完好并已签收,
 Deliverer=发货人:
-Sender=寄件人
-Recipient=接受者
-ErrorStockIsNotEnough=There's not enough stock
-Shippable=Shippable
-NonShippable=Not Shippable
-ShowReceiving=Show delivery receipt
+Sender=发送方
+Recipient=接收方
+ErrorStockIsNotEnough=库存不足
+Shippable=可运输
+NonShippable=不可运输
+ShowReceiving=显示送达回执
diff --git a/htdocs/langs/zh_CN/dict.lang b/htdocs/langs/zh_CN/dict.lang
index f84b2dbf875..6ef4fce3954 100644
--- a/htdocs/langs/zh_CN/dict.lang
+++ b/htdocs/langs/zh_CN/dict.lang
@@ -138,7 +138,7 @@ CountryLS=莱索托
 CountryLR=利比里亚
 CountryLY=利比亚
 CountryLI=列支敦士登
-CountryLT=Lithuania
+CountryLT=立陶宛
 CountryLU=卢森堡
 CountryMO=澳门
 CountryMK=马其顿,前南斯拉夫的
@@ -251,7 +251,7 @@ CountryMF=圣马丁
 CivilityMME=夫人
 CivilityMR=先生
 CivilityMLE=女士
-CivilityMTRE=主
+CivilityMTRE=尊上(花千骨看多了)
 CivilityDR=医生
 ##### Currencies #####
 Currencyeuros=欧元
@@ -265,8 +265,8 @@ CurrencyEUR=欧元
 CurrencySingEUR=欧元
 CurrencyFRF=法国法郎
 CurrencySingFRF=法国法郎
-CurrencyGBP=国标磅
-CurrencySingGBP=GB的庞德
+CurrencyGBP=国标英镑
+CurrencySingGBP=国标英镑
 CurrencyINR=印度卢比
 CurrencySingINR=印度卢比
 CurrencyMAD=迪拉姆
@@ -295,33 +295,33 @@ CurrencyCentSingINR=派萨
 CurrencyThousandthSingTND=千分之一
 #### Input reasons #####
 DemandReasonTypeSRC_INTE=因特网
-DemandReasonTypeSRC_CAMP_MAIL=邮寄活动
+DemandReasonTypeSRC_CAMP_MAIL=发邮件
 DemandReasonTypeSRC_CAMP_EMAIL=通过电子邮件发送运动
 DemandReasonTypeSRC_CAMP_PHO=电话运动
 DemandReasonTypeSRC_CAMP_FAX=传真运动
-DemandReasonTypeSRC_COMM=商业联系
-DemandReasonTypeSRC_SHOP=商店联系
+DemandReasonTypeSRC_COMM=商业联系人
+DemandReasonTypeSRC_SHOP=商店联系人
 DemandReasonTypeSRC_WOM=口碑
 DemandReasonTypeSRC_PARTNER=伙伴
 DemandReasonTypeSRC_EMPLOYEE=雇员
 DemandReasonTypeSRC_SPONSORING=赞助
 #### Paper formats ####
-PaperFormatEU4A0=4A0
-PaperFormatEU2A0=2A0
-PaperFormatEUA0=A0
-PaperFormatEUA1=A1
-PaperFormatEUA2=A2
-PaperFormatEUA3=A3
-PaperFormatEUA4=A4
+PaperFormatEU4A0=4A0格式
+PaperFormatEU2A0=2A0格式
+PaperFormatEUA0=A0格式
+PaperFormatEUA1=A1格式
+PaperFormatEUA2=A2格式
+PaperFormatEUA3=A3格式
+PaperFormatEUA4=A4格式
 PaperFormatEUA5=A5
-PaperFormatEUA6=A6
-PaperFormatUSLETTER=US 信签
-PaperFormatUSLEGAL=US 法律文书
+PaperFormatEUA6=A6格式
+PaperFormatUSLETTER=美式信签格式
+PaperFormatUSLEGAL=美式法律格式
 PaperFormatUSEXECUTIVE=US 公文
 PaperFormatUSLEDGER=总帐/小报
-PaperFormatCAP1=加拿大 P1
-PaperFormatCAP2=加拿大 P2
-PaperFormatCAP3=加拿大 P3
-PaperFormatCAP4=加拿大 P4
-PaperFormatCAP5=加拿大 P5
-PaperFormatCAP6=加拿大 P6
+PaperFormatCAP1=加拿大 P1格式
+PaperFormatCAP2=加拿大 P2格式
+PaperFormatCAP3=加拿大 P3格式
+PaperFormatCAP4=加拿大 P4格式
+PaperFormatCAP5=加拿大 P5格式
+PaperFormatCAP6=加拿大 P6格式
diff --git a/htdocs/langs/zh_CN/donations.lang b/htdocs/langs/zh_CN/donations.lang
index 5872757e1d9..7f043c09cb5 100644
--- a/htdocs/langs/zh_CN/donations.lang
+++ b/htdocs/langs/zh_CN/donations.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=捐款
 Donations=捐赠
-DonationRef=捐赠文书
+DonationRef=捐赠编号
 Donor=捐赠者
-AddDonation=Create a donation
+AddDonation=新建捐赠
 NewDonation=新捐赠
-DeleteADonation=Delete a donation
-ConfirmDeleteADonation=Are you sure you want to delete this donation ?
+DeleteADonation=删除捐赠
+ConfirmDeleteADonation=你确定想要删除捐赠吗?
 ShowDonation=显示捐赠
 PublicDonation=市民捐款
 DonationsArea=捐赠区
 DonationStatusPromiseNotValidated=草案承诺
 DonationStatusPromiseValidated=验证承诺
 DonationStatusPaid=收到的捐款
-DonationStatusPromiseNotValidatedShort=草案
+DonationStatusPromiseNotValidatedShort=草稿
 DonationStatusPromiseValidatedShort=验证
 DonationStatusPaidShort=收稿
-DonationTitle=Donation receipt
-DonationDatePayment=Payment date
+DonationTitle=捐款收据
+DonationDatePayment=付款日期
 ValidPromess=验证承诺
 DonationReceipt=捐款收据
 DonationsModels=捐赠收据的文件模式
-LastModifiedDonations=Latest %s modified donations
+LastModifiedDonations=最近变更的 %s 份捐款
 DonationRecipient=受捐赠者
-IConfirmDonationReception=接受者声明接收,捐款,数额如下
-MinimumAmount=Minimum amount is  %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
-DONATION_ART200=Show article 200 from CGI if you are concerned
-DONATION_ART238=Show article 238 from CGI if you are concerned
-DONATION_ART885=Show article 885 from CGI if you are concerned
-DonationPayment=Donation payment
+IConfirmDonationReception=接收方声明接收,捐款,数额如下
+MinimumAmount=最小数额为  %s
+FreeTextOnDonations=页脚额外说明文字
+FrenchOptions=法国选项
+DONATION_ART200=从CGI显示200笔
+DONATION_ART238=从CGI显示238笔
+DONATION_ART885=从CGI显示885笔
+DonationPayment=捐赠付款
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 65a02540ce3..91c6cda209e 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -3,10 +3,10 @@ ECMNbOfDocs=铌在目录中的文档
 ECMSection=目录
 ECMSectionManual=手册目录
 ECMSectionAuto=自动目录
-ECMSectionsManual=手册树
-ECMSectionsAuto=自动树
+ECMSectionsManual=手动目录树
+ECMSectionsAuto=自动目录树
 ECMSections=目录
-ECMRoot=根
+ECMRoot=Root
 ECMNewSection=新目录
 ECMAddSection=添加手册目录
 ECMCreationDate=创建日期
@@ -14,7 +14,7 @@ ECMNbOfFilesInDir=在目录中的文件数
 ECMNbOfSubDir=数子目录
 ECMNbOfFilesInSubDir=子目录中的文件数量
 ECMCreationUser=创造者
-ECMArea=电子文档管理
+ECMArea=EDM电子文档管理区
 ECMAreaDesc=EDM(电子文档管理)区允许您保存,共享和快速搜索各类文件。
 ECMAreaDesc2=*自动填写目录时自动加入一个元素从卡的文件。 <br> *手动目录可以用来保存未链接到一个特定元素的文件。
 ECMSectionWasRemoved=目录<b>%s</b>已被删除。
@@ -22,16 +22,16 @@ ECMSearchByKeywords=搜寻关键字
 ECMSearchByEntity=搜索对象
 ECMSectionOfDocuments=目录中的文件
 ECMTypeAuto=自动
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
-ECMDocsByThirdParties=文件链接到第三方
-ECMDocsByProposals=文件与建议
-ECMDocsByOrders=文件链接到客户的订单
+ECMDocsBySocialContributions=社会或财政税相关文档
+ECMDocsByThirdParties=合伙人相关文档
+ECMDocsByProposals=报价相关文档
+ECMDocsByOrders=客户订单相关文档
 ECMDocsByContracts=文件与合约
-ECMDocsByInvoices=文件与客户发票
-ECMDocsByProducts=文件与产品
-ECMDocsByProjects=文件关联到项目
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByInvoices=客户发票相关文档
+ECMDocsByProducts=产品相关文档
+ECMDocsByProjects=项目相关文件
+ECMDocsByUsers=用户相关文档
+ECMDocsByInterventions=干预相关文档
 ECMNoDirectoryYet=没有目录中创建
 ShowECMSection=显示目录
 DeleteSection=删除目录
@@ -39,6 +39,6 @@ ConfirmDeleteSection=你能确认你要删除的目录<b>%s吗</b> ?
 ECMDirectoryForFiles=相对目录的文件
 CannotRemoveDirectoryContainsFiles=删除不可能的,因为它包含了一些文件
 ECMFileManager=档案管理员
-ECMSelectASection=左树中选择一个目录...
-DirNotSynchronizedSyncFirst=该目录似乎外ECM模块来创建或修改。你必须先点击“刷新”按钮,磁盘和数据库同步,此目录的内容。
+ECMSelectASection=请在左侧目录树中选取目录...
+DirNotSynchronizedSyncFirst=该目录似乎是在ECM电子文档管理模块之外创建或变更的哦。你必须先点击“刷新”按钮同步此目录磁盘和数据库的内容。
 
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index cbba25dfd31..e2bcdb90b5b 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -5,9 +5,9 @@ NoErrorCommitIsDone=没有错误,我们承诺
 # Errors
 ErrorButCommitIsDone=发现错误我们将进行验证
 ErrorBadEMail=电子邮件%s是错误的
-ErrorBadUrl=网址%s是错误的
+ErrorBadUrl=网址 %s 有误
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorLoginAlreadyExists=登录%s已经存在。
+ErrorLoginAlreadyExists=登陆%s已经存在。
 ErrorGroupAlreadyExists=组%s已经存在。
 ErrorRecordNotFound=记录没有找到。
 ErrorFailToCopyFile=无法复制文件<b>'%s'</b>成<b>'%s'。</b>
@@ -20,30 +20,30 @@ ErrorFailToDeleteDir=无法删除目录<b>'%s'</b>的。
 ErrorThisContactIsAlreadyDefinedAsThisType=这个联络已定义为这种类型的接触。
 ErrorCashAccountAcceptsOnlyCashMoney=这是一个银行帐户的现金帐户,所以只接受现金支付的类型。
 ErrorFromToAccountsMustDiffers=源和目标的银行帐户必须是不同的。
-ErrorBadThirdPartyName=坏第三者名义价值
+ErrorBadThirdPartyName=错误的合伙人名称
 ErrorProdIdIsMandatory=%s 是强制性的
-ErrorBadCustomerCodeSyntax=坏客户代码的语法
+ErrorBadCustomerCodeSyntax=错误的客户代码
 ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
 ErrorCustomerCodeRequired=客户代码需要
 ErrorBarCodeRequired=需要条形码
 ErrorCustomerCodeAlreadyUsed=客户代码已被使用
-ErrorBarCodeAlreadyUsed=Bar code already used
+ErrorBarCodeAlreadyUsed=条码已存在且已使用
 ErrorPrefixRequired=前缀要求
-ErrorBadSupplierCodeSyntax=对供应商的语法错误代码
+ErrorBadSupplierCodeSyntax=错误的供应商代码
 ErrorSupplierCodeRequired=要求供应商代码
 ErrorSupplierCodeAlreadyUsed=供应商代码已被使用
 ErrorBadParameters=错误的参数
-ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
-ErrorBadImageFormat=Image file has not a supported format (Your PHP does not support functions to convert images of this format)
+ErrorBadValueForParameter=错误值 '%s' 参数 '%s'
+ErrorBadImageFormat=图片格式不支持(你的PHP不支持图片格式转换功能)
 ErrorBadDateFormat=值“%s”有错误的日期格式
 ErrorWrongDate=日期不正确!
 ErrorFailedToWriteInDir=无法写在目录%s
 ErrorFoundBadEmailInFile=找到%S的语法不正确的电子邮件文件中的行(例如行%的电子邮件s =%s)的
-ErrorUserCannotBeDelete=User cannot be deleted. May be it is associated to Dolibarr entities.
+ErrorUserCannotBeDelete=用户不能删除。也许它已经关联到Dolibarr实体对象了。
 ErrorFieldsRequired=一些必要的栏位都没有填补。
 ErrorFailedToCreateDir=无法创建一个目录。检查Web服务器的用户有权限写入Dolibarr文件目录。如果参数<b>safe_mode设置</b>为启用这个PHP,检查Dolibarr php文件到Web服务器的用户拥有(或组)。
 ErrorNoMailDefinedForThisUser=没有邮件定义该用户
-ErrorFeatureNeedJavascript=此功能需要Javascript被激活的工作。更改此设置 - 显示。
+ErrorFeatureNeedJavascript=此功能需要Javascript被激活才能工作。更改此设置 - 显示。
 ErrorTopMenuMustHaveAParentWithId0=一个类型'顶'不能有一个父菜单中的菜单。放在父菜单0或选择一个类型为'左'菜单。
 ErrorLeftMenuMustHaveAParentId=一个类型为'左'必须有一个父菜单的ID。
 ErrorFileNotFound=档案<b>%s</b>未找到(错误的道路,错误的参数safe_mode设置权限或访问被拒绝或由PHP openbasedir)
@@ -57,14 +57,14 @@ ErrorUploadBlockedByAddon=上传封锁一个PHP / Apache的插件。
 ErrorFileSizeTooLarge=文件大小是太大。
 ErrorSizeTooLongForIntType=尺寸int类型的长(%s最大位数)
 ErrorSizeTooLongForVarcharType=尺寸长字符串类型(%s字符最大)
-ErrorNoValueForSelectType=请填写选择列表值
+ErrorNoValueForSelectType=请填写选取列表值
 ErrorNoValueForCheckBoxType=请填写复选框列表值
 ErrorNoValueForRadioType=请填写电台列表的值
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
-ErrorFieldCanNotContainSpecialCharacters=菲尔德<b>%s</b>必须不包含特殊字符。
+ErrorBadFormatValueList=列表值不能有一个以上的逗号: <u>%s</u>, 但至少需要一个: key,value
+ErrorFieldCanNotContainSpecialCharacters=栏位<b>%s</b>必须不包含特殊字符。
 ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
-ErrorNoAccountancyModuleLoaded=没有一个会计模块激活
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
+ErrorNoAccountancyModuleLoaded=没有激活启用任何财务会计模块
+ErrorExportDuplicateProfil=导出设定配置名称已存在
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
 ErrorLDAPMakeManualTest=甲。LDIF文件已经生成在目录%s的尝试加载命令行手动有更多的错误信息。
 ErrorCantSaveADoneUserWithZeroPercentage=无法储存与行动“规约未启动”如果领域“做的”,也是填补。
@@ -76,39 +76,39 @@ ErrorModuleRequireJavascript=不能禁用JavaScript必须有此功能的工作
 ErrorPasswordsMustMatch=这两种类型的密码必须相互匹配
 ErrorContactEMail=一个技术性错误发生。请联系管理员,以下连接提供错误代码<b>%s</b>在您的邮件,甚至更好,加入了这个页面的屏幕拷贝的电子邮件<b>%s。</b>
 ErrorWrongValueForField=<b>s'</b>的领域的一些错误值<b>的%s(</b>价值<b>'%</b>不匹配正则表达式规则<b>%s)</b>
-ErrorFieldValueNotIn=Wrong value for field number <b>%s</b> (value '<b>%s</b>' is not a value available into field <b>%s</b> of table <b>%s</b>)
-ErrorFieldRefNotIn=错场数<b>%s</b>值(值<b>'%s'</b>是不是一个的<b>%s</b>现有文献)
+ErrorFieldValueNotIn=栏位数字参数值错误 <b>%s</b> (值 '<b>%s</b>' 不允许填写在这个栏位 <b>%s</b> 表格 <b>%s</b>)
+ErrorFieldRefNotIn=栏位数字错误 <b>%s</b> (value '<b>%s</b>'不是一个<b>%s</b>现有编号)
 ErrorsOnXLines=<b>%</b>误差<b>的</b>源上线
 ErrorFileIsInfectedWithAVirus=防病毒程序无法验证文件(文件可能被病毒感染)
 ErrorSpecialCharNotAllowedForField=特殊字符不为外地允许“%s的”
 ErrorNumRefModel=存在一个引用(%s)和编号是不符合本规则兼容到数据库。记录中删除或重命名参考激活此模块。
 ErrorQtyTooLowForThisSupplier=数量过低,供应商或供应商在这此产品没有价格定义
-ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
+ErrorModuleSetupNotComplete=模块设置看起来未完成设置。请到 主页->设置->模块菜单 完成模块的设置。
 ErrorBadMask=在面具的错误
 ErrorBadMaskFailedToLocatePosOfSequence=没有序列号错误,面具
 ErrorBadMaskBadRazMonth=错误,坏的复位值
 ErrorMaxNumberReachForThisMask=Max number reach for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=错误。选择至少一个条目。
-ErrorDeleteNotPossibleLineIsConsolidated=删除没有可能的,因为记录是调解到的银行transation,
-ErrorProdIdAlreadyExist=%s被分配到另一个第三
+ErrorCounterMustHaveMoreThan3Digits=计数器必须有3个以上的数字
+ErrorSelectAtLeastOne=错误。请至少选取一个条目。
+ErrorDeleteNotPossibleLineIsConsolidated=不能删除该记录已经关联到银行交易并已过账了
+ErrorProdIdAlreadyExist=%s被分配到其他合伙人
 ErrorFailedToSendPassword=无法传送密码
 ErrorFailedToLoadRSSFile=未能得到RSS提要。尝试添加恒定MAIN_SIMPLEXMLLOAD_DEBUG,如果错误消息不提供足够的信息。
 ErrorForbidden=Access denied.<br>You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
-ErrorForbidden2=此登录权限可以定义你的Dolibarr从菜单%的S ->%s的管理员
+ErrorForbidden2=此登陆权限可在你的Dolibarr管理员菜单 %s->%s中定义。
 ErrorForbidden3=看来Dolibarr是不是通过身份验证的会话中使用。以在Dolibarr安装文件就会知道如何管理认证(htaccess的,mod_auth或其他...).
 ErrorNoImagickReadimage=功能imagick_readimage是没有发现在这个PHP。没有预览可用。管理员可以从菜单中禁用此设置 - 显示选项卡。
 ErrorRecordAlreadyExists=记录已存在
 ErrorCantReadFile=无法读取档案'%s'
 ErrorCantReadDir=无法读取目录'%s'
-ErrorBadLoginPassword=坏值的帐号和密码
+ErrorBadLoginPassword=帐号密码不正确
 ErrorLoginDisabled=您的帐户已被禁用
 ErrorFailedToRunExternalCommand=无法运行外部命令。检查它是可用和可运行在PHP的服务器。如果PHP <b>安全模式</b>被激活,请检查命令<b>safe_mode_exec_dir之</b>内,是由参数定义一个目录。
 ErrorFailedToChangePassword=无法更改密码
-ErrorLoginDoesNotExists=<b>如何正确</b>使用手机与登录<b>%</b>找不到。
-ErrorLoginHasNoEmail=这位用户没有电子邮件地址。进程中止。
+ErrorLoginDoesNotExists=登陆账号 <b>%s</b> 有误——系统中没有这个账户.
+ErrorLoginHasNoEmail=此账户未设定Email地址。无法使用该功能.
 ErrorBadValueForCode=代码有错误的值类型。再次尝试以新的价值...
-ErrorBothFieldCantBeNegative=领域的%s及%s可以不消极
+ErrorBothFieldCantBeNegative=栏位%s和%s不能都为负的
 ErrorQtyForCustomerInvoiceCantBeNegative=Quantity for line into customer invoices can't be negative
 ErrorWebServerUserHasNotPermission=<b>%s</b>用来执行Web服务器用户帐户没有该权限
 ErrorNoActivatedBarcode=没有激活的条码类型
@@ -117,8 +117,8 @@ ErrNoZipEngine=PHP没有引擎来解压缩文件%s
 ErrorFileMustBeADolibarrPackage=%s 文件必须是Dolibarr zip格式包
 ErrorFileRequired=它需要一个Dolibarr格式包文件
 ErrorPhpCurlNotInstalled=PHP Curl没有安装,这需要与支付宝协调
-ErrorFailedToAddToMailmanList=无法添加记录%s到邮递员列表%s,或SP的IP地址
-ErrorFailedToRemoveToMailmanList=无法删除记录%s到邮递员列表%s,或SP的IP地址
+ErrorFailedToAddToMailmanList=Failed to add record %s to Mailman list %s or SPIP base
+ErrorFailedToRemoveToMailmanList=Failed to remove record %s to Mailman list %s or SPIP base
 ErrorNewValueCantMatchOldValue=新价值不能等于旧的价值
 ErrorFailedToValidatePasswordReset=重新初始化密码密码失败。重新初始化密码已经完成(该链接可以只用一次)。如果没有,请尝试重新启动初始化过程。
 ErrorToConnectToMysqlCheckInstance=连接到数据库失败。检查MySQL服务器运行(在大多数情况下,您可以启动'sudo /etc/init.d/mysql start'的命令行)。
@@ -129,39 +129,39 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=格式错误!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
-ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
+ErrorThereIsSomeDeliveries=错误,此运输已被关联到某交货,即可能已经交货了不能反悔了。拒绝删除。
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
-ErrorPriceExpression1=Cannot assign to constant '%s'
-ErrorPriceExpression2=Cannot redefine built-in function '%s'
-ErrorPriceExpression3=Undefined variable '%s' in function definition
-ErrorPriceExpression4=Illegal character '%s'
-ErrorPriceExpression5=Unexpected '%s'
-ErrorPriceExpression6=Wrong number of arguments (%s given, %s expected)
-ErrorPriceExpression8=Unexpected operator '%s'
-ErrorPriceExpression9=An unexpected error occured
-ErrorPriceExpression10=Iperator '%s' lacks operand
-ErrorPriceExpression11=Expecting '%s'
-ErrorPriceExpression14=Division by zero
-ErrorPriceExpression17=Undefined variable '%s'
-ErrorPriceExpression19=Expression not found
-ErrorPriceExpression20=Empty expression
-ErrorPriceExpression21=Empty result '%s'
-ErrorPriceExpression22=Negative result '%s'
-ErrorPriceExpressionInternal=Internal error '%s'
-ErrorPriceExpressionUnknown=Unknown error '%s'
+ErrorPriceExpression1=无法分配到常数 '%s'
+ErrorPriceExpression2=不能重新定义内置函数 '%s'
+ErrorPriceExpression3=未定义的变量 '%s' 在函数的定义
+ErrorPriceExpression4=非法字符 '%s'
+ErrorPriceExpression5=意外 '%s'
+ErrorPriceExpression6=错误的数量参数值 (%s given, %s expected)
+ErrorPriceExpression8=操作意外 '%s'
+ErrorPriceExpression9=发生意外错误
+ErrorPriceExpression10=运算符 '%s' 缺少操作数
+ErrorPriceExpression11=预料 '%s'
+ErrorPriceExpression14=除以零
+ErrorPriceExpression17=未定义的变量 '%s'
+ErrorPriceExpression19=表达式未发现 
+ErrorPriceExpression20=空白表达式
+ErrorPriceExpression21=空白结果 '%s'
+ErrorPriceExpression22=负结果 '%s'
+ErrorPriceExpressionInternal=内部错误 '%s'
+ErrorPriceExpressionUnknown=未知错误 '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
 ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on a product requiring lot/serial information
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified (approved or denied) before being allowed to do this action
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=All recorded receptions must first be verified (approved) before being allowed to do this action
-ErrorGlobalVariableUpdater0=HTTP request failed with error '%s'
-ErrorGlobalVariableUpdater1=Invalid JSON format '%s'
-ErrorGlobalVariableUpdater2=Missing parameter '%s'
-ErrorGlobalVariableUpdater3=The requested data was not found in result
-ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
-ErrorGlobalVariableUpdater5=No global variable selected
-ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
+ErrorGlobalVariableUpdater0=HTTP 请求失败错误为 '%s'
+ErrorGlobalVariableUpdater1=无效 JSON 格式 '%s'
+ErrorGlobalVariableUpdater2=丢失参数 '%s'
+ErrorGlobalVariableUpdater3=请求数据在结果中没找到
+ErrorGlobalVariableUpdater4=SOAP 客户端失败错误为 '%s'
+ErrorGlobalVariableUpdater5=没有全局变量选择
+ErrorFieldMustBeANumeric=填写 <b>%s</b> 必须为数字值
 ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
 ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
@@ -169,26 +169,28 @@ ErrorSavingChanges=An error has ocurred when saving the changes
 ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
 ErrorFileMustHaveFormat=File must have format %s
 ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Correct this first.
-ErrorsThirdpartyMerge=Failed to merge the two records. Request canceled.
+ErrorsThirdpartyMerge=两条记录合并失败。请求已取消。
 ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to add it into a new order.
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=强制设置参数尚未定义
+WarningMandatorySetupNotComplete=初始参数尚未设置
 WarningSafeModeOnCheckExecDir=警告,PHP的选项<b>safe_mode设置</b>为在此情况下命令必须在<b>safe_mode_exec_dir之</b>存储参数的PHP目录内宣布。
 WarningBookmarkAlreadyExists=本标题或此目标(网址)书签已存在。
 WarningPassIsEmpty=警告,数据库密码是空的。这是一个安全漏洞。您应该添加一个密码到您的数据库,并改变你的conf.php文件,以反映这一点。
-WarningConfFileMustBeReadOnly=警告,你的配置文件<b>(conf.php htdocs中/ conf /中</b> ),可覆盖由Web服务器。这是一个严重的安全漏洞。在文件修改权限在阅读作业系统由Web服务器使用的用户只模式。如果您的磁盘使用Windows和FAT格式的,你要知道,这个文件系统不允许添加文件的权限,因此不能完全安全的。
+WarningConfFileMustBeReadOnly=警告:您的服务器配置文件 (<b>htdocs/conf/conf.php</b>LiAnGjiA注:初始安装时需要允许Dolibarr读写权限安装完成后为了安全着想则需要取消写入权限害怕被公鸡啦) 有写入权限。这是个非常严重的漏洞。其允许服务器权限级别的文件读取与写入,有被恶意利用的风险。假如你是Windows的磁盘格式是FAT格式,你必须将该配置文件的权限修改为只读权限,并请继续加强其他服务器安全防护工作。
 WarningsOnXLines=<b>%S上</b>的源代码行警告
-WarningNoDocumentModelActivated=没有模型,对文档生成,已被激活。一个模式是选用默认,直到您检查您的模块设置。
-WarningLockFileDoesNotExists=警告,一旦安装完成后,您必须进入目录<b>%s</b>添加一个<b>install.lock</b>文件来禁用安装/迁移工具,缺少这个文件是一个安全漏洞。
-WarningUntilDirRemoved=所有安全警告(可见由管理员用户只)将保持活跃,只要是存在的脆弱性(或常数MAIN_REMOVE_INSTALL_WARNING是在安装程序->其他设置添加)。
-WarningCloseAlways=即使源和目标之间金额不同进行警告,关闭。启用此功能时要小心。
+WarningNoDocumentModelActivated=没有模板,对文档生成,已被激活。一个模板是选用默认,直到您检查您的模块设置。
+WarningLockFileDoesNotExists=警告:一旦您安装完成Dolibarr则必须将install整个目录移走并在目录 <b>%s</b>下添加一个 <b>install.lock</b> 文件来防止他人的恶意重装。如若缺少此文件则将是个安全漏洞哦。
+WarningUntilDirRemoved=全部的安全警告(仅管理员用户可见普通用户看不到的)只要该漏洞一直存在且你并未修复漏洞,那么安全警告将持续呈现给您。(或在设置->其他设置中将参数MAIN_REMOVE_INSTALL_WARNING添加进去)。
+WarningCloseAlways=即使源和目标之间金额不同进行警告,禁用。启用此功能时要小心。
 WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
-WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
+WarningClickToDialUserSetupNotComplete=即将完工的网络电话资料信息设置 (详见用户资料信息页的网络电话).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
 WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
 WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
diff --git a/htdocs/langs/zh_CN/exports.lang b/htdocs/langs/zh_CN/exports.lang
index 19ccde53468..212d4a29b9e 100644
--- a/htdocs/langs/zh_CN/exports.lang
+++ b/htdocs/langs/zh_CN/exports.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=出口地区
+ExportsArea=导出区
 ImportArea=进口地区
-NewExport=新的出口
-NewImport=新的进口
+NewExport=新建导出
+NewImport=新建导入
 ExportableDatas=导出的数据集
 ImportableDatas=导入数据集
-SelectExportDataSet=选择您要导出数据集...
-SelectImportDataSet=选择要导入的数据集...
-SelectExportFields=选择您要导出字段,或选择一个预定义的出口材
+SelectExportDataSet=选取您要导出的数据集...
+SelectImportDataSet=选取要导入的数据集...
+SelectExportFields=请选取您要导出的字段栏位,或选择一个预定义的导出配置文件
 SelectImportFields=Choose source file fields you want to import and their target field in database by moving them up and down with anchor %s, or select a predefined import profile:
-NotImportedFields=田源文件不导入
+NotImportedFields=源文件栏位不导入
 SaveExportModel=保存这个导出配置,如果你打算以后再用...
 SaveImportModel=保存这个导入配置文件,如果你打算以后再用...
 ExportModelName=导出配置文件的名称
 ExportModelSaved=导出配置文件<b>%</b>保存在<b>所属</b>期。
-ExportableFields=出口领域
-ExportedFields=出口领域
+ExportableFields=导出表格栏位
+ExportedFields=导出表格栏位
 ImportModelName=导入配置文件的名称
 ImportModelSaved=导入配置文件<b>%</b>保存在<b>所属</b>期。
-DatasetToExport=出口数据集
+DatasetToExport=导出数据集
 DatasetToImport=导入文件到数据集
-ChooseFieldsOrdersAndTitle=选择字段的顺序...
+ChooseFieldsOrdersAndTitle=选取字段的顺序...
 FieldsTitle=字段标题
 FieldTitle=字段标题
-NowClickToGenerateToBuildExportFile=现在,组合框,然后点击选择文件格式“生成”,以建立出口文件...
+NowClickToGenerateToBuildExportFile=现在,组合框,然后点击选择文件格式“生成”,以建立怀出文件...
 AvailableFormats=可用的格式
-LibraryShort=图书馆
-LibraryUsed=图书馆使用
+LibraryShort=资料库
+LibraryUsed=使用的资料库
 LibraryVersion=版本
-Step=一步
+Step=步
 FormatedImport=导入助手
 FormatedImportDesc1=此区域允许进口的个性化数据,使用过程中的助手,帮助您没有技术知识。
 FormatedImportDesc2=第一步是选择一个数据国王要加载,然后文件加载,然后选择哪些字段要加载。
-FormatedExport=出口助理
-FormatedExportDesc1=此区域允许出口的个性化数据,使用过程中的助手,帮助您没有技术知识。
+FormatedExport=导出助手
+FormatedExportDesc1=此区域允许导出的个性化数据,使用过程中的助手,帮助您没有技术知识。
 FormatedExportDesc2=第一步是选择一个预定义的数据集,然后选择在哪些领域你的结果文件你想要的,和秩序。
-FormatedExportDesc3=当数据出口都被选中,你可以定义输出文件格式您要导出您的数据。
+FormatedExportDesc3=当数据导出都被选中,你可以定义输出文件格式您要导出您的数据。
 Sheet=片
 NoImportableData=没有导入数据(没有定义模块,让数据导入)
-FileSuccessfullyBuilt=File generated
+FileSuccessfullyBuilt=生成文件
 SQLUsedForExport=SQL Request used to build export file
-LineId=Id of line
-LineLabel=Label of line
+LineId=Id 明细
+LineLabel=标签明细
 LineDescription=说明线
 LineUnitPrice=优惠价线
 LineVATRate=增值税率线
 LineQty=线路数量
-LineTotalHT=额扣除税线
+LineTotalHT=Amount net of tax for line
 LineTotalTTC=税收总额为线
-LineTotalVAT=增值税额的线路
-TypeOfLineServiceOrProduct=型线(0 =产品,1 =服务)
+LineTotalVAT=增值税总金额明细
+TypeOfLineServiceOrProduct=型号明细(0 =表示产品,1 =表示服务)
 FileWithDataToImport=与数据文件导入
 FileToImport=源文件导入
 FileMustHaveOneOfFollowingFormat=要导入的文件必须具有以下格式之一
@@ -59,7 +59,7 @@ ChooseFileToImport=上传文件然后点击象形%s到选择导入文件作为
 SourceFileFormat=源文件格式
 FieldsInSourceFile=在源文件中的字段
 FieldsInTargetDatabase=目标字段:Dolibarr数据库(粗体=强制)
-Field=场
+Field=栏位
 NoFields=没有字段
 MoveField=移动领域的%s的列号
 ExampleOfImportFile=Example_of_import_file
@@ -71,28 +71,28 @@ FieldTarget=有针对性的领域
 FieldSource=水源地
 NbOfSourceLines=在源文件的行数
 NowClickToTestTheImport=检查输入你所定义的参数。如果他们是正确的,按一下按钮<b>%</b>的<b>“S”</b>来启动数据库的导入过程的模拟(无数据将在你改变,这只是一个模拟的时刻)...
-RunSimulateImportFile=启动进口仿真
-FieldNeedSource=This field requires data from the source file
+RunSimulateImportFile=启动模拟导入
+FieldNeedSource=栏位从源文件请求数据
 SomeMandatoryFieldHaveNoSource=有些领域没有强制性的从数据源文件
 InformationOnSourceFile=关于源信息文件
 InformationOnTargetTables=在信息领域的目标
-SelectAtLeastOneField=开关至少一源的字段列字段出口
+SelectAtLeastOneField=开关至少一个源字段列字段导出
 SelectFormat=选择此导入文件格式
 RunImportFile=启动导入文件
 NowClickToRunTheImport=检查进口仿真结果。如果一切正常,启动最终进口。
-DataLoadedWithId=All data will be loaded with the following import id: <b>%s</b>
-ErrorMissingMandatoryValue=强制性数据是<b>%</b>空场源文件中<b>的</b> S。
+DataLoadedWithId=全部数据将加载完成以下导入ID: <b>%s</b>
+ErrorMissingMandatoryValue=无效的源文件或栏位强制数据 <b>%s</b>。
 TooMuchErrors=还有<b>%的台词</b> ,但有错误的其他来源,但产量一直有限。
 TooMuchWarnings=还有<b>%s的</b>线,警告其他来源,但产量一直有限。
 EmptyLine=空行(将被丢弃)
 CorrectErrorBeforeRunningImport=您必须先输入正确运行前确定的所有错误。
 FileWasImported=进口数量<b>%s</b>文件。
-YouCanUseImportIdToFindRecord=你可以找到所有进口领域<b>import_key</b>记录过滤您的数据库<b>='%s'的</b> 。
-NbOfLinesOK=行数没有错误,也没有警告<b>:%s的</b> 。
+YouCanUseImportIdToFindRecord=你可以找到所有进口领域记录筛选您的数据库<b>import_key='%s'</b>.
+NbOfLinesOK=行数没有错误,也没有警告: <b>%s</b>.
 NbOfLinesImported=线成功导入数<b>:%s的</b> 。
 DataComeFromNoWhere=值插入来自无处源文件。
 DataComeFromFileFieldNb=值插入来自<b>S</b>的源文件<b>%</b>来自外地的数目。
-DataComeFromIdFoundFromRef=值<b>%</b>来自外地号码文件<b>的</b> S来源将被用来找到父对象的ID使用(因此,客体<b>%s的</b>具有参考。Dolibarr从源文件必须存在到)。
+DataComeFromIdFoundFromRef=Value that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the objet <b>%s</b> that has the ref. from source file must exists into Dolibarr).
 DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of source file will be used to find id of parent object to use (So the code from source file must exists into dictionary <b>%s</b>). Note that if you know id, you can also use it into source file instead of code. Import should work in both cases.
 DataIsInsertedInto=未来的数据源文件将被插入到以下领域:
 DataIDSourceIsInsertedInto=标识对象的家长发现使用源文件中的数据,将被插入到下面的字段:
@@ -109,16 +109,16 @@ ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will a
 CsvOptions=CSV选项
 Separator=分隔符
 Enclosure=附件
-SpecialCode=Special code
+SpecialCode=特殊代码
 ExportStringFilter=%% allows replacing one or more characters in the text
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : 按整 年/月/日筛选<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
+ExportNumericFilter='NNNNN' 按单一值筛选<br>'NNNNN+NNNNN' filters over a range of values<br>'&gt;NNNNN' filters by lower values<br>'&gt;NNNNN' filters by higher values
 ImportFromLine=Import starting from line number
 EndAtLineNb=End at line number
 SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude the 2 first lines
-KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
+KeepEmptyToGoToEndOfFile=保持栏位为空直到文件结尾为止
 ## filters
-SelectFilterFields=如果你想过滤一些值,这里只是输入值。
+SelectFilterFields=如果你想筛选一些值,这里只是输入值。
 FilteredFields=过滤字段
 FilteredFieldsValues=过滤值
-FormatControlRule=Format control rule
+FormatControlRule=控制规则格式
diff --git a/htdocs/langs/zh_CN/externalsite.lang b/htdocs/langs/zh_CN/externalsite.lang
index 60addb61283..11107f670be 100644
--- a/htdocs/langs/zh_CN/externalsite.lang
+++ b/htdocs/langs/zh_CN/externalsite.lang
@@ -2,4 +2,4 @@
 ExternalSiteSetup=设置链接到外部网站
 ExternalSiteURL=外部网站网址
 ExternalSiteModuleNotComplete=外部网站模块配置不正确。
-ExampleMyMenuEntry=My menu entry
+ExampleMyMenuEntry=我的菜单选项
diff --git a/htdocs/langs/zh_CN/ftp.lang b/htdocs/langs/zh_CN/ftp.lang
index 2a2eb0ffbe8..31efb1c5f66 100644
--- a/htdocs/langs/zh_CN/ftp.lang
+++ b/htdocs/langs/zh_CN/ftp.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - ftp
 FTPClientSetup=FTP客户端模块设置
-NewFTPClient=新的FTP连接建立
-FTPArea=的FTP区
+NewFTPClient=新建FTP链接
+FTPArea=FTP 区
 FTPAreaDesc=这个屏幕显示您的FTP服务器查看内容
 SetupOfFTPClientModuleNotComplete=模块的FTP客户端安装程序似乎是不完整
 FTPFeatureNotSupportedByYourPHP=您的PHP不支持FTP功能
 FailedToConnectToFTPServer=无法连接到FTP服务器(服务器%s,港口%s)
-FailedToConnectToFTPServerWithCredentials=无法登录到FTP服务器的定义登录/密码
+FailedToConnectToFTPServerWithCredentials=无法登录到FTP服务器的定义登陆/密码
 FTPFailedToRemoveFile=无法删除文件<b>%s。</b>
 FTPFailedToRemoveDir=无法删除目录<b>%s(</b>检查权限和目录是空的)。
 FTPPassiveMode=被动模式
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
+ChooseAFTPEntryIntoMenu=在菜单中选择一个FTP选项
+FailedToGetFile=获取文件失败 %s
diff --git a/htdocs/langs/zh_CN/help.lang b/htdocs/langs/zh_CN/help.lang
index 00185b98e0c..5dc261446e2 100644
--- a/htdocs/langs/zh_CN/help.lang
+++ b/htdocs/langs/zh_CN/help.lang
@@ -3,10 +3,10 @@ CommunitySupport=论坛/维基支持
 EMailSupport=电子邮件支持
 RemoteControlSupport=网上实时/远程支持
 OtherSupport=其他支持
-ToSeeListOfAvailableRessources=联络/查看可用的资源:
+ToSeeListOfAvailableRessources=查看/联络可用的资源:
 HelpCenter=帮助中心
 DolibarrHelpCenter=Dolibarr帮助和支持中心
-ToGoBackToDolibarr=否则,请点击<a href="%s">这里使用Dolibarr</a>
+ToGoBackToDolibarr=或者,请点击<a href="%s">返回Dolibarr</a>简体中文翻译可到Dolibarr爱好者交流Q群技术交流:206239089
 TypeOfSupport=源支持
 TypeSupportCommunauty=社区(免费)
 TypeSupportCommercial=商业
@@ -19,7 +19,7 @@ TypeHelpDevForm=帮助+开发+形成
 ToGetHelpGoOnSparkAngels1=有些公司可以提供快速(有时直接的),并采取更有效的在线控制您的计算机支持。这些佣工可以是<b>%s</b>网站上找到:
 ToGetHelpGoOnSparkAngels3=您还可以到所有可用的Dolibarr教练列表,点击这个按钮
 ToGetHelpGoOnSparkAngels2=有时,是目前公司没有可供您进行搜索,所以想改变过滤器,以寻找“所有的可用性”。您将能够发送更多的请求。
-BackToHelpCenter=否则,请点击这里进入<a href="%s">返回帮助中心主页</a> 。
+BackToHelpCenter=或者,请点击<a href="%s">返回帮助中心</a> 。简体中文翻译可到Dolibarr爱好者交流Q群技术交流:206239089
 LinkToGoldMember=你可以调用由Dolibarr预选您的语言(%s的按一下他的小工具(状态和最高价格自动更新))的教练之一:
 PossibleLanguages=支持的语言
 SubscribeToFoundation=帮助Dolibarr项目,认购的机构
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 5d0865cedfe..684460e5d08 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=人事管理
-Holidays=Leaves
-CPTitreMenu=Leaves
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=You must enable the module Leaves to view this page.
+Holidays=请假
+CPTitreMenu=请假
+MenuReportMonth=月结单
+MenuAddCP=新建请假请求
+NotActiveModCP=你必须先启用请假模块再查看本页。
 AddCP=做一个请假申请
 DateDebCP=开始日期
 DateFinCP=结束日期
 DateCreateCP=创建日期
-DraftCP=草案
+DraftCP=草稿
 ToReviewCP=等待批准
 ApprovedCP=批准
 CancelCP=取消
 RefuseCP=拒绝
 ValidatorCP=同意
 ListeCP=请假记录
-ReviewedByCP=将审查
+ReviewedByCP=审批人
 DescCP=描述
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Balance of leaves
-SoldeCPUser=Leaves balance is <b>%s</b> days.
-ErrorEndDateCP=你必须选择结束日期大于起始日期。
+SendRequestCP=创建请假请求
+DelayToRequestCP=超过 <b>%s 天(s)</b> 必须请假.
+MenuConfCP=请假平衡
+SoldeCPUser=请假平衡 <b>%s</b> 天。
+ErrorEndDateCP=你选取的结束日期必须大于起始日期要不然时光逆转就说不过去啦。
 ErrorSQLCreateCP=创建过程中发生了一个SQL错误:
 ErrorIDFicheCP=出现一个错误,请假申请不存在。
 ReturnCP=返回前一页
 ErrorUserViewCP=您无权阅读该请假申请。
 InfosWorkflowCP=工作流程信息
-RequestByCP=Requested by
+RequestByCP=申请人
 TitreRequestCP=请假条
 NbUseDaysCP=消耗的休假天数
 EditCP=编辑
@@ -40,20 +40,20 @@ TitleDeleteCP=删除请假条
 ConfirmDeleteCP=确认删除该请假申请?
 ErrorCantDeleteCP=错误,您没有权限删除这个请假条。
 CantCreateCP=您无权做请假条。
-InvalidValidatorCP=You must choose an approbator to your leave request.
-NoDateDebut=你必须选择开始日期。
-NoDateFin=你必须选择结束日期。
-ErrorDureeCP=Your leave request does not contain working day.
-TitleValidCP=Approve the leave request
-ConfirmValidCP=Are you sure you want to approve the leave request?
+InvalidValidatorCP=你必须选择同意你自己的请假申请。
+NoDateDebut=起始日期为必选。
+NoDateFin=结束日期为必选。
+ErrorDureeCP=你的请假申请不在工作时间内即是说你不需要请假因为不是工作时间呀请什么假呀。
+TitleValidCP=同意请假申请
+ConfirmValidCP=你确定想要同意这个请假申请吗?
 DateValidCP=批准日期
-TitleToValidCP=Send leave request
-ConfirmToValidCP=Are you sure you want to send the leave request?
-TitleRefuseCP=Refuse the leave request
-ConfirmRefuseCP=Are you sure you want to refuse the leave request?
-NoMotifRefuseCP=You must choose a reason for refusing the request.
-TitleCancelCP=Cancel the leave request
-ConfirmCancelCP=Are you sure you want to cancel the leave request?
+TitleToValidCP=发送请假申请
+ConfirmToValidCP=你确定想要发送请假申请吗?
+TitleRefuseCP=拒绝请假申请
+ConfirmRefuseCP=你确定想要拒绝请假申请吗?
+NoMotifRefuseCP=你必须选择拒绝申请的原因。
+TitleCancelCP=取消请假申请
+ConfirmCancelCP=你确定想要取消请假申请吗?
 DetailRefusCP=拒绝原因
 DateRefusCP=拒绝日期
 DateCancelCP=注销日期
@@ -61,43 +61,43 @@ DefineEventUserCP=为用户分配一个特殊的假期
 addEventToUserCP=指定休假
 MotifCP=雷森
 UserCP=用户
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View change logs
-LogCP=Log of updates of available vacation days
-ActionByCP=Performed by
-UserUpdateCP=For the user
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
-alreadyCPexist=A leave request has already been done on this period.
+ErrorAddEventToUserCP=添加外部请假时出错异常。
+AddEventToUserOkCP=外部请假添加成功。
+MenuLogCP=查看变更日志
+LogCP=可用休假天数的更新日志
+ActionByCP=执行人
+UserUpdateCP=用户
+PrevSoldeCP=上一条平衡
+NewSoldeCP=新建平衡
+alreadyCPexist=这个期间已有请假申请了。
 FirstDayOfHoliday=假期第一天
 LastDayOfHoliday=假期最后一天
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=最近变更的 %s 份请假申请
 HolidaysMonthlyUpdate=每月更新
 ManualUpdate=手动更新
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee lastname
-EmployeeFirstname=Employee firstname
+HolidaysCancelation=请假申请取消
+EmployeeLastname=雇员姓氏
+EmployeeFirstname=雇员名字
 
 ## Configuration du Module ##
-LastUpdateCP=Latest automatic update of leaves allocation
-MonthOfLastMonthlyUpdate=Month of latest automatic update of leaves allocation
+LastUpdateCP=最后自动更新请假分配
+MonthOfLastMonthlyUpdate=本月最后自动更新请假分配
 UpdateConfCPOK=更新成功。
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Notice period
+Module27130Name= 管理请假申请
+Module27130Desc= 管理请假申请
+ErrorMailNotSend=发送邮件时发生异常:
+NoticePeriod=通知期限
 #Messages
-HolidaysToValidate=Validate leave requests
-HolidaysToValidateBody=Below is a leave request to validate
-HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
-HolidaysValidated=Validated leave requests
-HolidaysValidatedBody=Your leave request for %s to %s has been validated.
-HolidaysRefused=Request denied
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled leaved request
-HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+HolidaysToValidate=批准请假申请
+HolidaysToValidateBody=下面是请假申请批准
+HolidaysToValidateDelay=这个请假申请的时间要求小于 %s 天.
+HolidaysToValidateAlertSolde=用户请假申请的天数超出准假时间天数范围。
+HolidaysValidated=批准请假申请
+HolidaysValidatedBody=你的请假申请 %s 到 %s 已批准。
+HolidaysRefused=申请否认
+HolidaysRefusedBody=你的请假申请 %s 到 %s 被否认的原因如下 :
+HolidaysCanceled=已取消请假申请
+HolidaysCanceledBody=你的请假申请 %s 到 %s 已取消。
 FollowedByACounter=1: This type of leave need to be followed by a counter. Counter is incremented manually or automatically and when a leave request is validated, counter is decremented.<br>0: Not followed by a counter.
 NoLeaveWithCounterDefined=There is no leave types defined that need to be followed by a counter
 GoIntoDictionaryHolidayTypes=点击 <strong>主页 - 设置 - 词汇表 - 请假类型表</strong> 设置请假类型不同的事由。
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index 6730da53d2d..c32d73c71cd 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - en_US - hrm
 # Admin
 HRM_EMAIL_EXTERNAL_SERVICE=Email to prevent HRM external service
-Establishments=Establishments
-Establishment=Establishment
-NewEstablishment=New establishment
-DeleteEstablishment=Delete establishment
-ConfirmDeleteEstablishment=Are-you sure to delete this establishment ?
-OpenEtablishment=Open establishment
-CloseEtablishment=Close establishment
+Establishments=机构
+Establishment=机构
+NewEstablishment=新建机构
+DeleteEstablishment=删除机构
+ConfirmDeleteEstablishment=你确定想要删除这个机构吗?
+OpenEtablishment=打开机构
+CloseEtablishment=关闭机构
 # Dictionary
-DictionaryDepartment=HRM - Department list
-DictionaryFunction=HRM - Function list
+DictionaryDepartment=HRM - 部门列表
+DictionaryFunction=HRM - 职能列表
 # Module
-Employees=Employees
-Employee=Employee
-NewEmployee=New employee
+Employees=雇员
+Employee=雇员
+NewEmployee=新建雇员
diff --git a/htdocs/langs/zh_CN/incoterm.lang b/htdocs/langs/zh_CN/incoterm.lang
index 7ff371e3a95..f4ebcdeecbf 100644
--- a/htdocs/langs/zh_CN/incoterm.lang
+++ b/htdocs/langs/zh_CN/incoterm.lang
@@ -1,3 +1,3 @@
-Module62000Name=Incoterm
-Module62000Desc=Add features to manage Incoterm
-IncotermLabel=Incoterms
+Module62000Name=国际贸易术语
+Module62000Desc=添加功能来管理国际贸易术语
+IncotermLabel=国际贸易术语解释通则
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 3d0b2c4aafb..bceccb0b0ba 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -1,22 +1,24 @@
 # Dolibarr language file - Source file is en_US - install
 InstallEasy=按照安装指南手册一步步执行即可。
-MiscellaneousChecks=服务器环境检查以便满足安装要求
+MiscellaneousChecks=服务器环境检查
 ConfFileExists=配置文件 <b>%s</b> 已存在。
-ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在并且无法创建!
+ConfFileDoesNotExistsAndCouldNotBeCreated=配置文件<b>%s</b>不存在并且无法创建请给予写入权限!
 ConfFileCouldBeCreated=已创建好 <b>%s</b> 配置文件。
 ConfFileIsNotWritable=配置文件 <b>%s</b> 没有写权限。烦请再次检查权限设置。首次安装时,Web服务器必须设置该配置文件为可写权限 (例如Unix系统中需要用"chmod 666"命令来赋予权限)。
 ConfFileIsWritable=配置文件 <b>%s</b> 为可写权限。
 ConfFileReload=从新的配置文件中加载全部信息。
-PHPSupportSessions=此版本PHP支持多线程。
-PHPSupportPOSTGETOk=此版本PHP支持可变的POST和GET。
+PHPSupportSessions=PHP多线程支持。
+PHPSupportPOSTGETOk=PHP的POST和GET支持。
 PHPSupportPOSTGETKo=有可能你的PHP安装程序不支持变量POST或GET。检查php.ini中参数 <b>variables_order</b> 的设置。
-PHPSupportGD=PHP的GD图形功能已激活。
-PHPSupportUTF8=PHP的UTF8功能已激活。
+PHPSupportGD=PHP开启GD图形功能。
+PHPSupportCurl=PHP的 Curl支持。
+PHPSupportUTF8=PHP开启UTF8功能。
 PHPMemoryOK=您的PHP最大session会话内存设置为<b>%s</b>。这应该够了的。
-PHPMemoryTooLow=您的PHP最大session会话内存设置为 <b>%s</b>字节。这太低了点儿。请修改 <b>php.ini</b> 中 <b>memory_limit</b>的参数的设置值改大点儿至少  <b>%s</b> 字节。
+PHPMemoryTooLow=您的PHP最大session会话内存设置为 <b>%s</b>bytes字节。这太低了点儿。请修改 <b>php.ini</b> 中 <b>memory_limit</b>的参数的设置值改大点儿至少  <b>%s</b> bytes字节。
 Recheck=点击这里有更多的有意义的测试
 ErrorPHPDoesNotSupportSessions=您的PHP安装不支持 sessions会话。而Dolibarr要求 sessions会话功能必须启用并激活Dolibarr才能正常运行。烦请再次检查PHP配置参数是否启用 sessions会话功能。
 ErrorPHPDoesNotSupportGD=您的PHP安装不支持GD图形功能。作图功能将失效。
+ErrorPHPDoesNotSupportCurl=你的PHP服务器不支持Curl。
 ErrorPHPDoesNotSupportUTF8=您的PHP安装不支持UTF8的功能。 Dolibarr不能正常工作。安装Dolibarr之前请先解决UTF8支持问题。
 ErrorDirDoesNotExists=目录 %s 不存在。
 ErrorGoBackAndCorrectParameters=请返回上页并修正里面错误的参数然后再继续下一步。
@@ -33,30 +35,30 @@ WarningBrowserTooOld=浏览器的版本太旧,您的浏览器得升级到最
 PHPVersion=PHP版本
 License=使用许可
 ConfigurationFile=配置文件
-WebPagesDirectory=网页存储目录
-DocumentsDirectory=附件存储目录
-URLRoot=根网址
-ForceHttps=安全连接 (https)
+WebPagesDirectory=网页路径
+DocumentsDirectory=附件保存目录
+URLRoot=网址
+ForceHttps=安全链接 (https)
 CheckToForceHttps=选中此选项,强制启用 (https)安全连接。<br>这就要求网络服务器已经配置好SSL证书。
-DolibarrDatabase=Dolibarr数据库
+DolibarrDatabase=配置Dolibarr数据库
 DatabaseType=数据库类型
 DriverType=驱动类型
 Server=服务器
-ServerAddressDescription=数据库服务器的名称或IP,当数据库服务器的地址存放在Web服务器相同的服务器的时候,通常填的是'localhost'本机
-ServerPortDescription=数据库服务器端口。如果不懂的话请保持空白,留空不填。
+ServerAddressDescription=这里填写数据库服务器域名或IP地址,当数据库服务器的地址存放在Web服务器相同的服务器的时候,通常填的是'localhost'本机
+ServerPortDescription=这里填写数据库服务器端口。如果不懂的话请略过不动它原来是什么就是什么就好啦。
 DatabaseServer=数据库服务器
 DatabaseName=数据库名称
-DatabasePrefix=数据库的表的前缀
-AdminLogin=登录为Dolibarr数据库所有者。
-PasswordAgain=第二次输入密码
-AdminPassword=Dolibarr数据库所有者的密码。
+DatabasePrefix=数据库表前缀
+AdminLogin=这里填写Dolibarr数据库的账号。
+PasswordAgain=确认密码
+AdminPassword=这里填写Dolibarr数据库的密码。
 CreateDatabase=创建数据库
-CreateUser=创建所有者
+CreateUser=创建账号
 DatabaseSuperUserAccess=数据库服务器 - 超级用户
-CheckToCreateDatabase=检查中,如果数据库不存在,必须创建。 <br>在这种情况下,必须填写登录/密码为超级用户帐户在本页面底部。
-CheckToCreateUser=如果数据库所有者复选框不存在,必须创建。 <br>在这种情况下,必须选择自己的登录名和密码,并填写在本页面底部的登录/为超级用户帐户的密码。如果此框未被选中,业主数据库及其密码必须存在。
-DatabaseRootLoginDescription=允许创建新的数据库或新用户,无用的,如果你的数据库和数据库登录已经存在就像当你在一个网站举办的托管服务提供商是(用户登录)。
-KeepEmptyIfNoPassword=给空如果用户没有密码(避免这种情况)
+CheckToCreateDatabase=勾选此选项则表示如果数据库不存在则创建数据库。<br>在这种情况下, 勾选之后会在页底显示填写超级数据库账号和密码的输入框。
+CheckToCreateUser=如果数据库所有者复选框不存在,必须创建。 <br>在这种情况下,必须选择自己的登录名和密码,并填写在本页面底部的登陆/为超级用户帐户的密码。如果此框未被选中,用户的数据库及其密码必须存在。
+DatabaseRootLoginDescription=选中此项表示使用有创建数据库并且可创建数据库登陆账号的权限,前提是假如填写的数据库不存在。
+KeepEmptyIfNoPassword=如果账号无需密码则保留空白不填写(最好避免空密码这种情况不安全呀)
 SaveConfigurationFile=保存参数
 ServerConnection=服务器连接
 DatabaseCreation=创建数据库
@@ -67,82 +69,86 @@ TablesAndPrimaryKeysCreation=创建表和主键
 CreateTableAndPrimaryKey=创建表 %s
 CreateOtherKeysForTable=创建表的外键和索引 %s
 OtherKeysCreation=创建外键和索引
-FunctionsCreation=创建主功能
-AdminAccountCreation=创建管理员登入账号
+FunctionsCreation=创建主要功能模块
+AdminAccountCreation=创建管理员登陆账号
 PleaseTypePassword=请输入密码,密码不得为空!
-PleaseTypeALogin=请登录!
+PleaseTypeALogin=请输入登陆账号!
 PasswordsMismatch=密码不正确,请重试!
-SetupEnd=安装完成
-SystemIsInstalled=本次安装已完成。
+SetupEnd=安装成功
+SystemIsInstalled=安装结束。
 SystemIsUpgraded=Dolibarr升级成功。
-YouNeedToPersonalizeSetup=您需要配置Dolibarr以满足您的需求(外观,功能,...).要做到这一点,请按照以下链接:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+YouNeedToPersonalizeSetup=请您进入后台管理并设定相关功能模块的初始化设定配置(例如外观,功能,..):点击后台管理:
+AdminLoginCreatedSuccessfuly=Dolibarr后台管理账号 '<b>%s</b>' 创建完毕。
 GoToDolibarr=前往Dolibarr
-GoToSetupArea=去dolibarr(设置区域)
+GoToSetupArea=欢迎进入 Dolibarr 美妙世界 (后台管理)
 MigrationNotFinished=您的数据库的版本是不完全最新的,所以你必须再次运行升级过程。
 GoToUpgradePage=转到页再次升级
-WithNoSlashAtTheEnd=没有斜杠“/”在年底
-DirectoryRecommendation=这是推荐使用的目录以外的你对你的网页目录。
+WithNoSlashAtTheEnd=注意:末尾没有斜杠 "/" 
+DirectoryRecommendation=基于安全及习惯做法我们推荐你使用网页目录以外的目录当然使用默认的也是可以的不强求。
 LoginAlreadyExists=已存在
-DolibarrAdminLogin=Dolibarr管理员登陆
+DolibarrAdminLogin=Dolibarr后台管理账号名
 AdminLoginAlreadyExists=Dolibarr管理员帐户<b>'%s'</b>已经存在。
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=警告,出于安全原因,一旦安装或升级完成后,你应该删除<b>安装目录或重命名为install.lock,以避免其恶意使用。</b>
-FunctionNotAvailableInThisPHP=不是可以用这个PHP
+WarningRemoveInstallDir=温馨提示,出于安全考量,安装或升级完成后你应删除<b>安装目录<b>或重命名为 <b>install.lock</b> ,以避免被他人恶意利用重装Dolibarr。
+FunctionNotAvailableInThisPHP=此服务器上的PHP不支持
 ChoosedMigrateScript=选择迁移脚本
 DataMigration=数据迁移
 DatabaseMigration=结构数据库迁移
 ProcessMigrateScript=脚本处理
 ChooseYourSetupMode=选择你的安装模式,然后点击“开始”...
 FreshInstall=全新安装
-FreshInstallDesc=使用此模式,如果这是你第一次安装。如果没有,这个模式可以不完全修复前安装,但是如果你想升级你的版本,选择“升级”模式。
+FreshInstallDesc=如果这是你第一次安装,请使用此模式然后点击"开始"。如果不是,这个模式可以修复前次的不完全的安装。但是如果你想升级你的版本,请选择底下的“升级”模式如果它可用的话显示不可用就没得选啦。
 Upgrade=升级
 UpgradeDesc=如果你使用这种模式已经取代了从一个较新版本的文件旧Dolibarr文件。这将提升您的数据库和数据。
 Start=开始
 InstallNotAllowed=安装程序不容许<b>conf.php</b>权限
-YouMustCreateWithPermission=您必须创建文件%s,并为网络服务器在安装过程中写上它的权限。
-CorrectProblemAndReloadPage=请修正这个问题,请按F5重新载入页面。
+YouMustCreateWithPermission=您必须创建文件%s,并且给予Dolibarr安装程序的读取和写入该文件的权限。
+CorrectProblemAndReloadPage=请修正未打勾项之后,该给读写权限就给chmod 777该怎样就修正之后,按F5刷新页面再安装或升级Dolibarr。
 AlreadyDone=已迁移
 DatabaseVersion=数据库版本
 ServerVersion=数据库服务器版本
 YouMustCreateItAndAllowServerToWrite=您必须创建此目录和Web服务器允许写进去。
 DBSortingCollation=字符排序
 YouAskDatabaseCreationSoDolibarrNeedToConnect=你问到创建数据库<b>%s,</b>但对于这一点,Dolibarr需要连接到伺服器<b>%S</b>与超级用户<b>%s</b>的权限。
-YouAskLoginCreationSoDolibarrNeedToConnect=你问到创建数据库登录<b>%s,</b>但是对于这一点,Dolibarr需要连接到伺服器<b>%S</b>与超级用户<b>%s</b>的权限。
+YouAskLoginCreationSoDolibarrNeedToConnect=你问到创建数据库登陆 <b>%s</b>, 但是对于这一点,Dolibarr需要连接到伺服器<b>%s</b> 与超级用户 <b>%s</b> 的权限。
 BecauseConnectionFailedParametersMayBeWrong=作为连接失败,主机或超级用户参数一定是错误的。
 OrphelinsPaymentsDetectedByMethod=孤儿付款检测方法%s
 RemoveItManuallyAndPressF5ToContinue=手动删除它,然后按F5键继续。
-FieldRenamed=场更名
-IfLoginDoesNotExistsCheckCreateUser=如果登录不存在,但你必须检查选项“创建用户”
-ErrorConnection=服务器<b>“%s”,</b>数据库名称<b>“%s”,</b>并登录<b>“%的</b> ”,或数据库密码可能是错误或PHP的客户端版本可能太旧版本相比,数据库。
+FieldRenamed=重命名栏位
+IfLoginDoesNotExistsCheckCreateUser=如果登陆名不存在,则你必须检查选项“创建用户”
+ErrorConnection=服务器 "<b>%s</b>", 数据库名称 "<b>%s</b>", 并登陆 "<b>%s</b>", 或数据库密码可能是错误或PHP的客户端版本可能太旧版本相比,数据库。
 InstallChoiceRecommanded=推荐选择<b>你</b>的安装版本<b>%%s</b>从当前版本
-InstallChoiceSuggested=<b>选择安装所建议的安装程序</b> 。
+InstallChoiceSuggested=<b>通过安装向导安装所选</b> 。
 MigrateIsDoneStepByStep=目标版本(%s)有好几个版本的差距,因此,安装向导会回来一次将完成这一个建议未来的迁移。
 CheckThatDatabasenameIsCorrect=检查数据库名称<b>“%s”</b>是正确的。
 IfAlreadyExistsCheckOption=如果此名称是正确的,该数据库尚不存在,你必须检查选项“创建数据库”。
 OpenBaseDir=PHP的openbasedir参数
-YouAskToCreateDatabaseSoRootRequired=你选中的方块“创建数据库”。为此,您需要提供登录/密码的超级用户(形式的底部)。
-YouAskToCreateDatabaseUserSoRootRequired=你选中的方块“创建数据库所有者”。为此,您需要提供登录/密码的超级用户(形式的底部)。
-NextStepMightLastALongTime=当前步骤可能会持续几分钟。请等待下一个屏幕显示完全,然后再继续。
-MigrationCustomerOrderShipping=客户订单出货迁移存储
-MigrationShippingDelivery=升级存储航运
-MigrationShippingDelivery2=升级存储航运2
+YouAskToCreateDatabaseSoRootRequired=你选中的选框“创建数据库”。为此,您需要提供登陆/密码的超级用户(表单底部)。
+YouAskToCreateDatabaseUserSoRootRequired=你选中的选框“创建数据库所有者”。为此,您需要提供登陆/密码的超级用户(表单底部)。
+NextStepMightLastALongTime=当前操作可能会持续几分钟。请耐心等待网页自动跳转至下一页面,谢谢合作!
+MigrationCustomerOrderShipping=客户订单送货迁移存储
+MigrationShippingDelivery=送货升级存储
+MigrationShippingDelivery2=送货升级存储 2
 MigrationFinished=迁移完成
-LastStepDesc=<strong>最后一步</strong> :此处定义的登录名和密码,您打算使用连接到软件。不松,因为它是帐户管理所有其他。
-ActivateModule=激活模块%s
+LastStepDesc=<strong>最后设置管理员登陆账号及密码</strong> :此处定义的是后台管理的登陆账号和密码。所创建的账号密码可别弄丢了哟!
+ActivateModule=激活启用模块%s
 ShowEditTechnicalParameters=点击此处显示/编辑高级参数(专家模式)
 WarningUpgrade=警告:\n您是否事先进行了数据库备份?\n强烈推荐先进行数据库备份!因为:在数据库中某些错误(如mysql 5.5.40/41/42/43版本中)可能导致在此过程中丢失部分数据或数据表。所以,在执行迁移时强烈建议进行一次完全数据备份。\n点击OK开始数据迁移进程...
 ErrorDatabaseVersionForbiddenForMigration=您的数据库版本为%s。此版本有关键性错误:如果进行数据结构调整(数据迁移过程必须调整数据结构),您会丢失数据。因此,直到您升级数据库到更高级无错误版本前,不允许迁移操作(已知有问题的版本列表:%s)
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
 MigrationFixData=修正了非规范化数据
-MigrationOrder=数据迁移的客户的订单
-MigrationSupplierOrder=数据迁移对供应商的订单
-MigrationProposal=数据迁移的商业建议
-MigrationInvoice=数据迁移的客户的发票
+MigrationOrder=数据迁移的客户订单
+MigrationSupplierOrder=数据迁移对供应商订单
+MigrationProposal=数据迁移的商业报价
+MigrationInvoice=数据迁移的客户发票
 MigrationContract=数据迁移合同
-MigrationSuccessfullUpdate=Upgrade successfull
+MigrationSuccessfullUpdate=升级成功
 MigrationUpdateFailed=升级过程中失败
 MigrationRelationshipTables=数据迁移的关系表(%s)的
 MigrationPaymentsUpdate=支付数据校正
@@ -154,37 +160,39 @@ MigrationContractsUpdate=合同数据校正
 MigrationContractsNumberToUpdate=%的合同(县)更新
 MigrationContractsLineCreation=创建合同号线中1%的合同
 MigrationContractsNothingToUpdate=没有更多的事情要做
-MigrationContractsFieldDontExist=场fk_facture不存在了。无事可做。
+MigrationContractsFieldDontExist=栏位 fk_facture 不存在。啥也没干。
 MigrationContractsEmptyDatesUpdate=合同空日期更正
 MigrationContractsEmptyDatesUpdateSuccess=Contract emtpy date correction done successfully
 MigrationContractsEmptyDatesNothingToUpdate=没有合同的日期,以正确的空
 MigrationContractsEmptyCreationDatesNothingToUpdate=没有合同,以正确的创建日期
 MigrationContractsInvalidDatesUpdate=合同日期更正错误的价值
 MigrationContractsInvalidDateFix=正确的%s的合同(合同日期=%s后,开始服务日期分=%s)的
-MigrationContractsInvalidDatesNumber=%s的合同修改
+MigrationContractsInvalidDatesNumber=%s 联系人已变更
 MigrationContractsInvalidDatesNothingToUpdate=无不良日至正确的价值
 MigrationContractsIncoherentCreationDateUpdate=合同无效值创建日期更正
 MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
 MigrationContractsIncoherentCreationDateNothingToUpdate=对合同成立之日起,纠正不良的价值
 MigrationReopeningContracts=未平仓合约关闭错误
 MigrationReopenThisContract=重新打开%s的合同
-MigrationReopenedContractsNumber=%s的合同修改
+MigrationReopenedContractsNumber=%s 联系人变更
 MigrationReopeningContractsNothingToUpdate=没有合同,打开封闭
 MigrationBankTransfertsUpdate=银行之间的交易和银行转帐更新链接
 MigrationBankTransfertsNothingToUpdate=所有链接是最新的
-MigrationShipmentOrderMatching=Sendings收据更新
+MigrationShipmentOrderMatching=发送收据更新
 MigrationDeliveryOrderMatching=送达回执更新
 MigrationDeliveryDetail=送货更新
-MigrationStockDetail=更新产品的股票价值
+MigrationStockDetail=更新产品的库存值
 MigrationMenusDetail=最新动态菜单表
-MigrationDeliveryAddress=在货物的配送地址更新
+MigrationDeliveryAddress=更新货物的配送地址
 MigrationProjectTaskActors=数据llx_projet_task_actors迁移表
 MigrationProjectUserResp=数据迁移llx_projet领域fk_user_resp到llx_element_contact
 MigrationProjectTaskTime=更新时间花费在几秒钟内
-MigrationActioncommElement=在行动上的更新数据
+MigrationActioncommElement=更新动作数据
 MigrationPaymentMode=付款方式的数据迁移
 MigrationCategorieAssociation=迁移类别
 MigrationEvents=迁移事件数据:将事件所有者数据添加到任务列表
+MigrationRemiseEntity=更新 llx_societe_remise 的实际栏位参数值
+MigrationRemiseExceptEntity=更新 llx_societe_remise_except 的实际栏位参数值
 MigrationReloadModule=重载模块%s
 ShowNotAvailableOptions=显示不可用的选项
 HideNotAvailableOptions=隐藏不可用的选项
diff --git a/htdocs/langs/zh_CN/interventions.lang b/htdocs/langs/zh_CN/interventions.lang
index 1f7c234d702..15d15414f35 100644
--- a/htdocs/langs/zh_CN/interventions.lang
+++ b/htdocs/langs/zh_CN/interventions.lang
@@ -3,54 +3,55 @@ Intervention=介入
 Interventions=干预
 InterventionCard=干预卡
 NewIntervention=新的干预
-AddIntervention=Create intervention
-ListOfInterventions=名单干预
-ActionsOnFicheInter=干预的行动
-LastInterventions=Latest %s interventions
-AllInterventions=所有发言
-CreateDraftIntervention=创建草案
+AddIntervention=创建干预
+ListOfInterventions=干预列表
+ActionsOnFicheInter=干预活动
+LastInterventions=最新 %s干预
+AllInterventions=所有干预
+CreateDraftIntervention=创建草稿
 InterventionContact=干预接触
 DeleteIntervention=删除干预
 ValidateIntervention=验证干预
-ModifyIntervention=修改干预
+ModifyIntervention=变更干预
 DeleteInterventionLine=删除干预行
-CloneIntervention=Clone intervention
+CloneIntervention=复制干预
 ConfirmDeleteIntervention=你确定要删除这个干预呢?
 ConfirmValidateIntervention=你确定要验证这种干预?
-ConfirmModifyIntervention=你确定要修改此干预呢?
+ConfirmModifyIntervention=你确定要变更此干预呢?
 ConfirmDeleteInterventionLine=你确定要删除此行的干预?
-ConfirmCloneIntervention=Are you sure you want to clone this intervention ?
-NameAndSignatureOfInternalContact=名称及干预签名:
-NameAndSignatureOfExternalContact=客户的姓名和签字:
-DocumentModelStandard=标准文档模型的干预
-InterventionCardsAndInterventionLines=干预和干预行
-InterventionClassifyBilled=Classify "Billed"
-InterventionClassifyUnBilled=Classify "Unbilled"
+ConfirmCloneIntervention=你确定想要复制干预吗?
+NameAndSignatureOfInternalContact=干预的签名和盖章::
+NameAndSignatureOfExternalContact=客户的签名和盖章::
+DocumentModelStandard=标准文档模板的干预
+InterventionCardsAndInterventionLines=干预和干预明细
+InterventionClassifyBilled=分类“帐单”
+InterventionClassifyUnBilled=归类 'Unbilled'
 StatusInterInvoiced=帐单
-ShowIntervention=展干预
-SendInterventionRef=Submission of intervention %s
-SendInterventionByMail=Send intervention by Email
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=Intervention %s validated
-InterventionModifiedInDolibarr=Intervention %s modified
-InterventionClassifiedBilledInDolibarr=Intervention %s set as billed
-InterventionClassifiedUnbilledInDolibarr=Intervention %s set as unbilled
-InterventionSentByEMail=Intervention %s sent by EMail
-InterventionDeletedInDolibarr=Intervention %s deleted
-InterventionsArea=Interventions area
-DraftFichinter=Draft interventions
-LastModifiedInterventions=Latest %s modified interventions
+ShowIntervention=显示干预
+SendInterventionRef=提交的干预 %s
+SendInterventionByMail=通过邮件发送干预
+InterventionCreatedInDolibarr=干预 %s 已创建
+InterventionValidatedInDolibarr=干预 %s 已验证
+InterventionModifiedInDolibarr=干预 %s 已变更
+InterventionClassifiedBilledInDolibarr=干预 %s 设为账单
+InterventionClassifiedUnbilledInDolibarr=干预 %s 设为未账单
+InterventionSentByEMail=干预 %s 通过电子邮件发送
+InterventionDeletedInDolibarr=干预 %s 已删除
+InterventionsArea=干预区
+DraftFichinter=干预草稿
+LastModifiedInterventions= 最近变更的 %s 干预
 ##### Types de contacts #####
 TypeContact_fichinter_external_CUSTOMER=随访客户联系
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=interventions generated from orders
-InterventionStatistics=Statistics of interventions
-NbOfinterventions=Nb of intervention cards
-NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
+PrintProductsOnFichinterDetails=从订单生成干预
+UseServicesDurationOnFichinter=使用服务持续时间从订单生成干预
+InterventionStatistics=干预统计
+NbOfinterventions=干预信息卡数量
+NumberOfInterventionsByMonth=按月筛选干预信息卡数量(认证日期)
 ##### Exports #####
 InterId=Intervention id
-InterRef=Intervention ref.
+InterRef=干预编号
 InterDateCreation=Date creation intervention
 InterDuration=Duration intervention
 InterStatus=Status intervention
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index 024eeb7c630..3d8f0bf23f9 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -35,7 +35,7 @@ Language_es_VE=Spanish (Venezuela)
 Language_et_EE=爱沙尼亚语
 Language_eu_ES=巴斯克
 Language_fa_IR=波斯语
-Language_fi_FI=Finnish
+Language_fi_FI=完成
 Language_fr_BE=法语(比利时)
 Language_fr_CA=法语(加拿大)
 Language_fr_CH=法语(瑞士)
diff --git a/htdocs/langs/zh_CN/ldap.lang b/htdocs/langs/zh_CN/ldap.lang
index 00998502fb2..38947d0b903 100644
--- a/htdocs/langs/zh_CN/ldap.lang
+++ b/htdocs/langs/zh_CN/ldap.lang
@@ -7,7 +7,7 @@ LDAPInformationsForThisUser=LDAP数据库中该用户信息
 LDAPInformationsForThisGroup=在LDAP数据库的资料本组
 LDAPInformationsForThisMember=在LDAP数据库信息该会员
 LDAPAttributes=LDAP属性
-LDAPCard=LDAP的卡
+LDAPCard=LDAP信息
 LDAPRecordNotFound=记录中找不到LDAP数据库
 LDAPUsers=在LDAP用户数据库
 LDAPFieldStatus=地位
@@ -15,9 +15,11 @@ LDAPFieldFirstSubscriptionDate=首先认购日期
 LDAPFieldFirstSubscriptionAmount=认购金额拳
 LDAPFieldLastSubscriptionDate=最后认购日期
 LDAPFieldLastSubscriptionAmount=最后认购金额
+LDAPFieldSkype=Skype账号
+LDAPFieldSkypeExample=例如 : skype账号
 UserSynchronized=用户同步
 GroupSynchronized=集团同步
 MemberSynchronized=会员同步
-ContactSynchronized=联系同步
+ContactSynchronized=同步联系人
 ForceSynchronize=力同步Dolibarr - &gt;的LDAP
 ErrorFailedToReadLDAP=无法读取LDAP数据库。检查的LDAP模块设置和数据库获取。
diff --git a/htdocs/langs/zh_CN/link.lang b/htdocs/langs/zh_CN/link.lang
index 42c7555d469..390f4fcaf81 100644
--- a/htdocs/langs/zh_CN/link.lang
+++ b/htdocs/langs/zh_CN/link.lang
@@ -1,9 +1,10 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=链接一份新文件/文档
+LinkedFiles=链接文件和文档
+NoLinkFound=空空如也
+LinkComplete=文件链接成功
+ErrorFileNotLinked=文件无法链接
+LinkRemoved=链接 %s 已移除
+ErrorFailedToDeleteLink= 移除链接失败 '<b>%s</b>'
+ErrorFailedToUpdateLink= 更新链接失败 '<b>%s</b>'
+URLToLink=URL网址超链接
diff --git a/htdocs/langs/zh_CN/loan.lang b/htdocs/langs/zh_CN/loan.lang
index 76d9bbaeb8b..4cb83b72646 100644
--- a/htdocs/langs/zh_CN/loan.lang
+++ b/htdocs/langs/zh_CN/loan.lang
@@ -5,23 +5,23 @@ NewLoan=新贷款
 ShowLoan=显示贷款
 PaymentLoan=贷款付款
 ShowLoanPayment=显示支付贷款
-LoanCapital=Capital
+LoanCapital=注册资金
 Insurance=保险
 Interest=利率
-Nbterms=术语数
-LoanAccountancyCapitalCode=会计代码(资本)
-LoanAccountancyInsuranceCode=会计代码(保险)
-LoanAccountancyInterestCode=会计代码(利率)
+Nbterms=一些条款
+LoanAccountancyCapitalCode=注册资金科目代码
+LoanAccountancyInsuranceCode=保险科目代码
+LoanAccountancyInterestCode=利息科目代码
 ConfirmDeleteLoan=确认删除本贷款
 LoanDeleted=成功删除贷款
 ConfirmPayLoan=确认支付本贷款
 LoanPaid=贷款已支付
 # Calc
 LoanCalc=银行贷款计算器
-PurchaseFinanceInfo=购买及金融信息
+PurchaseFinanceInfo=购买及财务信息
 SalePriceOfAsset=资产出售价格
 PercentageDown=贬值比率
-LengthOfMortgage=Duration of loan
+LengthOfMortgage=贷款期限
 AnnualInterestRate=年度利率
 ExplainCalculations=解释计算方式
 ShowMeCalculationsAndAmortization=显示计算结果及分期摊销
@@ -34,16 +34,16 @@ MonthlyInterestRateDesc=<b>月度利率</b> = 年度利率除以12(按每年12
 MonthTermDesc=贷款按每月计算的 <b>月限</b> =您借款年限乘以12
 MonthlyPaymentDesc=月度付款按以下公式计算
 AmortizationPaymentDesc= <a href="#摊销">摊销</a> 确定您每月支付的银行利息是多少,而本金又是多少。
-AmountFinanced=融资金额
+AmountFinanced=财务金额
 AmortizationMonthlyPaymentOverYears=月度付款的摊销:: <b>%s</b> 按 %s 年计算
 Totalsforyear=年度合计
 MonthlyPayment=月度付款
 LoanCalcDesc=This <b>mortgage calculator</b> can be used to figure out monthly payments of a loaning, based on the amount borrowed, the term of the loan desired and the interest rate.<br> This calculator includes also PMI (Private Mortgage Insurance) for loans where less than 20%% is put as a down payment. Also taken into consideration are the town property taxes, and their effect on the total monthly mortgage payment.<br>
 GoToInterest=%s 将指向利率
-GoToPrincipal=%s 将指向资本
-YouWillSpend=You will spend %s in year %s
+GoToPrincipal=%s 将指向注册资金
+YouWillSpend=你将花费 %s 年 %s
 # Admin
-ConfigLoan=Configuration of the module loan
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Accountancy code capital by default
+ConfigLoan=货款模块设置
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=默认注册资金科目代码
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Accountancy code interest by default
 LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Accountancy code insurance by default
diff --git a/htdocs/langs/zh_CN/mailmanspip.lang b/htdocs/langs/zh_CN/mailmanspip.lang
index bab4b3576b4..d1a66a29775 100644
--- a/htdocs/langs/zh_CN/mailmanspip.lang
+++ b/htdocs/langs/zh_CN/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing list system
-TestSubscribe=To test subscription to Mailman lists
-TestUnSubscribe=To test unsubscribe from Mailman lists
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=A Mailman update will be performed
-SynchroSpipEnabled=A Spip update will be performed
-DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+MailmanSpipSetup=Mailman 和 SPIP 模块设置
+MailmanTitle=Mailman 邮件列表系统
+TestSubscribe=测试订阅Mailman 邮件列表
+TestUnSubscribe=测试非订阅Mailman 邮件列表
+MailmanCreationSuccess=订阅测试执行成功
+MailmanDeletionSuccess=非订阅测试执行成功
+SynchroMailManEnabled=Mailman更新执行
+SynchroSpipEnabled=SPIP更新执行
+DescADHERENT_MAILMAN_ADMINPW=Mailman 超级管理员administrator密码
+DescADHERENT_MAILMAN_URL=Mailman的订阅URL地址
+DescADHERENT_MAILMAN_UNSUB_URL=Mailman的非订阅URL地址
 DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
-SPIPTitle=SPIP Content Management System
-DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
-AddIntoSpip=Add into SPIP
-AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-AddIntoSpipError=Failed to add the user in SPIP
-DeleteIntoSpip=Remove from SPIP
-DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-DeleteIntoSpipError=Failed to suppress the user from SPIP
-SPIPConnectionFailed=Failed to connect to SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+SPIPTitle=SPIP内容管理系统
+DescADHERENT_SPIP_SERVEUR=SPIP服务
+DescADHERENT_SPIP_DB=SPIP 数据库名称
+DescADHERENT_SPIP_USER=SPIP 数据库账号
+DescADHERENT_SPIP_PASS=SPIP 数据库密码
+AddIntoSpip=添加到SPIP
+AddIntoSpipConfirmation=你确定要将此会员添加到 SPIP吗?
+AddIntoSpipError=添加用户到SPIP失败
+DeleteIntoSpip=从SPIP移除
+DeleteIntoSpipConfirmation=你确定要将此会员从SPIP删除吗?
+DeleteIntoSpipError=从SPIP阻止用户失效
+SPIPConnectionFailed=SPIP连接失效
+SuccessToAddToMailmanList=%s 成功添加到 mailman 邮件列表 %s 或 SPIP数据库
+SuccessToRemoveToMailmanList=%s 成功从 mailman 邮件列表 %s 或SPIP 数据库删除
diff --git a/htdocs/langs/zh_CN/mails.lang b/htdocs/langs/zh_CN/mails.lang
index af2ecbccfa8..566e4d3fafa 100644
--- a/htdocs/langs/zh_CN/mails.lang
+++ b/htdocs/langs/zh_CN/mails.lang
@@ -1,24 +1,24 @@
 # Dolibarr language file - Source file is en_US - mails
 Mailing=发送电子邮件
 EMailing=发送电子邮件
-EMailings=EMailings
-AllEMailings=所有eMailings
+EMailings=电子邮件
+AllEMailings=所有电子邮件
 MailCard=通过电子邮件发送卡
 MailRecipients=收件人
-MailRecipient=接受者
+MailRecipient=接收方
 MailTitle=描述
-MailFrom=寄件人
-MailErrorsTo=误差的
+MailFrom=寄件者
+MailErrorsTo=Errors to
 MailReply=回复
-MailTo=接收器(第)
-MailCC=复制到
+MailTo=收件者(s)
+MailCC=抄送
 MailCCC=缓存副本
-MailTopic=电子邮件的主题
-MailText=信息
-MailFile=附加档案
+MailTopic=主题
+MailText=内容
+MailFile=附件
 MailMessage=电子邮件正文
 ShowEMailing=显示电子邮件
-ListOfEMailings=名单emailings
+ListOfEMailings=邮件列表
 NewMailing=新的电子邮件
 EditMailing=编辑电子邮件
 ResetMailing=重新发送电子邮件
@@ -28,49 +28,50 @@ PreviewMailing=预览电子邮件
 CreateMailing=创建电子邮件
 TestMailing=测试的电子邮件
 ValidMailing=有效的电子邮件
-MailingStatusDraft=草案
+MailingStatusDraft=草稿
 MailingStatusValidated=验证
 MailingStatusSent=发送
 MailingStatusSentPartialy=发送部分
 MailingStatusSentCompletely=发送完全
 MailingStatusError=错误
 MailingStatusNotSent=不发送
-MailSuccessfulySent=电子邮件发送成功从%(s到%s)
+MailSuccessfulySent=电子邮件发送成功 (从 %s 到 %s)
 MailingSuccessfullyValidated=通过电子邮件发送成功验证
 MailUnsubcribe=退订
 MailingStatusNotContact=不要再联系
 MailingStatusReadAndUnsubscribe=Read and unsubscribe
 ErrorMailRecipientIsEmpty=电子邮件收件人是空的
-WarningNoEMailsAdded=没有新的电子邮件添加到收件人的名单。
+WarningNoEMailsAdded=没有新的电子邮件添加到收件人列表。
 ConfirmValidMailing=你确定要验证这个电子邮件?
 ConfirmResetMailing=警告<b>%,</b>其中重新初始化电子邮件<b>秒</b> ,你可以使一个集体的时间发送这封电子邮件的另一。您确定这是你想做什么?
-ConfirmDeleteMailing=你确定要删除这个emailling?
-NbOfUniqueEMails=铌独特的电子邮件
-NbOfEMails=铌的电子邮件
+ConfirmDeleteMailing=你确定要删除这封邮件吗??
+NbOfUniqueEMails=邮件单位数量
+NbOfEMails=邮件数量
 TotalNbOfDistinctRecipients=受助人数目明显
 NoTargetYet=受助人还没有确定(走吧标签'收件人')
 RemoveRecipient=删除收件人
-CommonSubstitutions=共同换人
+CommonSubstitutions=通用代码
 YouCanAddYourOwnPredefindedListHere=要创建您的电子邮件选择模块,见htdocs中/包括/模块/邮寄/自述文件。
 EMailTestSubstitutionReplacedByGenericValues=当使用测试模式,替换变量的值取代通用
 MailingAddFile=附加这个文件
-NoAttachedFiles=没有附加档案
-BadEMail=坏值电子邮箱
-CloneEMailing=克隆用电子邮件发送
-ConfirmCloneEMailing=你确定要克隆这个电子邮件?
-CloneContent=克隆消息
-CloneReceivers=克隆者
-DateLastSend=Date of latest sending
+NoAttachedFiles=没有附件
+BadEMail=错误电子邮箱
+CloneEMailing=复制用电子邮件发送
+ConfirmCloneEMailing=你确定要复制这封电子邮件?
+CloneContent=复制消息
+CloneReceivers=复制收件人
+DateLastSend=最新发送日期
 DateSending=发送日期
 SentTo=发送到<b>%s</b>
 MailingStatusRead=阅读
 YourMailUnsubcribeOK=电子邮件<b>%s</b>被正确地从邮件列表中退定
-ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
+ActivateCheckReadKey=输入加密URL地址用于 "阅读回执" 和 "非订阅" 功能
 EMailSentToNRecipients=电子邮件发送到 %s 的收件人。
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
-ResultOfMailSending=Result of mass EMail sending
+ResultOfMailSending=结果邮件群发
 NbSelected=Nb selected
 NbIgnored=Nb ignored
 NbSent=Nb sent
@@ -78,11 +79,11 @@ NbSent=Nb sent
 # Libelle des modules de liste de destinataires mailing
 LineInFile=在文件%s的线
 RecipientSelectionModules=为收件人的选择定义的要求
-MailSelectedRecipients=选择收件人
-MailingArea=EMailings区
-LastMailings=上次%s的emailings
+MailSelectedRecipients=请选取收件人
+MailingArea=电子邮件区
+LastMailings=最近的 %s 封邮件
 TargetsStatistics=统计指标
-NbOfCompaniesContacts=公司独特的接触
+NbOfCompaniesContacts=唯一联系人/地址
 MailNoChangePossible=为验证电子邮件收件人无法改变
 SearchAMailing=搜索邮件
 SendMailing=发送电子邮件
@@ -90,12 +91,12 @@ SendMail=发送电子邮件
 MailingNeedCommand=出于安全的原因,收发邮件发送是更好地执行命令行。如果你有一个,请问您的服务器管理员启动以下命令给所有收件人发送电子邮件:
 MailingNeedCommand2=但是您可以发送到网上,加入与最大的电子邮件数量值参数MAILING_LIMIT_SENDBYWEB你要发送的会议。
 ConfirmSendingEmailing=如果你能或不喜欢他们发送您的www浏览器,请确认你确定要发送电子邮件现在从你的浏览器吗?
-LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, <b>%s</b> recipients at a time for each sending session.
-TargetsReset=清除名单
+LimitSendingEmailing=注意: 基于安全与超时的原因从web界面发送邮件 <b>%s</b> 收件人在每次发送会话的时间。
+TargetsReset=清除列表
 ToClearAllRecipientsClickHere=点击这里以清除此电子邮件的收件人列表
-ToAddRecipientsChooseHere=添加从名单中选择收件人
-NbOfEMailingsReceived=收到群众emailings
-NbOfEMailingsSend=Mass emailings sent
+ToAddRecipientsChooseHere=从收件人列表中选取并添加收件人
+NbOfEMailingsReceived=批量接收邮件
+NbOfEMailingsSend=群发邮件
 IdRecord=编号记录
 DeliveryReceipt=送达回执
 YouCanUseCommaSeparatorForSeveralRecipients=您可以使用<b>逗号</b>分隔符指定多个收件人。
@@ -103,42 +104,42 @@ TagCheckMail=追踪邮件打开
 TagUnsubscribe=退订链接
 TagSignature=签名发送给用户
 EMailRecipient=Recipient EMail
-TagMailtoEmail=Recipient EMail (including html "mailto:" link)
+TagMailtoEmail=收件人 EMail (包括 html "mailto:" 链接)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=通知
 NoNotificationsWillBeSent=没有电子邮件通知此事件的计划和公司
 ANotificationsWillBeSent=1通知将通过电子邮件发送
 SomeNotificationsWillBeSent=%s的通知将通过电子邮件发送
-AddNewNotification=Activate a new email notification target
-ListOfActiveNotifications=List all active targets for email notification
+AddNewNotification=激活启用新邮件到达通知提醒
+ListOfActiveNotifications=激活的全部邮件到达通知列表
 ListOfNotificationsDone=列出所有发送电子邮件通知
-MailSendSetupIs=Configuration of email sending has been setup to '%s'. This mode can't be used to send mass emailing.
+MailSendSetupIs=Email电子邮箱配置设定 '%s'. 这个模式无法用于邮件群发。
 MailSendSetupIs2=首先您得这么地, 得先有个管理员账号吧 admin , 进入菜单 %s主页 - 设置 - EMails%s 修改参数 <strong>'%s'</strong> 用 '%s'模式。 在此模式下, 您才可输入一个 SMTP 服务器地址 来供您收发邮件。
-MailSendSetupIs3=If you have any questions on how to setup your SMTP server, you can ask to %s.
-YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOREMAIL__</strong> to have email being sent to the supervisor of user (works only if an email is defined for this supervisor)
+MailSendSetupIs3=如果你对 SMTP 服务器的配置方面有疑问, 你可到这里询问 %s.
+YouCanAlsoUseSupervisorKeyword=您同样可以添加关键字 <strong>__SUPERVISOREMAIL__</strong> 来发送邮件给超级管理员们 (假如超级管理员们设有工作邮箱的地址的话)
 NbOfTargetedContacts=Current number of targeted contact emails
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the thirdparties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For exemple  <b>jean;joe;jim%%;!jimo;!jima%</b> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
 AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
+AdvTgtMinVal=最小值
+AdvTgtMaxVal=最大值
 AdvTgtSearchDtHelp=Use interval to select date value
-AdvTgtStartDt=Start dt.
-AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtStartDt=开始日期
+AdvTgtEndDt=结束日期
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
-AddAll=Add all
-RemoveAll=Remove all
+AddAll=全部添加
+RemoveAll=全部删除
 ItemsCount=Item(s)
-AdvTgtNameTemplate=Filter name
+AdvTgtNameTemplate=筛选器名称
 AdvTgtAddContact=Add emails according to criterias
-AdvTgtLoadFilter=Load filter
-AdvTgtDeleteFilter=Delete filter
-AdvTgtSaveFilter=Save filter
-AdvTgtCreateFilter=Create filter
-AdvTgtOrCreateNewFilter=Name of new filter
-NoContactWithCategoryFound=No contact/address with a category found
-NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
+AdvTgtLoadFilter=加载筛选
+AdvTgtDeleteFilter=删除筛选
+AdvTgtSaveFilter=保存筛选
+AdvTgtCreateFilter=创建筛选
+AdvTgtOrCreateNewFilter=新筛选器的名称
+NoContactWithCategoryFound=分类没有联系人/地址
+NoContactLinkedToThirdpartieWithCategoryFound=分类没有联系人/地址
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 744518d2f04..14befc78324 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -24,25 +24,25 @@ FormatDateHourSecShort=%Y/%m/%d %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=数据库连接
-NoTemplateDefined=No template defined for this email type
+NoTemplateDefined=Email类型未定义模板
 AvailableVariables=Available substitution variables
 NoTranslation=没有翻译
-NoRecordFound=没有找到记录
-NotEnoughDataYet=Not enough data
+NoRecordFound=空空如也——没有找到记录
+NotEnoughDataYet=数据不足
 NoError=没有错误
 Error=错误
-Errors=Errors
-ErrorFieldRequired=场'%s'的要求
-ErrorFieldFormat=场'%s'有一个坏的价值
+Errors=错误
+ErrorFieldRequired=栏位 '%s' 必须按要求填写
+ErrorFieldFormat=栏位 '%s' 参数值有误
 ErrorFileDoesNotExists=文件%s不存在
 ErrorFailedToOpenFile=无法打开文件%s
-ErrorCanNotCreateDir=Cannot create dir %s
-ErrorCanNotReadDir=Cannot read dir %s
+ErrorCanNotCreateDir=无法创建目录 %s
+ErrorCanNotReadDir=无法读取目录 %s
 ErrorConstantNotDefined=不是定义的参数%
 ErrorUnknown=未知错误
 ErrorSQL=SQL错误
-ErrorLogoFileNotFound=徽标文件'%s'没有找到
-ErrorGoToGlobalSetup=到'公司/基金会的设置来解决此
+ErrorLogoFileNotFound=徽标LOGO文件'%s'没有找到
+ErrorGoToGlobalSetup=到'公司/机构的设置来解决此
 ErrorGoToModuleSetup=前往模块设置来解决此
 ErrorFailedToSendMail=无法发送邮件(发件人=%s后,接收器=%s)的
 ErrorFileNotUploaded=文件没有上传。检查大小不超过允许的最大值,即在磁盘上的可用空间是可用和有没有这已经与in这个目录同名文件。
@@ -54,104 +54,105 @@ ErrorWrongValue=错误的值
 ErrorWrongValueForParameterX=错误的参数值之%
 ErrorNoRequestInError=在错误的请求
 ErrorServiceUnavailableTryLater=服务暂时无法使用。请稍后再试。
-ErrorDuplicateField=重复的值在一个独特的领域
+ErrorDuplicateField=在唯一的栏位中复制值
 ErrorSomeErrorWereFoundRollbackIsDone=有些发现错误。我们回滚更改。
 ErrorConfigParameterNotDefined=参数<b>%s</b>是没有定义的配置文件里面Dolibarr <b>conf.php。</b>
-ErrorCantLoadUserFromDolibarrDatabase=无法找到用户<b>%s</b>在Dolibarr数据库。
+ErrorCantLoadUserFromDolibarrDatabase=在Dolibarr数据库<b>%s</b>无法找到用户账号。
 ErrorNoVATRateDefinedForSellerCountry=错误,没有增值税税率确定为国家'%s'的。
-ErrorNoSocialContributionForSellerCountry=Error, no social/fiscal taxes type defined for country '%s'.
+ErrorNoSocialContributionForSellerCountry=错误, 这个国家未定义社会/财政税类型 '%s'.
 ErrorFailedToSaveFile=错误,无法保存文件。
 NotAuthorized=You are not authorized to do that.
-SetDate=Set date
-SelectDate=Select a date
+SetDate=设置日期
+SelectDate=请选择日期
 SeeAlso=另请参阅 %s
-SeeHere=See here
+SeeHere=看这里
 BackgroundColorByDefault=默认的背景颜色
-FileUploaded=The file was successfully uploaded
+FileRenamed=The file was successfully renamed
+FileUploaded=文件上传成功
 FileWasNotUploaded=一个文件被选中的附件,但还没有上传。点击“附加文件”为这一点。
 NbOfEntries=铌条目
-GoToWikiHelpPage=Read online help (Internet access needed)
+GoToWikiHelpPage=阅读在线帮助文档 (需要访问外网)
 GoToHelpPage=阅读帮助
-RecordSaved=记录保存
-RecordDeleted=记录删除
-LevelOfFeature=级别特征
+RecordSaved=记录已保存
+RecordDeleted=记录已删除
+LevelOfFeature=权限级别
 NotDefined=未定义
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr身份验证模式设置为<b>%s,</b>在配置文件<b>conf.php。</b> <br>这意味着密码数据库是外部到Dolibarr,因此改变了这个领域可能没有影响。
 Administrator=管理员
 Undefined=未定义
-PasswordForgotten=忘记密码?
+PasswordForgotten=找回密码?
 SeeAbove=见上文
-HomeArea=信息状态
-LastConnexion=最后一个连接
-PreviousConnexion=前连接
-PreviousValue=Previous value
+HomeArea=首页信息状态区
+LastConnexion=最后登陆
+PreviousConnexion=上次登陆
+PreviousValue=上一个值
 ConnectedOnMultiCompany=对实体连接
-ConnectedSince=自连接
+ConnectedSince=当前连接状态
 AuthenticationMode=认证模式
 RequestedUrl=请求的URL
-DatabaseTypeManager=数据库类型经理
-RequestLastAccessInError=Latest database access request error
-ReturnCodeLastAccessInError=Return code for latest database access request error
-InformationLastAccessInError=Information for latest database access request error
+DatabaseTypeManager=数据库类型管理员
+RequestLastAccessInError=最后数据库访问请求错误
+ReturnCodeLastAccessInError=返回最后数据库访问请求错误代码
+InformationLastAccessInError=最后数据库访问请求错误信息
 DolibarrHasDetectedError=Dolibarr检测到一个技术性错误
-InformationToHelpDiagnose=This information can be useful for diagnostic
+InformationToHelpDiagnose=这个信息对于诊断非常有用
 MoreInformation=更多信息
-TechnicalInformation=Technical information
-TechnicalID=Technical ID
-NotePublic=注(公开)
-NotePrivate=注(私人)
+TechnicalInformation=技术信息
+TechnicalID=技术ID
+NotePublic=备注 (公开)
+NotePrivate=备注(私人)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr是安装精度的限制价格单位为<b>%s</b>小数。
 DoTest=测试
-ToFilter=过滤器
-NoFilter=No filter
+ToFilter=筛选
+NoFilter=不筛选
 WarningYouHaveAtLeastOneTaskLate=警告,你有至少一个任务,超出了容忍的延误。
-yes=是的
-Yes=是的
+yes=是
+Yes=是
 no=没有
-No=没有
-All=所有
+No=否
+All=All
 Home=主页
 Help=帮助
 OnlineHelp=在线帮助
 PageWiki=维基页面
-MediaBrowser=Media browser
+MediaBrowser=媒体浏览
 Always=总是
 Never=从来没有
 Under=下
 Period=期间
 PeriodEndDate=结束日期的期限
 Activate=激活
-Activated=活性
+Activated=启用
 Closed=关闭
 Closed2=关闭
-Enabled=启用
+Enabled=生效
 Deprecated=已过时
 Disable=禁用
-Disabled=被禁用的
+Disabled=禁用
 Add=添加
 AddLink=添加链接
-RemoveLink=Remove link
-AddToDraft=Add to draft
+RemoveLink=移除链接
+AddToDraft=添加到草稿
 Update=更新
 Close=关闭
-CloseBox=Remove widget from your dashboard
+CloseBox=将插件从你的看板中移除
 Confirm=确认
 ConfirmSendCardByMail=难道你真的想通过邮件发送此卡?
 Delete=删除
 Remove=移除
 Resiliate=Resiliate
 Cancel=取消
-Modify=修改
+Modify=变更
 Edit=编辑
 Validate=验证
-ValidateAndApprove=Validate and Approve
+ValidateAndApprove=验证和同意
 ToValidate=为了验证
 Save=保存
 SaveAs=另存为
 TestConnection=测试连接
-ToClone=克隆
-ConfirmClone=选择你想要克隆的数据:
-NoCloneOptionsSpecified=没有数据克隆界定。
+ToClone=复制
+ConfirmClone=选取你想要复制的数据:
+NoCloneOptionsSpecified=没有数据复制界定。
 Of=的
 Go=下一步
 Run=运行
@@ -162,89 +163,93 @@ Search=搜索
 SearchOf=搜索
 Valid=有效
 Approve=批准
-Disapprove=Disapprove
+Disapprove=不同意
 ReOpen=重新开放
 Upload=发送文件
-ToLink=Link
-Select=选择
+ToLink=链接
+Select=请选取
 Choose=选择
 Resize=调整大小
 Recenter=Recenter
-Author=作者
+Author=操作者
 User=用户
 Users=用户
 Group=组
-Groups=团体
-NoUserGroupDefined=No user group defined
+Groups=群组
+NoUserGroupDefined=未定义用户群组
 Password=密码
 PasswordRetype=重新输入您的密码
-NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
+NoteSomeFeaturesAreDisabled=注意了注意了在这个Demo演示中很多功能/模块都是禁用的。
 Name=名称
 Person=人
 Parameter=参数
 Parameters=参数
-Value=确认
-PersonalValue=个人价值
+Value=值
+PersonalValue=自定义
 NewValue=新的价值
 CurrentValue=当前值
-Code=码
+Code=编码
 Type=类型
-Language=语
+Language=语言
 MultiLanguage=多语言
-Note=注意
+Note=备注
 Title=标题
 Label=标签
-RefOrLabel=号。或标签
+RefOrLabel=编码或标签
 Info=日志
 Family=家庭
 Description=描述
 Designation=描述
-Model=模型
+Model=模板
 DefaultModel=默认模式
-Action=行动
+Action=活动
 About=关于
-Number=数
+Number=数字
 NumberByMonth=按月份数
 AmountByMonth=每月金额
-Numero=数
+Numero=数字
 Limit=限制
 Limits=范围
 Logout=注销
 NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode <b>%s</b>
-Connection=连接
-Setup=格局
-Alert=警报
+Connection=登陆
+Setup=设置
+Alert=生日提醒
 Previous=以前
 Next=未来
 Cards=牌
-Card=卡
+Card=信息
 Now=现在
-HourStart=Start hour
+HourStart=开始时间
 Date=日期
-DateAndHour=Date and hour
-DateToday=Today's date
-DateReference=Reference date
-DateStart=Start date
-DateEnd=End date
+DateAndHour=日期与小时
+DateToday=今天的日期
+DateReference=参考日期
+DateStart=开始日期
+DateEnd=结束日期
 DateCreation=创建日期
-DateCreationShort=Creat. date
-DateModification=修改日期
-DateModificationShort=Modif。日期
-DateLastModification=最后修改日期
+DateCreationShort=创建日期
+DateModification=变更日期
+DateModificationShort=变更日期
+DateLastModification=最近变更日期
 DateValidation=验证日期
 DateClosing=截止日期
 DateDue=截止日期
 DateValue=确认日期
 DateValueShort=确认日期
 DateOperation=发生日期
-DateOperationShort=歌剧院。日期
-DateLimit=极限日期
+DateOperationShort=操作日期
+DateLimit=限定日期
 DateRequest=申请日期
 DateProcess=处理日
 DateBuild=报告生成日期
 DatePayment=付款日期
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
+DateApprove=批准日期
+DateApprove2=批准日期(二次批准)
+UserCreation=创建用户
+UserModification=修改用户
+UserCreationShort=创建用户
+UserModificationShort=修改用户
 DurationYear=年
 DurationMonth=月
 DurationWeek=周
@@ -256,6 +261,7 @@ DurationDays=天
 Year=年
 Month=月
 Week=周
+WeekShort=星期
 Day=天
 Hour=小时
 Minute=分钟
@@ -267,25 +273,26 @@ days=天
 Hours=时间
 Minutes=纪要
 Seconds=秒
-Weeks=Weeks
+Weeks=星期
 Today=今日
 Yesterday=昨天
 Tomorrow=明天
-Morning=Morning
-Afternoon=Afternoon
-Quadri=夸德里
+Morning=早上
+Afternoon=中午
+Quadri=Quadri
 MonthOfDay=本月的一天
 HourShort=Ĥ
 MinuteShort=mn
-Rate=率
+Rate=税率
+CurrencyRate=Currency conversion rate
 UseLocalTax=含税
-Bytes=字节
-KiloBytes=千字节
-MegaBytes=兆字节
-GigaBytes=千兆字节
+Bytes=B
+KiloBytes=KB
+MegaBytes=MB
+GigaBytes=GB
 TeraBytes=TB级
-b=湾
-Kb=Kb的
+b=b.
+Kb=Kb
 Mb=兆
 Gb=千兆
 Tb=Tb
@@ -300,16 +307,16 @@ UnitPriceHT=单位价格(净值)
 UnitPriceTTC=单价
 PriceU=向上
 PriceUHT=不含税价格
-PriceUHTCurrency=U.P (currency)
+PriceUHTCurrency=U.P (货币)
 PriceUTTC=U.P. (inc. tax)
 Amount=金额
 AmountInvoice=发票金额
 AmountPayment=付款金额
 AmountHTShort=金额(净值)
-AmountTTCShort=金额(包括税)
-AmountHT=金额(税后)
-AmountTTC=金额(包括税)
-AmountVAT=增值税额
+AmountTTCShort=金额(含税)
+AmountHT=金额(税后)
+AmountTTC=金额(含税)
+AmountVAT=增值税总金额
 MulticurrencyAmountHT=Amount (net of tax), original currency
 MulticurrencyAmountTTC=Amount (inc. of tax), original currency
 MulticurrencyAmountVAT=Amount tax, original currency
@@ -321,80 +328,80 @@ AmountTotal=总金额
 AmountAverage=平均金额
 PriceQtyMinHT=价格数量分钟。 (税后)
 Percentage=百分比
-Total=总
+Total=总计
 SubTotal=小计
 TotalHTShort=共计(净额)
-TotalHTShortCurrency=Total (net in currency)
-TotalTTCShort=共有(包括税)
-TotalHT=共计(不含税)
-TotalHTforthispage=Total (net of tax) for this page
-Totalforthispage=Total for this page
-TotalTTC=共计(含税)
-TotalTTCToYourCredit=共有(包括税),以你的信用
-TotalVAT=增值税额
+TotalHTShortCurrency=总计 (货币净额)
+TotalTTCShort=共计(含税)
+TotalHT=共计(不含税)
+TotalHTforthispage=本页面 (净税)小计
+Totalforthispage=本页总计
+TotalTTC=共计(含税)
+TotalTTCToYourCredit=共计(含税)你的信用
+TotalVAT=增值税总金额
 TotalLT1=总税2
 TotalLT2=总税项3
 TotalLT1ES=共有再生能源
 TotalLT2ES=共有IRPF
-HT=扣除税
-TTC=公司增值税
+HT=不含税
+TTC=含增值税
 VAT=增值税
-VATs=Sales taxes
+VATs=销售税
 LT1ES=稀土
 LT2ES=IRPF
 VATRate=增值税率
 Average=平均
 Sum=总和
-Delta=三角洲
-Module=模
+Delta=增量
+Module=模块
 Option=选项
 List=列表
 FullList=全部列表
 Statistics=统计
 OtherStatistics=其他统计
 Status=状态
-Favorite=Favorite
-ShortInfo=信息。
-Ref=号码
-ExternalRef=Ref. extern
-RefSupplier=号。供应商
-RefPayment=号。付款
+Favorite=收藏夹
+ShortInfo=信息
+Ref=编号
+ExternalRef=外部编号
+RefSupplier=供应商编号
+RefPayment=付款编号
 CommercialProposalsShort=报价单
-Comment=评论
-Comments=评论
-ActionsToDo=这样的行动
-ActionsToDoShort=要做到
+Comment=说明
+Comments=说明
+ActionsToDo=要做的活动
+ActionsToDoShort=未完成
 ActionsDoneShort=完成
 ActionNotApplicable=不适用
-ActionRunningNotStarted=未开始
+ActionRunningNotStarted=等待
 ActionRunningShort=开始
-ActionDoneShort=成品
-ActionUncomplete=Uncomplete
-CompanyFoundation=公司/基金会
-ContactsForCompany=联系方式/不会忽略这个第三者
-ContactsAddressesForCompany=这个第三方联系人/地址
-AddressesForCompany=这个第三方的地址
-ActionsOnCompany=关于这个第三方的行动
-ActionsOnMember=有关此会员的活动
-NActionsLate=%s的后期
-RequestAlreadyDone=Request already recorded
-Filter=过滤器
+ActionDoneShort=已完成
+ActionUncomplete=未完成
+CompanyFoundation=公司/机构
+ContactsForCompany=合伙人联系方式
+ContactsAddressesForCompany=这个合伙人联系人/地址
+AddressesForCompany=这个合伙人的地址
+ActionsOnCompany=关于这个合伙人的动作
+ActionsOnMember=此会员相关活动
+NActionsLate=逾期 %s
+RequestAlreadyDone=申请已记录
+Filter=筛选
 FilterOnInto=Search criteria '<strong>%s</strong>' into fields %s
-RemoveFilter=删除过滤器
+RemoveFilter=清除筛选
 ChartGenerated=图表生成
 ChartNotGenerated=图不会生成
-GeneratedOn=建立于%s
+GeneratedOn=生成于%s
 Generate=生成
 Duration=为期
 TotalDuration=总时间
 Summary=摘要
 DolibarrStateBoard=统计
-DolibarrWorkBoard=工作任务板
+DolibarrWorkBoard=工作任务看板
 Available=可用的
 NotYetAvailable=尚未提供
-NotAvailable=不适用
-Categories=Tags/categories
-Category=Tag/category
+NotAvailable=不可用
+Categories=标签/分类
+Category=标签/分类
 By=由
 From=From
 to=至
@@ -406,27 +413,27 @@ OtherInformations=其它信息
 Quantity=数量
 Qty=数量
 ChangedBy=改变
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
+ApprovedBy=被批准
+ApprovedBy2=被批准(二次核准)
+Approved=批准
+Refused=拒绝
 ReCalculate=重新计算
 ResultKo=失败
 Reporting=报告
 Reportings=报告
-Draft=草案
+Draft=草稿
 Drafts=草稿
 Validated=验证
 Opened=打开
-New=新
+New=新建
 Discount=折扣
 Unknown=未知
 General=一般
 Size=大小
-Received=已收到
+Received=已收
 Paid=已支付
-Topic=Subject
-ByCompanies=由第三方
+Topic=主题
+ByCompanies=由合伙人
 ByUsers=通过用户
 Links=链接
 Link=链接
@@ -436,15 +443,15 @@ NextStep=下一步
 Datas=数据
 None=无
 NoneF=无
-Late=晚
-LateDesc=Delay to define if a record is late or not depends on your setup. Ask your admin to change delay from menu Home - Setup - Alerts.
+Late=逾期
+LateDesc=延迟的定义假如一条记录逾期或者取决于你的配置设定。请向管理员询问并从首页菜单->设置->警告菜单下修改相应设置。
 Photo=图片
 Photos=图片
 AddPhoto=添加图片
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-Login=登录
-CurrentLogin=当前登录
+DeletePicture=删除图片
+ConfirmDeletePicture=确认删除图片吗?
+Login=登陆
+CurrentLogin=当前登陆
 January=一月
 February=二月
 March=三月
@@ -457,18 +464,18 @@ September=九月
 October=十月
 November=十一月
 December=十二月
-JanuaryMin=一月
-FebruaryMin=二月
-MarchMin=三月
-AprilMin=四月
-MayMin=五月
-JuneMin=六月
-JulyMin=七月
-AugustMin=八月
-SeptemberMin=九月
-OctoberMin=十月
-NovemberMin=十一月
-DecemberMin=十二月
+JanuaryMin=1
+FebruaryMin=2
+MarchMin=3
+AprilMin=4
+MayMin=5
+JuneMin=6
+JulyMin=7
+AugustMin=8
+SeptemberMin=9
+OctoberMin=10
+NovemberMin=11
+DecemberMin=12
 Month01=一月
 Month02=二月
 Month03=三月
@@ -481,18 +488,18 @@ Month09=九月
 Month10=十月
 Month11=十一月
 Month12=十二月
-MonthShort01=一月
-MonthShort02=二月
-MonthShort03=三月
-MonthShort04=四月
-MonthShort05=五月
-MonthShort06=六月
-MonthShort07=七月
-MonthShort08=八月
-MonthShort09=九月
-MonthShort10=十月
-MonthShort11=十一月
-MonthShort12=十二月
+MonthShort01=1
+MonthShort02=2
+MonthShort03=3
+MonthShort04=4
+MonthShort05=5
+MonthShort06=6
+MonthShort07=7
+MonthShort08=8
+MonthShort09=9
+MonthShort10=10
+MonthShort11=11
+MonthShort12=12
 AttachedFiles=附件
 FileTransferComplete=文件被上传successfuly
 DateFormatYYYYMM=为YYYY - MM
@@ -502,30 +509,30 @@ ReportName=报告名称
 ReportPeriod=报告期内
 ReportDescription=描述
 Report=报告
-Keyword=Keyword
+Keyword=关键字
 Legend=传说
 Fill=填
 Reset=复位
 File=文件
-Files=档
+Files=文件
 NotAllowed=不允许
 ReadPermissionNotAllowed=读取权限不允许
 AmountInCurrency= %s 金额
-Example=例子
+Example=举例
 Examples=范例
-NoExample=没有例子
+NoExample=没有示例
 FindBug=报告错误
-NbOfThirdParties=第三方数
+NbOfThirdParties=合伙人数量值
 NbOfLines=线数
 NbOfObjects=数对象
-NbOfObjectReferers=Number of related items
-Referers=Related items
+NbOfObjectReferers=关联料号
+Referers=关联物料
 TotalQuantity=总数量
 DateFromTo=从%s到%s
 DateFrom=第05期从%
 DateUntil=直到%s的
 Check=支票
-Uncheck=Uncheck
+Uncheck=不检查
 Internal=内部
 External=外部
 Internals=内部
@@ -539,49 +546,53 @@ CustomerPreview=客户预览
 SupplierPreview=供应商预览
 ShowCustomerPreview=显示客户预览
 ShowSupplierPreview=显示供应商预览
-RefCustomer=客户代码
+RefCustomer=客户编号
 Currency=货币
 InfoAdmin=信息管理员
 Undo=复原
 Redo=重做
 ExpandAll=全部展开
-UndoExpandAll=撤消扩大
+UndoExpandAll=全部折叠
 Reason=原因
 FeatureNotYetSupported=功能尚不支持
 CloseWindow=关闭窗口
 Response=反应
-Priority=优先
+Priority=优先级
 SendByMail=通过电子邮件发送
 MailSentBy=通过电子邮件发送
 TextUsedInTheMessageBody=电子邮件正文
-SendAcknowledgementByMail=Send confirmation email
+SendAcknowledgementByMail=发送确认邮件
 EMail=E-mail
 NoEMail=没有电子邮件
-NoMobilePhone=No mobile phone
-Owner=业主
+NoMobilePhone=没有手机号码
+Owner=用户
 FollowingConstantsWillBeSubstituted=以下常量将与相应的值代替。
 Refresh=刷新
 BackToList=返回列表
 GoBack=回去
-CanBeModifiedIfOk=可以修改,如果有效
-CanBeModifiedIfKo=可以进行修改,如果不有效
-RecordModifiedSuccessfully=记录修改成功
-RecordsModified=修改 %s 记录
+CanBeModifiedIfOk=可以变更,如果有效
+CanBeModifiedIfKo=可以进行变更,如果不有效
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
+RecordModifiedSuccessfully=记录变更成功
+RecordsModified=变更 %s 记录
+RecordsDeleted=%s 记录已删除
 AutomaticCode=自动代码
 FeatureDisabled=功能禁用
-MoveBox=Move widget
+MoveBox=拖动插件
 Offered=提供
 NotEnoughPermissions=您没有这个动作的权限
 SessionName=会议名称
 Method=方法
 Receive=收到
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=局部的
-TotalWoman=总
+TotalWoman=总计
 NeverReceived=从未收到
 Canceled=取消
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+YouCanChangeValuesForThisListFromDictionarySetup=你可在设置->字典中更改此下拉列表值
 YouCanSetDefaultValueInModuleSetup=You can set the default value used when creating a new record into module setup
-Color=彩色
+Color=颜色
 Documents=链接的文件
 Documents2=文件
 UploadDisabled=上传禁用
@@ -589,36 +600,37 @@ MenuECM=文件
 MenuAWStats=awstats的
 MenuMembers=会员
 MenuAgendaGoogle=谷歌议程
-ThisLimitIsDefinedInSetup=Dolibarr限制(菜单家庭安装安全):%s的Kb的,PHP的限制:%s的Kb的
-NoFileFound=在这个目录中保存任何文件
+ThisLimitIsDefinedInSetup=来自Dolibarr本身的大小限制(菜单:home-setup-security)为:%s Kb,而PHP的限制为: %s Kb
+NoFileFound=这个目录没保存有文档
 CurrentUserLanguage=当前语言
-CurrentTheme=当前主题
-CurrentMenuManager=当前菜单管理器
-DisabledModules=残疾人模块
+CurrentTheme=当前主题样式
+CurrentMenuManager=当前后台管理菜单主题样式
+DisabledModules=禁用模块
 For=为
 ForCustomer=对于客户
 Signature=签名
+DateOfSignature=Date of signature
 HidePassword=显示命令的隐藏密码
 UnHidePassword=真正拿出明确的密码命令
-Root=根
+Root=Root
 Informations=信息
 Page=页面
-Notes=笔记
+Notes=备注
 AddNewLine=添加新行
 AddFile=添加文件
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=克隆的对象,其主要属性
+FreeZone=自由选项
+FreeLineOfType=自由选项类型
+CloneMainAttributes=复制项目含主属性
 PDFMerge=PDF合并
 Merge=合并
-PrintContentArea=显示页面的主要内容打印区
+PrintContentArea=打印中间大区域中显示的文字内容
 MenuManager=菜单管理器
-WarningYouAreInMaintenanceMode=警告,你是在维护模式,因此,目前只有登录<b>%s</b>才被允许使用应用。
+WarningYouAreInMaintenanceMode=警告,你是在维护模式,因此,目前只有登陆<b>%s</b>才被允许使用应用。
 CoreErrorTitle=系统错误
 CoreErrorMessage=很抱歉,发生错误。检查日志或系统管理员联系。
 CreditCard=信用卡
 FieldsWithAreMandatory=与<b>%或学科</b>是强制性
-FieldsWithIsForPublic= 公开显示<b>%s</b> 域的成员名单。如果你不想要这个,检查“公共”框。
+FieldsWithIsForPublic= 公开显示<b>%s</b> 域的成员列表。如果你不想要这个,检查“公共”框。
 AccordingToGeoIPDatabase=(根据geoip的转换)
 Line=线
 NotSupported=不支持
@@ -626,7 +638,7 @@ RequiredField=必填字段
 Result=结果
 ToTest=测试
 ValidateBefore=卡在使用之前必须经过验证此功能
-Visibility=能见度
+Visibility=性质
 Private=私人
 Hidden=隐蔽
 Resources=资源
@@ -636,13 +648,22 @@ Before=前
 After=后
 IPAddress=IP地址
 Frequency=频率
-IM=即时消息
-NewAttribute=新属性
+IM=IM
+NewAttribute=新建属性
 AttributeCode=属性代码
 URLPhoto=照片/徽标的URL
-SetLinkToAnotherThirdParty=Link to another third party
-CreateDraft=创建草案
-SetToDraft=Back to draft
+SetLinkToAnotherThirdParty=关联其他合伙人
+LinkTo=链接到
+LinkToProposal=链接到报价
+LinkToOrder=链接到订单
+LinkToInvoice=链接到发票
+LinkToSupplierOrder=链接到供应商订单
+LinkToSupplierProposal=链接到供应商报价
+LinkToSupplierInvoice=链接到供应商发票
+LinkToContract=链接到联系人
+LinkToIntervention=链接到干预
+CreateDraft=创建草稿
+SetToDraft=返回草稿
 ClickToEdit=单击“编辑”
 ObjectDeleted=删除对象%s
 ByCountry=按国家
@@ -655,52 +676,55 @@ ByDay=白天
 BySalesRepresentative=按销售代表
 LinkedToSpecificUsers=链接到一个特定的用户
 NoResults=没有结果
-AdminTools=Admin tools
-SystemTools=System tools
+AdminTools=管理员工具
+SystemTools=系统工具
 ModulesSystemTools=模块工具
 Test=测试
 Element=元素
 NoPhotoYet=还没有图片
-Dashboard=Dashboard
+Dashboard=看板
 Deductible=可抵扣
 from=从
 toward=往
-Access=Access
+Access=访问
 SelectAction=Select action
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
+HelpCopyToClipboard=按快捷键 Ctrl+C 复制
 SaveUploadedFileWithMask=Save file on server with name "<strong>%s</strong>" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
-ShowTransaction=Show transaction on bank account
+OriginFileName=原始文件名
+SetDemandReason=设置源
+SetBankAccount=定义银行账户
+AccountCurrency=帐户货币
+ViewPrivateNote=查看备注
+XMoreLines=%s 明细(s) 隐藏
+PublicUrl=公网URL
+AddBox=添加选项框
+SelectElementAndClickRefresh=选择元素然后点击刷新
+PrintFile=打印文件 %s
+ShowTransaction=显示银行账户交易
 GoIntoSetupToChangeLogo=点击菜单 主页 -> 设置 -> 公司 来修改LOGO或 主页 -> 设置 -> 显示菜单隐藏它。
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Gender=Gender
-Genderman=Man
-Genderwoman=Woman
-ViewList=List view
-Mandatory=Mandatory
-Hello=Hello
-Sincerely=Sincerely
-DeleteLine=Delete line
-ConfirmDeleteLine=Are you sure you want to delete this line ?
+Deny=否认
+Denied=否认
+ListOfTemplates=模板列表
+Gender=性别
+Genderman=男人
+Genderwoman=女人
+ViewList=列表视图
+Mandatory=强制性
+Hello=你好
+Sincerely=诚恳地
+DeleteLine=删除行
+ConfirmDeleteLine=你确定要删除此行吗?
 NoPDFAvailableForDocGenAmongChecked=No PDF were available for the document generation among checked records
 TooManyRecordForMassAction=Too many records selected for mass action. The action is restricted to a list of %s records.
-MassFilesArea=Area for files built by mass actions
-ShowTempMassFilesArea=Show area of files built by mass actions
-RelatedObjects=Related Objects
-ClassifyBilled=Classify billed
-Progress=Progress
-ClickHere=Click here
+MassFilesArea=批量动作生成文件区
+ShowTempMassFilesArea=显示批量动作生成文件区
+RelatedObjects=关联项目
+ClassifyBilled=归为已付款
+Progress=进展
+ClickHere=点击这里
+FrontOffice=前台
+BackOffice=后台
+View=查看
 # Week day
 Monday=星期一
 Tuesday=星期二
@@ -730,30 +754,30 @@ ShortThursday=Ŧ
 ShortFriday=F
 ShortSaturday=S
 ShortSunday=S
-SelectMailModel=Select email template
-SetRef=Set ref
+SelectMailModel=选择邮件模板
+SetRef=设置编号
 Select2ResultFoundUseArrows=
-Select2NotFound=No result found
-Select2Enter=Enter
-Select2MoreCharacter=or more character
-Select2MoreCharacters=or more characters
-Select2LoadingMoreResults=Loading more results...
-Select2SearchInProgress=Search in progress...
-SearchIntoThirdparties=Thirdparties
-SearchIntoContacts=Contacts
+Select2NotFound=空空如也——没有结果
+Select2Enter=请输入至少
+Select2MoreCharacter=个以上的字符
+Select2MoreCharacters=个以上的字符
+Select2LoadingMoreResults=正在加载更多结果...
+Select2SearchInProgress=正在搜索...
+SearchIntoThirdparties=合伙人
+SearchIntoContacts=联系人
 SearchIntoMembers=会员
-SearchIntoUsers=Users
-SearchIntoProductsOrServices=Products or services
-SearchIntoProjects=Projects
-SearchIntoTasks=Tasks
-SearchIntoCustomerInvoices=Customer invoices
-SearchIntoSupplierInvoices=Supplier invoices
-SearchIntoCustomerOrders=Customer orders
-SearchIntoSupplierOrders=Supplier orders
-SearchIntoCustomerProposals=Customer proposals
-SearchIntoSupplierProposals=Supplier proposals
-SearchIntoInterventions=Interventions
-SearchIntoContracts=Contracts
-SearchIntoCustomerShipments=Customer shipments
-SearchIntoExpenseReports=HR费用报表
-SearchIntoLeaves=Leaves
+SearchIntoUsers=用户
+SearchIntoProductsOrServices=产品或服务
+SearchIntoProjects=项目
+SearchIntoTasks=任务
+SearchIntoCustomerInvoices=客户发票
+SearchIntoSupplierInvoices=供应商发票
+SearchIntoCustomerOrders=客户订单
+SearchIntoSupplierOrders=供应商订单
+SearchIntoCustomerProposals=客户报价
+SearchIntoSupplierProposals=供应商报价
+SearchIntoInterventions=干预
+SearchIntoContracts=合同
+SearchIntoCustomerShipments=客户运输
+SearchIntoExpenseReports=费用报表
+SearchIntoLeaves=请假
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index 6a15bce56d2..5165c5b41b4 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -1,43 +1,44 @@
 # Dolibarr language file - Source file is en_US - marges
 
-Margin=Margin
+Margin=利润
 Margins=利润空间
-TotalMargin=Total Margin
-MarginOnProducts=Margin / Products
-MarginOnServices=Margin / Services
-MarginRate=Margin rate
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=Profit margins management
-margesSetup=Profit margins management setup
-MarginDetails=Margin details
-ProductMargins=Product margins
-CustomerMargins=Customer margins
+TotalMargin=总利润
+MarginOnProducts=利润 / 产品
+MarginOnServices=利润 / 服务
+MarginRate=利润率
+MarkRate=标记税率
+DisplayMarginRates=显示利润率
+DisplayMarkRates=显示mark rates
+InputPrice=输入价格
+margin=利润和利润率管理
+margesSetup=盈利利润管理设置
+MarginDetails=利润明细
+ProductMargins=产品利润
+CustomerMargins=客户利润
 SalesRepresentativeMargins=Sales representative margins
-UserMargins=User margins
-ProductService=产品/服务
-AllProducts=All products and services
-ChooseProduct/Service=Choose product or service
-ForceBuyingPriceIfNull=Force buying/cost price to selling price if not defined
-ForceBuyingPriceIfNullDetails=If buying/cost price not defined, and this option "ON", margin will be zero on line (buying/cost price = selling price), otherwise ("OFF"), marge will be equal to suggested default.
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
-UseDiscountAsProduct=As a product
-UseDiscountAsService=As a service
-UseDiscountOnTotal=On subtotal
+UserMargins=用户利润
+ProductService=产品或服务
+AllProducts=全部产品和服务
+ChooseProduct/Service=选择产品或服务
+ForceBuyingPriceIfNull=如期尚未定义则强制设定买入/成本价格为销售价格
+ForceBuyingPriceIfNullDetails=如果未定义买入/成本价格, 这个选项 "ON", 显示为零 (即买入/成本价格 = 销售价格), 除些之外 ("OFF"), 显示建议的默认值.
+MARGIN_METHODE_FOR_DISCOUNT=全局纯利润计算方法
+UseDiscountAsProduct=作为产品
+UseDiscountAsService=作为服务
+UseDiscountOnTotal=在小计
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defines if a global discount is treated as a product, a service, or only on subtotal for margin calculation.
 MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
-MargeType1=Margin on Best supplier price
-MargeType2=Margin on Weighted Average Price (WAP)
-MargeType3=Margin on Cost Price
+MargeType1=供应商最高价
+MargeType2=加权平均价差 (WAP)
+MargeType3=成本价格保证金
 MarginTypeDesc=* Margin on best buying price = Selling price - Best supplier price defined on product card<br>* Margin on Weighted Average Price (WAP) = Selling price - Product Weighted Average Price (WAP) or best supplier price if WAP not yet defined<br>* Margin on Cost price = Selling price - Cost price defined on product card or WAP if cost price not defined, or best supplier price if WAP not yet defined
-CostPrice=Cost price
-UnitCharges=Unit charges
-Charges=Charges
-AgentContactType=Commercial agent contact type
+CostPrice=成本价
+UnitCharges=费用单位
+Charges=费用
+AgentContactType=商业代理联络类型
 AgentContactTypeDetails=Define what contact type (linked on invoices) will be used for margin report per sale representative
-rateMustBeNumeric=Rate must be a numeric value
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
-CheckMargins=Margins detail
+rateMustBeNumeric=税率必须为数字值
+markRateShouldBeLesserThan100=Mark rate 将低于 100
+ShowMarginInfos=显示利润信息
+CheckMargins=利润明细
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index dbbe7578bf3..50c9a62975c 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -6,34 +6,34 @@ Member=会员
 Members=会员
 ShowMember=出示会员卡
 UserNotLinkedToMember=用户是用户,会员是会员,成员是成员,半毛钱关系都没有
-ThirdpartyNotLinkedToMember=Third-party not linked to a member
-MembersTickets=会员票
+ThirdpartyNotLinkedToMember=合伙人未链接到会员
+MembersTickets=会员卷
 FundationMembers=基础会员
-ListOfValidatedPublicMembers=验证市民名单
+ListOfValidatedPublicMembers=公共认证会员列表
 ErrorThisMemberIsNotPublic=该会员不公开
-ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称: <b>%s</b> ,登录: <b>%s</b>) 是已链接到第三方<b>%s</b>。首先删除这个链接,因为一个第三方不能被链接到只有一个成员(反之亦然)。
+ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称: <b>%s</b> ,登陆: <b>%s</b>) 是已链接到合伙人<b>%s</b>。首先删除这个链接,因为一个合伙人不能被链接到只有一个成员(反之亦然)。
 ErrorUserPermissionAllowsToLinksToItselfOnly=出于安全原因,您必须被授予权限编辑所有用户能够连接到用户的成员是不是你的。
 ThisIsContentOfYourCard=这是您的信用卡资料
 CardContent=内容您的会员卡
 SetLinkToUser=用户链接到Dolibarr
-SetLinkToThirdParty=链接到第三方Dolibarr
-MembersCards=议员打印卡
-MembersList=会员名单
-MembersListToValid=会员名单草案 (待验证)
+SetLinkToThirdParty=链接到Dolibarr合伙人
+MembersCards=会员名片
+MembersList=会员列表
+MembersListToValid=准会员 (待验证)列表
 MembersListValid=有效人员名录
-MembersListUpToDate=有效人员名单最新订阅
-MembersListNotUpToDate=名单内有效会员即日起订阅生效
+MembersListUpToDate=最新订阅有效会员列表
+MembersListNotUpToDate=即日起订阅的有效会员列表
 MembersListResiliated=弹性人员名录
-MembersListQualified=合格人员名单
+MembersListQualified=合格会员列表
 MenuMembersToValidate=待定会员
 MenuMembersValidated=认证会员
 MenuMembersUpToDate=新进人员
 MenuMembersNotUpToDate=老油条
 MenuMembersResiliated=弹性会员
-MembersWithSubscriptionToReceive=会员接受订阅
+MembersWithSubscriptionToReceive=接受订阅会员
 DateSubscription=认购日期
 DateEndSubscription=认购结束日期
-EndSubscription=认购完
+EndSubscription=最终订阅
 SubscriptionId=认购编号
 MemberId=会员ID
 NewMember=新会员
@@ -41,8 +41,8 @@ MemberType=会员类型
 MemberTypeId=会员类型ID
 MemberTypeLabel=会员类型标签
 MembersTypes=会员类型
-MemberStatusDraft=草案(需要验证)
-MemberStatusDraftShort=草案
+MemberStatusDraft=草稿(需要验证)
+MemberStatusDraftShort=草稿
 MemberStatusActive=验证(等待订阅)
 MemberStatusActiveShort=验证
 MemberStatusActiveLate=订阅过期
@@ -58,23 +58,23 @@ PaymentSubscription=支付的新贡献
 SubscriptionEndDate=认购的结束日期
 MembersTypeSetup=会员类型设定
 NewSubscription=新的订阅
-NewSubscriptionDesc=这种形式可以让你记录你的订阅为基础的新会员。如果你想续订(如果已经是会员),请联系,而不是通过电子邮件%s 基金会董事会。
+NewSubscriptionDesc=这种形式可以让你记录你的订阅为基础的新会员。如果你想续订(如果已经是会员),请联系,而不是通过电子邮件%s 机构董事会。
 Subscription=订阅
 Subscriptions=订阅
-SubscriptionLate=晚
+SubscriptionLate=逾期
 SubscriptionNotReceived=认购从未收到
-ListOfSubscriptions=订阅名单
-SendCardByMail=发送卡
-AddMember=Create member
-NoTypeDefinedGoToSetup=任何会员类型定义。前往设置 - 会员类型
+ListOfSubscriptions=订阅列表
+SendCardByMail=通过邮件发送信息卡
+AddMember=创建会员
+NoTypeDefinedGoToSetup=尚未定义会员类型。请在 会员类型 菜单进行设定
 NewMemberType=新会员类型
 WelcomeEMail=欢迎电子邮件
-SubscriptionRequired=认购要求
+SubscriptionRequired=是否订阅
 DeleteType=删除
-VoteAllowed=允许投票
-Physical=物理
-Moral=道德
-MorPhy=道德/物理
+VoteAllowed=是否允许投票
+Physical=普通会员
+Moral=荣誉会员
+MorPhy=荣誉会员/普通会员
 Reenable=重新启用
 ResiliateMember=弹性会员
 ConfirmResiliateMember=你确定要resiliate该会员?
@@ -87,43 +87,43 @@ ValidateMember=验证会员
 ConfirmValidateMember=你确定要验证这个会员?
 FollowingLinksArePublic=下面的链接是没有任何Dolibarr权限保护打开的网页。他们不是格式化网页,提供的例子,说明如何列出成员数据库。
 PublicMemberList=公共会员名录
-BlankSubscriptionForm=认购表格
-BlankSubscriptionFormDesc=dolibarr可以为您提供一个公共URL允许外部访问者问到订阅的基础。如果启用在线支付模块,付款方式也将被自动提供。
-EnablePublicSubscriptionForm=让市民自动认购表格
+BlankSubscriptionForm=公众订阅表格
+BlankSubscriptionFormDesc=Dolibarr可以为您提供一个公网URL允许外部访问者问到订阅的基础。如果启用在线支付模块,付款方式也将被自动提供。
+EnablePublicSubscriptionForm=是否允许公众自动订阅表格
 ExportDataset_member_1=会员和订阅
 ImportDataset_member_1=会员
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified subscriptions
-String=弦
+LastMembersModified=最近变更的 %s 位会员
+LastSubscriptionsModified=最近变更的 %s 份订阅
+String=String字符串
 Text=文本
-Int=诠释
+Int=Int型
 DateAndTime=日期和时间
-PublicMemberCard=市民卡会员
+PublicMemberCard=公共会员信息
 SubscriptionNotRecorded=Subscription not recorded
-AddSubscription=Create subscription
+AddSubscription=创建订阅
 ShowSubscription=显示订阅
 SendAnEMailToMember=向会员发送信息的电子邮件
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=收到的电子邮件的主题的情况下自动的嘉宾题词
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=电子邮件收到的情况下,自动的客户题词
-DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=电邮题目会员autosubscription
-DescADHERENT_AUTOREGISTER_MAIL=电子邮箱会员autosubscription
-DescADHERENT_MAIL_VALID_SUBJECT=电邮题目会员验证
-DescADHERENT_MAIL_VALID=会员的电子邮件验证
-DescADHERENT_MAIL_COTIS_SUBJECT=电邮题目认购
-DescADHERENT_MAIL_COTIS=订阅的电子邮件
-DescADHERENT_MAIL_RESIL_SUBJECT=电邮题目会员resiliation
-DescADHERENT_MAIL_RESIL=电子邮箱会员resiliation
-DescADHERENT_MAIL_FROM=发件人的电子邮件自动电子邮件
-DescADHERENT_ETIQUETTE_TYPE=标签的格式页
+DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=会员自动订阅邮件主题
+DescADHERENT_AUTOREGISTER_MAIL=会员自动订阅邮件
+DescADHERENT_MAIL_VALID_SUBJECT=会员认证邮件主题
+DescADHERENT_MAIL_VALID=会员认证邮件
+DescADHERENT_MAIL_COTIS_SUBJECT=订阅邮件主题
+DescADHERENT_MAIL_COTIS=订阅邮件
+DescADHERENT_MAIL_RESIL_SUBJECT=EMail subject for member resiliation
+DescADHERENT_MAIL_RESIL=EMail for member resiliation
+DescADHERENT_MAIL_FROM=自动发送邮件
+DescADHERENT_ETIQUETTE_TYPE=标签纸的格式
 DescADHERENT_ETIQUETTE_TEXT=文本打印会员地址表
-DescADHERENT_CARD_TYPE=卡的格式页
-DescADHERENT_CARD_HEADER_TEXT=文字印在会员卡顶部
-DescADHERENT_CARD_TEXT=文字印在(会员卡,左对齐)
-DescADHERENT_CARD_TEXT_RIGHT=文字印在(会员卡对齐右)
-DescADHERENT_CARD_FOOTER_TEXT=文字印在会员卡的底部
+DescADHERENT_CARD_TYPE=名片格式
+DescADHERENT_CARD_HEADER_TEXT=名片顶部文字
+DescADHERENT_CARD_TEXT=会员名片(左对齐)
+DescADHERENT_CARD_TEXT_RIGHT=名片右边文字(右对齐)
+DescADHERENT_CARD_FOOTER_TEXT=会员名片底部文字
 ShowTypeCard=显示类型'%s'
-HTPasswordExport=htpassword文件生成
-NoThirdPartyAssociatedToMember=无关联的第三方该会员
+HTPasswordExport=生成htpassword密文
+NoThirdPartyAssociatedToMember=无合伙人关联该会员
 MembersAndSubscriptions= 议员和Subscriptions
 MoreActions=补充行动记录
 MoreActionsOnSubscription=互补作用,建议默认情况下记录一项认购
@@ -134,33 +134,33 @@ LinkToGeneratedPages=生成访问卡
 LinkToGeneratedPagesDesc=这个界面可让你生成所有的成员或单一会员的名片的PDF文件。
 DocForAllMembersCards=为所有成员生成名片
 DocForOneMemberCards=为特定成员生成名片
-DocForLabels=生成报告表(格式输出实际上设置<b>:%s)</b>
+DocForLabels=生成地址表
 SubscriptionPayment=认购款项
 LastSubscriptionDate=最后认购日期
 LastSubscriptionAmount=最后认购金额
 MembersStatisticsByCountries=按国别统计人员
 MembersStatisticsByState=成员由州/省的统计信息
 MembersStatisticsByTown=按村镇统计人员
-MembersStatisticsByRegion=Members statistics by region
+MembersStatisticsByRegion=各地区会员统计
 NbOfMembers=人员数量
-NoValidatedMemberYet=发现未经验证的成员
+NoValidatedMemberYet=空空如也——未发现已经验证的成员
 MembersByCountryDesc=这个界面显示按国别统计人员的数据。图形依赖于谷歌在线图形服务,因此当然需要连网才能正常工作。
 MembersByStateDesc=此界面显示按省/市/村镇统计人员的数据。
 MembersByTownDesc=此界面显示按村镇统计人员的数据。
 MembersStatisticsDesc=选择你想读的统计...
 MenuMembersStats=统计
-LastMemberDate=最后成员日期
+LastMemberDate=最后会员日期
 Nature=性质
-Public=信息是公开的
-Exports=出口
+Public=信息是否公开
+Exports=导出
 NewMemberbyWeb=增加了新成员。等待批准中
 NewMemberForm=新成员申请表
 SubscriptionsStatistics=统计数据上的订阅
 NbOfSubscriptions=订阅数
 AmountOfSubscriptions=订阅金额
 TurnoverOrBudget=营业额(公司)或财政预算案(基础)
-DefaultAmount=拖欠金额认购
-CanEditAmount=游客可以选择/编辑其认购金额
+DefaultAmount=默认订阅数
+CanEditAmount=访客是否允许编辑/选择订阅数
 MEMBER_NEWFORM_PAYONLINE=集成在线支付页面跳转
 ByProperties=按特征
 MembersStatisticsByProperties=按特性统计会员
@@ -169,4 +169,4 @@ MembersByRegion=This screen show you statistics on members by region.
 VATToUseForSubscriptions=增值税率,用于订阅
 NoVatOnSubscription=没有增值税订阅
 MEMBER_PAYONLINE_SENDEMAIL=Email to use for email warning when Dolibarr receive a confirmation of a validated payment for a subscription (Example: paymentdone@example.com)
-ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product used for subscription line into invoice: %s
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=产品使用发票明细订阅列表: %s
diff --git a/htdocs/langs/zh_CN/oauth.lang b/htdocs/langs/zh_CN/oauth.lang
index f8dfee9788f..357e50b571f 100644
--- a/htdocs/langs/zh_CN/oauth.lang
+++ b/htdocs/langs/zh_CN/oauth.lang
@@ -1,15 +1,26 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Oauth Configuration
-NoAccessToken=No access token saved into local database
-HasAccessToken=A token was generated and saved into local database
-NewTokenStored=Token received ans saved
+ConfigOAuth=认证配置
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
+NoAccessToken=没有访问token保存到本地数据库
+HasAccessToken=一个token已生成并保存到本地数据库
+NewTokenStored=接收并保存Token
 ToCheckDeleteTokenOnProvider=To check/delete authorization saved by %s OAuth provider
-TokenDeleted=Token deleted
+TokenDeleted=删除Token
 RequestAccess=Click here to request/renew access and receive a new token to save
-DeleteAccess=Click here to delete token
+DeleteAccess=点击这里删除token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/zh_CN/opensurvey.lang b/htdocs/langs/zh_CN/opensurvey.lang
index 67696b7c39d..e7f213cd142 100644
--- a/htdocs/langs/zh_CN/opensurvey.lang
+++ b/htdocs/langs/zh_CN/opensurvey.lang
@@ -1,59 +1,59 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=调查
-Surveys=Polls
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-NewSurvey=New poll
-OpenSurveyArea=Polls area
+Surveys=调查
+OrganizeYourMeetingEasily=轻松地组织你的会议和投票。首先选择一个调查问卷投票类型...
+NewSurvey=新建调查
+OpenSurveyArea=调查问卷区
 AddACommentForPoll=You can add a comment into poll...
-AddComment=Add comment
-CreatePoll=Create poll
-PollTitle=Poll title
-ToReceiveEMailForEachVote=Receive an email for each vote
-TypeDate=Type date
-TypeClassic=Type standard
+AddComment=添加评论
+CreatePoll=创建调查问卷
+PollTitle=调查问卷标题
+ToReceiveEMailForEachVote=每次投票均接收邮件
+TypeDate=日期类型
+TypeClassic=标准类型
 OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-RemoveAllDays=Remove all days
-CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllDays=移除全部日期
+CopyHoursOfFirstDay=复制首日时数
 RemoveAllHours=删除所有小时
-SelectedDays=Selected days
-TheBestChoice=The best choice currently is
-TheBestChoices=The best choices currently are
+SelectedDays=择日
+TheBestChoice=当前最佳选择是
+TheBestChoices=当前最佳选择是
 with=with
 OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-CommentsOfVoters=Comments of voters
-ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+CommentsOfVoters=评论投票
+ConfirmRemovalOfPoll=你确定想要移除这个调查 (以及全部投票)
 RemovePoll=删除民意调查
-UrlForSurvey=URL to communicate to get a direct access to poll
-PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-CreateSurveyDate=Create a date poll
-CreateSurveyStandard=Create a standard poll
+UrlForSurvey=获取直接访问调查以及进行沟通的URL地址
+PollOnChoice=你创建了一个多项选择的调查投票。首先先输入调查问卷的全部选项:
+CreateSurveyDate=创建日期问卷
+CreateSurveyStandard=创建标准调查问卷
 CheckBox=简单的复选框
-YesNoList=List (empty/yes/no)
-PourContreList=List (empty/for/against)
-AddNewColumn=Add new column
+YesNoList=列表 (空白/是/否)
+PourContreList=列表 (空白/禁止/反对)
+AddNewColumn=新建一列
 TitleChoice=选择标签
 ExportSpreadsheet=导出电子表格结果
-ExpireDate=极限日期
-NbOfSurveys=Number of polls
-NbOfVoters=Nb of voters
+ExpireDate=限定日期
+NbOfSurveys=调查问卷数量
+NbOfVoters=投票数量
 SurveyResults=结果
-PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-5MoreChoices=5个更多选择
+PollAdminDesc=你有权限通过 "编辑"菜单来变更全部投票详细. 你也可以 , 移除 %s. 你更可以添加 %s.
+5MoreChoices=5 个以上选择
 Against=反对
-YouAreInivitedToVote=You are invited to vote for this poll
-VoteNameAlreadyExists=This name was already used for this poll
+YouAreInivitedToVote=你被邀请投票支持这项民意调查
+VoteNameAlreadyExists=该调查问卷投票名称已经存在
 AddADate=添加日期
 AddStartHour=添加起始时间
 AddEndHour=添加结束时间
-votes=vote(s)
-NoCommentYet=No comments have been posted for this poll yet
-CanComment=Voters can comment in the poll
-CanSeeOthersVote=Voters can see other people's vote
-SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- "8h", "8H" or "8:00" to give a meeting's start hour,<br>- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+votes=调查(s)
+NoCommentYet=这个调查投票问卷没有评论
+CanComment=投票者可评论该投票
+CanSeeOthersVote=投票者可查看其他人的投票
+SelectDayDesc=选择每个日期天数, 你能选择, 或者不选, 会议时长格式如下 :<br>- 留空,<br>- "8h", "8H" 或 "8:00" 会议的开始时间,<br>- "8-11", "8h-11h", "8H-11H" 或 "8:00-11:00" 会议的开始时间和结束时间,<br>- "8h15-11h15", "8H15-11H15" 或 "8:15-11:15" 用分钟同一个事儿.
 BackToCurrentMonth=回到当前月份
 ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
 ErrorOpenSurveyOneChoice=Enter at least one choice
-ErrorInsertingComment=插入您的评论时出错
+ErrorInsertingComment=插入您的说明时出错
 MoreChoices=Enter more choices for the voters
 SurveyExpiredInfo=The poll has been closed or voting delay has expired.
 EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 45bc4607578..1aaea123372 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -1,147 +1,147 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=客户订单区
 SuppliersOrdersArea=供应商订单区
-OrderCard=订购卡
+OrderCard=订单信息
 OrderId=订单编号
 Order=订单
 Orders=订单
 OrderLine=在线订单
 OrderDate=订购日期
-OrderDateShort=Order date
+OrderDateShort=订单日期
 OrderToProcess=待处理订单
 NewOrder=新订单
 ToOrder=订单填写
 MakeOrder=订单填写
-SupplierOrder=供应商的订单
-SuppliersOrders=供应商的订单
-SuppliersOrdersRunning=当前供应商的订单
+SupplierOrder=供应商订单
+SuppliersOrders=供应商订单
+SuppliersOrdersRunning=当前供应商订单
 CustomerOrder=客户订单
-CustomersOrders=Customer orders
-CustomersOrdersRunning=Current customer orders
-CustomersOrdersAndOrdersLines=Customer orders and order lines
-OrdersToBill=Customer orders delivered
-OrdersInProcess=Customer orders in process
-OrdersToProcess=Customer orders to process
-SuppliersOrdersToProcess=Supplier orders to process
+CustomersOrders=客户订单
+CustomersOrdersRunning=当前客户订单
+CustomersOrdersAndOrdersLines=客户订单和订单明细
+OrdersToBill=客户订单交期
+OrdersInProcess=待处理客户订单
+OrdersToProcess=待处理客户订单
+SuppliersOrdersToProcess=供应商订单处理
 StatusOrderCanceledShort=已取消
-StatusOrderDraftShort=草案
+StatusOrderDraftShort=草稿
 StatusOrderValidatedShort=已验证
 StatusOrderSentShort=处理中
-StatusOrderSent=船运处理中
-StatusOrderOnProcessShort=Ordered
+StatusOrderSent=运输处理中
+StatusOrderOnProcessShort=已下订单
 StatusOrderProcessedShort=处理中
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
+StatusOrderDelivered=已递送
+StatusOrderDeliveredShort=已递送
 StatusOrderToBillShort=已递送
-StatusOrderApprovedShort=已核准
+StatusOrderApprovedShort=已批准
 StatusOrderRefusedShort=已拒绝
-StatusOrderBilledShort=Billed
+StatusOrderBilledShort=已到账
 StatusOrderToProcessShort=待处理
 StatusOrderReceivedPartiallyShort=部分收到
 StatusOrderReceivedAllShort=全部收到
 StatusOrderCanceled=已取消
-StatusOrderDraft=草案(需要验证)
+StatusOrderDraft=草稿(需要验证)
 StatusOrderValidated=已验证
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=已下订单 - 等待接收
+StatusOrderOnProcessWithValidation=已下订单 - 等待接收或确认
 StatusOrderProcessed=已处理
 StatusOrderToBill=已递送
-StatusOrderApproved=已核准
+StatusOrderApproved=已批准
 StatusOrderRefused=已拒绝
-StatusOrderBilled=Billed
+StatusOrderBilled=已到账
 StatusOrderReceivedPartially=部分收到
 StatusOrderReceivedAll=全部收到
-ShippingExist=航运存在
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ShippingExist=运输存在
+ProductQtyInDraft=订单草稿中的产品数量
+ProductQtyInDraftOrWaitingApproved=草稿或已确认的订单中的产品数量,不只是已下订单
 MenuOrdersToBill=已发货订单
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=订单账单
 ShipProduct=航运产品
 CreateOrder=创建订单
 RefuseOrder=拒绝订单
-ApproveOrder=Approve order
+ApproveOrder=批准订单
 Approve2Order=Approve order (second level)
 ValidateOrder=验证订单
 UnvalidateOrder=未验证订单
 DeleteOrder=删除订单
 CancelOrder=取消订单
-OrderReopened= Order %s Reopened
-AddOrder=Create order
-AddToDraftOrders=添加订单草案
+OrderReopened= 订单 %s 已重开
+AddOrder=创建订单
+AddToDraftOrders=添加订单草稿
 ShowOrder=显示订单
-OrdersOpened=Orders to process
-NoDraftOrders=没有订单草案
-NoOrder=No order
-NoSupplierOrder=No supplier order
-LastOrders=Latest %s customer orders
-LastCustomerOrders=Latest %s customer orders
-LastSupplierOrders=Latest %s supplier orders
-LastModifiedOrders=Latest %s modified orders
+OrdersOpened=处理订单
+NoDraftOrders=没有订单草稿
+NoOrder=空空如也——没有订单
+NoSupplierOrder=空空如也——没有供应商订单
+LastOrders=最新 %s 客户订单
+LastCustomerOrders=最新 %s 客户订单
+LastSupplierOrders=最近的 %s 份供应商订单
+LastModifiedOrders=最近变更的 %s 份订单
 AllOrders=所有的订单
 NbOfOrders=订单号码
 OrdersStatistics=订单统计
-OrdersStatisticsSuppliers=供应商的订单统计
+OrdersStatisticsSuppliers=供应商订单统计
 NumberOfOrdersByMonth=按月份订单数
-AmountOfOrdersByMonthHT=每月订单金额(税后)
+AmountOfOrdersByMonthHT=每月订单金额(税后)
 ListOfOrders=订单列表
 CloseOrder=关闭订单
 ConfirmCloseOrder=您确定要关闭这个订单?一旦订单被关闭,它只能产生帐单。
 ConfirmDeleteOrder=你确定要删除这个订单?
-ConfirmValidateOrder=你确定要验证这个原则下,根据名称<b>%s吗</b> ?
-ConfirmUnvalidateOrder=你是否确定要恢复订单<b>%s</b>草案状态?
+ConfirmValidateOrder=你确定要验证这个原则下,根据名称 <b>%s</b> 吗?
+ConfirmUnvalidateOrder=你是否确定要恢复订单 <b>%s</b>草稿状态?
 ConfirmCancelOrder=您确定要取消此订单?
 ConfirmMakeOrder=你确定你想要生成这个<b>%的</b>订单?
 GenerateBill=生成发票
 ClassifyShipped=归类"已交付"
-DraftOrders=草案订单
-DraftSuppliersOrders=Draft suppliers orders
+DraftOrders=订单草稿
+DraftSuppliersOrders=供应商订单草稿
 OnProcessOrders=处理中订单
-RefOrder=订单号码
-RefCustomerOrder=Ref. order for customer
-RefOrderSupplier=Ref. order for supplier
+RefOrder=订单编号
+RefCustomerOrder=客户订单编号
+RefOrderSupplier=供应商订单编号
 SendOrderByMail=通过邮件发送订单
 ActionsOnOrder=订单上的事件
 NoArticleOfTypeProduct=任何类型的产品文章',以便对这一秩序shippable文章
 OrderMode=订购方法
 AuthorRequest=要求提交
-UserWithApproveOrderGrant=授予了“核准订单”权限的用户。
+UserWithApproveOrderGrant=被授予“核准订单”的权限的用户。
 PaymentOrderRef=订单付款%s
-CloneOrder=克隆订单
-ConfirmCloneOrder=你确定要克隆这个订单<b>%s吗</b> ?
-DispatchSupplierOrder=接收供应商的订单%s
-FirstApprovalAlreadyDone=First approval already done
+CloneOrder=复制订单
+ConfirmCloneOrder=你确定要复制这个订单 <b>%s</b> 吗 ?
+DispatchSupplierOrder=接收供应商订单 %s
+FirstApprovalAlreadyDone=审批已完成
 SecondApprovalAlreadyDone=Second approval already done
-SupplierOrderReceivedInDolibarr=Supplier order %s received %s
-SupplierOrderSubmitedInDolibarr=Supplier order %s submited
+SupplierOrderReceivedInDolibarr=供应商订单 %s 接收 %s
+SupplierOrderSubmitedInDolibarr=供应商订单 %s 提交
 SupplierOrderClassifiedBilled=Supplier order %s set billed
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=代表跟进客户订单
-TypeContact_commande_internal_SHIPPING=代表跟进航运
+TypeContact_commande_internal_SHIPPING=送货跟进
 TypeContact_commande_external_BILLING=客户发票联系人
-TypeContact_commande_external_SHIPPING=客户航运联系人
+TypeContact_commande_external_SHIPPING=客户送货联系人
 TypeContact_commande_external_CUSTOMER=客户跟进订单联系人
 TypeContact_order_supplier_internal_SALESREPFOLL=代表跟进供应商订单
-TypeContact_order_supplier_internal_SHIPPING=代表跟进航运
+TypeContact_order_supplier_internal_SHIPPING=送货跟进
 TypeContact_order_supplier_external_BILLING=供应商发票联系人
-TypeContact_order_supplier_external_SHIPPING=供应商航运联系人
+TypeContact_order_supplier_external_SHIPPING=供应商送货联系人
 TypeContact_order_supplier_external_CUSTOMER=供应商跟进订单联系人
 
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=常量COMMANDE_SUPPLIER_ADDON没有定义
 Error_COMMANDE_ADDON_NotDefined=常量COMMANDE_ADDON没有定义
-Error_OrderNotChecked=没有订单发票选择
+Error_OrderNotChecked=选定发票中没有订单
 # Sources
 OrderSource0=报价单
 OrderSource1=因特网
-OrderSource2=邮件活动
+OrderSource2=发邮件
 OrderSource3=电话宣传运动
-OrderSource4=传真活动
+OrderSource4=发起传真
 OrderSource5=广告
 OrderSource6=商店
 QtyOrdered=订购数量
 # Documents models
 PDFEinsteinDescription=一个完整的命令模式(logo. ..)
 PDFEdisonDescription=一份简单的订购模式
-PDFProformaDescription=完整的预开发票(标志...)
+PDFProformaDescription=完整的预开发票(LOGO标志...)
 # Orders modes
 OrderByMail=邮件
 OrderByFax=传真
@@ -149,11 +149,12 @@ OrderByEMail=电子邮件
 OrderByWWW=在线
 OrderByPhone=电话
 CreateInvoiceForThisCustomer=计费订单
-NoOrdersToInvoice=没有订单计费
+NoOrdersToInvoice=没有订单账单
 CloseProcessedOrdersAutomatically=归类所有“已处理”的订单。
 OrderCreation=创建订单
-Ordered=已下单
+Ordered=已下订单
 OrderCreated=您的订单已创建
 OrderFail=您的订单创建期间发生了错误
 CreateOrders=创建订单
 ToBillSeveralOrderSelectCustomer=要为多个订单创建一张发票, 首先点击客户,然后选择  "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 5eba67aca16..60d7565a5c7 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -1,102 +1,102 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=安全代码
+SecurityCode=验证码
 Calendar=日历
 NumberingShort=N°
 Tools=工具
-ToolsDesc=All miscellaneous tools not included in other menu entries are collected here.<br /><br />All the tools can be reached in the left menu.
+ToolsDesc=所有没在其他菜单的工具都在这里<br /><br /> 可以通过左边的菜单访问
 Birthday=生日
-BirthdayDate=Birthday date
-DateToBirth=在出生日期
+BirthdayDate=生日
+DateToBirth=生日
 BirthdayAlertOn=生日提醒活跃
 BirthdayAlertOff=生日提醒无效
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+Notify_FICHINTER_ADD_CONTACT=添加联络人到干预
 Notify_FICHINTER_VALIDATE=干预验证
 Notify_FICHINTER_SENTBYMAIL=通过邮件发送的干预
 Notify_ORDER_VALIDATE=验证客户订单
 Notify_ORDER_SENTBYMAIL=通过邮件发送的客户订单
 Notify_ORDER_SUPPLIER_SENTBYMAIL=通过邮件发送的供应商的订单
-Notify_ORDER_SUPPLIER_VALIDATE=Supplier order recorded
+Notify_ORDER_SUPPLIER_VALIDATE=供应商订单记录
 Notify_ORDER_SUPPLIER_APPROVE=供应商为了批准
-Notify_ORDER_SUPPLIER_REFUSE=供应商的订单被拒绝
+Notify_ORDER_SUPPLIER_REFUSE=供应商订单被拒绝
 Notify_PROPAL_VALIDATE=验证客户的建议
-Notify_PROPAL_CLOSE_SIGNED=Customer propal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer propal closed refused
-Notify_PROPAL_SENTBYMAIL=通过邮件发送的商业提案
+Notify_PROPAL_CLOSE_SIGNED=客户允许关闭已签署
+Notify_PROPAL_CLOSE_REFUSED=客户允许关闭已拒绝
+Notify_PROPAL_SENTBYMAIL=通过邮件发送的商业报价
 Notify_WITHDRAW_TRANSMIT=传输撤军
 Notify_WITHDRAW_CREDIT=信贷撤离
 Notify_WITHDRAW_EMIT=执行撤离
-Notify_COMPANY_CREATE=第三方创建
-Notify_COMPANY_SENTBYMAIL=Mails sent from third party card
-Notify_BILL_VALIDATE=客户发票验证
+Notify_COMPANY_CREATE=合伙人已创建
+Notify_COMPANY_SENTBYMAIL=从合伙人信息卡发邮件
+Notify_BILL_VALIDATE=客户发票已验证
 Notify_BILL_UNVALIDATE=未经验证客户发票
-Notify_BILL_PAYED=客户发票payed
-Notify_BILL_CANCEL=客户发票取消
+Notify_BILL_PAYED=客户发票已支付
+Notify_BILL_CANCEL=客户发票已取消
 Notify_BILL_SENTBYMAIL=通过邮件发送的客户发票
 Notify_BILL_SUPPLIER_VALIDATE=供应商发票验证
-Notify_BILL_SUPPLIER_PAYED=供应商发票payed
+Notify_BILL_SUPPLIER_PAYED=供应商发票已支付
 Notify_BILL_SUPPLIER_SENTBYMAIL=通过邮件发送的供应商发票
-Notify_BILL_SUPPLIER_CANCELED=Supplier invoice cancelled
+Notify_BILL_SUPPLIER_CANCELED=取消供应商发票
 Notify_CONTRACT_VALIDATE=合同验证
 Notify_FICHEINTER_VALIDATE=干预验证
-Notify_SHIPPING_VALIDATE=航运验证
-Notify_SHIPPING_SENTBYMAIL=通过电子邮件发送的航运
+Notify_SHIPPING_VALIDATE=送货验证
+Notify_SHIPPING_SENTBYMAIL=通过电子邮件发送送货信息资料
 Notify_MEMBER_VALIDATE=会员验证
-Notify_MEMBER_MODIFY=Member modified
+Notify_MEMBER_MODIFY=会员变更
 Notify_MEMBER_SUBSCRIPTION=会员订阅
 Notify_MEMBER_RESILIATE=会员resiliated
 Notify_MEMBER_DELETE=会员删除
-Notify_PROJECT_CREATE=Project creation
-Notify_TASK_CREATE=Task created
-Notify_TASK_MODIFY=Task modified
-Notify_TASK_DELETE=Task deleted
-SeeModuleSetup=See setup of module %s
+Notify_PROJECT_CREATE=项目创建
+Notify_TASK_CREATE=创建任务
+Notify_TASK_MODIFY=任务变更
+Notify_TASK_DELETE=删除任务
+SeeModuleSetup=参见模块设置 %s
 NbOfAttachedFiles=所附文件数/文件
-TotalSizeOfAttachedFiles=所附文件的总大小/文件
+TotalSizeOfAttachedFiles=所附文件/文档的总大小
 MaxSize=最大尺寸
-AttachANewFile=附加一个新的文件/文件
+AttachANewFile=添加一个新附件
 LinkedObject=链接对象
-Miscellaneous=杂项
-NbOfActiveNotifications=Number of notifications (nb of recipient emails)
-PredefinedMailTest=这是一个测试邮件。\\ n该两行是由一个回车分隔。
-PredefinedMailTestHtml=这是一个<b>测试</b>邮件(单词测试必须大胆)。 <br>这两条线隔开,回车。
+Miscellaneous=各项设定
+NbOfActiveNotifications=通知数量(收到邮件数量)
+PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
+PredefinedMailTestHtml=This is a <b>test</b> mail (the word test must be in bold).<br>The two lines are separated by a carriage return.<br><br>__SIGNATURE__
 PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice  __REF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__CONTACTCIVNAME__\n\n你将在这里找到询价申请 __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __REF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
 PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__
-DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available.
-ChooseYourDemoProfil=Choose the demo profile that best suits your needs...
+DemoDesc=Dolibarr是一个轻量的功能模块丰富的ERP/CRM系统。展示所有的模块演示没有道理为这种情况永远不会发生。因此,几个演示配置文件。
+ChooseYourDemoProfil=选择最适合您所需的演示配置文件…
 DemoFundation=基础会员管理
 DemoFundation2=管理成员及银行账户的基础
-DemoCompanyServiceOnly=管理一特约销售服务活动只
+DemoCompanyServiceOnly=仅管理一个自由活动销售服务
 DemoCompanyShopWithCashDesk=管理与现金办公桌店
 DemoCompanyProductAndStocks=管理一个小型或中型公司销售产品
-DemoCompanyAll=与管理(所有主要功能模块多种活动小型或中型公司)
-CreatedBy=创建了%s
-ModifiedBy=由%改性s
+DemoCompanyAll=管理一个小型或中型公司与多个活动(所有的主要模块)
+CreatedBy=创建者 %s
+ModifiedBy=修改者 %s
 ValidatedBy=由%验证s
 ClosedBy=由%闭s
-CreatedById=User id who created
-ModifiedById=User id who made latest change
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
-ModifiedByLogin=User login who made latest change
-ValidatedByLogin=User login who validated
-CanceledByLogin=User login who canceled
-ClosedByLogin=User login who closed
+CreatedById=创建的用户ID号
+ModifiedById=最近变更的用户ID号
+ValidatedById=验证的用户ID号
+CanceledById=取消的用户ID号
+ClosedById=关闭的的用户ID号
+CreatedByLogin=创建的登陆账户
+ModifiedByLogin=最近变更的登陆账户
+ValidatedByLogin=认证的登陆账户
+CanceledByLogin=取消的登陆账户
+ClosedByLogin=关闭的登陆账户
 FileWasRemoved=档案%s被删除
 DirWasRemoved=目录%s被删除
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeaturesSupported=Supported features
-Width=宽度
-Height=高度
+FeatureNotYetAvailable=在当前版本中还没有可用的功能
+FeaturesSupported=支持的功能
+Width=宽
+Height=高
 Depth=深度
 Top=顶部
 Bottom=底部的
@@ -105,7 +105,7 @@ Right=右键
 CalculatedWeight=计算重量
 CalculatedVolume=计算量
 Weight=重量
-WeightUnitton=tonne
+WeightUnitton=吨
 WeightUnitkg=公斤
 WeightUnitg=克
 WeightUnitmg=毫克
@@ -115,7 +115,7 @@ LengthUnitm=米
 LengthUnitdm=马克
 LengthUnitcm=厘米
 LengthUnitmm=毫米
-Surface=区
+Surface=面积
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
@@ -140,41 +140,41 @@ SizeUnitinch=英寸
 SizeUnitfoot=脚
 SizeUnitpoint=点
 BugTracker=bug跟踪系统
-SendNewPasswordDesc=This form allows you to request a new password. It will be sent to your email address.<br />Change will become effective once you click on the confirmation link in the email.<br />Check your inbox.
-BackToLoginPage=回到登录页面
-AuthenticationDoesNotAllowSendNewPassword=Authentication mode is <b>%s</b>.<br />In this mode, Dolibarr can't know nor change your password.<br />Contact your system administrator if you want to change your password.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
-ProfIdShortDesc=<b>教授ID为%s</b>是一个国家的信息取决于第三方。 <br>例如,对于国家的<b>%s,</b>它的代码<b>的%s。</b>
+SendNewPasswordDesc=慎重:这里是密码重置页面。 当你输入你的账号并点击「重置密码」系统将发送一封电子邮件给你。<br />你可通过在邮件中附上的重置密码的超链接来修改密码.<br />请留意查收.
+BackToLoginPage=返回登陆界面
+AuthenticationDoesNotAllowSendNewPassword=认证模式是 <b>%s</b>。<br />在这种模式下, Dolibarr 本身不知道你的密码更无法修改你的密码。<br />如果你要修改密码请联系你的系统管理员。
+EnableGDLibraryDesc=这个选项安装或启用PHP的GD支持库。
+ProfIdShortDesc=<b>Prof Id %s</b> 取决于合伙人的国别。 <br>例如,对于<b>%s</b>, 它的代码是<b>%s</b>.。
 DolibarrDemo=Dolibarr的ERP / CRM的演示
 StatsByNumberOfUnits=统计的产品/服务单位数目
 StatsByNumberOfEntities=统计中所指的实体数量
-NumberOfProposals=Number of proposals in past 12 months
-NumberOfCustomerOrders=Number of customer orders in past 12 months
-NumberOfCustomerInvoices=Number of customer invoices in past 12 months
-NumberOfSupplierProposals=Number of supplier proposals in past 12 months
-NumberOfSupplierOrders=Number of supplier orders in past 12 months
-NumberOfSupplierInvoices=Number of supplier invoices in past 12 months
-NumberOfUnitsProposals=Number of units on proposals in past 12 months
-NumberOfUnitsCustomerOrders=Number of units on customer orders in past 12 months
-NumberOfUnitsCustomerInvoices=Number of units on customer invoices in past 12 months
-NumberOfUnitsSupplierProposals=Number of units on supplier proposals in past 12 months
-NumberOfUnitsSupplierOrders=Number of units on supplier orders in past 12 months
-NumberOfUnitsSupplierInvoices=Number of units on supplier invoices in past 12 months
-EMailTextInterventionAddedContact=A newintervention %s has been assigned to you.
+NumberOfProposals=过去12个月的报价数量
+NumberOfCustomerOrders=过去12个月客户订单数
+NumberOfCustomerInvoices=过去12个月客户发票数量
+NumberOfSupplierProposals=过去12个月供应商报价数
+NumberOfSupplierOrders=过去12个月的供应商订单数
+NumberOfSupplierInvoices=去年供应商发票数
+NumberOfUnitsProposals=过去12个月的报价单位数量
+NumberOfUnitsCustomerOrders=过去12个月客户订单单位数量
+NumberOfUnitsCustomerInvoices=过去12个月客户发票单位数量
+NumberOfUnitsSupplierProposals=过去12个月供应商报价单位数量
+NumberOfUnitsSupplierOrders=过去12个月供应商订单单位数量
+NumberOfUnitsSupplierInvoices=去年供应商发票单位数量
+EMailTextInterventionAddedContact=你有一个新干预%s任务。
 EMailTextInterventionValidated=干预%s已被验证。
 EMailTextInvoiceValidated=发票%s已被确认。
 EMailTextProposalValidated=这项建议%s已经验证。
 EMailTextOrderValidated=该命令%s已被验证。
 EMailTextOrderApproved=该命令%s已被批准。
-EMailTextOrderValidatedBy=The order %s has been recorded by %s.
-EMailTextOrderApprovedBy=该命令%s已被%s的批准
+EMailTextOrderValidatedBy=这个订单 %s 由记录人员 %s 进行录入.
+EMailTextOrderApprovedBy=该命令 %s已被 %s的批准
 EMailTextOrderRefused=该命令%s已被拒绝。
 EMailTextOrderRefusedBy=该命令%s已经拒绝%s的
-EMailTextExpeditionValidated=该托运 %s 已得到证实。
+EMailTextExpeditionValidated=该送货 %s 已验证。
 ImportedWithSet=输入数据集
 DolibarrNotification=自动通知
 ResizeDesc=输入新的高度新的宽度<b>或</b> 。比率将维持在调整大小...
-NewLength=新宽
+NewLength=新宽度
 NewHeight=新高度
 NewSizeAfterCropping=新的尺寸裁剪后
 DefineNewAreaToPick=定义图像的新领域挑选(图像左侧单击然后拖动,直到到达对面角落)
@@ -191,46 +191,46 @@ StartUpload=开始上传
 CancelUpload=取消上传
 FileIsTooBig=文件过大
 PleaseBePatient=请耐心等待...
-RequestToResetPasswordReceived=A request to change your Dolibarr password has been received
-NewKeyIs=This is your new keys to login
-NewKeyWillBe=Your new key to login to software will be
-ClickHereToGoTo=Click here to go to %s
-YouMustClickToChange=You must however first click on the following link to validate this password change
-ForgetIfNothing=If you didn't request this change, just forget this email. Your credentials are kept safe.
-IfAmountHigherThan=If amount higher than <strong>%s</strong>
-SourcesRepository=Repository for sources
-Chart=Chart
+RequestToResetPasswordReceived=已收到你的Dolibarr密码修改申请
+NewKeyIs=你的新登陆码如上
+NewKeyWillBe=你的新登陆码将会是
+ClickHereToGoTo=点击这里 %s
+YouMustClickToChange=你要先点击下面的链接来验证密码改变
+ForgetIfNothing=如果不想改密码,直接忽略这个邮件,你的密码将保持原样。
+IfAmountHigherThan=如果数额高于 <strong>%s</strong>
+SourcesRepository=源库
+Chart=图表
 
 ##### Calendar common #####
-NewCompanyToDolibarr=Company %s added
-ContractValidatedInDolibarr=Contract %s validated
-PropalClosedSignedInDolibarr=Proposal %s signed
-PropalClosedRefusedInDolibarr=Proposal %s refused
-PropalValidatedInDolibarr=Proposal %s validated
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
-InvoiceValidatedInDolibarr=Invoice %s validated
-InvoicePaidInDolibarr=Invoice %s changed to paid
-InvoiceCanceledInDolibarr=Invoice %s canceled
-MemberValidatedInDolibarr=Member %s validated
-MemberResiliatedInDolibarr=Member %s resiliated
-MemberDeletedInDolibarr=Member %s deleted
-MemberSubscriptionAddedInDolibarr=Subscription for member %s added
-ShipmentValidatedInDolibarr=Shipment %s validated
-ShipmentClassifyClosedInDolibarr=Shipment %s classify billed
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classify reopened
-ShipmentDeletedInDolibarr=Shipment %s deleted
+NewCompanyToDolibarr=公司 %s 已添加
+ContractValidatedInDolibarr=联系人 %s 已验证
+PropalClosedSignedInDolibarr=建议 %s 已标记
+PropalClosedRefusedInDolibarr=建议 %s 已被拒绝
+PropalValidatedInDolibarr=建议 %s 已验证
+PropalClassifiedBilledInDolibarr=建议 %s 已归类账单
+InvoiceValidatedInDolibarr=发票 %s 已验证
+InvoicePaidInDolibarr=发票 %s 已变更为支付
+InvoiceCanceledInDolibarr=发票 %s 已取消
+MemberValidatedInDolibarr=会员 %s 已验证
+MemberResiliatedInDolibarr=会员 %s 已适应
+MemberDeletedInDolibarr=会员 %s 已删除
+MemberSubscriptionAddedInDolibarr=会员订阅 %s 已添加
+ShipmentValidatedInDolibarr=运输 %s 验证
+ShipmentClassifyClosedInDolibarr=发货%s已经确认付账
+ShipmentUnClassifyCloseddInDolibarr=发货%s已经确认重开。
+ShipmentDeletedInDolibarr=运输 %s 已删除
 ##### Export #####
-Export=出口
-ExportsArea=出口地区
+Export=导出
+ExportsArea=导出区
 AvailableFormats=可用的格式
 LibraryUsed=Librairy使用
 LibraryVersion=版本
 ExportableDatas=导出的数据
-NoExportableData=没有出口的数据(导出加载的数据,或丢失的权限没有模块)
-NewExport=新的出口
+NoExportableData=没有导出的数据(导出加载的数据,或丢失的权限没有模块)
+NewExport=新建导出
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
-WEBSITE_TITLE=Title
-WEBSITE_DESCRIPTION=Description
-WEBSITE_KEYWORDS=Keywords
+WebsiteSetup=建立模块化的网页
+WEBSITE_PAGEURL=页面URL地址
+WEBSITE_TITLE=标题
+WEBSITE_DESCRIPTION=描述
+WEBSITE_KEYWORDS=关键字
diff --git a/htdocs/langs/zh_CN/paybox.lang b/htdocs/langs/zh_CN/paybox.lang
index 8ca75fc631a..28c7b2f067f 100644
--- a/htdocs/langs/zh_CN/paybox.lang
+++ b/htdocs/langs/zh_CN/paybox.lang
@@ -12,28 +12,28 @@ Creditor=债权人
 PaymentCode=付款代码
 PayBoxDoPayment=前往付款
 YouWillBeRedirectedOnPayBox=您将被重定向担保Paybox页,输入您的信用卡信息
-Continue=未来
+Continue=下一个
 ToOfferALinkForOnlinePayment=网址为%s支付
 ToOfferALinkForOnlinePaymentOnOrder=网址提供一个命令%s网上支付的用户界面
 ToOfferALinkForOnlinePaymentOnInvoice=网址提供发票一%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnContractLine=网址提供了一个合同线%s在线支付的用户界面
 ToOfferALinkForOnlinePaymentOnFreeAmount=网址提供一个免费的网上支付金额%s用户界面
 ToOfferALinkForOnlinePaymentOnMemberSubscription=网址为会员提供订阅%s在线支付的用户界面
-YouCanAddTagOnUrl=您还可以添加<b>标签=</b> url参数<b>及<i>价值</i></b>的任何网址(只需要支付免费)添加自己的注释标记付款。
+YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (required only for free payment) to add your own payment comment tag.
 SetupPayBoxToHavePaymentCreatedAutomatically=设置您的<b>%s</b> PayBox与网址有paybox付款时自动创建的验证。
 YourPaymentHasBeenRecorded=本页面确认您的付款已记录。谢谢。
 YourPaymentHasNotBeenRecorded=您的付款并没有被记录和交易已取消。谢谢。
 AccountParameter=帐户参数
 UsageParameter=使用参数
 InformationToFindParameters=帮助,找到你的%s帐户信息
-PAYBOX_CGI_URL_V2=付款出纳CGI模块的网址
+PAYBOX_CGI_URL_V2=钱箱付款CGI模块的调用地址
 VendorName=供应商名称
 CSSUrlForPaymentForm=付款方式的CSS样式表的URL
 MessageOK=讯息验证支付返回页面
 MessageKO=取消支付返回页面的讯息
-NewPayboxPaymentReceived=新的出纳收到货款
-NewPayboxPaymentFailed=新的出纳支付的尝试,但未能
+NewPayboxPaymentReceived=新建收款钱箱
+NewPayboxPaymentFailed=尝试新建收款钱箱失败
 PAYBOX_PAYONLINE_SENDEMAIL=电子邮件提醒后付款(成功或失败)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+PAYBOX_PBX_SITE=PBX SITE参数值
+PAYBOX_PBX_RANG=PBX Rang参数值
+PAYBOX_PBX_IDENTIFIANT=PBX ID参数值
diff --git a/htdocs/langs/zh_CN/paypal.lang b/htdocs/langs/zh_CN/paypal.lang
index bbabf7acdf6..3be076ef9c1 100644
--- a/htdocs/langs/zh_CN/paypal.lang
+++ b/htdocs/langs/zh_CN/paypal.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=贝宝模块的设置
-PaypalDesc=该模块提供的网页,允许<a href="http://www.paypal.com" target="_blank">对贝</a>宝支付客户的。这可以使用一个免费的付款或支付上一个特定的Dolibarr对象(发票,订单,... ...)
+PaypalDesc=This module offer pages to allow payment on <a href="http://www.paypal.com" target="_blank">PayPal</a> by customers. This can be used for a free payment or for a payment on a particular Dolibarr object (invoice, order, ...)
 PaypalOrCBDoPayment=与信用卡或PayPal付款
 PaypalDoPayment=用PayPal
 PAYPAL_API_SANDBOX=测试/沙箱模式
 PAYPAL_API_USER=API的用户名
 PAYPAL_API_PASSWORD=API密码
 PAYPAL_API_SIGNATURE=API签名
-PAYPAL_SSLVERSION=Curl SSL Version
+PAYPAL_SSLVERSION=Curl SSL 版本
 PAYPAL_API_INTEGRAL_OR_PAYPALONLY=优惠“不可分割的”支付(信用卡+贝宝)或“贝宝”只
 PaypalModeIntegral=积分
 PaypalModeOnlyPaypal=支付宝
@@ -16,8 +16,8 @@ ThisIsTransactionId=这是交易编号<b>:%s</b>
 PAYPAL_ADD_PAYMENT_URL=当你邮寄一份文件,添加URL Paypal付款
 PredefinedMailContentLink=您可以点击下面的安全链接,使您的​​支付宝(PayPal),如果它不是已经完成。⏎⏎ %s ⏎⏎.
 YouAreCurrentlyInSandboxMode=您目前在“沙箱”模式
-NewPaypalPaymentReceived=收到新的支付宝付款
-NewPaypalPaymentFailed=新的支付宝付款尝试,但未能成功
+NewPaypalPaymentReceived=新建Paypal收款
+NewPaypalPaymentFailed=尝试新建Paypal收款但失败了
 PAYPAL_PAYONLINE_SENDEMAIL=电子邮件提醒后付款(成功与否)
 ReturnURLAfterPayment=付款后返回网页地址
 ValidationOfPaypalPaymentFailed=Paypal(支付宝)付款验证失败
@@ -25,6 +25,6 @@ PaypalConfirmPaymentPageWasCalledButFailed=Paypal(支付宝)清求付款确
 SetExpressCheckoutAPICallFailed=SetExpressCheckout API call failed.
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API call failed.
 DetailedErrorMessage=Detailed Error Message
-ShortErrorMessage=Short Error Message
-ErrorCode=Error Code
+ShortErrorMessage=简短错误信息
+ErrorCode=错误代码
 ErrorSeverityCode=Error Severity Code
diff --git a/htdocs/langs/zh_CN/printing.lang b/htdocs/langs/zh_CN/printing.lang
index 2da614e96f9..bb0017116ad 100644
--- a/htdocs/langs/zh_CN/printing.lang
+++ b/htdocs/langs/zh_CN/printing.lang
@@ -1,55 +1,51 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=Direct Printing
-Module64000Desc=Enable Direct Printing System
-PrintingSetup=Setup of Direct Printing System
+Module64000Name=直接打印
+Module64000Desc=允许系统直接打印
+PrintingSetup=设置直接打印系统
 PrintingDesc=This module adds a Print button to send documents directly to a printer (without opening document into an application) with various module.
-MenuDirectPrinting=Direct Printing jobs
-DirectPrint=Direct print
+MenuDirectPrinting=直接打印任务
+DirectPrint=直接打印
 PrintingDriverDesc=Configuration variables for printing driver.
-ListDrivers=List of drivers
-PrintTestDesc=List of Printers.
-FileWasSentToPrinter=File %s was sent to printer
-NoActivePrintingModuleFound=No active module to print document
-PleaseSelectaDriverfromList=Please select a driver from list.
-PleaseConfigureDriverfromList=Please configure the selected driver from list.
-SetupDriver=Driver setup
-TargetedPrinter=Targeted printer
-UserConf=Setup per user
-PRINTGCP_INFO=Google OAuth API setup
+ListDrivers=驱动列表
+PrintTestDesc=打印机列表。
+FileWasSentToPrinter=文件 %s 已发送到打印机
+NoActivePrintingModuleFound=没有激活文档打印模块
+PleaseSelectaDriverfromList=请在驱动列表中选择驱动程序。
+PleaseConfigureDriverfromList=请在下面配置列表中选择一个驱动程序。
+SetupDriver=驱动设置
+TargetedPrinter=目标打印机
+UserConf=单用户设置
+PRINTGCP_INFO=谷歌 OAuth API 设置
 PRINTGCP_AUTHLINK=Authentication
-PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
-PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
-GCP_Name=Name
-GCP_displayName=Display Name
-GCP_Id=Printer Id
-GCP_OwnerName=Owner Name
-GCP_State=Printer State
-GCP_connectionStatus=Online State
-GCP_Type=Printer Type
+PRINTGCP_TOKEN_ACCESS=谷歌云打印 OAuth Token
+PrintGCPDesc=这个驱动允许发送文档至谷歌云打印机。
+GCP_Name=名称
+GCP_displayName=显示名称
+GCP_Id=打印机ID号
+GCP_OwnerName=用户名称
+GCP_State=打印机状态
+GCP_connectionStatus=在线状态
+GCP_Type=打印机类型
 PrintIPPDesc=This driver allow to send documents directly to a printer. It requires a Linux system with CUPS installed.
-PRINTIPP_HOST=Print server
-PRINTIPP_PORT=Port
-PRINTIPP_USER=Login
-PRINTIPP_PASSWORD=Password
-NoDefaultPrinterDefined=No default printer defined
-DefaultPrinter=Default printer
-Printer=Printer
-IPP_Uri=Printer Uri
-IPP_Name=Printer Name
-IPP_State=Printer State
-IPP_State_reason=State reason
-IPP_State_reason1=State reason1
-IPP_BW=BW
-IPP_Color=Color
-IPP_Device=Device
-IPP_Media=Printer media
-IPP_Supported=Type of media
+PRINTIPP_HOST=打印服务器
+PRINTIPP_PORT=端口
+PRINTIPP_USER=登陆
+PRINTIPP_PASSWORD=密码
+NoDefaultPrinterDefined=未设定默认打印机
+DefaultPrinter=默认打印机
+Printer=打印机
+IPP_Uri=打印Uri
+IPP_Name=打印名称
+IPP_State=打印状态
+IPP_State_reason=状态原因
+IPP_State_reason1=状态原因1
+IPP_BW=黑白
+IPP_Color=彩色
+IPP_Device=设备
+IPP_Media=打印媒体
+IPP_Supported=媒体类型
 DirectPrintingJobsDesc=This page lists printing jobs found for available printers.
 GoogleAuthNotConfigured=Google OAuth setup not done. Enable module OAuth and set a Google ID/Secret.
 GoogleAuthConfigured=Google OAuth credentials found into setup of module OAuth.
-PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintTestDescprintgcp=List of Printers for Google Cloud Print.
+PrintingDriverDescprintgcp=配置可用的谷歌云打印机驱动
+PrintTestDescprintgcp=谷歌云打印机列表
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index c3d78f7ff7f..885a1dba851 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -1,21 +1,24 @@
 # ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use lot/serial number
-ProductStatusOnBatch=Yes (lot/serial required)
-ProductStatusNotOnBatch=No (lot/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
-Batch=Lot/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
-batch_number=Lot/Serial number
-BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Lot/Serial details
-DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
-printBatch=Lot/Serial: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
+ManageLotSerial=使用批号/序列号
+ProductStatusOnBatch=是 (必须使用批号/序列号)
+ProductStatusNotOnBatch=否 (不使用批号/序列号)
+ProductStatusOnBatchShort=是
+ProductStatusNotOnBatchShort=否
+Batch=批号/序列号
+atleast1batchfield=保质期或销售日期或批号/序列号
+batch_number=批号/序列号码
+BatchNumberShort=批号/序列号
+EatByDate=保质期
+SellByDate=销售日期
+DetailBatchNumber=批号/序列号详细
+DetailBatchFormat=批号/序列号: %s - 食用日期: %s - 销售日期: %s (数量 : %d)
+printBatch=批号/序列号: %s
+printEatby=食用日期: %s
+printSellby=销售日期: %s
+printQty=数量: %d
+AddDispatchBatchLine=添加一个用于货架寿命调度
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductDoesNotUseBatchSerial=此产品不使用批号/序列号
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 5b13caf7937..35cfde61758 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=产品编号
 ProductLabel=产品名称
-ProductLabelTranslated=Translated product label
-ProductDescriptionTranslated=Translated product description
-ProductNoteTranslated=Translated product note
+ProductLabelTranslated=产品标签已翻译
+ProductDescriptionTranslated=产品描述已翻译
+ProductNoteTranslated=产品备注已翻译
 ProductServiceCard=产品/服务 信息卡
 Products=产品
 Services=服务
@@ -14,61 +14,63 @@ Create=创建
 Reference=编号
 NewProduct=新建产品
 NewService=新建服务
-ProductVatMassChange=Mass VAT change
+ProductVatMassChange=批量 VAT 变更
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
-MassBarcodeInit=Mass barcode init
+MassBarcodeInit=批量条码初始化
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=会计代码 (购买)
-ProductAccountancySellCode=会计代码 (销售)
-ProductOrService=产品/服务
+ProductAccountancyBuyCode=科目代码(采购)
+ProductAccountancySellCode=科目代码(销售)
+ProductOrService=产品或服务
 ProductsAndServices=产品和服务
 ProductsOrServices=产品或服务
-ProductsOnSell=Product for sale or for purchase
-ProductsNotOnSell=Product not for sale and not for purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services not for sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
-LastModifiedProductsAndServices=Latest %s modified products/services
-LastRecordedProducts=Latest %s recorded products
-LastRecordedServices=Latest %s recorded services
-CardProduct0=Product card
-CardProduct1=Service card
+ProductsOnSell=可销售的产品或可采购的产品
+ProductsNotOnSell=不可销售的产品和不可采购的产品
+ProductsOnSellAndOnBuy=可销售的产品和可采购的产品
+ServicesOnSell=可销售的服务或可采购的服务
+ServicesNotOnSell=不可销售的服务
+ServicesOnSellAndOnBuy=可销售的服务与可采购的服务
+LastModifiedProductsAndServices=最近变更的 %s 个产品/服务
+LastRecordedProducts=最近登记的 %s 产品
+LastRecordedServices=最后 %s 已记录服务
+CardProduct0=产品信息卡
+CardProduct1=服务信息卡
 Stock=库存
-Stocks=仓库
-Movements=库间转移
+Stocks=库存
+Movements=库间调拨
 Sell=销售
 Buy=采购
-OnSell=供销售
-OnBuy=供采购
-NotOnSell=不销售
-ProductStatusOnSell=供销售
-ProductStatusNotOnSell=不销售
-ProductStatusOnSellShort=供销售
-ProductStatusNotOnSellShort=不销售
-ProductStatusOnBuy=供采购
-ProductStatusNotOnBuy=不采购
-ProductStatusOnBuyShort=供采购
-ProductStatusNotOnBuyShort=不采购
-UpdateVAT=Update vat
-UpdateDefaultPrice=Update default price
-UpdateLevelPrices=Update prices for each level
+OnSell=可销售
+OnBuy=可采购
+NotOnSell=不可销售
+ProductStatusOnSell=可销售
+ProductStatusNotOnSell=不可销售
+ProductStatusOnSellShort=可销售
+ProductStatusNotOnSellShort=不可销售
+ProductStatusOnBuy=可采购
+ProductStatusNotOnBuy=不可采购
+ProductStatusOnBuyShort=可采购
+ProductStatusNotOnBuyShort=不可采购
+UpdateVAT=更新VAT
+UpdateDefaultPrice=更新默认价格
+UpdateLevelPrices=更新各级价格
 AppliedPricesFrom=价格起始时间
 SellingPrice=售价
 SellingPriceHT=售价(税前)
 SellingPriceTTC=售价(税后)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=销售总额
+PurchasedAmount=采购总额
 NewPrice=新增价格
-MinPrice=Min. selling price
+MinPrice=最低销售价
 CantBeLessThanMinPrice=售价不能低于此产品的最低价格 (%s 税前)。此消息也可能在您输入折扣巨大时出现
-ContractStatusClosed=已关闭
+ContractStatusClosed=已禁用
 ErrorProductAlreadyExists=编号为 %s 的产品已存在。
 ErrorProductBadRefOrLabel=输入的编号或标签无效,请输入符合要求的编号或标签。
-ErrorProductClone=试图同时克隆该产品或服务会有一个问题。
+ErrorProductClone=试图同时复制该产品或服务会有一个问题。
 ErrorPriceCantBeLowerThanMinPrice=Error, price can't be lower than minimum price.
 Suppliers=供应商
-SupplierRef=供应商的产品编号
+SupplierRef=供应商产品编码
 ShowProduct=显示产品
 ShowService=显示服务
 ProductsAndServicesArea=产品和服务区
@@ -76,7 +78,7 @@ ProductsArea=产品区
 ServicesArea=服务区
 ListOfStockMovements=库存移动清单
 BuyingPrice=买价
-PriceForEachProduct=Products with specific prices
+PriceForEachProduct=产品明码标价
 SupplierCard=供应商 信息卡
 PriceRemoved=价格已删除
 BarCode=条码
@@ -85,23 +87,23 @@ SetDefaultBarcodeType=设置条码类型
 BarcodeValue=条码值
 NoteNotVisibleOnBill=备注 (账单、报价...中不可见)
 ServiceLimitedDuration=如果产品是有限期的服务:
-MultiPricesAbility=Several segment of prices per product/service (each customer is in one segment)
+MultiPricesAbility=每部分价格产品/服务(每位客户的一部分)
 MultiPricesNumPrices=价格个数
-AssociatedProductsAbility=Activate the package feature
-AssociatedProducts=Package product
-AssociatedProductsNumber=Number of products composing this package product
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Parent products
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a package product
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any package product
+AssociatedProductsAbility=激活包功能
+AssociatedProducts=产品包装
+AssociatedProductsNumber=组成此包产品的产品数量
+ParentProductsNumber=父级包装产品的数量
+ParentProducts=父产品
+IfZeroItIsNotAVirtualProduct=如果为 0, 则表示这产品无需打包包装
+IfZeroItIsNotUsedByVirtualProduct=如果为 0, 则表示此产品不用任何包装
 Translation=翻译
 KeywordFilter=关键词筛选
 CategoryFilter=分类筛选
 ProductToAddSearch=搜索要添加的产品
 NoMatchFound=未发现匹配项目
-ProductAssociationList=List of products/services that are component of this virtual product/package
-ProductParentList=List of package products/services with this product as a component
-ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父产品
+ProductAssociationList=组成此虚拟产品/包装的产品/服务列表
+ProductParentList=以该产品为组件的包装产品/服务列表
+ErrorAssociationIsFatherOfThis=所选产品中有当前产品的父级产品
 DeleteProduct=删除产品/服务
 ConfirmDeleteProduct=您确定要删除此产品/服务吗?
 ProductDeleted=产品/服务 "%s" 已从数据库中删除。
@@ -112,145 +114,145 @@ ImportDataset_service_1=服务
 DeleteProductLine=删除产品文字行
 ConfirmDeleteProductLine=您确定要删除这行产品吗?
 ProductSpecial=Special
-QtyMin=Minimum Qty
-PriceQtyMin=Price for this min. qty (w/o discount)
-VATRateForSupplierProduct=此产品/供应商的 增值税税率
-DiscountQtyMin=Default discount for qty
+QtyMin=起订量
+PriceQtyMin=最小数量价格 (w/o 折扣)
+VATRateForSupplierProduct=(产品/供应商)增值税税率
+DiscountQtyMin=默认数量折扣
 NoPriceDefinedForThisSupplier=此供应商/产品未设置价格/数量
 NoSupplierPriceDefinedForThisProduct=此产品未设置供应商价格/数量
-PredefinedProductsToSell=Predefined products to sell
-PredefinedServicesToSell=Predefined services to sell
-PredefinedProductsAndServicesToSell=Predefined products/services to sell
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to puchase
-NotPredefinedProducts=Not predefined products/services
+PredefinedProductsToSell=预定产品到销售
+PredefinedServicesToSell=预定服务到销售
+PredefinedProductsAndServicesToSell=预定产品/服务到销售
+PredefinedProductsToPurchase=预定产品到采购
+PredefinedServicesToPurchase=预定服务到采购
+PredefinedProductsAndServicesToPurchase=预定产品/服务到采购
+NotPredefinedProducts=没有预定产品/服务
 GenerateThumb=生成 缩略图
 ServiceNb=服务 #%s
 ListProductServiceByPopularity=产品/服务列表(按人气)
 ListProductByPopularity=产品列表(按人气)
 ListServiceByPopularity=服务列表(按人气)
-Finished=已生产产品
+Finished=成品
 RowMaterial=原料
-CloneProduct=复制产品/服务
+CloneProduct=复制产品或服务
 ConfirmCloneProduct=您确定要复制产品或服务 <b>%s</b> 吗?
 CloneContentProduct=复制产品/服务的所有主要信息
 ClonePricesProduct=复制主要信息/价格
-CloneCompositionProduct=Clone packaged product/service
+CloneCompositionProduct=复制已打包包装的产品/服务
 ProductIsUsed=此产品已使用
 NewRefForClone=新产品/服务的编号
-SellingPrices=Selling prices
-BuyingPrices=Buying prices
-CustomerPrices=Customer prices
-SuppliersPrices=Supplier prices
-SuppliersPricesOfProductsOrServices=Supplier prices (of products or services)
+SellingPrices=售价
+BuyingPrices=买价
+CustomerPrices=客户价格
+SuppliersPrices=供应商价格
+SuppliersPricesOfProductsOrServices=供应商价格(产品或服务)
 CustomCode=海关编码
 CountryOrigin=产地国
 Nature=属性
-ShortLabel=Short label
-Unit=Unit
+ShortLabel=标签别名
+Unit=单位
 p=u.
-set=set
-se=set
-second=second
+set=设置
+se=设置
+second=秒
 s=s
-hour=hour
+hour=小时
 h=h
-day=day
+day=天
 d=d
-kilogram=kilogram
+kilogram=千克
 kg=Kg
-gram=gram
+gram=克
 g=g
-meter=meter
+meter=米
 m=m
 lm=lm
 m2=m²
 m3=m³
-liter=liter
+liter=升
 l=L
-ProductCodeModel=Product ref template
-ServiceCodeModel=Service ref template
+ProductCodeModel=产品编号模板
+ServiceCodeModel=服务编号模板
 CurrentProductPrice=当前价格
 AlwaysUseNewPrice=始终使用产品/服务的当前价格
 AlwaysUseFixedPrice=使用固定价格
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=不同数量价格
 PriceByQuantityRange=定量范围
-MultipriceRules=Price segment rules
+MultipriceRules=市场价格规则
 UseMultipriceRules=Use price segment rules (defined into product module setup) to autocalculate prices of all other segment according to first segment
-PercentVariationOver=%% variation over %s
+PercentVariationOver=%% 变化 %s
 PercentDiscountOver=%% discount over %s
 ### composition fabrication
 Build=生产
 ProductsMultiPrice=Products and prices for each price segment
-ProductsOrServiceMultiPrice=Customer prices (of products or services, multi-prices)
-ProductSellByQuarterHT=Products turnover quarterly before tax
+ProductsOrServiceMultiPrice=客户价格(产品或服务,多价格)
+ProductSellByQuarterHT=产品税前季度营业额
 ServiceSellByQuarterHT=Services turnover quarterly before tax
-Quarter1=第1季度
-Quarter2=第2季度
-Quarter3=第3季度
-Quarter4=第4季度
-BarCodePrintsheet=打印条形码
-PageToGenerateBarCodeSheets=With this tool, you can print sheets of bar code stickers. Choose format of your sticker page, type of barcode and value of barcode, then click on button <b>%s</b>.
-NumberOfStickers=Number of stickers to print on page
+Quarter1=一季度
+Quarter2=二季度
+Quarter3=三季度
+Quarter4=四季度
+BarCodePrintsheet=条码打印
+PageToGenerateBarCodeSheets=有了这个工具,你就可以在标签纸上打印条码啦。首先选择标签纸的条码格式,输入条码参数值, 最后点击这个按钮 <b>%s</b>。
+NumberOfStickers=要打印的标签数量
 PrintsheetForOneBarCode=Print several stickers for one barcode
-BuildPageToPrint=Generate page to print
-FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
-FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+BuildPageToPrint=生成打印页面
+FillBarCodeTypeAndValueManually=填入所要打印的条码类型和常规参数值
+FillBarCodeTypeAndValueFromProduct=将产品的条码值填入所要打印的条码类型和参数值
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
-BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
+BarCodeDataForProduct=产品条码信息 %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Different prices for each customer
-PriceCatalogue=A single sell price per product/service
-PricingRule=Rules for sell prices
-AddCustomerPrice=Add price by customer
+PriceByCustomer=每位客户不同价格
+PriceCatalogue=每产品/服务单独销售价
+PricingRule=销售价格规则
+AddCustomerPrice=为客户添加价格
 ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
 PriceByCustomerLog=Log of previous customer prices
-MinimumPriceLimit=Minimum price can't be lower then %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
-PriceExpressionEditor=Price expression editor
-PriceExpressionSelected=Selected price expression
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
+MinimumPriceLimit=最低价格不允许低于 %s
+MinimumRecommendedPrice=推荐最低价格 : %s
+PriceExpressionEditor=价格表达式编辑器
+PriceExpressionSelected=选择价格表达式
+PriceExpressionEditorHelp1="price = 2 + 2" 或 "2 + 2" 价格设置. 使用 ; 单独的表达式
 PriceExpressionEditorHelp2=You can access ExtraFields with variables like <b>#extrafield_myextrafieldkey#</b> and global variables with <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
 PriceExpressionEditorHelp4=In product/service price only: <b>#supplier_min_price#</b><br>In supplier prices only: <b>#supplier_quantity# and #supplier_tva_tx#</b>
-PriceExpressionEditorHelp5=Available global values:
-PriceMode=Price mode
-PriceNumeric=Number
-DefaultPrice=Default price
-ComposedProductIncDecStock=Increase/Decrease stock on parent change
-ComposedProduct=Sub-product
-MinSupplierPrice=Minimum supplier price
-MinCustomerPrice=Minimum customer price
-DynamicPriceConfiguration=Dynamic price configuration
+PriceExpressionEditorHelp5=全局变量值:
+PriceMode=价格模式
+PriceNumeric=数字
+DefaultPrice=默认价格
+ComposedProductIncDecStock=增加/减少父库存变化
+ComposedProduct=子产品
+MinSupplierPrice=供应商的最低价
+MinCustomerPrice=最低客户价格
+DynamicPriceConfiguration=动态价格配置
 DynamicPriceDesc=On product card, with this module enabled, you should be able to set mathematic functions to calculate Customer or Supplier prices. Such function can use all mathematic operators, some constants and variables. You can set here the variables you want to be able and if the variable need an automatic update, the external URL to use to ask Dolibarr to update automaticaly the value.
-AddVariable=Add Variable
-AddUpdater=Add Updater
-GlobalVariables=Global variables
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=Global variable updaters
-UpdateInterval=Update interval (minutes)
-LastUpdated=Last updated
-CorrectlyUpdated=Correctly updated
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product/service with tag
+AddVariable=添加变量
+AddUpdater=添加更新
+GlobalVariables=全局变量
+VariableToUpdate=变量到更新
+GlobalVariableUpdaters=全局变量更新
+UpdateInterval=升级更新间隔(分钟)
+LastUpdated=最后更新
+CorrectlyUpdated=当前更新
+PropalMergePdfProductActualFile=文件添加到 PDF Azur are/is
+PropalMergePdfProductChooseFile=选择PDF文件
+IncludingProductWithTag=包括产品/服务标签
 DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
 WarningSelectOneDocument=Please select at least one document
-DefaultUnitToShow=Unit
-NbOfQtyInProposals=Qty in proposals
+DefaultUnitToShow=单位
+NbOfQtyInProposals=报价数
 ClinkOnALinkOfColumn=Click on a link of column %s to get a detailed view...
-TranslatedLabel=Translated label
-TranslatedDescription=Translated description
-TranslatedNote=Translated notes
+TranslatedLabel=翻译标签
+TranslatedDescription=翻译描述
+TranslatedNote=翻译备注
 ProductWeight=Weight for 1 product
-ProductVolume=Volume for 1 product
-WeightUnits=Weight unit
-VolumeUnits=Volume unit
-SizeUnits=Size unit
-DeleteProductBuyPrice=Delete buying price
-ConfirmDeleteProductBuyPrice=Are you sure you want to delete this buying price?
+ProductVolume=产品 1 参数值
+WeightUnits=重量单位
+VolumeUnits=体积单位
+SizeUnits=大小单位
+DeleteProductBuyPrice=删除买价
+ConfirmDeleteProductBuyPrice=您确定想要删除买价吗?
 
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index e24a13ffd65..9df47e33682 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. project
-ProjectRef=Project ref.
-ProjectId=Project Id
-ProjectLabel=Project label
+RefProject=项目编号
+ProjectRef=项目编号
+ProjectId=项目ID号
+ProjectLabel=项目标签
 Project=项目
 Projects=项目
-ProjectsArea=Projects Area
-ProjectStatus=Project status
-SharedProject=每个人
-PrivateProject=Project contacts
+ProjectsArea=项目区
+ProjectStatus=项目状态
+SharedProject=全体同仁
+PrivateProject=项目联系人
 MyProjectsDesc=这种观点是有限的项目你是一个接触(不管是类型)。
 ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。
 TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
@@ -17,79 +17,79 @@ ProjectsDesc=这种观点提出的所有项目(你的用户权限批准你认
 TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
 MyTasksDesc=这种观点是有限的项目或任务你是一个接触(不管是类型)。
 OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=已关闭的项目是不可见的。
 TasksPublicDesc=这种观点提出的所有项目,您可阅读任务。
 TasksDesc=这种观点提出的所有项目和任务(您的用户权限批准你认为一切)。
 AllTaskVisibleButEditIfYouAreAssigned=All tasks for such project are visible, but you can enter time only for task you are assigned on. Assign task to you if you want to enter time on it.
 OnlyYourTaskAreVisible=Only tasks you are assigned on are visible. Assign task to you if you want to enter time on it.
-NewProject=新项目
-AddProject=Create project
+NewProject=新建项目
+AddProject=创建项目
 DeleteAProject=删除一个项目
 DeleteATask=删除任务
 ConfirmDeleteAProject=你确定要删除此项目吗?
 ConfirmDeleteATask=你确定要删除这个任务吗?
-OpenedProjects=Open projects
-OpenedTasks=Open tasks
-OpportunitiesStatusForOpenedProjects=Opportunities amount of open projects by status
-OpportunitiesStatusForProjects=Opportunities amount of projects by status
+OpenedProjects=打开项目
+OpenedTasks=打开任务
+OpportunitiesStatusForOpenedProjects=按有效项目状态机会值
+OpportunitiesStatusForProjects=按项目状态机会值
 ShowProject=显示项目
 SetProject=设置项目
 NoProject=没有项目或拥有的定义
-NbOfProjects=铌项目
+NbOfProjects=项目数量
 TimeSpent=花费的时间
-TimeSpentByYou=Time spent by you
-TimeSpentByUser=Time spent by user
+TimeSpentByYou=你花费的时间
+TimeSpentByUser=用户花费时间
 TimesSpent=所花费的时间
-RefTask=号。任务
+RefTask=任务编号
 LabelTask=标签任务
-TaskTimeSpent=Time spent on tasks
-TaskTimeUser=User
-TaskTimeNote=Note
+TaskTimeSpent=任务花费时间
+TaskTimeUser=用户
+TaskTimeNote=备注
 TaskTimeDate=日期
-TasksOnOpenedProject=Tasks on open projects
-WorkloadNotDefined=Workload not defined
+TasksOnOpenedProject=打开项目任务
+WorkloadNotDefined=工作量没有定义
 NewTimeSpent=新的时间
 MyTimeSpent=我的时间花
 Tasks=任务
 Task=任务
-TaskDateStart=Task start date
-TaskDateEnd=Task end date
-TaskDescription=Task description
-NewTask=新任务
-AddTask=Create task
+TaskDateStart=任务开始日期
+TaskDateEnd=任务结束日期
+TaskDescription=任务描述
+NewTask=新建任务
+AddTask=创建任务
 Activity=活动
 Activities=任务/活动
 MyActivities=我的任务/活动
 MyProjects=我的项目
-MyProjectsArea=My projects Area
+MyProjectsArea=我的项目区
 DurationEffective=有效时间
-ProgressDeclared=Declared progress
-ProgressCalculated=Calculated progress
+ProgressDeclared=进度
+ProgressCalculated=计算进展
 Time=时间
-ListOfTasks=List of tasks
+ListOfTasks=任务列表
 GoToListOfTimeConsumed=Go to list of time consumed
-GoToListOfTasks=Go to list of tasks
-ListProposalsAssociatedProject=名单与项目有关的商业建议
-ListOrdersAssociatedProject=名单与项目相关的客户的订单
-ListInvoicesAssociatedProject=名单与项目相关的客户的发票
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=名单与项目相关的供应商的订单
-ListSupplierInvoicesAssociatedProject=名单与项目相关的供应商的发票
-ListContractAssociatedProject=名单与项目有关的合同
-ListFichinterAssociatedProject=名单与项目相关的干预措施
-ListExpenseReportsAssociatedProject=List of expense reports associated with the project
-ListDonationsAssociatedProject=List of donations associated with the project
-ListActionsAssociatedProject=名单与项目有关的行动
-ListTaskTimeUserProject=List of time consumed on tasks of project
+GoToListOfTasks=任务列表
+ListProposalsAssociatedProject=项目相关的商业报价列表
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
+ListContractAssociatedProject=项目有关的合同列表
+ListFichinterAssociatedProject=项目相关的干预措施列表
+ListExpenseReportsAssociatedProject=项目相关费用报销列表
+ListDonationsAssociatedProject=项目相关捐款列表
+ListActionsAssociatedProject=项目有关的行动列表
+ListTaskTimeUserProject=项目相关任务时间列表
 ActivityOnProjectToday=Activity on project today
 ActivityOnProjectYesterday=Activity on project yesterday
-ActivityOnProjectThisWeek=对项目活动周
-ActivityOnProjectThisMonth=本月初对项目活动
-ActivityOnProjectThisYear=今年对项目活动
-ChildOfTask=儿童的项目/任务
+ActivityOnProjectThisWeek=本周项目活动
+ActivityOnProjectThisMonth=本月项目活动
+ActivityOnProjectThisYear=今年项目活动
+ChildOfTask=子项目/任务
 NotOwnerOfProject=不是所有者的私人项目
-AffectedTo=受影响
-CantRemoveProject=这个项目不能删除,因为它是由一些(其他对象引用的发票,订单或其他)。见参照资讯标签。
+AffectedTo=分配给
+CantRemoveProject=这个项目不能删除,因为它是由一些(其他对象引用的发票,订单或其他)。见参照资料标签。
 ValidateProject=验证谟
 ConfirmValidateProject=你确定要验证这个项目?
 CloseAProject=关闭项目
@@ -97,96 +97,97 @@ ConfirmCloseAProject=你确定要关闭此项目吗?
 ReOpenAProject=打开的项目
 ConfirmReOpenAProject=您确定要重新打开这个项目呢?
 ProjectContact=项目联系人
-ActionsOnProject=行动项目
+ActionsOnProject=项目活动
 YouAreNotContactOfProject=你是不是这个私人项目联系
 DeleteATimeSpent=删除的时间
 ConfirmDeleteATimeSpent=你确定要删除这个花的时间?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
-ShowMyTasksOnly=View only tasks assigned to me
-TaskRessourceLinks=Resources
-ProjectsDedicatedToThisThirdParty=这个项目致力于第三方
+DoNotShowMyTasksOnly=查看未分配给我的任务
+ShowMyTasksOnly=查看仅分配给我的任务
+TaskRessourceLinks=资源
+ProjectsDedicatedToThisThirdParty=这个项目致力于合伙人
 NoTasks=该项目没有任务
-LinkedToAnotherCompany=链接到其他第三方
-TaskIsNotAffectedToYou=Task not assigned to you
+LinkedToAnotherCompany=链接到其他合伙人
+TaskIsNotAffectedToYou=未分配给你的任务
 ErrorTimeSpentIsEmpty=所花费的时间是空的
-ThisWillAlsoRemoveTasks=这一行动也将删除所有项目任务<b>(%s</b>任务的时刻),花全部的时间都投入。
-IfNeedToUseOhterObjectKeepEmpty=如果某些对象(发票,订单,...),属于其他第三方,必须与该项目以创建,保持这个空项目多的第三方。
-CloneProject=克隆项目
-CloneTasks=克隆任务
-CloneContacts=克隆往来
-CloneNotes=克隆票据
-CloneProjectFiles=Clone project joined files
-CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
-ConfirmCloneProject=你一定要克隆这个项目?
+ThisWillAlsoRemoveTasks=这一行动也将删除所有项目任务 (<b>%s</b> 任务的时刻) ,花全部的时间都投入。
+IfNeedToUseOhterObjectKeepEmpty=如果某些对象(发票,订单,...),属于其他合伙人,必须与该项目以创建,保持这个空项目多的合伙人。
+CloneProject=复制项目
+CloneTasks=复制任务
+CloneContacts=复制联系人
+CloneNotes=复制备注
+CloneProjectFiles=复制项目嵌入文件中
+CloneTaskFiles=复制任务(s) 嵌入到文件中 (假如任务(s) 已复制的话)
+CloneMoveDate=即时更新项目/任务日期吗?
+ConfirmCloneProject=你一定要复制这个项目?
 ProjectReportDate=更改任务的日期,根据项目的开始日期
 ErrorShiftTaskDate=根据新项目的开始日期,不可能的改变任务日期
 ProjectsAndTasksLines=项目和任务
 ProjectCreatedInDolibarr=项目 %s  创建
-TaskCreatedInDolibarr=Task %s created
-TaskModifiedInDolibarr=Task %s modified
-TaskDeletedInDolibarr=Task %s deleted
-OpportunityStatus=Opportunity status
+ProjectModifiedInDolibarr=Project %s modified
+TaskCreatedInDolibarr=任务 %s 已创建
+TaskModifiedInDolibarr=任务 %s 已变更
+TaskDeletedInDolibarr=任务 %s 已删除
+OpportunityStatus=机会状态
 OpportunityStatusShort=Opp. status
-OpportunityProbability=Opportunity probability
+OpportunityProbability=机会概率
 OpportunityProbabilityShort=Opp. probab.
-OpportunityAmount=Opportunity amount
-OpportunityAmountShort=Opp. amount
-OpportunityAmountAverageShort=Average Opp. amount
-OpportunityAmountWeigthedShort=Weighted Opp. amount
-WonLostExcluded=Won/Lost excluded
+OpportunityAmount=机会数值
+OpportunityAmountShort=机会数值
+OpportunityAmountAverageShort=平均机会值
+OpportunityAmountWeigthedShort=加权机会值
+WonLostExcluded=不包括赢得/失去的
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=项目负责人
 TypeContact_project_external_PROJECTLEADER=项目负责人
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Contributor
-TypeContact_project_external_PROJECTCONTRIBUTOR=Contributor
+TypeContact_project_internal_PROJECTCONTRIBUTOR=捐助
+TypeContact_project_external_PROJECTCONTRIBUTOR=捐助
 TypeContact_project_task_internal_TASKEXECUTIVE=执行任务
 TypeContact_project_task_external_TASKEXECUTIVE=执行任务
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Contributor
-TypeContact_project_task_external_TASKCONTRIBUTOR=Contributor
-SelectElement=Select element
-AddElement=Link to element
+TypeContact_project_task_internal_TASKCONTRIBUTOR=捐助
+TypeContact_project_task_external_TASKCONTRIBUTOR=捐助
+SelectElement=选择元素
+AddElement=链接到元素
 # Documents models
-DocumentModelBeluga=Project template for linked objects overview
-DocumentModelBaleine=Project report template for tasks
+DocumentModelBeluga=项目模板链接到对象视图
+DocumentModelBaleine=任务项目报告模板
 PlannedWorkload=计划的工作量
-PlannedWorkloadShort=Workload
-ProjectReferers=Related items
-ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
-InputPerDay=Input per day
-InputPerWeek=Input per week
-InputPerAction=Input per action
+PlannedWorkloadShort=工作量
+ProjectReferers=关联物料
+ProjectMustBeValidatedFirst=项目首先必须认证
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
+InputPerDay=输入天数
+InputPerWeek=输入周数
+InputPerAction=输入动作
 TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
-ProjectsWithThisUserAsContact=Projects with this user as contact
-TasksWithThisUserAsContact=Tasks assigned to this user
-ResourceNotAssignedToProject=Not assigned to project
+ProjectsWithThisUserAsContact=项目的用户作为联系人
+TasksWithThisUserAsContact=任务分配给这个用户
+ResourceNotAssignedToProject=未分配到项目
 ResourceNotAssignedToTheTask=Not assigned to the task
-AssignTaskToMe=Assign task to me
-AssignTask=Assign
-ProjectOverview=Overview
-ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=Nb of created projects by month
+AssignTaskToMe=分配任务给自己
+AssignTask=分配
+ProjectOverview=概览
+ManageTasks=用项目跟进任务和工时
+ManageOpportunitiesStatus=用项目跟进机会/线索
+ProjectNbProjectByMonth=按月份筛选创建项目数
 ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
-ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
-ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
-ProjectsStatistics=Statistics on projects/leads
+ProjectWeightedOppAmountOfProjectsByMonth=按月的机会加权数值
+ProjectOpenedProjectByOppStatus=按机会状态打开项目/线索
+ProjectsStatistics=统计项目/线索
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
-OpenedProjectsByThirdparties=Open projects by thirdparties
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
+OpenedProjectsByThirdparties=按合伙人打开项目
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
 NotAnOpportunityShort=Not an opportunity
-OpportunityTotalAmount=Opportunities total amount
-OpportunityPonderatedAmount=Opportunities weighted amount
-OpportunityPonderatedAmountDesc=Opportunities amount weighted with probability
-OppStatusPROSP=Prospection
-OppStatusQUAL=Qualification
-OppStatusPROPO=Proposal
-OppStatusNEGO=Negociation
-OppStatusPENDING=Pending
-OppStatusWON=Won
-OppStatusLOST=Lost
-Budget=Budget
+OpportunityTotalAmount=机会数值总计
+OpportunityPonderatedAmount=机会加权数值
+OpportunityPonderatedAmountDesc=机会加权数值机率
+OppStatusPROSP=准客户
+OppStatusQUAL=授权
+OppStatusPROPO=报价
+OppStatusNEGO=谈判
+OppStatusPENDING=待办
+OppStatusWON=赢得
+OppStatusLOST=失去
+Budget=预算
diff --git a/htdocs/langs/zh_CN/propal.lang b/htdocs/langs/zh_CN/propal.lang
index 02de173fb7d..955fd0acd96 100644
--- a/htdocs/langs/zh_CN/propal.lang
+++ b/htdocs/langs/zh_CN/propal.lang
@@ -3,23 +3,23 @@ Proposals=报价单
 Proposal=报价单
 ProposalShort=报价
 ProposalsDraft=起草报价单
-ProposalsOpened=Open commercial proposals
+ProposalsOpened=开启商业报价
 Prop=报价单
 CommercialProposal=报价单
 ProposalCard=报价 信息卡
 NewProp=新建报价单
 NewPropal=新建报价单
-Prospect=潜在客户
+Prospect=准客户
 DeleteProp=删除报价单
 ValidateProp=确定报价单
-AddProp=Create proposal
+AddProp=创建建议
 ConfirmDeleteProp=您确定要删除此报价单吗?
 ConfirmValidateProp=您确定要制定报价<b>%s</b>吗?
-LastPropals=Latest %s proposals
-LastModifiedProposals=Latest %s modified proposals
+LastPropals=最近的 %s 份报价
+LastModifiedProposals=最近变更的 %s 份报价
 AllPropals=全部报价单
 SearchAProposal=搜索报价单
-NoProposal=No proposal
+NoProposal=空空如也——没有报价
 ProposalsStatistics=报价单统计
 NumberOfProposalsByMonth=月数量
 AmountOfProposalsByMonthHT=金额 (税前)/每月
@@ -27,13 +27,13 @@ NbOfProposals=报价单数量
 ShowPropal=显示报价
 PropalsDraft=草稿
 PropalsOpened=打开
-PropalStatusDraft=草案(需要验证)
+PropalStatusDraft=草稿(需要验证)
 PropalStatusValidated=已确定(打开的报价单)
 PropalStatusSigned=已签署(待付款)
 PropalStatusNotSigned=未签署(已关闭)
 PropalStatusBilled=已到账
 PropalStatusDraftShort=草稿
-PropalStatusClosedShort=已关闭
+PropalStatusClosedShort=已禁用
 PropalStatusSignedShort=已签署
 PropalStatusNotSignedShort=未签署
 PropalStatusBilledShort=已到账
@@ -44,27 +44,27 @@ ActionsOnPropal=报价相关事件
 RefProposal=报价单编号
 SendPropalByMail=通过电邮发送报价单
 DatePropal=报价日期
-DateEndPropal=有效期截至日期
+DateEndPropal=有效期截止至
 ValidityDuration=有效时间
-CloseAs=Set status to
-SetAcceptedRefused=Set accepted/refused
+CloseAs=设置状态
+SetAcceptedRefused=设定接受/拒绝
 ErrorPropalNotFound=未发现报价单 %s
-AddToDraftProposals=添加至提议草案
-NoDraftProposals=没有提议草案
-CopyPropalFrom=通过复制(并修改)现有报价单创建新报价单
+AddToDraftProposals=添加至报价草稿
+NoDraftProposals=没有报价草稿
+CopyPropalFrom=通过复制(并变更)现有报价单创建新报价单
 CreateEmptyPropal=新建空白报价单
-DefaultProposalDurationValidity=默认报价单有效期(按日)
+DefaultProposalDurationValidity=默认报价单有效期(按天计算)
 UseCustomerContactAsPropalRecipientIfExist=报价单中使用客户联系人信息中的地址,不使用客户公司的办公地址是。
 ClonePropal=复制报价单
-ConfirmClonePropal=您确定要复制并修改报价单<b>%s</b>吗?
+ConfirmClonePropal=您确定要复制并变更报价单<b>%s</b>吗?
 ConfirmReOpenProp=您确定要重新打开报价单<b>%s</b>吗?
 ProposalsAndProposalsLines=报价单和报价项目
 ProposalLine=报价项目
-AvailabilityPeriod=允许交货延迟
+AvailabilityPeriod=交货延迟期
 SetAvailability=设置交货延迟期
 AfterOrder=下单后
 ##### Availability #####
-AvailabilityTypeAV_NOW=立即
+AvailabilityTypeAV_NOW=即时
 AvailabilityTypeAV_1W=1 周
 AvailabilityTypeAV_2W=2 周
 AvailabilityTypeAV_3W=3 周
@@ -74,9 +74,9 @@ TypeContact_propal_internal_SALESREPFOLL=跟进报价的销售代表
 TypeContact_propal_external_BILLING=客户账单联系人
 TypeContact_propal_external_CUSTOMER=跟进报价的客户联系人
 # Document models
-DocModelAzurDescription=完整的订单模版 (标志...)
+DocModelAzurDescription=完整的订单模版 (LOGO标志...)
 DefaultModelPropalCreate=设置默认模板
 DefaultModelPropalToBill=关闭订单时使用的默认模板(待生成账单)
 DefaultModelPropalClosed=关闭订单时使用的默认模板(待付款)
-ProposalCustomerSignature=Written acceptance, company stamp, date and signature
-ProposalsStatisticsSuppliers=Supplier proposals statistics
+ProposalCustomerSignature=书面接受,公司盖章,日期和签名
+ProposalsStatisticsSuppliers=供应商报价统计
diff --git a/htdocs/langs/zh_CN/receiptprinter.lang b/htdocs/langs/zh_CN/receiptprinter.lang
index 756461488cc..b306b4d9851 100644
--- a/htdocs/langs/zh_CN/receiptprinter.lang
+++ b/htdocs/langs/zh_CN/receiptprinter.lang
@@ -1,44 +1,44 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Setup of module ReceiptPrinter
-PrinterAdded=Printer %s added
-PrinterUpdated=Printer %s updated
-PrinterDeleted=Printer %s deleted
-TestSentToPrinter=Test Sent To Printer %s
-ReceiptPrinter=Receipt printers
-ReceiptPrinterDesc=Setup of receipt printers
-ReceiptPrinterTemplateDesc=Setup of Templates
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
-ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
-ListPrinters=List of Printers
-SetupReceiptTemplate=Template Setup
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Network Printer
-CONNECTOR_FILE_PRINT=Local Printer
-CONNECTOR_WINDOWS_PRINT=Local Windows Printer
-CONNECTOR_DUMMY_HELP=Fake Printer for test, does nothing
+ReceiptPrinterSetup=设置发票打印机模块
+PrinterAdded=打印机 %s 已添加
+PrinterUpdated=打印机 %s 已更新
+PrinterDeleted=打印机 %s 已删除
+TestSentToPrinter=发送测试页到打印机 %s
+ReceiptPrinter=发票打印机
+ReceiptPrinterDesc=设置发票打印机
+ReceiptPrinterTemplateDesc=模板设置
+ReceiptPrinterTypeDesc=发票打印机类型描述
+ReceiptPrinterProfileDesc=发票打印机配置
+ListPrinters=打印机列表
+SetupReceiptTemplate=模板设置
+CONNECTOR_DUMMY=虚拟打印机
+CONNECTOR_NETWORK_PRINT=网络打印机
+CONNECTOR_FILE_PRINT=本地打印机
+CONNECTOR_WINDOWS_PRINT=本地Windows打印机
+CONNECTOR_DUMMY_HELP=伪造测试打印,啥也不做的
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
 CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
-PROFILE_DEFAULT=Default Profile
-PROFILE_SIMPLE=Simple Profile
-PROFILE_EPOSTEP=Epos Tep Profile
-PROFILE_P822D=P822D Profile
-PROFILE_STAR=Star Profile
-PROFILE_DEFAULT_HELP=Default Profile suitable for Epson printers
-PROFILE_SIMPLE_HELP=Simple Profile No Graphics
-PROFILE_EPOSTEP_HELP=Epos Tep Profile Help
-PROFILE_P822D_HELP=P822D Profile No Graphics
-PROFILE_STAR_HELP=Star Profile
-DOL_ALIGN_LEFT=Left align text
-DOL_ALIGN_CENTER=Center text
-DOL_ALIGN_RIGHT=Right align text
+PROFILE_DEFAULT=默认配置
+PROFILE_SIMPLE=简单配置
+PROFILE_EPOSTEP=Epos Tep配置
+PROFILE_P822D=P822D 配置
+PROFILE_STAR=开始配置
+PROFILE_DEFAULT_HELP=Epson打印机默认最佳配置
+PROFILE_SIMPLE_HELP=简单配置无可视界面
+PROFILE_EPOSTEP_HELP=Epos Tep 配置帮助
+PROFILE_P822D_HELP=P822D 配置无可视界面
+PROFILE_STAR_HELP=开始配置
+DOL_ALIGN_LEFT=文字居左
+DOL_ALIGN_CENTER=文字居中
+DOL_ALIGN_RIGHT=文字居右
 DOL_USE_FONT_A=Use font A of printer
 DOL_USE_FONT_B=Use font B of printer
 DOL_USE_FONT_C=Use font C of printer
-DOL_PRINT_BARCODE=Print barcode
-DOL_PRINT_BARCODE_CUSTOMER_ID=Print barcode customer id
+DOL_PRINT_BARCODE=打印条码
+DOL_PRINT_BARCODE_CUSTOMER_ID=打印客户id条码
 DOL_CUT_PAPER_FULL=Cut ticket completely
 DOL_CUT_PAPER_PARTIAL=Cut ticket partially
 DOL_OPEN_DRAWER=Open cash drawer
 DOL_ACTIVATE_BUZZER=Activate buzzer
-DOL_PRINT_QRCODE=Print QR Code
+DOL_PRINT_QRCODE=打印二维码
diff --git a/htdocs/langs/zh_CN/resource.lang b/htdocs/langs/zh_CN/resource.lang
index 018f4f8b5bd..8f623536ee3 100644
--- a/htdocs/langs/zh_CN/resource.lang
+++ b/htdocs/langs/zh_CN/resource.lang
@@ -1,31 +1,31 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=资源
-MenuResourceAdd=新资源
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
+MenuResourceAdd=新的资源
+DeleteResource=删除资源
+ConfirmDeleteResourceElement=确认从这个元素中删除资源
+NoResourceInDatabase=数据库中无资源
 NoResourceLinked=无资源链接
 
 ResourcePageIndex=资源列表
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourceSingular=资源
+ResourceCard=资源信息卡
+AddResource=新建资源
+ResourceFormLabel_ref=资源名称
+ResourceType=资源类别
+ResourceFormLabel_description=资源描述
 
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=资源链接到元素
 
-ShowResource=Show resource
+ShowResource=显示资源
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=元素资源
+ResourceCreatedWithSuccess=资源成功创建
+RessourceLineSuccessfullyDeleted=资源明细成功删除
+RessourceLineSuccessfullyUpdated=资源明细成功更新
+ResourceLinkedWithSuccess=资源链接成功
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+ConfirmDeleteResource=确认删除这个资源
+RessourceSuccessfullyDeleted=资源成功删除
+DictionaryResourceType=资源类别
 
-SelectResource=Select resource
+SelectResource=请选择资源
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index da177410860..bd66875ec16 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -1,14 +1,14 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
-Salary=Salary
-Salaries=Salaries
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
-CurrentSalary=Current salary
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=薪酬支付的财务会计科目代码
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=财务记账科目代码
+Salary=工资
+Salaries=工资
+NewSalaryPayment=新建工资支付
+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
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index b4c07295e03..76f1a407db0 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -1,67 +1,67 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=号。装船
-Sending=装船
-Sendings=出货
-AllSendings=All Shipments
-Shipment=装船
-Shipments=出货
-ShowSending=Show Shipments
-Receivings=Delivery Receipts
-SendingsArea=出货面积
-ListOfSendings=名单sendings
-SendingMethod=送货方式
-LastSendings=Latest %s shipments
+RefSending=运输编号
+Sending=运输
+Sendings=运输
+AllSendings=全部运输
+Shipment=运输
+Shipments=运输
+ShowSending=显示运输
+Receivings=送货单
+SendingsArea=出货区
+ListOfSendings=运输列表
+SendingMethod=运输方式
+LastSendings=最近的 %s 次出货
 StatisticsOfSendings=统计出货量
 NbOfSendings=出货数量
 NumberOfShipmentsByMonth=每月的出货数量
-SendingCard=Shipment card
-NewSending=新装运
-CreateASending=创建一个货件
+SendingCard=运输信息卡
+NewSending=新建运输
+CreateASending=创建运输
 QtyShipped=出货数量
 QtyToShip=出货数量
 QtyReceived=收到的数量
 KeepToShip=Remain to ship
-OtherSendingsForSameOrder=这个命令的其他货物
-SendingsAndReceivingForSameOrder=出货量为这种秩序和receivings
-SendingsToValidate=发送验证
+OtherSendingsForSameOrder=这个订单的其他运输
+SendingsAndReceivingForSameOrder=该订单的出货和收货
+SendingsToValidate=运输验证
 StatusSendingCanceled=取消
-StatusSendingDraft=草案
+StatusSendingDraft=草稿
 StatusSendingValidated=验证(产品出货或已经出货)
 StatusSendingProcessed=加工
-StatusSendingDraftShort=草案
+StatusSendingDraftShort=草稿
 StatusSendingValidatedShort=验证
 StatusSendingProcessedShort=加工
-SendingSheet=Shipment sheet
-ConfirmDeleteSending=你确定要删除这个交货?
-ConfirmValidateSending=你确定要验证这个交货?
-ConfirmCancelSending=你确定要取消此交货?
-DocumentModelSimple=简单的文档模型
-DocumentModelMerou=梅鲁河五大模式
+SendingSheet=运输表格
+ConfirmDeleteSending=你确定要删除这个运输吗?
+ConfirmValidateSending=你确定要验证这个运输 <b>%s</b> 吗?
+ConfirmCancelSending=你确定要取消此运输吗?
+DocumentModelSimple=简洁的文档模板
+DocumentModelMerou=Merou A5 model
 WarningNoQtyLeftToSend=警告,没有产品等待装运。
-StatsOnShipmentsOnlyValidated=对货物进行统计验证。使用的数据的验证的装运日期(计划交货日期并不总是已知)。
-DateDeliveryPlanned=Planned date of delivery
+StatsOnShipmentsOnlyValidated=对运输进行统计验证。使用的数据的验证的装运日期(计划交货日期并不总是已知)。
+DateDeliveryPlanned=计划运输日期
 DateReceived=交货日期收到
-SendShippingByEMail=通过电子邮件发送货物
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=对装运的事件
+SendShippingByEMail=通过电子邮件发送运输信息资料
+SendShippingRef=提交运输 %s
+ActionsOnShipping=运输活动
 LinkToTrackYourPackage=链接到追踪您的包裹
-ShipmentCreationIsDoneFromOrder=就目前而言,建立一个新的装运完成从订单卡。
-ShipmentLine=航线
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
+ShipmentCreationIsDoneFromOrder=就目前而言,创建一个新的装运完成从订单信息卡。
+ShipmentLine=运输线路
+ProductQtyInCustomersOrdersRunning=打开的客户订单中产品的数量
+ProductQtyInSuppliersOrdersRunning=供应商订单中产品数量
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInSuppliersShipmentAlreadyRecevied=已接收到的供应商订单中产品数量
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
+WeightVolShort=重量/体积
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=更多的送货单(logo. ..完整的文档模型)
+DocumentModelTyphon=更多的送货单(logo. ..完整的文档模板)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=没有定义的常数EXPEDITION_ADDON_NUMBER
 SumOfProductVolumes=产品总数
 SumOfProductWeights=产品总重
 
 # warehouse details
-DetailWarehouseNumber= Warehouse details
-DetailWarehouseFormat= W:%s (Qty : %d)
+DetailWarehouseNumber= 仓库明细
+DetailWarehouseFormat= 重量:%s (数量 : %d)
diff --git a/htdocs/langs/zh_CN/sms.lang b/htdocs/langs/zh_CN/sms.lang
index 14413c749e6..6d50316c18b 100644
--- a/htdocs/langs/zh_CN/sms.lang
+++ b/htdocs/langs/zh_CN/sms.lang
@@ -8,7 +8,7 @@ SmsTargets=目标
 SmsRecipients=目标
 SmsRecipient=目标
 SmsTitle=描述
-SmsFrom=寄件人
+SmsFrom=寄件者
 SmsTo=目标
 SmsTopic=主题的短信
 SmsText=讯息
@@ -27,7 +27,7 @@ SmsResult=结果发送短信
 TestSms=测试短信
 ValidSms=验证SMS
 ApproveSms=批准短信
-SmsStatusDraft=草案
+SmsStatusDraft=草稿
 SmsStatusValidated=验证
 SmsStatusApproved=批准
 SmsStatusSent=发送
@@ -39,11 +39,11 @@ SmsSuccessfulySent=短信正确发送(从%s %s)
 ErrorSmsRecipientIsEmpty=目标号码是空的
 WarningNoSmsAdded=没有新的电话号码添加到目标列表
 ConfirmValidSms=你确认这个战役的验证?
-NbOfUniqueSms=铌自由度唯一的电话号码
-NbOfSms=喷号码的nbre
+NbOfUniqueSms=电话号码单位数量
+NbOfSms=电话号码数量
 ThisIsATestMessage=这是一条测试消息
 SendSms=发送短信
-SmsInfoCharRemain=铌的剩余字符
+SmsInfoCharRemain=剩余字符数量
 SmsInfoNumero= (国际格式如:33899701761)
 DelayBeforeSending=延迟发送前(分钟)
 SmsNoPossibleSenderFound=No sender available. Check setup of your SMS provider.
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index ddfa812282e..348dc39ab6e 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -1,39 +1,41 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=仓库卡片
+WarehouseCard=仓库信息
 Warehouse=仓库
 Warehouses=仓库
-NewWarehouse=新仓库/库存区
-WarehouseEdit=修改仓库
-MenuNewWarehouse=新仓库
-WarehouseSource=来源仓库
+NewWarehouse=新建仓库/库位
+WarehouseEdit=变更仓库
+MenuNewWarehouse=新建仓库
+WarehouseSource=来源仓
 WarehouseSourceNotDefined=没有定义仓库,
 AddOne=添加
-WarehouseTarget=目标仓库
+WarehouseTarget=目标仓
 ValidateSending=删除发送
 CancelSending=取消发送
 DeleteSending=删除发送
-Stock=股票
-Stocks=仓库
-StocksByLotSerial=Stocks by lot/serial
+Stock=库存
+Stocks=库存
+StocksByLotSerial=按库存批号/序列号
+LotSerial=批号/序列号
+LotSerialList=批号/序列号列表
 Movements=运动
 ErrorWarehouseRefRequired=仓库引用的名称是必需的
-ListOfWarehouses=仓库名单
-ListOfStockMovements=名单的股票走势
-StocksArea=Warehouses area
+ListOfWarehouses=仓库列表
+ListOfStockMovements=库存调拨列表
+StocksArea=仓库区
 Location=位置
-LocationSummary=短名称位置
+LocationSummary=位置简称
 NumberOfDifferentProducts=不同的产品数
 NumberOfProducts=产品总数
 LastMovement=最后乐章
 LastMovements=最后动作
 Units=单位
 Unit=单位
-StockCorrection=正确的股票
-StockTransfer=Transfer stock
-MassStockTransferShort=Mass stock transfer
-StockMovement=Stock movement
-StockMovements=Stock movements
-LabelMovement=转移标签
+StockCorrection=合适的库存
+StockTransfer=库存调拨
+MassStockTransferShort=批量库存调拨
+StockMovement=库存调拨转移
+StockMovements=库存调拨转移
+LabelMovement=调拨标签
 NumberOfUnit=单位数目
 UnitPurchaseValue=采购单价
 StockTooLow=库存过低
@@ -42,93 +44,100 @@ EnhancedValue=值
 PMPValue=加权平均价格
 PMPValueShort=的WAP
 EnhancedValueOfWarehouses=仓库价值
-UserWarehouseAutoCreate=创建一个股票时自动创建一个用户
+UserWarehouseAutoCreate=创建一个库存时自动创建一个用户
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=派出数量
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=派送数量
+QtyToDispatchShort=分配数量
 OrderDispatch=联合调度
 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=Decrease real stocks on customers orders validation
-DeStockOnShipment=减少实际库存出货验证
+DeStockOnValidateOrder=减少库存对客户订单的确认
+DeStockOnShipment=减少实际库存送货验证
 DeStockOnShipmentOnClosing=Decrease real stocks on shipping classification closed
-ReStockOnBill=增加对供应商发票的实际库存/信用票据验证(警告在此版本中,它只有在仓库数1,股票被修改)
-ReStockOnValidateOrder=对供应商的订单增加赞许(警告在此版本中,真正的股票,它只有在仓库数1,股票被修改)
-ReStockOnDispatchOrder=增加人工调度到仓库供应商接到订单后,实时股票
+ReStockOnBill=增加对供应商发票的实际库存/信用票据验证
+ReStockOnValidateOrder=对供应商订单增加赞许
+ReStockOnDispatchOrder=增加人工调度到仓库供应商接到订单后,实时库存
 OrderStatusNotReadyToDispatch=命令还没有或根本没有更多的地位,使产品在仓库库存调度。
 StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
 NoPredefinedProductToDispatch=此对象没有预定义的产品。因此,没有库存调度是必需的。
 DispatchVerb=派遣
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
-PhysicalStock=体育股票
-RealStock=实际股票
-VirtualStock=虚拟股票
+StockLimitShort=最小预警值
+StockLimit=最小库存预警
+PhysicalStock=实际库存
+RealStock=实际库存
+VirtualStock=虚拟库存
 IdWarehouse=编号仓库
 DescWareHouse=说明仓库
 LieuWareHouse=本地化仓库
 WarehousesAndProducts=仓库和产品
-WarehousesAndProductsBatchDetail=Warehouses and products (with detail per lot/serial)
+WarehousesAndProductsBatchDetail=仓库和产品(各批号/序列号详情)
 AverageUnitPricePMPShort=投入品平均价格
 AverageUnitPricePMP=投入品平均价格
 SellPriceMin=销售单价
-EstimatedStockValueSellShort=Value for sell
-EstimatedStockValueSell=Value for sell
-EstimatedStockValueShort=估计值的股票
-EstimatedStockValue=估计值的股票
+EstimatedStockValueSellShort=销量
+EstimatedStockValueSell=销量
+EstimatedStockValueShort=输入库存值
+EstimatedStockValue=输入库存值
 DeleteAWarehouse=删除仓库
 ConfirmDeleteWarehouse=你确定要删除仓库<b>%s吗</b> ?
-PersonalStock=%s的个人股票
-ThisWarehouseIsPersonalStock=这个仓库代表的%s%的个人股票期权
+PersonalStock=个人库存 %s
+ThisWarehouseIsPersonalStock=此仓库为个人库存 %s %s
 SelectWarehouseForStockDecrease=选择仓库库存减少使用
 SelectWarehouseForStockIncrease=选择使用库存增加的仓库
 NoStockAction=暂无现货的行动
-DesiredStock=Desired optimal stock
+DesiredStock=最佳库存值
 DesiredStockDesc=This stock amount will be the value used to fill the stock by replenishment feature.
 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
-UseVirtualStock=Use virtual stock
-UsePhysicalStock=Use physical stock
-CurentSelectionMode=Current selection mode
-CurentlyUsingVirtualStock=Virtual stock
-CurentlyUsingPhysicalStock=Physical stock
+UseVirtualStock=使用虚拟库位
+UsePhysicalStock=使用物理库位
+CurentSelectionMode=当前所选模式
+CurentlyUsingVirtualStock=虚拟库位
+CurentlyUsingPhysicalStock=物理库位
 RuleForStockReplenishment=库存补充规则
-SelectProductWithNotNullQty=至少选择一个数量非空的产品和供应商
-AlertOnly= Alerts only
+SelectProductWithNotNullQty=请至少选择一个数量非空的产品和供应商
+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
-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.
-Replenishments=Replenishments
+ForThisWarehouse=这个仓库
+ReplenishmentStatusDesc=下面列表罗表出低于库存要求的最低库存的全部商品 (或者低于库存预警值 "alert only"复选框 ). 使用复选框, 您可以创建供应商订单,以填补差额.
+ReplenishmentOrdersDesc=这是一个包含所有包括预定义产品的打开的供应商订单的列表.只有预定义的产品的订单,所以可能会影响库存的订单,在这里是可见的。
+Replenishments=补充资金
 NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
 NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
-MassMovement=Mass movement
-SelectProductInAndOutWareHouse=Select a product, a quantity, a source warehouse and a target warehouse, then click "%s". Once this is done for all required movements, click onto "%s".
-RecordMovement=Record transfert
-ReceivingForSameOrder=Receipts for this order
-StockMovementRecorded=Stock movements recorded
-RuleForStockAvailability=Rules on stock requirements
+MassMovement=批量库存调拨
+SelectProductInAndOutWareHouse=请选择一个产品,数量值,来源仓和目标仓,然后点击 "%s"。完了之后呢,点击 "%s"。
+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)
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
+MovementLabel=调拨标签
+InventoryCode=调拨或盘点编码
+IsInPackage=包含在模块包
 WarehouseAllowNegativeTransfer=Stock can be negative
 qtyToTranferIsNotEnough=You don't have enough stock from your source warehouse
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
-InventoryCodeShort=Inv./Mov. code
+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 for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/zh_CN/supplier_proposal.lang b/htdocs/langs/zh_CN/supplier_proposal.lang
index 909a4d713c1..23aecc96701 100644
--- a/htdocs/langs/zh_CN/supplier_proposal.lang
+++ b/htdocs/langs/zh_CN/supplier_proposal.lang
@@ -1,53 +1,54 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Supplier commercial proposals
-supplier_proposalDESC=Manage price requests to suppliers
-SupplierProposalNew=New request
-CommRequest=Price request
-CommRequests=Price requests
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Draft supplier proposals
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Open price requests
-SupplierProposalArea=Supplier proposals area
-SupplierProposalShort=Supplier proposal
-SupplierProposals=Supplier proposals
-SupplierProposalsShort=Supplier proposals
-NewAskPrice=New price request
-ShowSupplierProposal=Show price request
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Supplier ref
-SupplierProposalDate=Delivery date
+SupplierProposal=供应商商业报价
+supplier_proposalDESC=管理供应商询价申请
+SupplierProposalNew=新建申请
+CommRequest=询价申请
+CommRequests=询价申请
+SearchRequest=搜索申请
+DraftRequests=草稿
+SupplierProposalsDraft=供应商报价草稿
+LastModifiedRequests=最近变更的 %s 份询价申请
+RequestsOpened=打开询价申请
+SupplierProposalArea=供应商报价区
+SupplierProposalShort=供应商报价
+SupplierProposals=供应商报价
+SupplierProposalsShort=供应商报价
+NewAskPrice=新建询价申请
+ShowSupplierProposal=显示询价申请
+AddSupplierProposal=创建询价申请
+SupplierProposalRefFourn=供应商编号
+SupplierProposalDate=交货日期
 SupplierProposalRefFournNotice=Before closing to "Accepted", think to grasp suppliers references.
-ConfirmValidateAsk=Are you sure you want to validate this price request under name <b>%s</b> ?
-DeleteAsk=Delete request
-ValidateAsk=Validate request
-SupplierProposalStatusDraft=Draft (needs to be validated)
+ConfirmValidateAsk=您确定想要确认这个名为 <b>%s</b> 的询价申请吗?
+DeleteAsk=删除申请
+ValidateAsk=验证申请
+SupplierProposalStatusDraft=草稿(需要确认)
 SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Closed
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
-SupplierProposalStatusDraftShort=Draft
-SupplierProposalStatusClosedShort=Closed
-SupplierProposalStatusSignedShort=Accepted
-SupplierProposalStatusNotSignedShort=Refused
-CopyAskFrom=Create price request by copying existing a request
-CreateEmptyAsk=Create blank request
-CloneAsk=Clone price request
-ConfirmCloneAsk=Are you sure you want to clone the price request <b>%s</b> ?
-ConfirmReOpenAsk=Are you sure you want to open back the price request <b>%s</b> ?
-SendAskByMail=Send price request by mail
-SendAskRef=Sending the price request %s
+SupplierProposalStatusClosed=关闭
+SupplierProposalStatusSigned=接受
+SupplierProposalStatusNotSigned=拒绝
+SupplierProposalStatusDraftShort=草稿
+SupplierProposalStatusClosedShort=关闭
+SupplierProposalStatusSignedShort=接受
+SupplierProposalStatusNotSignedShort=拒绝
+CopyAskFrom=复制已创建的询价申请为新的询价申请
+CreateEmptyAsk=创建空白申请
+CloneAsk=复制询价申请
+ConfirmCloneAsk=您确定想要复制这个询价申请 <b>%s</b> 吗?
+ConfirmReOpenAsk=您确定想要撤回这个询价申请 <b>%s</b> 吗?
+SendAskByMail=用邮件发送询价申请
+SendAskRef=发送询价申请 %s
 SupplierProposalCard=Request card
-ConfirmDeleteAsk=Are you sure you want to delete this price request ?
-ActionsOnSupplierProposal=Events on price request
-DocModelAuroreDescription=A complete request model (logo...)
-CommercialAsk=Price request
+ConfirmDeleteAsk=您确定想要删除这个询价申请吗?
+ActionsOnSupplierProposal=询价申请的活动
+DocModelAuroreDescription=一个完成申请模型(logo...)
+CommercialAsk=询价申请
 DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposal=List of supplier proposal requests
-SupplierProposalsToClose=Supplier proposals to close
-SupplierProposalsToProcess=Supplier proposals to process
-LastSupplierProposals=Last price requests
-AllPriceRequests=All requests
+DefaultModelSupplierProposalToBill=当关闭询价申请时的默认模板 (接受)
+DefaultModelSupplierProposalClosed=当关闭询价申请时的默认模板 (拒绝)
+ListOfSupplierProposal=供应商报价需求列表
+ListSupplierProposalsAssociatedProject=供应商报价与项目列表
+SupplierProposalsToClose=供应商无效报价
+SupplierProposalsToProcess=处理供应商报价
+LastSupplierProposals=最新的询价申请
+AllPriceRequests=全部申请
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index 4d3d59ae9e4..11c82a45a26 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -1,43 +1,43 @@
 # Dolibarr language file - Source file is en_US - suppliers
 Suppliers=供应商
 SuppliersInvoice=供应商发票
-ShowSupplierInvoice=Show Supplier Invoice
+ShowSupplierInvoice=显示供应商发票
 NewSupplier=新供应商
 History=历史
-ListOfSuppliers=供应商名单
+ListOfSuppliers=供应商列表
 ShowSupplier=查看供应商
 OrderDate=订购日期
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=新增供应商的价格
-ChangeSupplierPrice=供应商的价格变化
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=该参考供应商已经与一参考:%s的
-NoRecordedSuppliers=没有供应商记录
+NoRecordedSuppliers=空空如也——没有供应商记录
 SupplierPayment=供应商付款
 SuppliersArea=供应商区
-RefSupplierShort=号。供应商
+RefSupplierShort=供应商编号
 Availability=可用性
 ExportDataset_fournisseur_1=供应商发票清单和发票的路线
 ExportDataset_fournisseur_2=供应商发票和付款
-ExportDataset_fournisseur_3=供应商的订单和订单行
+ExportDataset_fournisseur_3=供应商订单和订单行
 ApproveThisOrder=批准这一命令
 ConfirmApproveThisOrder=你确定要批准了这项命令?
-DenyingThisOrder=Deny this order
+DenyingThisOrder=否认这笔订单
 ConfirmDenyingThisOrder=你确定要否认这个秩序?
 ConfirmCancelThisOrder=您确定要取消此订单?
-AddSupplierOrder=建立供应商的订单
+AddSupplierOrder=创建供应商订单
 AddSupplierInvoice=创建供应商发票
-ListOfSupplierProductForSupplier=<b>%</b>产品供应商名单和价格<b>的</b> S
+ListOfSupplierProductForSupplier=产品和供应商价格列表 <b>%s</b>
 SentToSuppliers=发送到供应商
-ListOfSupplierOrders=List of supplier orders
-MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
+ListOfSupplierOrders=供应商订单列表
+MenuOrdersSupplierToBill=供应商订单发票
+NbDaysToDelivery=交货延迟天数
 DescNbDaysToDelivery=The biggest deliver delay of the products from this order
-UseDoubleApproval=Use double approval when amount (without tax) is higher than (The second approval can be done by any user with the dedicated permission. Set to 0 for no double approval)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
-NotTheGoodQualitySupplier=Wrong quality
+NotTheGoodQualitySupplier=劣质
 ReputationForThisProduct=Reputation
+BuyerName=买家名称
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index 4877913e992..ad0b2f25485 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -1,66 +1,66 @@
 # Dolibarr language file - Source file is en_US - trips
-ExpenseReport=Expense report
-ExpenseReports=HR费用报表
-Trips=HR费用报表
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
+ExpenseReport=费用报表
+ExpenseReports=费用报表
+Trips=费用报表
+TripsAndExpenses=费用报表
+TripsAndExpensesStatistics=费用报表统计
+TripCard=费用报表信息卡
+AddTrip=创建费用报表
+ListOfTrips=费用报表列表
 ListOfFees=费用清单
-ShowTrip=Show expense report
-NewTrip=New expense report
+ShowTrip=显示费用报表
+NewTrip=新建费用报表
 CompanyVisited=公司/基础访问
 FeesKilometersOrAmout=金额或公里
-DeleteTrip=Delete expense report
-ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
-ListTripsAndExpenses=List of expense reports
-ListToApprove=Waiting for approval
-ExpensesArea=Expense reports area
-ClassifyRefunded=Classify 'Refunded'
+DeleteTrip=删除费用报表
+ConfirmDeleteTrip=您确定想要删除这个费用报表吗?
+ListTripsAndExpenses=费用报表列表
+ListToApprove=等待审批
+ExpensesArea=费用报表区
+ClassifyRefunded=归类 'Refunded'
 ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
-ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
-TripId=Id expense report
-AnyOtherInThisListCanValidate=Person to inform for validation.
-TripSociete=Information company
-TripNDF=Informations expense report
-PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
-ExpenseReportLine=Expense report line
+ExpenseReportWaitingForApprovalMessage=费用报销单已经提交并在等待审批中.\n- 用户: %s\n- 时期: %s\n点击这里来验证: %s
+TripId=费用报表ID号
+AnyOtherInThisListCanValidate=通知人确认。
+TripSociete=公司资料信息
+TripNDF=费用报表信息
+PDFStandardExpenseReports=用于生成费用报表PDF文档的标准模板
+ExpenseReportLine=费用报表明细
 TF_OTHER=其他
-TF_TRIP=Transportation
+TF_TRIP=交通
 TF_LUNCH=午餐
-TF_METRO=Metro
-TF_TRAIN=Train
-TF_BUS=Bus
-TF_CAR=Car
-TF_PEAGE=Toll
-TF_ESSENCE=Fuel
-TF_HOTEL=Hotel
-TF_TAXI=Taxi
+TF_METRO=地铁
+TF_TRAIN=火车
+TF_BUS=公交
+TF_CAR=汽车
+TF_PEAGE=总数
+TF_ESSENCE=燃料
+TF_HOTEL=酒店
+TF_TAXI=的士
 
 ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
 AucuneLigne=There is no expense report declared yet
 
-ModePaiement=Payment mode
+ModePaiement=支付模式
 
 VALIDATOR=User responsible for approval
-VALIDOR=Approved by
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Paid by
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+VALIDOR=被批准
+AUTHOR=记录人员
+AUTHORPAIEMENT=付款人
+REFUSEUR=否认人
+CANCEL_USER=删除者
 
-MOTIF_REFUS=Reason
-MOTIF_CANCEL=Reason
+MOTIF_REFUS=原因
+MOTIF_CANCEL=原因
 
-DATE_REFUS=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Payment date
+DATE_REFUS=否认日期
+DATE_SAVE=验证日期
+DATE_CANCEL=取消日期
+DATE_PAIEMENT=付款日期
 
-BROUILLONNER=Reopen
-ValidateAndSubmit=Validate and submit for approval
-ValidatedWaitingApproval=Validated (waiting for approval)
+BROUILLONNER=重新打开
+ValidateAndSubmit=同意验证和提交
+ValidatedWaitingApproval=验证 (等待审批)
 
 NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
 
@@ -72,16 +72,16 @@ ConfirmValideTrip=Are you sure you want to approve this expense report ?
 PaidTrip=Pay an expense report
 ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
 
-ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+ConfirmCancelTrip=您确定想要取消这个费用报表吗?
 
-BrouillonnerTrip=Move back expense report to status "Draft"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+BrouillonnerTrip=费用报表回退到"草稿"状态
+ConfirmBrouillonnerTrip=您确定想要将费用报表回退到"草稿"状态吗?
 
-SaveTrip=Validate expense report
-ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+SaveTrip=批准费用报表
+ConfirmSaveTrip=您确定想要批准这个费用报表吗?
 
 NoTripsToExportCSV=No expense report to export for this period.
-ExpenseReportPayment=Expense report payment
+ExpenseReportPayment=支付费用报表
 
-ExpenseReportsToApprove=Expense reports to approve
-ExpenseReportsToPay=Expense reports to pay
+ExpenseReportsToApprove=批准费用报表
+ExpenseReportsToPay=支付费用报表
diff --git a/htdocs/langs/zh_CN/users.lang b/htdocs/langs/zh_CN/users.lang
index e931bd3aad1..d400275e118 100644
--- a/htdocs/langs/zh_CN/users.lang
+++ b/htdocs/langs/zh_CN/users.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=HRM area
-UserCard=用户卡
-GroupCard=集团卡
+HRMArea=人力资源管理区
+UserCard=用户信息
+GroupCard=群组信息
 Permission=允许
 Permissions=权限
 EditPassword=修改密码
-SendNewPassword=再生和发送密码
+SendNewPassword=重置密码
 ReinitPassword=重生密码
 PasswordChangedTo=密码更改为:%s
 SubjectNewPassword=您的新密码Dolibarr
 GroupRights=组权限
 UserRights=用户权限
-UserGUISetup=用户显示设置
+UserGUISetup=用户看板设置
 DisableUser=禁用
 DisableAUser=禁用一个用户
 DeleteUser=删除
@@ -25,78 +25,81 @@ ConfirmDeleteGroup=你确定要删除群组<b>%s吗</b> ?
 ConfirmEnableUser=您确定要启用用户<b>%s吗</b> ?
 ConfirmReinitPassword=你确定要生成一个新密码的用户<b>%s吗</b> ?
 ConfirmSendNewPassword=你确定要生成和发送新密码的用户<b>%s吗</b> ?
-NewUser=新用户
+NewUser=新建用户
 CreateUser=创建用户
-LoginNotDefined=登录没有定义。
+LoginNotDefined=登陆没有定义。
 NameNotDefined=名称没有定义。
-ListOfUsers=用户名单
+ListOfUsers=用户列表
 SuperAdministrator=超级管理员
 SuperAdministratorDesc=管理员的所有权利
 AdministratorDesc=Administrator
 DefaultRights=默认权限
 DefaultRightsDesc=这里定义<u>默认</u> )权限自动授予一个<u>新创建的</u>用户的用户(转到卡上改变现有的用户权限。
 DolibarrUsers=Dolibarr用户
-LastName=Last Name
+LastName=姓氏
 FirstName=名字
-ListOfGroups=团体名单
-NewGroup=新组
+ListOfGroups=群组列表
+NewGroup=新建群组
 CreateGroup=创建组
 RemoveFromGroup=从组中删除
 PasswordChangedAndSentTo=密码更改,发送到<b>%s。</b>
 PasswordChangeRequestSent=要求更改密码<b>的S%</b>发送到<b>%s。</b>
 MenuUsersAndGroups=用户和组
-LastGroupsCreated=Latest %s created groups
-LastUsersCreated=Latest %s users created
+LastGroupsCreated=最近创建的 %s 个群组
+LastUsersCreated=最近创建的 %s 位用户
 ShowGroup=显示组
 ShowUser=显示用户
-NonAffectedUsers=非受影响的用户
-UserModified=用户修改成功
+NonAffectedUsers=非指定的用户
+UserModified=用户变更成功
 PhotoFile=图片档案
-ListOfUsersInGroup=在这个名单的用户组
-ListOfGroupsForUser=这个名单的用户群
-LinkToCompanyContact=链接到第三方/联系
+ListOfUsersInGroup=本群组的用户列表
+ListOfGroupsForUser=此用户的群组列表
+LinkToCompanyContact=链接到合伙人/联系人
 LinkedToDolibarrMember=链接到会员
 LinkedToDolibarrUser=用户链接到Dolibarr
-LinkedToDolibarrThirdParty=链接到第三方Dolibarr
+LinkedToDolibarrThirdParty=链接到Dolibarr合伙人
 CreateDolibarrLogin=创建一个用户
-CreateDolibarrThirdParty=创建一个第三者
+CreateDolibarrThirdParty=创建合伙人
 LoginAccountDisableInDolibarr=帐户已停用的Dolibarr。
-UsePersonalValue=使用个人价值
+UsePersonalValue=使用自定义值
 InternalUser=内部用户
 ExportDataset_user_1=Dolibarr的用户和属性
 DomainUser=域用户%s
-Reactivate=重新启用
+Reactivate=重新激活
 CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
-InternalExternalDesc=<b>内部</b>用户是一个用户是公司的一部分,你的/基础。 <br> <b>外部</b>用户是一个客户,供应商或其他。 <br><br>在这两种情况下,权限定义了Dolibarr权利,也有外部用户可以比内部用户(见首页 - 设置 - 显示不同的菜单经理)
+InternalExternalDesc=<b>内部用户</b>是一个用户同时也是你的公司/机构的一部分。 <br> <b>外部用户</b>是一个客户,供应商或其他。 <br><br>在这两种情况下,定义了Dolibarr权利权限,也有外部用户可以比内部用户(见首页 - 设置 - 显示界面)
 PermissionInheritedFromAGroup=因为从权限授予一个用户的一组继承。
 Inherited=遗传
-UserWillBeInternalUser=创建的用户将是一个内部用户(因为没有联系到一个特定的第三方)
-UserWillBeExternalUser=创建的用户将是外部用户(因为链接到一个特定的第三方)
+UserWillBeInternalUser=创建的用户将是一个内部用户(因为没有联系到一个特定的合伙人)
+UserWillBeExternalUser=创建的用户将是外部用户(因为链接到一个特定的合伙人)
 IdPhoneCaller=手机来电者身份
 NewUserCreated=创建用户%s
 NewUserPassword=%变动的密码
-EventUserModified=用户%s修改
+EventUserModified=用户 %s 已变更
 UserDisabled=用户%s禁用
 UserEnabled=用户%s启动
 UserDeleted=使用者%s删除
 NewGroupCreated=集团创建%s的
-GroupModified=Group %s modified
+GroupModified=群组 %s 已变更
 GroupDeleted=群组%s删除
 ConfirmCreateContact=你确定要为此创造联系Dolibarr帐户?
 ConfirmCreateLogin=你确定要给该成员创建Dolibarr登陆帐号吗?
 ConfirmCreateThirdParty=你确定要创建该成员成为客户?
-LoginToCreate=登录创建
-NameToCreate=第三党的名称创建
+LoginToCreate=登陆创建
+NameToCreate=创建合伙人名称
 YourRole=您的角色
 YourQuotaOfUsersIsReached=你的活跃用户达到配额!
-NbOfUsers=NB用户
+NbOfUsers=用户数量
 DontDowngradeSuperAdmin=只有超级管理员可以降级超级管理员
-HierarchicalResponsible=Supervisor
+HierarchicalResponsible=超级管理员
 HierarchicView=分层视图
 UseTypeFieldToChange=改变用户字段类型
 OpenIDURL=OpenID URL
-LoginUsingOpenID=Use OpenID to login
-WeeklyHours=Weekly hours
-ColorUser=Color of the user
+LoginUsingOpenID=使用 OpenID 登陆
+WeeklyHours=每周工作时间
+ColorUser=用户颜色
 DisabledInMonoUserMode=Disabled in maintenance mode
-UserAccountancyCode=User accountancy code
+UserAccountancyCode=用户科目代码
+UserLogoff=用户注销
+UserLogged=用户登录
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/zh_CN/website.lang b/htdocs/langs/zh_CN/website.lang
index b1b51cfedc2..edd7384d103 100644
--- a/htdocs/langs/zh_CN/website.lang
+++ b/htdocs/langs/zh_CN/website.lang
@@ -1,25 +1,28 @@
 # Dolibarr language file - Source file is en_US - website
-Shortname=Code
+Shortname=代码
 WebsiteSetupDesc=Create here as much entry as number of different websites you need. Then go into menu Websites to edit them.
-DeleteWebsite=Delete website
+DeleteWebsite=删除网址
 ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its pages and content will also be removed.
-WEBSITE_PAGENAME=Page name/alias
-WEBSITE_CSS_URL=URL of external CSS file
-WEBSITE_CSS_INLINE=CSS content
-MediaFiles=Media library
-EditCss=Edit Style/CSS
-EditMenu=Edit menu
-EditPageMeta=Edit Meta
-EditPageContent=Edit Content
-Website=Web site
-AddPage=Add page
+WEBSITE_PAGENAME=页面名字/别名
+WEBSITE_CSS_URL=外部CSS文件的URL地址
+WEBSITE_CSS_INLINE=CSS 内容
+MediaFiles=媒体库
+EditCss=编辑 Style/CSS
+EditMenu=编辑菜单
+EditPageMeta=编辑 Meta
+EditPageContent=编辑内容
+Website=网站
+Webpage=Web page
+AddPage=添加页面
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
-PageDeleted=Page '%s' of website %s deleted
-PageAdded=Page '%s' added
-ViewSiteInNewTab=View site in new tab
-ViewPageInNewTab=View page in new tab
-SetAsHomePage=Set as Home page
-RealURL=Real URL
-ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+PageDeleted=网站 '%s' 页面 %s 已删除
+PageAdded=页面 '%s' 已添加
+ViewSiteInNewTab=在新标签页查看网站
+ViewPageInNewTab=在新标签页查看页面
+SetAsHomePage=设为首页
+RealURL=真实URL地址
+ViewWebsiteInProduction=使用主页URL网址查看网页
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/zh_CN/withdrawals.lang b/htdocs/langs/zh_CN/withdrawals.lang
index bd1675d1bf3..f69a2ebd986 100644
--- a/htdocs/langs/zh_CN/withdrawals.lang
+++ b/htdocs/langs/zh_CN/withdrawals.lang
@@ -1,29 +1,30 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=站在客户的订单面积
-StandingOrders=常年订单
-StandingOrder=常年订单
-NewStandingOrder=新的长期订单
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=要处理
-WithdrawalsReceipts=提款收据
-WithdrawalReceipt=提款收据
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=提款线
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
-NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=可撤消请求发票数目
-NbOfInvoiceToWithdrawWithInfo=对已设置银行信息用户,可撤消请求发票数目
-InvoiceWaitingWithdraw=发票等待撤离
+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
+NotPossibleForThisStatusOfWithdrawReceiptORLine=这不可能。在声明拒绝特定明细行之前撤回状态必须设置为 'credited' 。
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=收回的款额
-WithdrawsRefused=拒绝撤回
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=无付款方式客户发票“撤回”是等待。继续就提款卡发票&#39;标签作出要求。
-ResponsibleUser=负责用户
-WithdrawalsSetup=提款设置
-WithdrawStatistics=提款的统计
-WithdrawRejectStatistics=撤回拒绝的统计
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+ResponsibleUser=责任人
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=作出撤回请求
-ThirdPartyBankCode=第三方银行代码
+ThirdPartyBankCode=合伙人银行账号
 NoInvoiceCouldBeWithdrawed=没有发票withdrawed成功。检查发票的公司是一个有效的禁令。
 ClassCredited=分类记
 ClassCreditedConfirm=你确定要分类这一撤离收据上记入您的银行帐户?
@@ -32,13 +33,13 @@ TransMetod=传输的方法
 Send=发送
 Lines=线路
 StandingOrderReject=发出拒绝
-WithdrawalRefused=提款Refuseds
+WithdrawalRefused=提款已被拒绝
 WithdrawalRefusedConfirm=你确定要输入一个社会拒绝撤出
 RefusedData=日期拒收
 RefusedReason=拒绝的原因
 RefusedInvoicing=帐单拒绝
 NoInvoiceRefused=拒绝不收
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
+InvoiceRefused=订单已被拒绝 (Charge the rejection to customer)
 StatusWaiting=等候
 StatusTrans=传播
 StatusCredited=计入
@@ -46,7 +47,7 @@ StatusRefused=拒绝
 StatusMotif0=未指定
 StatusMotif1=提供insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=没有撤退的命令
+StatusMotif3=No direct debit payment order
 StatusMotif4=客户订单
 StatusMotif5=肋inexploitable
 StatusMotif6=帐户无余额
@@ -61,28 +62,43 @@ NotifyCredit=提款信用
 NumeroNationalEmetter=国家发射数
 WithBankUsingRIB=有关银行账户,使用肋
 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的银行帐户
-BankToReceiveWithdraw=银行帐户,以接收退出
+BankToReceiveWithdraw=Bank account to receive direct debit
 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 standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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=设置状态“发送的文件”
 ThisWillAlsoAddPaymentOnInvoice=这也将创造在付款发票上,将它们归类支付
-StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+StatisticsByLineStatus=按状态明细统计
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=由银行支付的长期订单%s
-InfoCreditMessage=站在为了%s银行已支付<br>付款资料:%s
-InfoTransSubject=传输到银行的长期订单%s
-InfoTransMessage=%s %s银行长期订单的%s已被transmited。 <br><br>
+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>
 InfoTransData=金额:%s <br> metode:%s <br>日期:%s
-InfoRejectSubject=定期支付被拒
-InfoRejectMessage=你好,<br><br>与公司%s相关的发票%s的定期支付,支付额为%s, 被银行<br><br>--<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
 ModeWarning=实模式下的选项没有设置,这个模拟后,我们停止
diff --git a/htdocs/langs/zh_CN/workflow.lang b/htdocs/langs/zh_CN/workflow.lang
index 266d7dbbfca..39a67e096b0 100644
--- a/htdocs/langs/zh_CN/workflow.lang
+++ b/htdocs/langs/zh_CN/workflow.lang
@@ -1,11 +1,13 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=工作流模块的设置
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
-ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a customer order after a commercial proposal is signed
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatically create a customer invoice after a commercial proposal is signed
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatically create a customer invoice after a contract is validated
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice after a customer order is closed
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=分类链接来源建议,建立客户订单时设置支付
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+WorkflowDesc=此模块的设计,以修改自动动作到应用程序的行为。默认情况下,工作流是打开的(你可以按你想要的顺序做事情)。你可以激活你感兴趣的自动动作。
+ThereIsNoWorkflowToModify=没有工作流程,您可以修改你已激活的模块。
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=商业提案签署后自动创建一个客户订单
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=当商业建议签署后自动创建客户发票
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=在合同确认后自动创建客户发票
+descWORKFLOW_ORDER_AUTOCREATE_INVOICE=当客户订单关闭后自动创建客户发票
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=分类链接来源建议,创建客户订单时设置支付
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=当客户发票标记为已开票时将账单归类到客户订单(s)资源
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=当客户发票标记为已确认时将账单归类到客户订单(s)资源
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=当客户发票生效时分类链接报价源到账单
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index c17acdcdff3..a603ce14e40 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -14,48 +14,69 @@ Journaux=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 
+AccountancyArea=Accountancy area
+AccountancyAreaDescIntro=Usage of the accountancy module is done in several step:
+AccountancyAreaDescActionOnce=The following actions are usually executed one time only, or once per year...
+AccountancyAreaDescActionFreq=The following actions are usually executed every month, week or day for very large companies...
+AccountancyAreaDescChart=STEP %s: Create or check your chart of account from menu %s
+AccountancyAreaDescProd=STEP %s: Check the binding between products/services and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your invoice lines.<br>For this you can use the menu entry %s.
+AccountancyAreaDescBank=STEP %s: Check the binding between bank accounts and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on your payment lines.<br>For this, go on the card of each financial account. You can start from page %s.
+AccountancyAreaDescVat=STEP %s: Check the binding between vat payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to VAT payments.<br>You can set accounting accounts to use for each VAT from page %s.
+AccountancyAreaDescSal=STEP %s: Check the binding between salaries payment and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payment of salaries.<br>For this you can use the menu entry %s.
+AccountancyAreaDescContrib=STEP %s: Check the binding between special expences (social or fiscal contributions) and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of social contributions.<br>For this you can use the menu entry %s.
+AccountancyAreaDescDonation=STEP %s: Check the binding between donation and accounting account is done. Complete missing bindings. This will save you time in future for the next steps by suggesting you the correct default accounting account on records related to payments of donation.<br>You can set the account dedicated for that from the menu entry %s.
+
+AccountancyAreaDescCustomer=STEP %s: Check the binding between existing customer invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescSupplier=STEP %s: Check the binding between existing supplier invoice lines and accounting account is done. Complete missing bindings. Once binding is complete, application will be able to record transactions in General Ledger in one click.<br>For this you can use the menu entry %s.
+AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the General Ledger. Add or edit existing transactions and generate reports
+
 Selectchartofaccounts=Select a chart of accounts
 Addanaccount=Add an accounting account
 AccountAccounting=Accounting account
 AccountAccountingShort=Account
 AccountAccountingSuggest=Accounting account suggest
-Ventilation=Breakdown
+Ventilation=Binding to accounts
+ProductsBinding=Products bindings
 
 MenuAccountancy=Accountancy
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
+CustomersVentilation=Customer invoice binding
+SuppliersVentilation=Supplier invoice binding
 Reports=Reports
 NewAccount=New accounting account
 Create=Create
-CreateMvts=Create movement
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
+CreateMvts=Create new transaction
+UpdateMvts=Modification of a transaction
+WriteBookKeeping=Record operations in General Ledger
 Bookkeeping=General ledger
 AccountBalance=Account balance
 
 CAHTF=Total purchase supplier before tax
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=Ventilate in the accounting account
+InvoiceLines=Lines of invoices to bind
+InvoiceLinesDone=Bound lines of invoices
+IntoAccount=Bind line with the accounting account
 
-Ventilate=Ventilate
+Ventilate=Bind
 
 Processing=Processing
 EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
+AnyLineVentilate=Any lines to bind
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+VentilatedinAccount=Binded successfully to the accounting account
+NotVentilatedinAccount=Not bound to the accounting account
+XLineSuccessfullyBinded=%s products/services successfuly bound to an accounting account
+XLineFailedToBeBinded=%s products/services were not bound to any accounting account
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "Breakdown" by the most recent elements
+ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to bind shown by page (maximum recommended : 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the page "Binding to do" by the most recent elements
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the page "Binding done" by the most recent elements
 
 ACCOUNTING_LENGTH_DESCRIPTION=Length for displaying product & services description in listings (Best = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Length for displaying product & services account description form in listings (Best = 50)
-ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounts
-ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounts
+ACCOUNTING_LENGTH_GACCOUNT=Length of the general accounting accounts
+ACCOUNTING_LENGTH_AACCOUNT=Length of the third party accounting accounts
+ACCOUNTING_MANAGE_ZERO=Manage the zero at the end of an accounting account. Needed by some countries. Disable by default. Be careful with the function "length of the accounts".
+BANK_DISABLE_DIRECT_INPUT=Disable free input of bank transactions (Enabled by default with this module).
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -81,32 +102,31 @@ Sens=Sens
 Codejournal=Journal
 NumPiece=Piece number
 AccountingCategory=Accounting category
-
 NotMatch=Not Set
-
 DeleteMvt=Delete general ledger lines
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all line of of the general ledger for year and/or from a specifics journal
-
+ConfirmDeleteMvt=This will delete all lines of the general ledger for year and/or from a specifics journal
+ConfirmDeleteMvtPartial=This will delete the selected line(s) of the general ledger
 DelBookKeeping=Delete the records of the general ledger
-
 DescSellsJournal=Sells journal
 DescPurchasesJournal=Purchases journal
 FinanceJournal=Finance journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
-
+DescJournalOnlyBindedVisible=This is a view of records that are bound to products/services accountancy account and can be recorded into the General Ledger.
+VATAccountNotDefined=Account for VAT not defined
+ThirdpartyAccountNotDefined=Account for third party not defined
+ProductAccountNotDefined=Account for product not defined
+BankAccountNotDefined=Account for bank not defined
 CustomerInvoicePayment=Payment of invoice customer
-
 ThirdPartyAccount=Thirdparty account
-
-NewAccountingMvt=New movement
-NumMvts=Number of movement
-ListeMvts=List of the movement
+NewAccountingMvt=New transaction
+NumMvts=Numero of transaction
+ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 
-ReportThirdParty=List thirdparty account
-DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+ReportThirdParty=List third party account
+DescThirdPartyReport=Consult here the list of the third party customers and suppliers and their accounting accounts
 
 ListAccounts=List of the accounting accounts
 
@@ -114,22 +134,29 @@ Pcgtype=Class of account
 Pcgsubtype=Under class of account
 Accountparent=Root of the account
 
-DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
-DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
-DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
-ChangeAccount=Change the accounting account for lines selected by the account:
+
+DescVentilCustomer=Consult here the list of customer invoice lines bound (or not) to a product accounting account
+DescVentilMore=In most cases, if you use predefined products or services and you set the account number on the product/service card, the application will be able to make all the binding between your invoice lines and the accounting account of your chart of accounts, just in one click with the button <strong>"%s"</strong>. If account was not set on product/service cards or if you still has some lines not bound to any account, you will have to make a manual binding from the menu "<strong>%s</strong>".
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their product accounting account
+DescVentilTodoCustomer=Bind invoice lines not already bound with a product accounting account
+ChangeAccount=Change the product/service accounting account for selected lines with the following accounting account:
 Vide=-
-DescVentilSupplier=Consult here the annual breakdown accounting of your invoices suppliers
+DescVentilSupplier=Consult here the list of supplier invoice lines bound or not yet bound to a product accounting account
 DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
 
-ValidateHistory=Validate Automatically
+ValidateHistory=Bind Automatically
+AutomaticBindingDone=Automatic binding done
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
 MvtNotCorrectlyBalanced=Mouvement not correctly balanced. Credit = %s. Debit = %s
-FicheVentilation=Breakdown card
+FicheVentilation=Binding card
 GeneralLedgerIsWritten=Operations are written in the general ledger
+GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be recorded.
+NoNewRecordSaved=No new record saved
+ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
+ChangeBinding=Change the binding
 
 ## Admin
 ApplyMassCategories=Apply mass categories
@@ -151,12 +178,14 @@ Modelcsv_cogilog=Export towards Cogilog
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Init accountancy
-InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of module accountancy is complete.
+InitAccountancyDesc=This page can be used to initialize an accounting account on products and services that does not have accountancy account defined for sales and purchases. Check before that setup of chart of accounts is complete.
 Options=Options
 OptionModeProductSell=Mode sales
 OptionModeProductBuy=Mode purchases
 OptionModeProductSellDesc=Show all products with no accounting account defined for sales.
 OptionModeProductBuyDesc=Show all products with no accounting account defined for purchases.
+CleanFixHistory=Remove accountancy code from lines that not exists into charts of account
+CleanHistory=Reset all bindings for selected year
 
 ## Dictionary
 Range=Range of accounting account
@@ -167,3 +196,9 @@ Formula=Formula
 ErrorNoAccountingCategoryForThisCountry=No accounting category are available for this country
 ExportNotSupported=The export format setuped is not supported into this page
 BookeppingLineAlreayExists=Lines already existing into bookeeping
+
+Binded=Lines bound
+ToBind=Lines to bind
+
+WarningReportNotReliable=Warning, this report is not based on the General Ledger, so is not reliable yet. It will be replaced by a correct report in a next version.
+
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 27eea2ef5c6..860889373b1 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -2,17 +2,22 @@
 Foundation=Foundation
 Version=版本
 VersionProgram=版本計劃
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=初始安裝版
+VersionLastUpgrade=最新版本升級
 VersionExperimental=實驗
 VersionDevelopment=發展
 VersionUnknown=未知
 VersionRecommanded=推薦
-FileCheck=Files Integrity
+FileCheck=Files integrity checker
+FileCheckDesc=This tool allows you to check the integrity of files of your application, comparing each files with the official ones. You can use this tool to detect if some files were modified by a hacker for example.
+MakeIntegrityAnalysisFrom=Make integrity analysis of application files from
+LocalSignature=Embedded local signature (less reliable)
+RemoteSignature=Remote distant signature (more reliable)
 FilesMissing=Missing Files
 FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheckDolibarr=Check integrity of application files
+AvailableOnlyOnPackagedVersions=The local file for integrity checking is only available when application is installed from a certified package
+XmlNotFound=Xml Integrity File of application not found
 SessionId=會話ID
 SessionSaveHandler=處理程序,以節省會議
 SessionSavePath=本地化存儲會議
@@ -49,7 +54,7 @@ ErrorDecimalLargerThanAreForbidden=錯誤<b>,1%的</b>精度高於不支持。
 DictionarySetup=Dictionary setup
 Dictionary=Dictionaries
 Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Fiscal year
 ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
 ErrorCodeCantContainZero=Code can't contain value 0
 DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -59,7 +64,7 @@ DelaiedFullListToSelectCompany=Wait you press a key before loading content of th
 DelaiedFullListToSelectContact=Wait you press a key before loading content of contact combo list (This may increase performance if you have a large number of contact)
 NumberOfKeyToSearch=需要 %s 個字元來觸發搜尋
 NotAvailableWhenAjaxDisabled=用時沒有Ajax的殘疾人
-AllowToSelectProjectFromOtherCompany=On document of a thirdparty, can choose a project linked to another thirdparty
+AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
 JavascriptDisabled=禁用JavaScript
 UsePreviewTabs=使用預覽標籤
 ShowPreview=顯示預覽
@@ -69,9 +74,9 @@ CurrentTimeZone=PHP服務器的TimeZone
 MySQLTimeZone=TimeZone MySql (database)
 TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
 Space=空間
-Table=Table
+Table=表格
 Fields=菲爾茲
-Index=Index
+Index=索引
 Mask=遮罩
 NextValue=下一個產生的值
 NextValueForInvoices=下一個發票(invoice)編碼值
@@ -115,11 +120,11 @@ DaylingSavingTime=夏令時間(用戶)
 CurrentHour=當前 PHP伺服器時間
 CurrentSessionTimeOut=當前會話超時
 YouCanEditPHPTZ=To set a different PHP timezone (not required), you can try to add a file .htacces with a line like this "SetEnv TZ Europe/Paris"
-Box=Widget
-Boxes=Widgets
+Box=小工具
+Boxes=小工具
 MaxNbOfLinesForBoxes=Max number of lines for widgets
 PositionByDefault=預設順序
-Position=Position
+Position=位置
 MenusDesc=Menu managers set content of the two menu bars (horizontal and vertical).
 MenusEditorDesc=The menu editor allows you to define custom menu entries. Use it carefully to avoid instability and permanently unreachable menu entries.<br />Some modules add menu entries (in menu <b>All</b> mostly). If you remove some of these entries by mistake, you can restore them disabling and reenabling the module.
 MenuForUsers=用戶菜單
@@ -176,10 +181,11 @@ EncodeBinariesInHexa=在十六進制編碼的二進制數據
 IgnoreDuplicateRecords=忽略重複的錯誤記錄(插入忽略)
 AutoDetectLang=自動檢測(瀏覽器的語言)
 FeatureDisabledInDemo=在演示功能禁用
+FeatureAvailableOnlyOnStable=Feature only available on official stable versions
 Rights=權限
 BoxesDesc=Widgets are components showing some information that you can add to personalize some pages. You can choose between showing the widget or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
 OnlyActiveElementsAreShown=只有被<a href="modules.php"> modules.php </a>所啟用的模組才會顯示。
-ModulesDesc=Dolibarr模組定義哪些功能是在軟件中啟用。有些模組需要您必須授予權限給用戶,在啟用模組。
+ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off to enable a module/feature.
 ModulesMarketPlaceDesc=You can find more modules to download on external websites on the Internet...
 ModulesMarketPlaces=更多的模組...
 DoliStoreDesc=DoliStore,為Dolibarr的ERP / CRM的外部模組官方市場
@@ -273,9 +279,10 @@ YouCanSubmitFile=For this step, you can send package using this tool: Select mod
 CurrentVersion=此系統軟體(Dolibarr)目前版本
 CallUpdatePage=Go to the page that updates the database structure and data: %s.
 LastStableVersion=Latest stable version
+LastActivationDate=Last activation date
 UpdateServerOffline=Update server offline
 GenericMaskCodes=這個編碼模組使用方式如下:<br>1. <b>{000000}</b>表示每個 %s 編碼會依據此參數產生序號字串,且會自動遞增。有多少個0就表示序號字串有多長,滿最大值會自動歸0。<br>2. <b>{000000+000}</b> 同上面第一條,但是多了 offset 功能,也就第一筆 %s 編碼的起始序號會根據 + 號後面的參數而定。<br>3. <b>{000000@x}</b> 同上面第一條,但是每當為新的月份時,會將序號歸0。如果使用兩個x 則必需要有 {yy}{mm} 或 {yyyy}{mm} 參數。<br><b>{dd}</b> 表示天 (01 to 31).<br><b>{mm}</b> 表示月 (01 to 12)<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b>  表示用多少位數顯示年<br>
-GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of thirdparty type on n characters (see dictionary-thirdparty types).<br>
+GenericMaskCodes2=<b>{cccc}</b> the client code on n characters<br><b>{cccc000}</b> the client code on n characters is followed by a counter dedicated for customer. This counter dedicated to customer is reset at same time than global counter.<br><b>{tttt}</b> The code of third party type on n characters (see dictionary-thirdparty types).<br>
 GenericMaskCodes3=非遮罩字元的則該字元維持不變,也就是 A 就是 A,Z 就是 Z<br>注意:不允許空白字元<br>
 GenericMaskCodes4a=<u>例如: 第99筆 %s 資訊於 2007-01-31 建立完成:</u> <br>
 GenericMaskCodes4b=<u>例如: 於 2007-01-31 建立的客戶/供應商資訊:</u> <br>
@@ -331,7 +338,7 @@ UrlGenerationParameters=參數,以確保網址
 SecurityTokenIsUnique=每個URL使用獨特的securekey參數
 EnterRefToBuildUrl=輸入參考對象%s
 GetSecuredUrl=獲取計算網址
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
+ButtonHideUnauthorized=Hide buttons to non admin users for unauthorized actions instead of showing greyed disabled buttons
 OldVATRates=Old VAT rate
 NewVATRates=New VAT rate
 PriceBaseTypeToChange=Modify on prices with base reference value defined on
@@ -349,6 +356,7 @@ ExtrafieldMail = Email
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
 ExtrafieldSeparator=Separator
+ExtrafieldPassword=Password
 ExtrafieldCheckBox=Checkbox
 ExtrafieldRadio=Radio button
 ExtrafieldCheckBoxFromList= Checkbox from table
@@ -383,11 +391,14 @@ EnableFileCache=Enable file cache
 ShowDetailsInPDFPageFoot=Add more details into footer of PDF files, like your company address, or manager names (to complete professional ids, company capital and VAT number).
 NoDetails=No more details in footer
 DisplayCompanyInfo=Display company address
-DisplayCompanyInfoAndManagers=Display company and manager names
+DisplayCompanyManagers=Display manager names
+DisplayCompanyInfoAndManagers=Display company address and manager names
 EnableAndSetupModuleCron=If you want to have this recurring invoice beeing generated automatically, module *%s* must be enabled and correctly setup. Otherwise, generation of invoices must be done manually from this template with button *Create*. Note that even if you enabled automatic generation, you can still safely launch manual generation. Duplicates generation for same period are not possible.
 ModuleCompanyCodeAquarium=Return an accountancy code built by:<br>%s followed by third party supplier code for a supplier accountancy code,<br>%s followed by third party customer code for a customer accountancy code.
 ModuleCompanyCodePanicum=Return an empty accountancy code.
 ModuleCompanyCodeDigitaria=Accountancy code depends on third party code. The code is composed of the character "C" in the first position followed by the first 5 characters of the third party code.
+Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce an third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1 validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval is always required.
+UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 
 # Modules
 Module0Name=用戶和組
@@ -428,8 +439,8 @@ Module55Name=條碼
 Module55Desc=條碼的管理
 Module56Name=電話
 Module56Desc=電話整合
-Module57Name=長期訂購
-Module57Desc=Standing orders and withdrawal management. Also includes generation of SEPA file for european countries.
+Module57Name=Direct bank payment orders
+Module57Desc=Management of Direct Debit payment orders. It includes generation of SEPA file for european countries.
 Module58Name=ClickToDial
 Module58Desc=ClickToDial一體化
 Module59Name=Bookmark4u
@@ -466,12 +477,12 @@ Module410Name=Webcalendar
 Module410Desc=Webcalendar一體化
 Module500Name=Special expenses
 Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
-Module510Name=Salaries
-Module510Desc=Management of employees salaries and payments
+Module510Name=Employee contracts and salaries
+Module510Desc=Management of employees contracts, salaries and payments
 Module520Name=Loan
 Module520Desc=Management of loans
 Module600Name=通知
-Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each thirdparty) or fixed emails
+Module600Desc=Send EMail notifications (triggered by some business events) to users (setup defined on each user), third-party contacts (setup defined on each third party) or fixed emails
 Module700Name=捐贈
 Module700Desc=捐款的管理
 Module770Name=Expense reports
@@ -606,10 +617,10 @@ Permission142=Create/modify all projects and tasks (also private projects i am n
 Permission144=Delete all projects and tasks (also private projects i am not contact for)
 Permission146=閲讀者
 Permission147=讀統計
-Permission151=閲讀常年訂單
-Permission152=安裝常年訂單
-Permission153=閲讀常年訂單收據
-Permission154=信貸/拒絶站在訂單收據
+Permission151=Read direct debit payment orders
+Permission152=Create/modify a direct debit payment orders
+Permission153=Send/Transmit direct debit payment orders
+Permission154=Record Credits/Rejects of direct debit payment orders
 Permission161=Read contracts/subscriptions
 Permission162=Create/modify contracts/subscriptions
 Permission163=Activate a service/subscription of a contract
@@ -747,6 +758,7 @@ Permission1236=匯出供應商發票(invoice)、屬性及其付款資訊
 Permission1237=Export supplier orders and their details
 Permission1251=執行外部資料大量匯入資料庫的功能(載入資料)
 Permission1321=匯出客戶的發票(invoice)、屬性及其付款資訊
+Permission1322=Reopen a paid bill
 Permission1421=匯出商業訂單及屬性資訊
 Permission20001=Read leave requests (yours and your subordinates)
 Permission20002=Create/modify your leave requests
@@ -780,6 +792,10 @@ Permission55002=Create/modify polls
 Permission59001=Read commercial margins
 Permission59002=Define commercial margins
 Permission59003=Read every user margin
+Permission63001=Read resources
+Permission63002=Create/modify resources
+Permission63003=Delete resources
+Permission63004=Link resources to agenda events
 DictionaryCompanyType=Types of thirdparties
 DictionaryCompanyJuridicalType=Legal forms of thirdparties
 DictionaryProspectLevel=Prospect potential level
@@ -853,6 +869,7 @@ LabelUsedByDefault=預設情況下使用標籤,如果沒有翻譯,可找到
 LabelOnDocuments=標籤上的文件
 NbOfDays=鈮天
 AtEndOfMonth=月末
+CurrentNext=Current/Next
 Offset=抵銷
 AlwaysActive=始終活躍
 Upgrade=升級
@@ -950,7 +967,7 @@ LogEventDesc=在這裡您可以啟用的Dolibarr安全事件日誌記錄。管
 AreaForAdminOnly=這些功能都可以使用<b>管理員用戶</b> 。
 SystemInfoDesc=只有系統管理員可以取得系統資訊。
 SystemAreaForAdminOnly=此區是只給具有管理員權限的使用者。在此系統軟體中,這是必要的限制。
-CompanyFundationDesc=編輯此頁面上所有的公司或您需要管理的基礎已知信息
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=您可以選擇相關的Dolibarr每個參數的外觀和感覺這裡
 AvailableModules=可用的模組
 ToActivateModule=要激活模組,繼續安裝區(首頁->安裝->模組)。
@@ -1029,9 +1046,17 @@ SendmailOptionNotComplete=警告,在某些Linux系統,從您的電子郵件
 PathToDocuments=文件路徑
 PathDirectory=目錄
 SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
-TranslationSetup=Configuration de la traduction
-TranslationDesc=How to set displayed application language<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
-TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the key string found in the lang file (langs/xx_XX/somefile.lang) into "%s" and your new translation into "%s".
+TranslationSetup=Setup of translation
+TranslationKeySearch=Search a translation key or string
+TranslationOverwriteKey=Overwrite a translation string
+TranslationDesc=How to set displayed application language :<br>* Systemwide: menu <strong>Home - Setup - Display</strong><br>* Per user: <strong>User display setup</strong> tab of user card (click on username at the top of the screen).
+TranslationOverwriteDesc=You can also override strings filling the following table. Choose your language from "%s" dropdown, insert the translation key string into "%s" and your new translation into "%s"
+TranslationOverwriteDesc2=You can use the other tab to help you know translation key to use
+TranslationString=Translation string
+CurrentTranslationString=Current translation string
+WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+NewTranslationStringToShow=New translation string to show
+OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
 TotalNumberOfActivatedModules=Total number of activated feature modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
 ClassNotFoundIntoPathWarning=Class %s not found into PHP path
@@ -1170,7 +1195,7 @@ LDAPServerUseTLS=使用TLS
 LDAPServerUseTLSExample=您的LDAP服務器使用TLS
 LDAPServerDn=服務器的DN
 LDAPAdminDn=管理員的DN
-LDAPAdminDnExample=完整的DN(例如:架CN = adminldap,直流=社會,直流= com)上
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=管理員密碼
 LDAPUserDn=用戶的DN
 LDAPUserDnExample=完整的DN(例如:歐=用戶,直流=社會,直流= com)上
@@ -1258,7 +1283,7 @@ LDAPFieldCompanyExample=例如:O型
 LDAPFieldSid=的SID
 LDAPFieldSidExample=例如:的objectSID
 LDAPFieldEndLastSubscription=認購結束日期
-LDAPFieldTitle=職位/職務
+LDAPFieldTitle=Job position
 LDAPFieldTitleExample=Example: title
 LDAPSetupNotComplete=LDAP的安裝程序不完整的(對別人去標籤)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=沒有管理員或密碼。 LDAP的訪問將是匿名的,在只讀模式。
@@ -1293,7 +1318,7 @@ ProductServiceSetup=產品和服務模組的設置
 NumberOfProductShowInSelect=在 combos 選擇清單中,最大可供選擇的產品數量(0 =沒有限制選擇列表)
 ViewProductDescInFormAbility=在表單上是否可以直接顯示產品描述資訊(如果關閉則採用彈出式訊息框方式顯示)
 MergePropalProductCard=Activate in product/service Attached Files tab an option to merge product PDF document to proposal PDF azur if product/service is in the proposal
-ViewProductDescInThirdpartyLanguageAbility=是否可以直接顯示其他語系的產品描述資訊
+ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the third party language
 UseSearchToSelectProductTooltip=Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).
 SetDefaultBarcodeTypeProducts=預設的條碼類型
@@ -1333,7 +1358,7 @@ GenbarcodeLocation=Bar code generation command line tool (used by internal engin
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=Manager to auto define barcode numbers
 ##### Prelevements #####
-WithdrawalsSetup=提款模組設置
+WithdrawalsSetup=Setup of module Direct debit payment orders
 ##### ExternalRSS #####
 ExternalRSSSetup=外部的RSS進口格局
 NewRSS=新的RSS飼料
@@ -1506,6 +1531,7 @@ OpenFiscalYear=Open fiscal year
 CloseFiscalYear=Close fiscal year
 DeleteFiscalYear=Delete fiscal year
 ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
+ShowFiscalYear=Show fiscal year
 AlwaysEditable=Can always be edited
 MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
 NbMajMin=Minimum number of uppercase characters
@@ -1526,7 +1552,7 @@ ListOfNotificationsPerUser=List of notifications per user*
 ListOfNotificationsPerUserOrContact=List of notifications per user* or per contact**
 ListOfFixedNotifications=List of fixed notifications
 GoOntoUserCardToAddMore=Go on the tab "Notifications" of a user to add or remove notifications for users
-GoOntoContactCardToAddMore=Go on the tab "Notifications" of a thirdparty contact to add or remove notifications for contacts/addresses
+GoOntoContactCardToAddMore=Go on the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Threshold
 BackupDumpWizard=Wizard to build database backup dump file
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
@@ -1538,9 +1564,10 @@ HighlightLinesColor=Highlight color of the line when the mouse passes over (keep
 TextTitleColor=Color of page title
 LinkColor=Color of links
 PressF5AfterChangingThis=Press F5 on keyboard after changing this value to have it effective
-NotSupportedByAllThemes=Will works with eldy theme but is not supported by all themes
+NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Background color
 TopMenuBackgroundColor=Background color for Top menu
+TopMenuDisableImages=Hide images in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableLineOddColor=Background color for odd table lines
@@ -1569,7 +1596,7 @@ MailToSendIntervention=To send intervention
 MailToSendSupplierRequestForQuotation=To send quotation request to supplier
 MailToSendSupplierOrder=To send supplier order
 MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MailToThirdparty=To send email from third party page
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the last stable version
 TitleExampleForMajorRelease=Example of message you can use to announce this major release (feel free to use it on your web sites)
@@ -1600,3 +1627,8 @@ UrlToGetKeyToUseAPIs=Url to get token to use API (once token has been received i
 ListOfAvailableAPIs=List of available APIs
 activateModuleDependNotSatisfied=Module "%s" depends on module "%s" that is missing, so module "%1$s" may not work correclty. Please install module "%2$s" or disable module "%1$s" if you want to be safe from any surprise
 CommandIsNotInsideAllowedCommands=The command you try to run is not inside list of allowed commands defined into parameter <strong>$dolibarr_main_restrict_os_commands</strong> into <strong>conf.php</strong> file.
+LandingPage=Landing page
+SamePriceAlsoForSharedCompanies=If you use a multicompany module, with the choice "Single price", price will be also the same for all companies if products are shared between environments
+ModuleEnabledAdminMustCheckRights=Module has been activated. Permissions for activated module(s) were given to admin users only. You may need to grant permissions to other users manually if necessary.
+UserHasNoPermissions=This user has no permission defined
+TypeCdr=Use "None" if the date of payment term is date of invoice plus a delta in days (delta is field "Nb of days")<br>Use "At end of month", if, after delta, the date must be increased to reach the end of month (+ an optional "Offset" in days)<br>Use "Current/Next" to have payment term date being the first Nth of the month (N is stored into field "Nb of days")
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index b7753e14b48..e29f9089df8 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -27,13 +27,9 @@ AllTime=From start
 Reconciliation=和解
 RIB=銀行帳號
 IBAN=IBAN號碼
-IbanValid=IBAN is Valid
-IbanNotValid=IBAN is Not Valid
 BIC=的BIC / SWIFT的號碼
-SwiftValid=BIC/SWIFT is Valid
-SwiftNotValid=BIC/SWIFT is Not Valid
-StandingOrders=常年訂單
-StandingOrder=長期訂單
+StandingOrders=Direct Debit orders
+StandingOrder=Direct debit order
 AccountStatement=戶口結單
 AccountStatementShort=聲明
 AccountStatements=戶口結單
@@ -73,12 +69,13 @@ Conciliable=可以兩全
 Conciliate=調和
 Conciliation=和解
 IncludeClosedAccount=包括關閉賬戶
-OnlyOpenedAccount=Only open accounts
+OnlyOpenedAccount=僅開立賬戶
 AccountToCredit=帳戶信用
 AccountToDebit=帳戶轉帳
 DisableConciliation=此帳戶的禁用和解功能
 ConciliationDisabled=和解功能禁用
-StatusAccountOpened=Open
+LinkedToAConciliatedTransaction=Linked to a conciliated transaction
+StatusAccountOpened=開放
 StatusAccountClosed=關閉
 AccountIdShort=數
 LineRecord=交易
@@ -87,6 +84,8 @@ AddBankRecordLong=新增手動交易
 ConciliatedBy=由調和
 DateConciliating=核對日期
 BankLineConciliated=交易和解
+Reconciled=Reconciled
+NotReconciled=Not reconciled
 CustomerInvoicePayment=客戶付款
 SupplierInvoicePayment=Supplier payment
 SubscriptionPayment=Subscription payment
@@ -94,7 +93,8 @@ WithdrawalPayment=提款支付
 SocialContributionPayment=Social/fiscal tax payment
 BankTransfer=銀行匯款
 BankTransfers=銀行轉帳
-TransferDesc=從一個帳戶轉移到另一個,Dolibarr會寫兩個記錄(相同數額的源帳戶借記卡和信用卡帳戶中的目標。同樣的標簽和日期將在此交易中使用)
+MenuBankInternalTransfer=Internal transfer
+TransferDesc=Transfer from one account to another one, Dolibarr will write two records (a debit in source account and a credit in target account. The same amount (except sign), label and date will be used for this transaction)
 TransferFrom=從
 TransferTo=至
 TransferFromToDone=一個<b>%</b>轉讓<b>從</b> s到<b>%s</b>的<b>%s%s</b>已被記錄。
@@ -116,11 +116,11 @@ Graph=圖像
 ExportDataset_banque_1=銀行交易和帳戶的聲明
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=交易的其他帳戶
-PaymentNumberUpdateSucceeded=Payment number updated successfully
+PaymentNumberUpdateSucceeded=付款號碼更新成功
 PaymentNumberUpdateFailed=付款數目無法更新
-PaymentDateUpdateSucceeded=Payment date updated successfully
+PaymentDateUpdateSucceeded=付款日期更新成功
 PaymentDateUpdateFailed=付款日期可能無法更新
-Transactions=Transactions
+Transactions=交易
 BankTransactionLine=銀行交易
 AllAccounts=所有銀行/現金帳戶
 BackToAccount=回到帳戶
@@ -129,7 +129,7 @@ FutureTransaction=在FUTUR的交易。調解沒有辦法。
 SelectChequeTransactionAndGenerate=選擇/篩選器檢查納入支票存款收據,並單擊“創建”。
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Eventually, specify a category in which to classify the records
-ToConciliate=To conciliate?
+ToConciliate=To reconcile ?
 ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
 DefaultRIB=Default BAN
 AllRIB=All BAN
@@ -142,3 +142,6 @@ ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
 RejectCheckDate=Date the check was returned
 CheckRejected=Check returned
 CheckRejectedAndInvoicesReopened=Check returned and invoices reopened
+BankAccountModelModule=Document templates for bank accounts
+DocumentModelSepaMandate=Template of SEPA mandate. Usefull for european countries in EEC only.
+DocumentModelBan=Template to print a page with BAN information.
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 47fa1262871..b6479e8156e 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -142,7 +142,7 @@ ErrorCantCancelIfReplacementInvoiceNotValidated=錯誤,無法取消一個已
 BillFrom=From
 BillTo=Bill To
 ActionsOnBill=行動對發票
-RecurringInvoiceTemplate=Recurring invoice
+RecurringInvoiceTemplate=Template/Recurring invoice
 NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
 FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
 NotARecurringInvoiceTemplate=Not a recurring template invoice
@@ -182,7 +182,7 @@ ConfirmCustomerPayment=確認此為<b>%s</b>付款金額 %s 嗎?
 ConfirmSupplierPayment=確認此為<b>%s</b>付款金額 %s 嗎?
 ConfirmValidatePayment=你確定要驗證此款項?沒有改變,可一旦付款驗證。
 ValidateBill=驗證發票
-UnvalidateBill=Unvalidate發票
+UnvalidateBill=未驗證發票
 NumberOfBills=發票數
 NumberOfBillsByMonth=每月發票(invoice)數
 AmountOfBills=發票金額
@@ -209,8 +209,8 @@ EscompteOffered=折扣額(任期前付款)
 EscompteOfferedShort=Discount
 SendBillRef=Submission of invoice %s
 SendReminderBillRef=Submission of invoice %s (reminder)
-StandingOrders=常年訂單
-StandingOrder=長期訂單
+StandingOrders=Direct debit orders
+StandingOrder=Direct debit order
 NoDraftBills=沒有任何發票(invoice)草案
 NoOtherDraftBills=沒有其他發票草案
 NoDraftInvoices=No draft invoices
@@ -351,8 +351,8 @@ VarAmount=Variable amount (%% tot.)
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=銀行的命令
-PaymentTypeShortPRE=銀行的命令
+PaymentTypePRE=Direct debit payment order
+PaymentTypeShortPRE=Debit payment order
 PaymentTypeLIQ=現金
 PaymentTypeShortLIQ=現金
 PaymentTypeCB=信用卡
@@ -381,6 +381,7 @@ ExtraInfos=額外的新聞電臺
 RegulatedOn=規範了
 ChequeNumber=檢查ñ °
 ChequeOrTransferNumber=支票/轉賬ñ °
+ChequeBordereau=Check schedule
 ChequeMaker=Check/Transfer transmitter
 ChequeBank=銀行檢查
 CheckBank=查詢
@@ -429,13 +430,15 @@ CantRemoveConciliatedPayment=Can't remove conciliated payment
 PayedByThisPayment=氟離子選擇電極通過此付款
 ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
 ClosePaidCreditNotesAutomatically=Classify "Paid" all credit notes entirely paid back.
+ClosePaidContributionsAutomatically=Classify "Paid" all social or fiscal contributions entirely paid.
 AllCompletelyPayedInvoiceWillBeClosed=所有發票仍然沒有支付將被自動關閉狀態“支付最高”。
 ToMakePayment=Pay
 ToMakePaymentBack=Pay back
 ListOfYourUnpaidInvoices=List of unpaid invoices
 NoteListOfYourUnpaidInvoices=Note: This list contains only invoices for third parties you are linked to as a sale representative.
 RevenueStamp=Revenue stamp
-YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of thirdparty
+YouMustCreateInvoiceFromThird=This option is only available when creating invoice from tab "customer" of third party
+YouMustCreateInvoiceFromSupplierThird=This option is only available when creating invoice from tab "supplier" of third party
 YouMustCreateStandardInvoiceFirstDesc=You have to create a standard invoice first and convert it to "template" to create a new template invoice
 PDFCrabeDescription=一個完整的PDF發票(invoice)文件範本(支援營業稅選項,折扣,付款條件..)
 PDFCrevetteDescription=Invoice PDF template Crevette. A complete invoice template for situation invoices
@@ -477,4 +480,6 @@ updatePriceNextInvoiceErrorUpdateline=Error : update price on invoice line : %s
 ToCreateARecurringInvoice=To create a recurring invoice for this contract, first create this draft invoice, then convert it into an invoice template and define the frequency for generation of future invoices.
 ToCreateARecurringInvoiceGene=To generate future invoices regularly and manually, just go on menu <strong>%s - %s - %s</strong>.
 ToCreateARecurringInvoiceGeneAuto=If you need to have such invoices generated automatically, ask you administrator to enable and setup module <strong>%s</strong>. Note that both method (manual and automatic) can be used together with no risk of duplication.
+DeleteRepeatableInvoice=Delete template invoice
+ConfirmDeleteRepeatableInvoice=Are your sure you want to delete the template invoice ?
 
diff --git a/htdocs/langs/zh_TW/boxes.lang b/htdocs/langs/zh_TW/boxes.lang
index 88167eb9033..36f6011b9c0 100644
--- a/htdocs/langs/zh_TW/boxes.lang
+++ b/htdocs/langs/zh_TW/boxes.lang
@@ -38,7 +38,7 @@ BoxMyLastBookmarks=My latest %s bookmarks
 BoxOldestExpiredServices=最早的活動過期服務
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
-BoxTitleLastContracts=Latest %s contracts
+BoxTitleLastContracts=Latest %s modified contracts
 BoxTitleLastModifiedDonations=Latest %s modified donations
 BoxTitleLastModifiedExpenses=Latest %s modified expense reports
 BoxGlobalActivity=Global activity (invoices, proposals, orders)
@@ -72,8 +72,13 @@ BoxProposalsPerMonth=Proposals per month
 NoTooLowStockProducts=No product under the low stock limit
 BoxProductDistribution=Products/Services distribution
 BoxProductDistributionFor=Distribution of %s for %s
+BoxTitleLastModifiedSupplierBills=Latest %s modified supplier bills
+BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
+BoxTitleLastModifiedCustomerBills=Latest %s modified customer bills
+BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
+BoxTitleLastModifiedPropals=Latest %s modified propals
 ForCustomersInvoices=客戶的發票
 ForCustomersOrders=Customers orders
 ForProposals=建議
 LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Add widget to your dashboard...
+ChooseBoxToAdd=Add widget to your dashboard
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index 8a8a4ab5ff5..35bce8c21a1 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -12,10 +12,9 @@ CashDeskOn=上
 CashDeskThirdParty=第三方
 ShoppingCart=購物車
 NewSell=新的銷售
-BackOffice=回到辦公室
 AddThisArticle=添加此文章
 RestartSelling=回去就賣
-SellFinished=出售完成
+SellFinished=Sale complete
 PrintTicket=打印準考證
 NoProductFound=沒有文章中找到
 ProductFound=產品被發現
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 529085f45c7..0bdf6bdbc22 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -14,6 +14,7 @@ CustomersCategoriesArea=Customers tags/categories area
 MembersCategoriesArea=Members tags/categories area
 ContactsCategoriesArea=Contacts tags/categories area
 AccountsCategoriesArea=Accounts tags/categories area
+ProjectsCategoriesArea=Projects tags/categories area
 SubCats=子類別
 CatList=List of tags/categories
 NewCategory=New tag/category
@@ -33,9 +34,10 @@ CompanyIsInSuppliersCategories=This third party is linked to following suppliers
 MemberIsInCategories=This member is linked to following members tags/categories
 ContactIsInCategories=This contact is linked to following contacts tags/categories
 ProductHasNoCategory=This product/service is not in any tags/categories
-CompanyHasNoCategory=This thirdparty is not in any tags/categories
+CompanyHasNoCategory=This third party is not in any tags/categories
 MemberHasNoCategory=This member is not in any tags/categories
 ContactHasNoCategory=This contact is not in any tags/categories
+ProjectHasNoCategory=This project is not in any tags/categories
 ClassifyInCategory=Add to tag/category
 NotCategorized=Without tag/category
 CategoryExistsAtSameLevel=此類別已存在此號
@@ -56,12 +58,14 @@ ProductsCategoriesShort=Products tags/categories
 MembersCategoriesShort=Members tags/categories
 ContactCategoriesShort=Contacts tags/categories
 AccountsCategoriesShort=Accounts tags/categories
+ProjectsCategoriesShort=Projects tags/categories
 ThisCategoryHasNoProduct=這個類別不含任何產品。
 ThisCategoryHasNoSupplier=這個類別不含任何供應商。
 ThisCategoryHasNoCustomer=這個類別不含任何客戶。
 ThisCategoryHasNoMember=這個類別不含任何成員。
 ThisCategoryHasNoContact=This category does not contain any contact.
 ThisCategoryHasNoAccount=This category does not contain any account.
+ThisCategoryHasNoProject=This category does not contain any project.
 CategId=Tag/category id
 CatSupList=List of supplier tags/categories
 CatCusList=List of customer/prospect tags/categories
@@ -71,6 +75,7 @@ CatContactList=List of contact tags/categories
 CatSupLinks=Links between suppliers and tags/categories
 CatCusLinks=Links between customers/prospects and tags/categories
 CatProdLinks=Links between products/services and tags/categories
+CatProJectLinks=Links between projects and tags/categories
 DeleteFromCat=Remove from tags/category
 ExtraFieldsCategories=Complementary attributes
 CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index e3b16863147..a394cfbc312 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -13,6 +13,8 @@ MenuNewPrivateIndividual=新的私營個體
 NewCompany=新客戶/供應商(潛在、客戶、供應商)
 NewThirdParty=新客戶/供應商(潛在、客戶、供應商)
 CreateDolibarrThirdPartySupplier=建立一個合作廠商(供應商)
+CreateThirdPartyOnly=Create thirdpary
+CreateThirdPartyAndContact=Create a third party + a child contact
 ProspectionArea=勘察區
 IdThirdParty=第三方身份
 IdCompany=公司ID
@@ -38,7 +40,7 @@ ThirdPartySuppliers=供應商
 ThirdPartyType=客戶/供應商類型
 Company/Fundation=公司/基金會
 Individual=私營個體
-ToCreateContactWithSameName=將自動用相同的表格建立實體聯絡訊息
+ToCreateContactWithSameName=Will create automatically a contact/address with same information than third party under the third party. In most cases, even if your third party is a physical people, creating a third party alone is enough.
 ParentCompany=母公司
 Subsidiaries=附屬公司
 ReportByCustomers=客戶的報告
@@ -47,7 +49,7 @@ CivilityCode=文明守則
 RegisteredOffice=註冊辦事處
 Lastname=姓氏
 Firstname=名字
-PostOrFunction=職位/職務
+PostOrFunction=Job position
 UserTitle=稱呼
 Address=地址
 State=州/省
@@ -64,7 +66,7 @@ Chat=對話
 PhonePro=公司電話號碼
 PhonePerso=個人電話號碼
 PhoneMobile=手機號碼
-No_Email=請勿發送大量的電子郵件
+No_Email=Refuse mass e-mailings
 Fax=傳真號碼
 Zip=郵遞區號
 Town=城市
@@ -73,7 +75,7 @@ Poste= 位置
 DefaultLang=預設語系
 VATIsUsed=使用營業稅(VAT)
 VATIsNotUsed=不使用營業稅(VAT)
-CopyAddressFromSoc=填寫地址於客戶/供應商地址欄位
+CopyAddressFromSoc=Fill address with third party address
 ThirdpartyNotCustomerNotSupplierSoNoRef=Thirdparty neither customer nor supplier, no available refering objects
 ##### Local Taxes #####
 LocalTax1IsUsed=Use second tax
@@ -239,7 +241,6 @@ ProfId6RU=-
 VATIntra=公司統一編號
 VATIntraShort=公司統編
 VATIntraSyntaxIsValid=語法是有效的
-VATIntraValueIsValid=值是有效的
 ProspectCustomer=潛在/客戶
 Prospect=潛在
 CustomerCard=客戶卡
@@ -261,7 +262,9 @@ AddContactAddress=建立聯絡資訊及地址
 EditContact=編輯聯絡人/地址
 EditContactAddress=編輯聯絡資訊及地址
 Contact=聯絡人
+ContactId=Contact id
 ContactsAddresses=聯絡資訊/地址
+FromContactName=Name:
 NoContactDefinedForThirdParty=此客戶/供應商沒有定義聯絡人
 NoContactDefined=此客戶(供應商)沒有定義聯絡人
 DefaultContact=預設聯絡人
@@ -284,7 +287,7 @@ CompanyDeleted=公司“%S”已從資料庫中刪除。
 ListOfContacts=聯絡人名單
 ListOfContactsAddresses=聯絡人及地址清單
 ListOfThirdParties=客戶/供應商清單
-ShowCompany=顯示公司
+ShowCompany=Show third party
 ShowContact=顯示聯絡
 ContactsAllShort=全部(不過濾)
 ContactType=聯絡型式
@@ -294,6 +297,7 @@ ContactForProposals=報價聯絡人
 ContactForContracts=合約聯絡人
 ContactForInvoices=發票聯絡人
 NoContactForAnyOrder=非訂單聯絡人
+NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
 NoContactForAnyProposal=非報價聯絡人
 NoContactForAnyContract=非合同聯絡人
 NoContactForAnyInvoice=非發票聯絡人
@@ -352,9 +356,9 @@ ExportCardToFormat=匯出格式
 ContactNotLinkedToCompany=聯系不與任何第三方
 DolibarrLogin=登錄系統時間
 NoDolibarrAccess=沒有任何系統存取記錄
-ExportDataset_company_1=客戶/供應商(公司/基金會/個人)和屬性
+ExportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ExportDataset_company_2=聯系和屬性
-ImportDataset_company_1=客戶/供應商(公司/基金會/個人)和屬性
+ImportDataset_company_1=Third parties (Companies / foundations / physical people) and properties
 ImportDataset_company_2=聯絡資訊/地址(合作廠商)和屬性
 ImportDataset_company_3=銀行的詳細資料
 ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
@@ -393,3 +397,5 @@ ThirdpartiesMergeSuccess=客戶/供應商將被合併
 SaleRepresentativeLogin=Login of sales representative
 SaleRepresentativeFirstname=Firstname of sales representative
 SaleRepresentativeLastname=Lastname of sales representative
+ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+NewCustomerSupplierCodeProposed=New customer or supplier code suggested on duplicate code
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 0454f1a8d7d..b0c57193e1d 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -49,6 +49,8 @@ SocialContribution=Social or fiscal tax
 SocialContributions=Social or fiscal taxes
 SocialContributionsDeductibles=Deductible social or fiscal taxes
 SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
+LabelContrib=Label contribution
+TypeContrib=Type contribution
 MenuSpecialExpenses=Special expenses
 MenuTaxAndDividends=稅和股息
 MenuSocialContributions=Social/fiscal taxes
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index 37bde67e313..7b037a7ed12 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -7,7 +7,7 @@ Permission23103 = Delete Scheduled job
 Permission23104 = Execute Scheduled job
 # Admin
 CronSetup= Scheduled job management setup
-URLToLaunchCronJobs=URL to check and launch cron jobs if required
+URLToLaunchCronJobs=URL to check and launch qualified cron jobs
 OrToLaunchASpecificJob=Or to check and launch a specific job
 KeyForCronAccess=Security key for URL to launch cron jobs
 FileToLaunchCronJobs=Command line to launch cron jobs
@@ -23,7 +23,7 @@ CronCommand=Command
 CronList=Scheduled jobs
 CronDelete=Delete scheduled jobs
 CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
-CronExecute=Launch scheduled jobs
+CronExecute=Launch scheduled job
 CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
 CronInfo=Scheduled job module allow to execute job that have been planned
 CronTask=Job
@@ -39,7 +39,7 @@ CronMethod=方法
 CronModule=模組
 CronNoJobs=No jobs registered
 CronPriority=優先
-CronLabel=描述
+CronLabel=Label
 CronNbRun=Nb. launch
 CronMaxRun=Max nb. launch
 CronEach=Every
@@ -76,3 +76,4 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled job
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Local database backup
 MakeLocalDatabaseDump=Create a local database dump
+WarningCronDelayed=Attention, for performance purpose, whatever is next date of execution of active jobs, your jobs may be delayed to a maximum of %s hours before being run.
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index da7e7cd858c..906520ea9bd 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -129,7 +129,7 @@ ErrorPHPNeedModule=Error, your PHP must have module <b>%s</b> installed to use t
 ErrorOpenIDSetupNotComplete=You setup Dolibarr config file to allow OpenID authentication, but URL of OpenID service is not defined into constant %s
 ErrorWarehouseMustDiffers=Source and target warehouses must differs
 ErrorBadFormat=Bad format!
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any third party. Link member to an existing third party or create a new third party before creating subscription with invoice.
 ErrorThereIsSomeDeliveries=Error, there is some deliveries linked to this shipment. Deletion refused.
 ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank transaction that was conciliated
 ErrorCantDeletePaymentSharedWithPayedInvoice=Can't delete a payment shared by at least one invoice with status Payed
@@ -174,6 +174,8 @@ ErrorStockIsNotEnoughToAddProductOnOrder=Stock is not enougth for product %s to
 ErrorStockIsNotEnoughToAddProductOnInvoice=Stock is not enougth for product %s to add it into a new invoice.
 ErrorStockIsNotEnoughToAddProductOnShipment=Stock is not enougth for product %s to add it into a new shipment.
 ErrorStockIsNotEnoughToAddProductOnProposal=Stock is not enougth for product %s to add it into a new proposal.
+ErrorFailedToLoadLoginFileForMode=Failed to get the login file for mode '%s'.
+ErrorModuleNotFound=File of module was not found.
 
 # Warnings
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 5ca4bac8bfd..e258ef0a093 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -11,12 +11,14 @@ PHPSupportSessions=這個PHP支持會議。
 PHPSupportPOSTGETOk=這個PHP支持的變量的POST和GET。
 PHPSupportPOSTGETKo=有可能你的PHP安裝程序不支持變量POST和/或GET。檢查你的php.ini中參數<b>的變數</b> 。
 PHPSupportGD=這個PHP支持廣東的圖形功能。
+PHPSupportCurl=This PHP support Curl.
 PHPSupportUTF8=這個PHP支持UTF8的功能。
 PHPMemoryOK=您的PHP最大會話內存設置為<b>%s。</b>這應該是足夠的。
 PHPMemoryTooLow=您的PHP最大會話內存設置為<b>%s</b>字節。這應該是太低了。改變你的<b>php.ini中</b>設置<b>memory_limit的</b>參數至少<b>%s</b>字節。
 Recheck=點擊這裏,更多的有意義的測試
 ErrorPHPDoesNotSupportSessions=您的PHP安裝不支持會話。此功能必須作出Dolibarr工作。檢查你的PHP安裝程序。
 ErrorPHPDoesNotSupportGD=您的PHP安裝不支持圖形功能的廣東。不圖將可用。
+ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
 ErrorPHPDoesNotSupportUTF8=您的PHP安裝不支持UTF8的功能。 Dolibarr不能正常工作。解決這個安裝之前Dolibarr。
 ErrorDirDoesNotExists=目錄%s不存在。
 ErrorGoBackAndCorrectParameters=後退和糾正錯誤的參數。
@@ -133,6 +135,10 @@ ActivateModule=激活模塊%s
 ShowEditTechnicalParameters=點選這裡以顯示/編輯進階參數設定(專家模式)
 WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40/41/42/43), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
 ErrorDatabaseVersionForbiddenForMigration=您的資料庫版本是 %s. 如果您需要使用遷移程序進行資料庫結構的變更, 這個版本有嚴重錯誤使得資料遺失.因此, 直到您升級資料庫版本到較新的已解決版本(已知有問題的版本: %s),遷移程序將不會被允許執行.
+KeepDefaultValuesWamp=You use the Dolibarr setup wizard from DoliWamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesDeb=You use the Dolibarr setup wizard from a Linux package (Ubuntu, Debian, Fedora...), so values proposed here are already optimized. Only the password of the database owner to create must be completed. Change other parameters only if you know what you do.
+KeepDefaultValuesMamp=You use the Dolibarr setup wizard from DoliMamp, so values proposed here are already optimized. Change them only if you know what you do.
+KeepDefaultValuesProxmox=You use the Dolibarr setup wizard from a Proxmox virtual appliance, so values proposed here are already optimized. Change them only if you know what you do.
 
 #########
 # upgrade
@@ -185,6 +191,8 @@ MigrationActioncommElement=在行動上的更新數據
 MigrationPaymentMode=付款方式的數據遷移
 MigrationCategorieAssociation=目錄遷移
 MigrationEvents=事件遷移正進行新增事件負責人到指定的表格
+MigrationRemiseEntity=Update entity field value of llx_societe_remise
+MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
 MigrationReloadModule=Reload module %s
 ShowNotAvailableOptions=顯示不可用的選項
 HideNotAvailableOptions= 隱藏不可用的選項
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index 73f0bac2efc..7c195b093ff 100644
--- a/htdocs/langs/zh_TW/interventions.lang
+++ b/htdocs/langs/zh_TW/interventions.lang
@@ -45,6 +45,7 @@ TypeContact_fichinter_external_CUSTOMER=隨訪客戶聯系
 # Modele numérotation
 PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
 PrintProductsOnFichinterDetails=interventions generated from orders
+UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
 InterventionStatistics=Statistics of interventions
 NbOfinterventions=Nb of intervention cards
 NumberOfInterventionsByMonth=Nb of intervention cards by month (date of validation)
diff --git a/htdocs/langs/zh_TW/ldap.lang b/htdocs/langs/zh_TW/ldap.lang
index 612ee673f4c..0b3023db254 100644
--- a/htdocs/langs/zh_TW/ldap.lang
+++ b/htdocs/langs/zh_TW/ldap.lang
@@ -15,6 +15,8 @@ LDAPFieldFirstSubscriptionDate=首先認購日期
 LDAPFieldFirstSubscriptionAmount=認購金額拳
 LDAPFieldLastSubscriptionDate=最後認購日期
 LDAPFieldLastSubscriptionAmount=最後認購金額
+LDAPFieldSkype=Skype id
+LDAPFieldSkypeExample=Example : skypeName
 UserSynchronized=用戶同步
 GroupSynchronized=集團同步
 MemberSynchronized=會員同步
diff --git a/htdocs/langs/zh_TW/mails.lang b/htdocs/langs/zh_TW/mails.lang
index 5cfabb518a3..b885243badd 100644
--- a/htdocs/langs/zh_TW/mails.lang
+++ b/htdocs/langs/zh_TW/mails.lang
@@ -67,8 +67,9 @@ MailingStatusRead=閱讀
 YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubcribe from mailing list
 ActivateCheckReadKey=Key used to encrypt URL used for "Read Receipt" and "Unsubcribe" feature
 EMailSentToNRecipients=EMail sent to %s recipients.
+EMailSentForNElements=EMail sent for %s elements.
 XTargetsAdded=<b>%s</b> recipients added into target list
-OnlyPDFattachmentSupported=If the PDF document was already generated for the invoice, it will be attached to email. If not, no email will be sent (also, note that only pdf invoice are supported as attachment in mass sending in this version).
+OnlyPDFattachmentSupported=If the PDF document was already generated for the object to send, it will be attached to email. If not, no email will be sent (also, note that only pdf documents are supported as attachment in mass sending in this version).
 AllRecipientSelected=All thirdparties selected and if an email is set.
 ResultOfMailSending=Result of mass EMail sending
 NbSelected=Nb selected
@@ -127,7 +128,7 @@ AdvTgtMaxVal=Maximum value
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
-AdvTgtTypeOfIncudeHelp=Target Email of thirdparty and email of contact of the thridparty, or just thridparty email or just contact email
+AdvTgtTypeOfIncudeHelp=Target Email of third party and email of contact of the third party, or just third party email or just contact email
 AdvTgtTypeOfIncude=Type of targeted email
 AdvTgtContactHelp=Use only if you target contact into "Type of targeted email"
 AddAll=Add all
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index 0443ebc1911..32a8b36446a 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -67,6 +67,7 @@ SelectDate=選擇日期
 SeeAlso=請參考 %s
 SeeHere=See here
 BackgroundColorByDefault=默認的背景顏色
+FileRenamed=The file was successfully renamed
 FileUploaded=檔案已上傳
 FileWasNotUploaded=附件尚未上傳
 NbOfEntries=鈮條目
@@ -245,6 +246,10 @@ DateBuild=報告生成日期
 DatePayment=付款日期
 DateApprove=核准日期
 DateApprove2=核准日期(主管)
+UserCreation=Creation user
+UserModification=Modification user
+UserCreationShort=Creat. user
+UserModificationShort=Modif. user
 DurationYear=年
 DurationMonth=月
 DurationWeek=周
@@ -256,6 +261,7 @@ DurationDays=天
 Year=年
 Month=月
 Week=周
+WeekShort=Week
 Day=天
 Hour=小時
 Minute=分鐘
@@ -278,6 +284,7 @@ MonthOfDay=日
 HourShort=時
 MinuteShort=分
 Rate=稅率
+CurrencyRate=Currency conversion rate
 UseLocalTax=營業稅
 Bytes=Bytes
 KiloBytes=KB
@@ -565,8 +572,11 @@ BackToList=返回列表
 GoBack=回去
 CanBeModifiedIfOk=可以被修改(如果值有效)
 CanBeModifiedIfKo=可以被修改(如果值無效)
+ValueIsValid=Value is valid
+ValueIsNotValid=Value is not valid
 RecordModifiedSuccessfully=記錄修改成功
 RecordsModified=%s records modified
+RecordsDeleted=%s records deleted
 AutomaticCode=自動產生代碼
 FeatureDisabled=功能禁用
 MoveBox=Move widget
@@ -575,6 +585,7 @@ NotEnoughPermissions=您沒有這個動作的權限
 SessionName=會議名稱
 Method=方法
 Receive=收到
+CompleteOrNoMoreReceptionExpected=Complete or nothing more expected
 PartialWoman=部分
 TotalWoman=全部
 NeverReceived=從未收到
@@ -598,6 +609,7 @@ DisabledModules=禁用模組
 For=為
 ForCustomer=客戶
 Signature=電子郵件簽名
+DateOfSignature=Date of signature
 HidePassword=隱藏密碼
 UnHidePassword=顯示密碼
 Root=根目錄
@@ -641,6 +653,15 @@ NewAttribute=新屬性
 AttributeCode=屬性代碼
 URLPhoto=照片的URL
 SetLinkToAnotherThirdParty=Link to another third party
+LinkTo=Link to
+LinkToProposal=Link to proposal
+LinkToOrder=Link to order
+LinkToInvoice=Link to invoice
+LinkToSupplierOrder=Link to supplier order
+LinkToSupplierProposal=Link to supplier proposal
+LinkToSupplierInvoice=Link to supplier invoice
+LinkToContract=Link to contract
+LinkToIntervention=Link to intervention
 CreateDraft=建立草稿
 SetToDraft=Back to draft
 ClickToEdit=單擊“編輯”
@@ -701,6 +722,9 @@ RelatedObjects=Related Objects
 ClassifyBilled=Classify billed
 Progress=Progress
 ClickHere=Click here
+FrontOffice=Front office
+BackOffice=Back office
+View=View
 # Week day
 Monday=星期一
 Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index 6568cac984a..356e9ec9d3d 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -41,3 +41,4 @@ rateMustBeNumeric=Rate must be a numeric value
 markRateShouldBeLesserThan100=Mark rate should be lower than 100
 ShowMarginInfos=Show margin infos
 CheckMargins=Margins detail
+MarginPerSaleRepresentativeWarning=The report of margin per user use the link between thirdparties and sale representatives to calculate the margin of each user. Because some thirdparties may not be linked to any sale representative and some thirdparties may be linked to several users, some margins may not appears in these report or may appears in several different lines.
diff --git a/htdocs/langs/zh_TW/oauth.lang b/htdocs/langs/zh_TW/oauth.lang
index f8dfee9788f..a338ab4d5df 100644
--- a/htdocs/langs/zh_TW/oauth.lang
+++ b/htdocs/langs/zh_TW/oauth.lang
@@ -1,5 +1,7 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Oauth Configuration
+OAuthServices=OAuth services
+ManualTokenGeneration=Manual token generation
 NoAccessToken=No access token saved into local database
 HasAccessToken=A token was generated and saved into local database
 NewTokenStored=Token received ans saved
@@ -9,7 +11,16 @@ RequestAccess=Click here to request/renew access and receive a new token to save
 DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credential on your OAuth provider:
 ListOfSupportedOauthProviders=Enter here credential provided by your OAuth2 provider. Only supported OAuth2 providers are visible here. This setup may be used by other modules that need OAuth2 authentication.
-OAUTH_GOOGLE_NAME=Api Google
-OAUTH_GOOGLE_ID=Api Google Id
-OAUTH_GOOGLE_SECRET=Api Google Secret
-OAUTH_GOOGLE_DESC=Go on <a href="https://console.developers.google.com/" target="_blank">this page</a> then Credentials to create Oauth credentials
+TOKEN_ACCESS=
+TOKEN_REFRESH=Token Refresh Present
+TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRE_AT=Token expire at
+TOKEN_DELETE=Delete saved token
+OAUTH_GOOGLE_NAME=Oauth Google service
+OAUTH_GOOGLE_ID=Oauth Google Id
+OAUTH_GOOGLE_SECRET=Oauth Google Secret
+OAUTH_GOOGLE_DESC=Go on <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">this page</a> then "Credentials" to create Oauth credentials
+OAUTH_GITHUB_NAME=Oauth GitHub service
+OAUTH_GITHUB_ID=Oauth GitHub Id
+OAUTH_GITHUB_SECRET=Oauth GitHub Secret
+OAUTH_GITHUB_DESC=Go on <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">this page</a> then "Register a new application" to create Oauth credentials
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 85d1cd30d56..a3e4e805fd1 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -2,7 +2,7 @@
 OrdersArea=客戶訂單面積
 SuppliersOrdersArea=供應商的訂單面積
 OrderCard=訂單資訊
-OrderId=Order Id
+OrderId=訂單編號
 Order=訂單
 Orders=訂單
 OrderLine=在線訂單
@@ -17,7 +17,7 @@ SuppliersOrders=供應商訂單
 SuppliersOrdersRunning=當前供應商的訂單
 CustomerOrder=客戶訂單
 CustomersOrders=Customer orders
-CustomersOrdersRunning=Current customer orders
+CustomersOrdersRunning=當前客戶訂單
 CustomersOrdersAndOrdersLines=Customer orders and order lines
 OrdersToBill=Customer orders delivered
 OrdersInProcess=Customer orders in process
@@ -55,25 +55,25 @@ ShippingExist=A貨存在
 ProductQtyInDraft=Product quantity into draft orders
 ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
 MenuOrdersToBill=訂單To帳單
-MenuOrdersToBill2=Billable orders
+MenuOrdersToBill2=可結算訂單
 ShipProduct=船舶產品
 CreateOrder=創建訂單
 RefuseOrder=拒絕訂單
-ApproveOrder=Approve order
+ApproveOrder=批准訂單
 Approve2Order=Approve order (second level)
 ValidateOrder=驗證訂單
-UnvalidateOrder=Unvalidate秩序
+UnvalidateOrder=未驗證訂單
 DeleteOrder=刪除訂單
 CancelOrder=取消訂單
 OrderReopened= Order %s Reopened
-AddOrder=Create order
+AddOrder=創建訂單
 AddToDraftOrders=Add to draft order
 ShowOrder=顯示訂單
 OrdersOpened=Orders to process
 NoDraftOrders=No draft orders
 NoOrder=No order
 NoSupplierOrder=No supplier order
-LastOrders=Latest %s customer orders
+LastOrders=最新%s個客戶訂單
 LastCustomerOrders=Latest %s customer orders
 LastSupplierOrders=Latest %s supplier orders
 LastModifiedOrders=Latest %s modified orders
@@ -92,7 +92,7 @@ ConfirmUnvalidateOrder=你是否確定要還原訂單<b>%s</b>草案狀態?
 ConfirmCancelOrder=您確定要取消此訂單?
 ConfirmMakeOrder=請確認您是否想要確認您於 <b>%s</b> 製作的訂單?
 GenerateBill=生成發票
-ClassifyShipped=Classify delivered
+ClassifyShipped=已發貨
 DraftOrders=草案訂單
 DraftSuppliersOrders=Draft suppliers orders
 OnProcessOrders=處理中的訂單
@@ -157,3 +157,4 @@ OrderCreated=Your orders have been created
 OrderFail=An error happened during your orders creation
 CreateOrders=Create orders
 ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CloseReceivedSupplierOrdersAutomatically=Close order to "%s" automatically if all products are received.
diff --git a/htdocs/langs/zh_TW/printing.lang b/htdocs/langs/zh_TW/printing.lang
index 2da614e96f9..d6cf49bd525 100644
--- a/htdocs/langs/zh_TW/printing.lang
+++ b/htdocs/langs/zh_TW/printing.lang
@@ -18,10 +18,6 @@ UserConf=Setup per user
 PRINTGCP_INFO=Google OAuth API setup
 PRINTGCP_AUTHLINK=Authentication
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PRINTGCP_TOKEN_REFRESH=Token Refresh Present
-PRINTGCP_TOKEN_EXPIRED=Token Expired
-PRINTGCP_TOKEN_EXPIRE_AT=Token expire at
-PRINTGCP_DELETE_TOKEN=Delete saved token
 PrintGCPDesc=This driver allow to send documents directly to a printer with Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Display Name
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index c3d78f7ff7f..9b9fd13f5cb 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -8,8 +8,8 @@ Batch=Lot/Serial
 atleast1batchfield=Eat-by date or Sell-by date or Lot/Serial number
 batch_number=Lot/Serial number
 BatchNumberShort=Lot/Serial
-l_eatby=Eat-by date
-l_sellby=Sell-by date
+EatByDate=Eat-by date
+SellByDate=Sell-by date
 DetailBatchNumber=Lot/Serial details
 DetailBatchFormat=Lot/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
 printBatch=Lot/Serial: %s
@@ -19,3 +19,6 @@ printQty=Qty: %d
 AddDispatchBatchLine=Add a line for Shelf Life dispatching
 WhenProductBatchModuleOnOptionAreForced=When module Lot/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
 ProductDoesNotUseBatchSerial=This product does not use lot/serial number
+ProductLotSetup=Setup of module lot/serial
+ShowCurrentStockOfLot=Show current stock for couple product/lot
+ShowLogOfMovementIfLot=Show log of movements for couple product/lot
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 0424e254a3e..a01a867b9ef 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -18,8 +18,8 @@ ProductVatMassChange=Mass VAT change
 ProductVatMassChangeDesc=This page can be used to modify a VAT rate defined on products or services from a value to another. Warning, this change is done on all database.
 MassBarcodeInit=Mass barcode init
 MassBarcodeInitDesc=This page can be used to initialize a barcode on objects that does not have barcode defined. Check before that setup of module barcode is complete.
-ProductAccountancyBuyCode=會計代碼(採購)
-ProductAccountancySellCode=會計代碼(銷售)
+ProductAccountancyBuyCode=Accountancy code (purchase)
+ProductAccountancySellCode=Accountancy code (sale)
 ProductOrService=產品或服務
 ProductsAndServices=產品與服務
 ProductsOrServices=產品或服務
@@ -59,6 +59,8 @@ SellingPriceHT=銷售價格(稅後)
 SellingPriceTTC=銷售價格(包括稅)
 CostPriceDescription=This price (net of tax) can be used to store the average amount this product cost to your company. It may be any price you calculate yourself, for example from the average buying price plus average production and distribution cost.
 CostPriceUsage=In a future version, this value could be used for margin calculation.
+SoldAmount=Sold amount
+PurchasedAmount=Purchased amount
 NewPrice=新價格
 MinPrice=Min. selling price
 CantBeLessThanMinPrice=售價不能超過該產品(%s的允許在沒有稅收的最低水平)
@@ -197,11 +199,11 @@ PrintsheetForOneBarCode=Print several stickers for one barcode
 BuildPageToPrint=Generate page to print
 FillBarCodeTypeAndValueManually=Fill barcode type and value manually.
 FillBarCodeTypeAndValueFromProduct=Fill barcode type and value from barcode of a product.
-FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a thirdparty.
+FillBarCodeTypeAndValueFromThirdParty=Fill barcode type and value from barcode of a third party.
 DefinitionOfBarCodeForProductNotComplete=Definition of type or value of bar code not complete for product %s.
-DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for thirdparty %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Definition of type or value of bar code non complete for third party %s.
 BarCodeDataForProduct=Barcode information of product %s :
-BarCodeDataForThirdparty=Barcode information of thirdparty %s :
+BarCodeDataForThirdparty=Barcode information of third party %s :
 ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
 PriceByCustomer=Different prices for each customer
 PriceCatalogue=A single sell price per product/service
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 6361d59e4e1..5d7484d1806 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -70,11 +70,11 @@ ListOfTasks=List of tasks
 GoToListOfTimeConsumed=Go to list of time consumed
 GoToListOfTasks=Go to list of tasks
 ListProposalsAssociatedProject=名單與項目有關的商業建議
-ListOrdersAssociatedProject=名單與項目相關的客戶的訂單
-ListInvoicesAssociatedProject=名單與項目相關的客戶的發票
-ListPredefinedInvoicesAssociatedProject=List of customer's template invoices associated with project
-ListSupplierOrdersAssociatedProject=名單與項目相關的供應商的訂單
-ListSupplierInvoicesAssociatedProject=名單與項目相關的供應商的發票
+ListOrdersAssociatedProject=List of customer orders associated with the project
+ListInvoicesAssociatedProject=List of customer invoices associated with the project
+ListPredefinedInvoicesAssociatedProject=List of customer template invoices associated with project
+ListSupplierOrdersAssociatedProject=List of supplier orders associated with the project
+ListSupplierInvoicesAssociatedProject=List of supplier invoices associated with the project
 ListContractAssociatedProject=名單與項目有關的合同
 ListFichinterAssociatedProject=名單與項目相關的幹預措施
 ListExpenseReportsAssociatedProject=List of expense reports associated with the project
@@ -123,6 +123,7 @@ ProjectReportDate=Change task date according project start date
 ErrorShiftTaskDate=Impossible to shift task date according to new project start date
 ProjectsAndTasksLines=Projects and tasks
 ProjectCreatedInDolibarr=Project %s created
+ProjectModifiedInDolibarr=Project %s modified
 TaskCreatedInDolibarr=Task %s created
 TaskModifiedInDolibarr=Task %s modified
 TaskDeletedInDolibarr=Task %s deleted
@@ -153,7 +154,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
-FirstAddRessourceToAllocateTime=Associate a resource to allocate time
+FirstAddRessourceToAllocateTime=Assign a user resource to task to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
 InputPerAction=Input per action
@@ -174,7 +175,7 @@ ProjectOpenedProjectByOppStatus=Open project/lead by opportunity status
 ProjectsStatistics=Statistics on projects/leads
 TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
 IdTaskTime=Id task time
-YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label.
+YouCanCompleteRef=If you want to complete the ref with some information (to use it as search filters), it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-ABC. You may also prefer to add search keys into label. But best practice may be to add a dedicated field, also called complementary attributes.
 OpenedProjectsByThirdparties=Open projects by thirdparties
 OnlyOpportunitiesShort=Only opportunities
 OpenedOpportunitiesShort=Open opportunities
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index da177410860..68407482edb 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -7,8 +7,8 @@ NewSalaryPayment=New salary payment
 SalaryPayment=Salary payment
 SalariesPayments=Salaries payments
 ShowSalaryPayment=Show salary payment
-THM=Average hourly price
-TJM=Average daily price
+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
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index d5d5fab1dd7..a41d6d12de3 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -6,7 +6,7 @@ AllSendings=All Shipments
 Shipment=出貨
 Shipments=出貨
 ShowSending=Show Shipments
-Receivings=Delivery Receipts
+Receivings=發貨收據
 SendingsArea=出貨
 ListOfSendings=出貨清單列表
 SendingMethod=送貨方式
@@ -31,7 +31,7 @@ StatusSendingProcessed=加工
 StatusSendingDraftShort=草案
 StatusSendingValidatedShort=驗證
 StatusSendingProcessedShort=加工
-SendingSheet=Shipment sheet
+SendingSheet=發貨單
 ConfirmDeleteSending=你確定要刪除這個出貨單?
 ConfirmValidateSending=你確定要驗證這個出貨單?
 ConfirmCancelSending=你確定要取消此出貨單?
@@ -52,7 +52,7 @@ ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
 ProductQtyInShipmentAlreadySent=Product quantity from opened customer order already sent
 ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
 NoProductToShipFoundIntoStock=No product to ship found into warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Weight/Vol.
+WeightVolShort=重量/體積
 ValidateOrderFirstBeforeShipment=You must first validate the order before being able to make shipments.
 
 # Sending methods
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index 56b3a63a61c..64137ab016b 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -15,6 +15,8 @@ DeleteSending=刪除發送
 Stock=庫存
 Stocks=庫存
 StocksByLotSerial=Stocks by lot/serial
+LotSerial=Lots/Serials
+LotSerialList=List of lot/serials
 Movements=轉讓
 ErrorWarehouseRefRequired=倉庫引用的名稱是必需的
 ListOfWarehouses=倉庫名單
@@ -43,6 +45,7 @@ PMPValue=加權平均價格
 PMPValueShort=的WAP
 EnhancedValueOfWarehouses=倉庫價值
 UserWarehouseAutoCreate=當建立一個用戶時,自動建立一個倉庫
+AllowAddLimitStockByWarehouse=Allow to add limit and desired stock by product and warehouse
 IndependantSubProductStock=Product stock and subproduct stock are independant
 QtyDispatched=派出數量
 QtyDispatchedShort=Qty dispatched
@@ -132,3 +135,9 @@ OpenAll=Open for all actions
 OpenInternal=Open for internal actions
 OpenShipping=Open for shippings
 OpenDispatch=Open for dispatch
+UseDispatchStatus=Use dispatch status (aprouve/refuse)
+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
diff --git a/htdocs/langs/zh_TW/supplier_proposal.lang b/htdocs/langs/zh_TW/supplier_proposal.lang
index 909a4d713c1..e39a69a3dbe 100644
--- a/htdocs/langs/zh_TW/supplier_proposal.lang
+++ b/htdocs/langs/zh_TW/supplier_proposal.lang
@@ -47,6 +47,7 @@ DefaultModelSupplierProposalCreate=Default model creation
 DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
 DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
 ListOfSupplierProposal=List of supplier proposal requests
+ListSupplierProposalsAssociatedProject=List of supplier proposals associated with project
 SupplierProposalsToClose=Supplier proposals to close
 SupplierProposalsToProcess=Supplier proposals to process
 LastSupplierProposals=Last price requests
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index f1e50735082..2025b3282e7 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -7,13 +7,13 @@ History=歷史紀錄
 ListOfSuppliers=供應商名單
 ShowSupplier=查看供應商
 OrderDate=訂購日期
-BuyingPriceMin=Minimum purchase price
-BuyingPriceMinShort=Min purchase price
-TotalBuyingPriceMinShort=Total of subproducts purchase prices
-TotalSellingPriceMinShort=Total of subproducts sell prices
+BuyingPriceMin=Best buying price
+BuyingPriceMinShort=Best buying price
+TotalBuyingPriceMinShort=Total of subproducts buying prices
+TotalSellingPriceMinShort=Total of subproducts selling prices
 SomeSubProductHaveNoPrices=Some sub-products have no price defined
-AddSupplierPrice=新增供應商的價格
-ChangeSupplierPrice=供應商的價格變化
+AddSupplierPrice=Add buying price
+ChangeSupplierPrice=Change buying price
 ReferenceSupplierIsAlreadyAssociatedWithAProduct=該參考供應商已經與一參考:%s的
 NoRecordedSuppliers=沒有供應商記錄
 SupplierPayment=供應商付款
@@ -36,8 +36,8 @@ ListOfSupplierOrders=採購單列表
 MenuOrdersSupplierToBill=待付款採購
 NbDaysToDelivery=延遲交貨天數
 DescNbDaysToDelivery=此訂單中最長延遲時間
-UseDoubleApproval=當含稅金額超過此額度 (需要特殊權限批准此金額,設為零時則無須雙重核准)
 SupplierReputation=Supplier reputation
 DoNotOrderThisProductToThisSupplier=Do not order
 NotTheGoodQualitySupplier=Wrong quality
 ReputationForThisProduct=Reputation
+BuyerName=Buyer name
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 4e043378328..cfb8f808112 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -100,3 +100,6 @@ WeeklyHours=Weekly hours
 ColorUser=Color of the user
 DisabledInMonoUserMode=Disabled in maintenance mode
 UserAccountancyCode=User accountancy code
+UserLogoff=User logout
+UserLogged=User logged
+DateEmployment=Date of Employment
diff --git a/htdocs/langs/zh_TW/website.lang b/htdocs/langs/zh_TW/website.lang
index b1b51cfedc2..6197580711f 100644
--- a/htdocs/langs/zh_TW/website.lang
+++ b/htdocs/langs/zh_TW/website.lang
@@ -12,6 +12,7 @@ EditMenu=Edit menu
 EditPageMeta=Edit Meta
 EditPageContent=Edit Content
 Website=Web site
+Webpage=Web page
 AddPage=Add page
 PreviewOfSiteNotYetAvailable=Preview of your website <strong>%s</strong> not yet available. You must first add a page.
 RequestedPageHasNoContentYet=Requested page with id %s has not content yet or cache file .tpl.php was removed. Edit content of page to solve this.
@@ -22,4 +23,6 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview will be done using this direct access instead of Dolibarr URLs wrapper.
+SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on <strong>%s</strong>, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+PreviewSiteServedByWebServer=Preview %s in a new tab. The %s will be served by an external web server (like Apache, Nginx, IIS). You must instal and setup this server before.<br>URL of %s served by external server:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=Preview %s in a new tab. The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed.<br>The inconvenient is that URL of pages are using path of your Dolibarr.<br>URL of %s served by Dolibarr:<br><strong>%s</strong>
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index c62c15187e0..ebb07aabc81 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -1,27 +1,28 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=站在客戶的訂單面積
-StandingOrders=常年訂單
-StandingOrder=常年訂單
-NewStandingOrder=新的長期訂單
+CustomersStandingOrdersArea=Direct debit payment orders area
+SuppliersStandingOrdersArea=Direct credit payment orders area
+StandingOrders=Direct debit payment orders
+StandingOrder=Direct debit payment order
+NewStandingOrder=New direct debit order
 StandingOrderToProcess=要處理
-WithdrawalsReceipts=提款收據
-WithdrawalReceipt=提款收據
-LastWithdrawalReceipts=Latest %s withdrawal receipts
-WithdrawalsLines=提款線
-RequestStandingOrderToTreat=Request for standing orders to process
-RequestStandingOrderTreated=Request for standing orders processed
+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
 NotPossibleForThisStatusOfWithdrawReceiptORLine=Not yet possible. Withdraw status must be set to 'credited' before declaring reject on specific lines.
-NbOfInvoiceToWithdraw=Nb. of invoice with withdraw request
-NbOfInvoiceToWithdrawWithInfo=Nb. of invoice with withdraw request for customers having defined bank account information
-InvoiceWaitingWithdraw=發票等待撤離
+NbOfInvoiceToWithdraw=Nb. of invoice with direct debit order
+NbOfInvoiceToWithdrawWithInfo=Nb. of customer invoice with direct debit payment orders having defined bank account information
+InvoiceWaitingWithdraw=Invoice waiting for direct debit
 AmountToWithdraw=收回的款額
-WithdrawsRefused=拒絕撤回
+WithdrawsRefused=Direct debit refused
 NoInvoiceToWithdraw=無付款方式客戶發票“撤回”是等待。繼續就提款卡發票&#39;標簽作出要求。
 ResponsibleUser=負責用戶
-WithdrawalsSetup=提款設置
-WithdrawStatistics=提款的統計
-WithdrawRejectStatistics=撤回拒絕的統計
-LastWithdrawalReceipt=Latest %s withdrawal receipts
+WithdrawalsSetup=Direct debit payment setup
+WithdrawStatistics=Direct debit payment statistics
+WithdrawRejectStatistics=Direct debit payment reject statistics
+LastWithdrawalReceipt=Latest %s direct debit receipts
 MakeWithdrawRequest=作出撤回請求
 ThirdPartyBankCode=第三方銀行代碼
 NoInvoiceCouldBeWithdrawed=沒有發票withdrawed成功。檢查發票的公司是一個有效的禁令。
@@ -46,7 +47,7 @@ StatusRefused=拒絕
 StatusMotif0=未指定
 StatusMotif1=提供insuffisante
 StatusMotif2=Tirage conteste
-StatusMotif3=沒有撤退的命令
+StatusMotif3=No direct debit payment order
 StatusMotif4=客戶訂單
 StatusMotif5=肋inexploitable
 StatusMotif6=帳戶無余額
@@ -61,28 +62,43 @@ NotifyCredit=提款信用
 NumeroNationalEmetter=國家發射數
 WithBankUsingRIB=有關銀行賬戶,使用肋
 WithBankUsingBANBIC=使用的IBAN / BIC / SWIFT的銀行帳戶
-BankToReceiveWithdraw=銀行帳戶,以接收退出
+BankToReceiveWithdraw=Bank account to receive direct debit
 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 standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Withdrawal 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"
 ThisWillAlsoAddPaymentOnInvoice=This will also apply payments to invoices and will classify them as "Paid"
 StatisticsByLineStatus=Statistics by status of lines
-RUM=RUM
-RUMWillBeGenerated=RUM number will be generated once bank account information are saved
-WithdrawMode=Withdraw mode (FRST or RECUR)
+RUM=UMR
+RUMLong=Unique Mandate Reference
+RUMWillBeGenerated=UMR number will be generated once bank account information are saved
+WithdrawMode=Direct debit mode (FRST or RECUR)
 WithdrawRequestAmount=Withdraw request amount:
 WithdrawRequestErrorNilAmount=Unable to create withdraw request for nil 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
 
 ### Notifications
-InfoCreditSubject=由銀行支付的長期訂單%s
-InfoCreditMessage=站在為了%s銀行已支付<br>付款資料:%s
-InfoTransSubject=傳輸到銀行的長期訂單%s
-InfoTransMessage=%s %s銀行長期訂單的%s已被transmited。 <br><br>
+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>
 InfoTransData=金額:%s <br> metode:%s <br>日期:%s
-InfoRejectSubject=站在為了拒絕
-InfoRejectMessage=Hello,<br><br>the standing 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=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
 ModeWarning=實模式下的選項沒有設置,我們停止後,這個模擬
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index 4df96e00ccb..f74e969d391 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - admin
+# Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=工作流模塊的設置
 WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is open (you can do things in the order you want). You can activate the automatic actions you are interested in.
 ThereIsNoWorkflowToModify=There is no workflow modifications available with the activated modules.
@@ -9,3 +9,5 @@ descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Automatically create a customer invoice af
 descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer order is set to paid
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is set to paid
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classify linked source customer order(s) to billed when customer invoice is validated
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Classify linked source proposal to billed when customer invoice is validated
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classify shipped linked source order on shipping validate if quantity shipped is the same as in order
-- 
GitLab