From 99c8a9211e3885be0d88d50784bfc730a74d61c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 20 Jul 2015 13:55:43 +0200
Subject: [PATCH] Sync with transifex
---
htdocs/install/inc.php | 1 +
htdocs/install/repair.php | 1 +
htdocs/install/upgrade.php | 1 +
htdocs/langs/ar_SA/accountancy.lang | 3 +
htdocs/langs/ar_SA/admin.lang | 12 +-
htdocs/langs/ar_SA/agenda.lang | 1 -
htdocs/langs/ar_SA/commercial.lang | 1 +
htdocs/langs/ar_SA/companies.lang | 4 +-
htdocs/langs/ar_SA/errors.lang | 3 +-
htdocs/langs/ar_SA/languages.lang | 2 +
htdocs/langs/ar_SA/main.lang | 2 +
htdocs/langs/ar_SA/margins.lang | 5 +-
htdocs/langs/ar_SA/products.lang | 8 +-
htdocs/langs/ar_SA/projects.lang | 15 +-
htdocs/langs/ar_SA/sendings.lang | 6 +-
htdocs/langs/ar_SA/stocks.lang | 4 +-
htdocs/langs/ar_SA/trips.lang | 1 +
htdocs/langs/bg_BG/accountancy.lang | 3 +
htdocs/langs/bg_BG/admin.lang | 12 +-
htdocs/langs/bg_BG/agenda.lang | 1 -
htdocs/langs/bg_BG/commercial.lang | 1 +
htdocs/langs/bg_BG/companies.lang | 4 +-
htdocs/langs/bg_BG/errors.lang | 3 +-
htdocs/langs/bg_BG/languages.lang | 2 +
htdocs/langs/bg_BG/main.lang | 2 +
htdocs/langs/bg_BG/margins.lang | 5 +-
htdocs/langs/bg_BG/products.lang | 8 +-
htdocs/langs/bg_BG/projects.lang | 15 +-
htdocs/langs/bg_BG/sendings.lang | 6 +-
htdocs/langs/bg_BG/stocks.lang | 4 +-
htdocs/langs/bg_BG/trips.lang | 1 +
htdocs/langs/bn_BD/accountancy.lang | 3 +
htdocs/langs/bn_BD/admin.lang | 12 +-
htdocs/langs/bn_BD/agenda.lang | 1 -
htdocs/langs/bn_BD/commercial.lang | 1 +
htdocs/langs/bn_BD/companies.lang | 4 +-
htdocs/langs/bn_BD/errors.lang | 3 +-
htdocs/langs/bn_BD/languages.lang | 2 +
htdocs/langs/bn_BD/main.lang | 2 +
htdocs/langs/bn_BD/margins.lang | 5 +-
htdocs/langs/bn_BD/products.lang | 8 +-
htdocs/langs/bn_BD/projects.lang | 15 +-
htdocs/langs/bn_BD/sendings.lang | 6 +-
htdocs/langs/bn_BD/stocks.lang | 4 +-
htdocs/langs/bn_BD/trips.lang | 1 +
htdocs/langs/bs_BA/accountancy.lang | 3 +
htdocs/langs/bs_BA/admin.lang | 12 +-
htdocs/langs/bs_BA/agenda.lang | 1 -
htdocs/langs/bs_BA/commercial.lang | 1 +
htdocs/langs/bs_BA/companies.lang | 16 +-
htdocs/langs/bs_BA/errors.lang | 3 +-
htdocs/langs/bs_BA/languages.lang | 2 +
htdocs/langs/bs_BA/main.lang | 2 +
htdocs/langs/bs_BA/margins.lang | 5 +-
htdocs/langs/bs_BA/products.lang | 8 +-
htdocs/langs/bs_BA/projects.lang | 15 +-
htdocs/langs/bs_BA/sendings.lang | 6 +-
htdocs/langs/bs_BA/stocks.lang | 4 +-
htdocs/langs/bs_BA/trips.lang | 1 +
htdocs/langs/ca_ES/accountancy.lang | 51 +++--
htdocs/langs/ca_ES/admin.lang | 12 +-
htdocs/langs/ca_ES/agenda.lang | 1 -
htdocs/langs/ca_ES/commercial.lang | 15 +-
htdocs/langs/ca_ES/companies.lang | 4 +-
htdocs/langs/ca_ES/errors.lang | 3 +-
htdocs/langs/ca_ES/languages.lang | 2 +
htdocs/langs/ca_ES/main.lang | 2 +
htdocs/langs/ca_ES/margins.lang | 5 +-
htdocs/langs/ca_ES/products.lang | 8 +-
htdocs/langs/ca_ES/projects.lang | 15 +-
htdocs/langs/ca_ES/sendings.lang | 6 +-
htdocs/langs/ca_ES/stocks.lang | 4 +-
htdocs/langs/ca_ES/trips.lang | 1 +
htdocs/langs/cs_CZ/accountancy.lang | 15 +-
htdocs/langs/cs_CZ/admin.lang | 12 +-
htdocs/langs/cs_CZ/agenda.lang | 1 -
htdocs/langs/cs_CZ/commercial.lang | 1 +
htdocs/langs/cs_CZ/companies.lang | 4 +-
htdocs/langs/cs_CZ/errors.lang | 3 +-
htdocs/langs/cs_CZ/languages.lang | 2 +
htdocs/langs/cs_CZ/main.lang | 2 +
htdocs/langs/cs_CZ/margins.lang | 5 +-
htdocs/langs/cs_CZ/products.lang | 8 +-
htdocs/langs/cs_CZ/projects.lang | 15 +-
htdocs/langs/cs_CZ/sendings.lang | 8 +-
htdocs/langs/cs_CZ/stocks.lang | 25 +--
htdocs/langs/cs_CZ/trips.lang | 1 +
htdocs/langs/da_DK/accountancy.lang | 3 +
htdocs/langs/da_DK/admin.lang | 12 +-
htdocs/langs/da_DK/agenda.lang | 1 -
htdocs/langs/da_DK/commercial.lang | 1 +
htdocs/langs/da_DK/companies.lang | 4 +-
htdocs/langs/da_DK/errors.lang | 3 +-
htdocs/langs/da_DK/languages.lang | 2 +
htdocs/langs/da_DK/main.lang | 2 +
htdocs/langs/da_DK/margins.lang | 5 +-
htdocs/langs/da_DK/products.lang | 8 +-
htdocs/langs/da_DK/projects.lang | 15 +-
htdocs/langs/da_DK/sendings.lang | 6 +-
htdocs/langs/da_DK/stocks.lang | 4 +-
htdocs/langs/da_DK/trips.lang | 1 +
htdocs/langs/de_AT/admin.lang | 3 -
htdocs/langs/de_AT/companies.lang | 1 -
htdocs/langs/de_AT/products.lang | 1 -
htdocs/langs/de_AT/projects.lang | 1 -
htdocs/langs/de_AT/sendings.lang | 2 -
htdocs/langs/de_AT/stocks.lang | 2 -
htdocs/langs/de_CH/admin.lang | 3 -
htdocs/langs/de_CH/companies.lang | 2 -
htdocs/langs/de_CH/products.lang | 2 -
htdocs/langs/de_CH/projects.lang | 2 -
htdocs/langs/de_CH/sendings.lang | 3 -
htdocs/langs/de_CH/stocks.lang | 3 -
htdocs/langs/de_DE/accountancy.lang | 3 +
htdocs/langs/de_DE/admin.lang | 18 +-
htdocs/langs/de_DE/agenda.lang | 1 -
htdocs/langs/de_DE/bills.lang | 8 +-
htdocs/langs/de_DE/boxes.lang | 12 +-
htdocs/langs/de_DE/categories.lang | 10 +-
htdocs/langs/de_DE/commercial.lang | 1 +
htdocs/langs/de_DE/companies.lang | 4 +-
htdocs/langs/de_DE/contracts.lang | 2 +-
htdocs/langs/de_DE/errors.lang | 3 +-
htdocs/langs/de_DE/languages.lang | 2 +
htdocs/langs/de_DE/main.lang | 10 +-
htdocs/langs/de_DE/margins.lang | 29 +--
htdocs/langs/de_DE/orders.lang | 2 +-
htdocs/langs/de_DE/products.lang | 10 +-
htdocs/langs/de_DE/projects.lang | 15 +-
htdocs/langs/de_DE/sendings.lang | 8 +-
htdocs/langs/de_DE/stocks.lang | 21 +-
htdocs/langs/de_DE/trips.lang | 1 +
htdocs/langs/el_GR/accountancy.lang | 3 +
htdocs/langs/el_GR/admin.lang | 12 +-
htdocs/langs/el_GR/agenda.lang | 1 -
htdocs/langs/el_GR/bills.lang | 10 +-
htdocs/langs/el_GR/commercial.lang | 1 +
htdocs/langs/el_GR/companies.lang | 16 +-
htdocs/langs/el_GR/ecm.lang | 2 +-
htdocs/langs/el_GR/errors.lang | 3 +-
htdocs/langs/el_GR/exports.lang | 2 +-
htdocs/langs/el_GR/languages.lang | 2 +
htdocs/langs/el_GR/main.lang | 26 +--
htdocs/langs/el_GR/margins.lang | 5 +-
htdocs/langs/el_GR/members.lang | 4 +-
htdocs/langs/el_GR/other.lang | 2 +-
htdocs/langs/el_GR/products.lang | 8 +-
htdocs/langs/el_GR/projects.lang | 15 +-
htdocs/langs/el_GR/sendings.lang | 6 +-
htdocs/langs/el_GR/stocks.lang | 4 +-
htdocs/langs/el_GR/trips.lang | 1 +
htdocs/langs/el_GR/users.lang | 2 +-
htdocs/langs/en_AU/admin.lang | 3 -
htdocs/langs/en_AU/companies.lang | 6 -
htdocs/langs/en_AU/main.lang | 45 ++---
htdocs/langs/en_AU/products.lang | 2 -
htdocs/langs/en_AU/projects.lang | 2 -
htdocs/langs/en_AU/sendings.lang | 3 -
htdocs/langs/en_AU/stocks.lang | 3 -
htdocs/langs/en_GB/admin.lang | 3 -
htdocs/langs/en_GB/companies.lang | 2 -
htdocs/langs/en_GB/products.lang | 2 -
htdocs/langs/en_GB/projects.lang | 2 -
htdocs/langs/en_GB/sendings.lang | 2 -
htdocs/langs/en_GB/stocks.lang | 3 -
htdocs/langs/en_IN/admin.lang | 3 -
htdocs/langs/en_IN/companies.lang | 2 -
htdocs/langs/en_IN/main.lang | 25 +--
htdocs/langs/en_IN/products.lang | 2 -
htdocs/langs/en_IN/projects.lang | 2 -
htdocs/langs/en_IN/sendings.lang | 3 -
htdocs/langs/en_IN/stocks.lang | 3 -
htdocs/langs/en_US/install.lang | 1 -
htdocs/langs/en_US/paybox.lang | 1 -
htdocs/langs/es_AR/admin.lang | 3 -
htdocs/langs/es_AR/companies.lang | 2 -
htdocs/langs/es_AR/products.lang | 2 -
htdocs/langs/es_AR/projects.lang | 2 -
htdocs/langs/es_AR/sendings.lang | 2 -
htdocs/langs/es_AR/stocks.lang | 3 -
htdocs/langs/es_BO/admin.lang | 3 -
htdocs/langs/es_BO/companies.lang | 2 -
htdocs/langs/es_BO/products.lang | 2 -
htdocs/langs/es_BO/projects.lang | 2 -
htdocs/langs/es_BO/sendings.lang | 3 -
htdocs/langs/es_BO/stocks.lang | 3 -
htdocs/langs/es_CL/admin.lang | 3 -
htdocs/langs/es_CL/companies.lang | 1 -
htdocs/langs/es_CL/main.lang | 1 +
htdocs/langs/es_CL/products.lang | 1 -
htdocs/langs/es_CL/projects.lang | 1 -
htdocs/langs/es_CL/sendings.lang | 3 -
htdocs/langs/es_CL/stocks.lang | 3 -
htdocs/langs/es_CO/admin.lang | 3 -
htdocs/langs/es_CO/products.lang | 2 -
htdocs/langs/es_CO/projects.lang | 2 -
htdocs/langs/es_CO/sendings.lang | 2 -
htdocs/langs/es_CO/stocks.lang | 3 -
htdocs/langs/es_DO/admin.lang | 3 -
htdocs/langs/es_DO/companies.lang | 4 -
htdocs/langs/es_DO/main.lang | 38 ++--
htdocs/langs/es_DO/products.lang | 2 -
htdocs/langs/es_DO/projects.lang | 2 -
htdocs/langs/es_DO/sendings.lang | 3 -
htdocs/langs/es_DO/stocks.lang | 3 -
htdocs/langs/es_ES/accountancy.lang | 13 +-
htdocs/langs/es_ES/admin.lang | 12 +-
htdocs/langs/es_ES/agenda.lang | 1 -
htdocs/langs/es_ES/commercial.lang | 1 +
htdocs/langs/es_ES/companies.lang | 4 +-
htdocs/langs/es_ES/errors.lang | 3 +-
htdocs/langs/es_ES/languages.lang | 2 +
htdocs/langs/es_ES/main.lang | 2 +
htdocs/langs/es_ES/margins.lang | 5 +-
htdocs/langs/es_ES/products.lang | 8 +-
htdocs/langs/es_ES/projects.lang | 15 +-
htdocs/langs/es_ES/sendings.lang | 8 +-
htdocs/langs/es_ES/stocks.lang | 23 ++-
htdocs/langs/es_ES/trips.lang | 1 +
htdocs/langs/es_MX/admin.lang | 3 -
htdocs/langs/es_MX/companies.lang | 2 -
htdocs/langs/es_MX/products.lang | 2 -
htdocs/langs/es_MX/projects.lang | 2 -
htdocs/langs/es_MX/sendings.lang | 2 -
htdocs/langs/es_MX/stocks.lang | 2 -
htdocs/langs/es_PE/admin.lang | 3 -
htdocs/langs/es_PE/companies.lang | 1 -
htdocs/langs/es_PE/products.lang | 2 -
htdocs/langs/es_PE/projects.lang | 2 -
htdocs/langs/es_PE/sendings.lang | 3 -
htdocs/langs/es_PE/stocks.lang | 3 -
htdocs/langs/es_PY/admin.lang | 3 -
htdocs/langs/es_PY/companies.lang | 1 -
htdocs/langs/es_PY/products.lang | 2 -
htdocs/langs/es_PY/projects.lang | 2 -
htdocs/langs/es_PY/sendings.lang | 3 -
htdocs/langs/es_PY/stocks.lang | 3 -
htdocs/langs/et_EE/accountancy.lang | 13 +-
htdocs/langs/et_EE/admin.lang | 12 +-
htdocs/langs/et_EE/agenda.lang | 1 -
htdocs/langs/et_EE/commercial.lang | 1 +
htdocs/langs/et_EE/companies.lang | 4 +-
htdocs/langs/et_EE/errors.lang | 3 +-
htdocs/langs/et_EE/languages.lang | 2 +
htdocs/langs/et_EE/main.lang | 2 +
htdocs/langs/et_EE/margins.lang | 5 +-
htdocs/langs/et_EE/products.lang | 8 +-
htdocs/langs/et_EE/projects.lang | 15 +-
htdocs/langs/et_EE/sendings.lang | 6 +-
htdocs/langs/et_EE/stocks.lang | 4 +-
htdocs/langs/et_EE/trips.lang | 1 +
htdocs/langs/eu_ES/accountancy.lang | 3 +
htdocs/langs/eu_ES/admin.lang | 12 +-
htdocs/langs/eu_ES/agenda.lang | 1 -
htdocs/langs/eu_ES/commercial.lang | 1 +
htdocs/langs/eu_ES/companies.lang | 4 +-
htdocs/langs/eu_ES/errors.lang | 3 +-
htdocs/langs/eu_ES/languages.lang | 2 +
htdocs/langs/eu_ES/main.lang | 2 +
htdocs/langs/eu_ES/margins.lang | 5 +-
htdocs/langs/eu_ES/products.lang | 8 +-
htdocs/langs/eu_ES/projects.lang | 15 +-
htdocs/langs/eu_ES/sendings.lang | 6 +-
htdocs/langs/eu_ES/stocks.lang | 4 +-
htdocs/langs/eu_ES/trips.lang | 1 +
htdocs/langs/fa_IR/accountancy.lang | 3 +
htdocs/langs/fa_IR/admin.lang | 12 +-
htdocs/langs/fa_IR/agenda.lang | 1 -
htdocs/langs/fa_IR/commercial.lang | 1 +
htdocs/langs/fa_IR/companies.lang | 4 +-
htdocs/langs/fa_IR/errors.lang | 3 +-
htdocs/langs/fa_IR/languages.lang | 2 +
htdocs/langs/fa_IR/main.lang | 2 +
htdocs/langs/fa_IR/margins.lang | 5 +-
htdocs/langs/fa_IR/products.lang | 8 +-
htdocs/langs/fa_IR/projects.lang | 15 +-
htdocs/langs/fa_IR/sendings.lang | 6 +-
htdocs/langs/fa_IR/stocks.lang | 4 +-
htdocs/langs/fa_IR/trips.lang | 1 +
htdocs/langs/fi_FI/accountancy.lang | 3 +
htdocs/langs/fi_FI/admin.lang | 12 +-
htdocs/langs/fi_FI/agenda.lang | 1 -
htdocs/langs/fi_FI/commercial.lang | 1 +
htdocs/langs/fi_FI/companies.lang | 4 +-
htdocs/langs/fi_FI/errors.lang | 3 +-
htdocs/langs/fi_FI/languages.lang | 2 +
htdocs/langs/fi_FI/main.lang | 2 +
htdocs/langs/fi_FI/margins.lang | 5 +-
htdocs/langs/fi_FI/products.lang | 8 +-
htdocs/langs/fi_FI/projects.lang | 15 +-
htdocs/langs/fi_FI/sendings.lang | 6 +-
htdocs/langs/fi_FI/stocks.lang | 4 +-
htdocs/langs/fi_FI/trips.lang | 1 +
htdocs/langs/fr_BE/admin.lang | 2 -
htdocs/langs/fr_BE/companies.lang | 2 -
htdocs/langs/fr_BE/products.lang | 2 -
htdocs/langs/fr_BE/projects.lang | 2 -
htdocs/langs/fr_BE/sendings.lang | 3 -
htdocs/langs/fr_BE/stocks.lang | 3 -
htdocs/langs/fr_CA/admin.lang | 2 +-
htdocs/langs/fr_CA/companies.lang | 1 -
htdocs/langs/fr_CA/products.lang | 2 -
htdocs/langs/fr_CA/projects.lang | 2 -
htdocs/langs/fr_CA/sendings.lang | 2 -
htdocs/langs/fr_CA/stocks.lang | 3 -
htdocs/langs/fr_CH/admin.lang | 2 -
htdocs/langs/fr_CH/companies.lang | 2 -
htdocs/langs/fr_CH/products.lang | 2 -
htdocs/langs/fr_CH/projects.lang | 2 -
htdocs/langs/fr_CH/sendings.lang | 3 -
htdocs/langs/fr_CH/stocks.lang | 3 -
htdocs/langs/fr_FR/accountancy.lang | 3 +
htdocs/langs/fr_FR/admin.lang | 50 ++---
htdocs/langs/fr_FR/agenda.lang | 3 +-
htdocs/langs/fr_FR/banks.lang | 2 +-
htdocs/langs/fr_FR/commercial.lang | 1 +
htdocs/langs/fr_FR/companies.lang | 4 +-
htdocs/langs/fr_FR/compta.lang | 10 +-
htdocs/langs/fr_FR/errors.lang | 5 +-
htdocs/langs/fr_FR/holiday.lang | 6 +-
htdocs/langs/fr_FR/languages.lang | 2 +
htdocs/langs/fr_FR/loan.lang | 30 +--
htdocs/langs/fr_FR/main.lang | 2 +
htdocs/langs/fr_FR/margins.lang | 7 +-
htdocs/langs/fr_FR/members.lang | 2 +-
htdocs/langs/fr_FR/products.lang | 41 ++--
htdocs/langs/fr_FR/projects.lang | 19 +-
htdocs/langs/fr_FR/salaries.lang | 2 +-
htdocs/langs/fr_FR/sendings.lang | 6 +-
htdocs/langs/fr_FR/stocks.lang | 4 +-
htdocs/langs/fr_FR/trips.lang | 1 +
htdocs/langs/he_IL/accountancy.lang | 3 +
htdocs/langs/he_IL/admin.lang | 12 +-
htdocs/langs/he_IL/agenda.lang | 1 -
htdocs/langs/he_IL/commercial.lang | 1 +
htdocs/langs/he_IL/companies.lang | 4 +-
htdocs/langs/he_IL/errors.lang | 3 +-
htdocs/langs/he_IL/languages.lang | 2 +
htdocs/langs/he_IL/main.lang | 2 +
htdocs/langs/he_IL/margins.lang | 5 +-
htdocs/langs/he_IL/products.lang | 8 +-
htdocs/langs/he_IL/projects.lang | 15 +-
htdocs/langs/he_IL/sendings.lang | 6 +-
htdocs/langs/he_IL/stocks.lang | 4 +-
htdocs/langs/he_IL/trips.lang | 1 +
htdocs/langs/hr_HR/accountancy.lang | 3 +
htdocs/langs/hr_HR/admin.lang | 12 +-
htdocs/langs/hr_HR/agenda.lang | 1 -
htdocs/langs/hr_HR/commercial.lang | 1 +
htdocs/langs/hr_HR/companies.lang | 4 +-
htdocs/langs/hr_HR/errors.lang | 3 +-
htdocs/langs/hr_HR/languages.lang | 2 +
htdocs/langs/hr_HR/main.lang | 2 +
htdocs/langs/hr_HR/margins.lang | 5 +-
htdocs/langs/hr_HR/products.lang | 8 +-
htdocs/langs/hr_HR/projects.lang | 15 +-
htdocs/langs/hr_HR/sendings.lang | 6 +-
htdocs/langs/hr_HR/stocks.lang | 4 +-
htdocs/langs/hr_HR/trips.lang | 1 +
htdocs/langs/hu_HU/accountancy.lang | 3 +
htdocs/langs/hu_HU/admin.lang | 12 +-
htdocs/langs/hu_HU/agenda.lang | 1 -
htdocs/langs/hu_HU/commercial.lang | 1 +
htdocs/langs/hu_HU/companies.lang | 4 +-
htdocs/langs/hu_HU/errors.lang | 3 +-
htdocs/langs/hu_HU/languages.lang | 2 +
htdocs/langs/hu_HU/main.lang | 2 +
htdocs/langs/hu_HU/margins.lang | 5 +-
htdocs/langs/hu_HU/products.lang | 8 +-
htdocs/langs/hu_HU/projects.lang | 15 +-
htdocs/langs/hu_HU/sendings.lang | 6 +-
htdocs/langs/hu_HU/stocks.lang | 4 +-
htdocs/langs/hu_HU/trips.lang | 1 +
htdocs/langs/id_ID/accountancy.lang | 3 +
htdocs/langs/id_ID/admin.lang | 12 +-
htdocs/langs/id_ID/agenda.lang | 1 -
htdocs/langs/id_ID/commercial.lang | 1 +
htdocs/langs/id_ID/companies.lang | 4 +-
htdocs/langs/id_ID/errors.lang | 3 +-
htdocs/langs/id_ID/languages.lang | 2 +
htdocs/langs/id_ID/main.lang | 2 +
htdocs/langs/id_ID/margins.lang | 5 +-
htdocs/langs/id_ID/products.lang | 8 +-
htdocs/langs/id_ID/projects.lang | 15 +-
htdocs/langs/id_ID/sendings.lang | 6 +-
htdocs/langs/id_ID/stocks.lang | 4 +-
htdocs/langs/id_ID/trips.lang | 1 +
htdocs/langs/is_IS/accountancy.lang | 3 +
htdocs/langs/is_IS/admin.lang | 12 +-
htdocs/langs/is_IS/agenda.lang | 1 -
htdocs/langs/is_IS/commercial.lang | 1 +
htdocs/langs/is_IS/companies.lang | 4 +-
htdocs/langs/is_IS/errors.lang | 3 +-
htdocs/langs/is_IS/languages.lang | 2 +
htdocs/langs/is_IS/main.lang | 2 +
htdocs/langs/is_IS/margins.lang | 5 +-
htdocs/langs/is_IS/products.lang | 8 +-
htdocs/langs/is_IS/projects.lang | 15 +-
htdocs/langs/is_IS/sendings.lang | 6 +-
htdocs/langs/is_IS/stocks.lang | 4 +-
htdocs/langs/is_IS/trips.lang | 1 +
htdocs/langs/it_IT/accountancy.lang | 3 +
htdocs/langs/it_IT/admin.lang | 12 +-
htdocs/langs/it_IT/agenda.lang | 1 -
htdocs/langs/it_IT/commercial.lang | 1 +
htdocs/langs/it_IT/companies.lang | 4 +-
htdocs/langs/it_IT/errors.lang | 3 +-
htdocs/langs/it_IT/languages.lang | 2 +
htdocs/langs/it_IT/main.lang | 2 +
htdocs/langs/it_IT/margins.lang | 5 +-
htdocs/langs/it_IT/products.lang | 8 +-
htdocs/langs/it_IT/projects.lang | 15 +-
htdocs/langs/it_IT/sendings.lang | 6 +-
htdocs/langs/it_IT/stocks.lang | 4 +-
htdocs/langs/it_IT/trips.lang | 1 +
htdocs/langs/ja_JP/accountancy.lang | 3 +
htdocs/langs/ja_JP/admin.lang | 12 +-
htdocs/langs/ja_JP/agenda.lang | 1 -
htdocs/langs/ja_JP/commercial.lang | 1 +
htdocs/langs/ja_JP/companies.lang | 4 +-
htdocs/langs/ja_JP/errors.lang | 3 +-
htdocs/langs/ja_JP/languages.lang | 2 +
htdocs/langs/ja_JP/main.lang | 2 +
htdocs/langs/ja_JP/margins.lang | 5 +-
htdocs/langs/ja_JP/products.lang | 8 +-
htdocs/langs/ja_JP/projects.lang | 15 +-
htdocs/langs/ja_JP/sendings.lang | 6 +-
htdocs/langs/ja_JP/stocks.lang | 4 +-
htdocs/langs/ja_JP/trips.lang | 1 +
htdocs/langs/ka_GE/accountancy.lang | 3 +
htdocs/langs/ka_GE/admin.lang | 12 +-
htdocs/langs/ka_GE/agenda.lang | 1 -
htdocs/langs/ka_GE/commercial.lang | 1 +
htdocs/langs/ka_GE/companies.lang | 4 +-
htdocs/langs/ka_GE/errors.lang | 3 +-
htdocs/langs/ka_GE/languages.lang | 2 +
htdocs/langs/ka_GE/main.lang | 2 +
htdocs/langs/ka_GE/margins.lang | 5 +-
htdocs/langs/ka_GE/products.lang | 8 +-
htdocs/langs/ka_GE/projects.lang | 15 +-
htdocs/langs/ka_GE/sendings.lang | 6 +-
htdocs/langs/ka_GE/stocks.lang | 4 +-
htdocs/langs/ka_GE/trips.lang | 1 +
htdocs/langs/kn_IN/accountancy.lang | 3 +
htdocs/langs/kn_IN/admin.lang | 12 +-
htdocs/langs/kn_IN/agenda.lang | 1 -
htdocs/langs/kn_IN/commercial.lang | 1 +
htdocs/langs/kn_IN/companies.lang | 4 +-
htdocs/langs/kn_IN/errors.lang | 3 +-
htdocs/langs/kn_IN/languages.lang | 2 +
htdocs/langs/kn_IN/main.lang | 2 +
htdocs/langs/kn_IN/margins.lang | 5 +-
htdocs/langs/kn_IN/products.lang | 8 +-
htdocs/langs/kn_IN/projects.lang | 15 +-
htdocs/langs/kn_IN/sendings.lang | 6 +-
htdocs/langs/kn_IN/stocks.lang | 4 +-
htdocs/langs/kn_IN/trips.lang | 1 +
htdocs/langs/ko_KR/accountancy.lang | 3 +
htdocs/langs/ko_KR/admin.lang | 12 +-
htdocs/langs/ko_KR/agenda.lang | 1 -
htdocs/langs/ko_KR/commercial.lang | 1 +
htdocs/langs/ko_KR/companies.lang | 4 +-
htdocs/langs/ko_KR/errors.lang | 3 +-
htdocs/langs/ko_KR/languages.lang | 2 +
htdocs/langs/ko_KR/main.lang | 2 +
htdocs/langs/ko_KR/margins.lang | 5 +-
htdocs/langs/ko_KR/products.lang | 8 +-
htdocs/langs/ko_KR/projects.lang | 15 +-
htdocs/langs/ko_KR/sendings.lang | 6 +-
htdocs/langs/ko_KR/stocks.lang | 4 +-
htdocs/langs/ko_KR/trips.lang | 1 +
htdocs/langs/lo_LA/accountancy.lang | 3 +
htdocs/langs/lo_LA/admin.lang | 12 +-
htdocs/langs/lo_LA/agenda.lang | 1 -
htdocs/langs/lo_LA/commercial.lang | 1 +
htdocs/langs/lo_LA/companies.lang | 4 +-
htdocs/langs/lo_LA/errors.lang | 3 +-
htdocs/langs/lo_LA/languages.lang | 2 +
htdocs/langs/lo_LA/main.lang | 2 +
htdocs/langs/lo_LA/margins.lang | 5 +-
htdocs/langs/lo_LA/products.lang | 8 +-
htdocs/langs/lo_LA/projects.lang | 15 +-
htdocs/langs/lo_LA/sendings.lang | 6 +-
htdocs/langs/lo_LA/stocks.lang | 4 +-
htdocs/langs/lo_LA/trips.lang | 1 +
htdocs/langs/lt_LT/accountancy.lang | 3 +
htdocs/langs/lt_LT/admin.lang | 12 +-
htdocs/langs/lt_LT/agenda.lang | 1 -
htdocs/langs/lt_LT/commercial.lang | 1 +
htdocs/langs/lt_LT/companies.lang | 4 +-
htdocs/langs/lt_LT/errors.lang | 3 +-
htdocs/langs/lt_LT/languages.lang | 2 +
htdocs/langs/lt_LT/main.lang | 2 +
htdocs/langs/lt_LT/margins.lang | 5 +-
htdocs/langs/lt_LT/products.lang | 8 +-
htdocs/langs/lt_LT/projects.lang | 15 +-
htdocs/langs/lt_LT/sendings.lang | 6 +-
htdocs/langs/lt_LT/stocks.lang | 4 +-
htdocs/langs/lt_LT/trips.lang | 1 +
htdocs/langs/lv_LV/accountancy.lang | 3 +
htdocs/langs/lv_LV/admin.lang | 12 +-
htdocs/langs/lv_LV/agenda.lang | 1 -
htdocs/langs/lv_LV/commercial.lang | 1 +
htdocs/langs/lv_LV/companies.lang | 4 +-
htdocs/langs/lv_LV/errors.lang | 3 +-
htdocs/langs/lv_LV/languages.lang | 2 +
htdocs/langs/lv_LV/main.lang | 2 +
htdocs/langs/lv_LV/margins.lang | 5 +-
htdocs/langs/lv_LV/products.lang | 8 +-
htdocs/langs/lv_LV/projects.lang | 15 +-
htdocs/langs/lv_LV/sendings.lang | 6 +-
htdocs/langs/lv_LV/stocks.lang | 4 +-
htdocs/langs/lv_LV/trips.lang | 1 +
htdocs/langs/mk_MK/accountancy.lang | 3 +
htdocs/langs/mk_MK/admin.lang | 12 +-
htdocs/langs/mk_MK/agenda.lang | 1 -
htdocs/langs/mk_MK/commercial.lang | 1 +
htdocs/langs/mk_MK/companies.lang | 4 +-
htdocs/langs/mk_MK/errors.lang | 3 +-
htdocs/langs/mk_MK/languages.lang | 2 +
htdocs/langs/mk_MK/main.lang | 2 +
htdocs/langs/mk_MK/margins.lang | 5 +-
htdocs/langs/mk_MK/products.lang | 8 +-
htdocs/langs/mk_MK/projects.lang | 15 +-
htdocs/langs/mk_MK/sendings.lang | 6 +-
htdocs/langs/mk_MK/stocks.lang | 4 +-
htdocs/langs/mk_MK/trips.lang | 1 +
htdocs/langs/nb_NO/accountancy.lang | 3 +
htdocs/langs/nb_NO/admin.lang | 12 +-
htdocs/langs/nb_NO/agenda.lang | 1 -
htdocs/langs/nb_NO/commercial.lang | 1 +
htdocs/langs/nb_NO/companies.lang | 4 +-
htdocs/langs/nb_NO/errors.lang | 3 +-
htdocs/langs/nb_NO/languages.lang | 2 +
htdocs/langs/nb_NO/main.lang | 2 +
htdocs/langs/nb_NO/margins.lang | 5 +-
htdocs/langs/nb_NO/products.lang | 8 +-
htdocs/langs/nb_NO/projects.lang | 15 +-
htdocs/langs/nb_NO/sendings.lang | 6 +-
htdocs/langs/nb_NO/stocks.lang | 4 +-
htdocs/langs/nb_NO/trips.lang | 1 +
htdocs/langs/nl_NL/accountancy.lang | 3 +
htdocs/langs/nl_NL/admin.lang | 12 +-
htdocs/langs/nl_NL/agenda.lang | 1 -
htdocs/langs/nl_NL/commercial.lang | 1 +
htdocs/langs/nl_NL/companies.lang | 4 +-
htdocs/langs/nl_NL/errors.lang | 3 +-
htdocs/langs/nl_NL/languages.lang | 2 +
htdocs/langs/nl_NL/main.lang | 2 +
htdocs/langs/nl_NL/margins.lang | 5 +-
htdocs/langs/nl_NL/products.lang | 8 +-
htdocs/langs/nl_NL/projects.lang | 15 +-
htdocs/langs/nl_NL/sendings.lang | 6 +-
htdocs/langs/nl_NL/stocks.lang | 4 +-
htdocs/langs/nl_NL/trips.lang | 1 +
htdocs/langs/pl_PL/accountancy.lang | 3 +
htdocs/langs/pl_PL/admin.lang | 12 +-
htdocs/langs/pl_PL/agenda.lang | 1 -
htdocs/langs/pl_PL/commercial.lang | 119 +++++------
htdocs/langs/pl_PL/companies.lang | 4 +-
htdocs/langs/pl_PL/errors.lang | 3 +-
htdocs/langs/pl_PL/languages.lang | 2 +
htdocs/langs/pl_PL/main.lang | 2 +
htdocs/langs/pl_PL/margins.lang | 5 +-
htdocs/langs/pl_PL/products.lang | 8 +-
htdocs/langs/pl_PL/projects.lang | 15 +-
htdocs/langs/pl_PL/sendings.lang | 6 +-
htdocs/langs/pl_PL/stocks.lang | 4 +-
htdocs/langs/pl_PL/trips.lang | 1 +
htdocs/langs/pt_BR/admin.lang | 16 +-
htdocs/langs/pt_BR/categories.lang | 5 +
htdocs/langs/pt_BR/errors.lang | 1 -
htdocs/langs/pt_BR/holiday.lang | 7 +
htdocs/langs/pt_BR/main.lang | 3 +-
htdocs/langs/pt_BR/products.lang | 1 -
htdocs/langs/pt_BR/sendings.lang | 1 -
htdocs/langs/pt_BR/stocks.lang | 1 -
htdocs/langs/pt_PT/accountancy.lang | 3 +
htdocs/langs/pt_PT/admin.lang | 12 +-
htdocs/langs/pt_PT/agenda.lang | 1 -
htdocs/langs/pt_PT/commercial.lang | 1 +
htdocs/langs/pt_PT/companies.lang | 4 +-
htdocs/langs/pt_PT/errors.lang | 3 +-
htdocs/langs/pt_PT/languages.lang | 2 +
htdocs/langs/pt_PT/main.lang | 2 +
htdocs/langs/pt_PT/margins.lang | 5 +-
htdocs/langs/pt_PT/products.lang | 8 +-
htdocs/langs/pt_PT/projects.lang | 15 +-
htdocs/langs/pt_PT/sendings.lang | 6 +-
htdocs/langs/pt_PT/stocks.lang | 4 +-
htdocs/langs/pt_PT/trips.lang | 1 +
htdocs/langs/ro_RO/accountancy.lang | 3 +
htdocs/langs/ro_RO/admin.lang | 12 +-
htdocs/langs/ro_RO/agenda.lang | 1 -
htdocs/langs/ro_RO/commercial.lang | 1 +
htdocs/langs/ro_RO/companies.lang | 4 +-
htdocs/langs/ro_RO/errors.lang | 3 +-
htdocs/langs/ro_RO/languages.lang | 2 +
htdocs/langs/ro_RO/main.lang | 2 +
htdocs/langs/ro_RO/margins.lang | 5 +-
htdocs/langs/ro_RO/products.lang | 8 +-
htdocs/langs/ro_RO/projects.lang | 15 +-
htdocs/langs/ro_RO/sendings.lang | 6 +-
htdocs/langs/ro_RO/stocks.lang | 4 +-
htdocs/langs/ro_RO/trips.lang | 1 +
htdocs/langs/ru_RU/accountancy.lang | 3 +
htdocs/langs/ru_RU/admin.lang | 12 +-
htdocs/langs/ru_RU/agenda.lang | 1 -
htdocs/langs/ru_RU/commercial.lang | 1 +
htdocs/langs/ru_RU/companies.lang | 4 +-
htdocs/langs/ru_RU/errors.lang | 3 +-
htdocs/langs/ru_RU/languages.lang | 2 +
htdocs/langs/ru_RU/main.lang | 2 +
htdocs/langs/ru_RU/margins.lang | 11 +-
htdocs/langs/ru_RU/products.lang | 8 +-
htdocs/langs/ru_RU/projects.lang | 15 +-
htdocs/langs/ru_RU/sendings.lang | 6 +-
htdocs/langs/ru_RU/stocks.lang | 4 +-
htdocs/langs/ru_RU/trips.lang | 1 +
htdocs/langs/sk_SK/accountancy.lang | 3 +
htdocs/langs/sk_SK/admin.lang | 12 +-
htdocs/langs/sk_SK/agenda.lang | 1 -
htdocs/langs/sk_SK/commercial.lang | 1 +
htdocs/langs/sk_SK/companies.lang | 4 +-
htdocs/langs/sk_SK/errors.lang | 3 +-
htdocs/langs/sk_SK/languages.lang | 2 +
htdocs/langs/sk_SK/main.lang | 2 +
htdocs/langs/sk_SK/margins.lang | 5 +-
htdocs/langs/sk_SK/products.lang | 8 +-
htdocs/langs/sk_SK/projects.lang | 15 +-
htdocs/langs/sk_SK/sendings.lang | 6 +-
htdocs/langs/sk_SK/stocks.lang | 4 +-
htdocs/langs/sk_SK/trips.lang | 1 +
htdocs/langs/sl_SI/accountancy.lang | 3 +
htdocs/langs/sl_SI/admin.lang | 12 +-
htdocs/langs/sl_SI/agenda.lang | 1 -
htdocs/langs/sl_SI/commercial.lang | 3 +-
htdocs/langs/sl_SI/companies.lang | 4 +-
htdocs/langs/sl_SI/errors.lang | 3 +-
htdocs/langs/sl_SI/languages.lang | 2 +
htdocs/langs/sl_SI/main.lang | 2 +
htdocs/langs/sl_SI/margins.lang | 15 +-
htdocs/langs/sl_SI/products.lang | 8 +-
htdocs/langs/sl_SI/projects.lang | 15 +-
htdocs/langs/sl_SI/sendings.lang | 6 +-
htdocs/langs/sl_SI/stocks.lang | 4 +-
htdocs/langs/sl_SI/trips.lang | 1 +
htdocs/langs/sq_AL/accountancy.lang | 3 +
htdocs/langs/sq_AL/admin.lang | 12 +-
htdocs/langs/sq_AL/agenda.lang | 1 -
htdocs/langs/sq_AL/commercial.lang | 1 +
htdocs/langs/sq_AL/companies.lang | 4 +-
htdocs/langs/sq_AL/errors.lang | 3 +-
htdocs/langs/sq_AL/languages.lang | 2 +
htdocs/langs/sq_AL/main.lang | 2 +
htdocs/langs/sq_AL/margins.lang | 5 +-
htdocs/langs/sq_AL/products.lang | 8 +-
htdocs/langs/sq_AL/projects.lang | 15 +-
htdocs/langs/sq_AL/sendings.lang | 6 +-
htdocs/langs/sq_AL/stocks.lang | 4 +-
htdocs/langs/sq_AL/trips.lang | 1 +
htdocs/langs/sr_RS/accountancy.lang | 159 ++++++++-------
htdocs/langs/sr_RS/admin.lang | 12 +-
htdocs/langs/sr_RS/agenda.lang | 1 -
htdocs/langs/sr_RS/bills.lang | 36 ++--
htdocs/langs/sr_RS/commercial.lang | 1 +
htdocs/langs/sr_RS/companies.lang | 4 +-
htdocs/langs/sr_RS/errors.lang | 3 +-
htdocs/langs/sr_RS/languages.lang | 2 +
htdocs/langs/sr_RS/main.lang | 2 +
htdocs/langs/sr_RS/margins.lang | 5 +-
htdocs/langs/sr_RS/products.lang | 8 +-
htdocs/langs/sr_RS/projects.lang | 15 +-
htdocs/langs/sr_RS/sendings.lang | 6 +-
htdocs/langs/sr_RS/stocks.lang | 4 +-
htdocs/langs/sr_RS/trips.lang | 1 +
htdocs/langs/sv_SE/accountancy.lang | 3 +
htdocs/langs/sv_SE/admin.lang | 302 ++++++++++++++--------------
htdocs/langs/sv_SE/agenda.lang | 1 -
htdocs/langs/sv_SE/commercial.lang | 1 +
htdocs/langs/sv_SE/companies.lang | 4 +-
htdocs/langs/sv_SE/errors.lang | 3 +-
htdocs/langs/sv_SE/languages.lang | 2 +
htdocs/langs/sv_SE/main.lang | 2 +
htdocs/langs/sv_SE/margins.lang | 5 +-
htdocs/langs/sv_SE/products.lang | 8 +-
htdocs/langs/sv_SE/projects.lang | 15 +-
htdocs/langs/sv_SE/sendings.lang | 6 +-
htdocs/langs/sv_SE/stocks.lang | 4 +-
htdocs/langs/sv_SE/trips.lang | 1 +
htdocs/langs/sw_SW/accountancy.lang | 3 +
htdocs/langs/sw_SW/admin.lang | 12 +-
htdocs/langs/sw_SW/agenda.lang | 1 -
htdocs/langs/sw_SW/commercial.lang | 1 +
htdocs/langs/sw_SW/companies.lang | 4 +-
htdocs/langs/sw_SW/errors.lang | 3 +-
htdocs/langs/sw_SW/languages.lang | 2 +
htdocs/langs/sw_SW/main.lang | 2 +
htdocs/langs/sw_SW/margins.lang | 5 +-
htdocs/langs/sw_SW/products.lang | 8 +-
htdocs/langs/sw_SW/projects.lang | 15 +-
htdocs/langs/sw_SW/sendings.lang | 6 +-
htdocs/langs/sw_SW/stocks.lang | 4 +-
htdocs/langs/sw_SW/trips.lang | 1 +
htdocs/langs/th_TH/accountancy.lang | 3 +
htdocs/langs/th_TH/admin.lang | 54 ++---
htdocs/langs/th_TH/agenda.lang | 13 +-
htdocs/langs/th_TH/banks.lang | 10 +-
htdocs/langs/th_TH/categories.lang | 2 +-
htdocs/langs/th_TH/commercial.lang | 1 +
htdocs/langs/th_TH/companies.lang | 4 +-
htdocs/langs/th_TH/compta.lang | 16 +-
htdocs/langs/th_TH/errors.lang | 5 +-
htdocs/langs/th_TH/exports.lang | 2 +-
htdocs/langs/th_TH/languages.lang | 4 +-
htdocs/langs/th_TH/main.lang | 2 +
htdocs/langs/th_TH/margins.lang | 5 +-
htdocs/langs/th_TH/products.lang | 8 +-
htdocs/langs/th_TH/projects.lang | 43 ++--
htdocs/langs/th_TH/sendings.lang | 6 +-
htdocs/langs/th_TH/stocks.lang | 4 +-
htdocs/langs/th_TH/trips.lang | 3 +-
htdocs/langs/tr_TR/accountancy.lang | 3 +
htdocs/langs/tr_TR/admin.lang | 12 +-
htdocs/langs/tr_TR/agenda.lang | 1 -
htdocs/langs/tr_TR/commercial.lang | 1 +
htdocs/langs/tr_TR/companies.lang | 4 +-
htdocs/langs/tr_TR/errors.lang | 3 +-
htdocs/langs/tr_TR/languages.lang | 2 +
htdocs/langs/tr_TR/main.lang | 2 +
htdocs/langs/tr_TR/margins.lang | 5 +-
htdocs/langs/tr_TR/products.lang | 8 +-
htdocs/langs/tr_TR/projects.lang | 15 +-
htdocs/langs/tr_TR/sendings.lang | 6 +-
htdocs/langs/tr_TR/stocks.lang | 4 +-
htdocs/langs/tr_TR/trips.lang | 1 +
htdocs/langs/uk_UA/accountancy.lang | 3 +
htdocs/langs/uk_UA/admin.lang | 12 +-
htdocs/langs/uk_UA/agenda.lang | 1 -
htdocs/langs/uk_UA/commercial.lang | 1 +
htdocs/langs/uk_UA/companies.lang | 4 +-
htdocs/langs/uk_UA/errors.lang | 3 +-
htdocs/langs/uk_UA/languages.lang | 2 +
htdocs/langs/uk_UA/main.lang | 2 +
htdocs/langs/uk_UA/margins.lang | 5 +-
htdocs/langs/uk_UA/products.lang | 8 +-
htdocs/langs/uk_UA/projects.lang | 15 +-
htdocs/langs/uk_UA/sendings.lang | 6 +-
htdocs/langs/uk_UA/stocks.lang | 4 +-
htdocs/langs/uk_UA/trips.lang | 1 +
htdocs/langs/uz_UZ/accountancy.lang | 3 +
htdocs/langs/uz_UZ/admin.lang | 12 +-
htdocs/langs/uz_UZ/agenda.lang | 1 -
htdocs/langs/uz_UZ/commercial.lang | 1 +
htdocs/langs/uz_UZ/companies.lang | 4 +-
htdocs/langs/uz_UZ/errors.lang | 3 +-
htdocs/langs/uz_UZ/languages.lang | 2 +
htdocs/langs/uz_UZ/main.lang | 2 +
htdocs/langs/uz_UZ/margins.lang | 5 +-
htdocs/langs/uz_UZ/products.lang | 8 +-
htdocs/langs/uz_UZ/projects.lang | 15 +-
htdocs/langs/uz_UZ/sendings.lang | 6 +-
htdocs/langs/uz_UZ/stocks.lang | 4 +-
htdocs/langs/uz_UZ/trips.lang | 1 +
htdocs/langs/vi_VN/accountancy.lang | 3 +
htdocs/langs/vi_VN/admin.lang | 12 +-
htdocs/langs/vi_VN/agenda.lang | 1 -
htdocs/langs/vi_VN/commercial.lang | 111 +++++-----
htdocs/langs/vi_VN/companies.lang | 4 +-
htdocs/langs/vi_VN/errors.lang | 3 +-
htdocs/langs/vi_VN/languages.lang | 2 +
htdocs/langs/vi_VN/main.lang | 2 +
htdocs/langs/vi_VN/margins.lang | 5 +-
htdocs/langs/vi_VN/products.lang | 8 +-
htdocs/langs/vi_VN/projects.lang | 15 +-
htdocs/langs/vi_VN/sendings.lang | 6 +-
htdocs/langs/vi_VN/stocks.lang | 4 +-
htdocs/langs/vi_VN/trips.lang | 1 +
htdocs/langs/zh_CN/accountancy.lang | 3 +
htdocs/langs/zh_CN/admin.lang | 12 +-
htdocs/langs/zh_CN/agenda.lang | 1 -
htdocs/langs/zh_CN/commercial.lang | 1 +
htdocs/langs/zh_CN/companies.lang | 4 +-
htdocs/langs/zh_CN/errors.lang | 3 +-
htdocs/langs/zh_CN/languages.lang | 2 +
htdocs/langs/zh_CN/main.lang | 2 +
htdocs/langs/zh_CN/margins.lang | 5 +-
htdocs/langs/zh_CN/products.lang | 8 +-
htdocs/langs/zh_CN/projects.lang | 15 +-
htdocs/langs/zh_CN/sendings.lang | 6 +-
htdocs/langs/zh_CN/stocks.lang | 4 +-
htdocs/langs/zh_CN/trips.lang | 1 +
htdocs/langs/zh_TW/accountancy.lang | 3 +
htdocs/langs/zh_TW/admin.lang | 12 +-
htdocs/langs/zh_TW/agenda.lang | 1 -
htdocs/langs/zh_TW/commercial.lang | 1 +
htdocs/langs/zh_TW/companies.lang | 4 +-
htdocs/langs/zh_TW/errors.lang | 3 +-
htdocs/langs/zh_TW/languages.lang | 2 +
htdocs/langs/zh_TW/main.lang | 2 +
htdocs/langs/zh_TW/margins.lang | 5 +-
htdocs/langs/zh_TW/products.lang | 8 +-
htdocs/langs/zh_TW/projects.lang | 15 +-
htdocs/langs/zh_TW/sendings.lang | 6 +-
htdocs/langs/zh_TW/stocks.lang | 4 +-
htdocs/langs/zh_TW/trips.lang | 1 +
htdocs/paybox/lib/paybox.lib.php | 1 -
807 files changed, 2977 insertions(+), 1893 deletions(-)
delete mode 100644 htdocs/langs/de_CH/companies.lang
delete mode 100644 htdocs/langs/de_CH/products.lang
delete mode 100644 htdocs/langs/de_CH/projects.lang
delete mode 100644 htdocs/langs/de_CH/sendings.lang
delete mode 100644 htdocs/langs/de_CH/stocks.lang
delete mode 100644 htdocs/langs/en_AU/companies.lang
delete mode 100644 htdocs/langs/en_AU/products.lang
delete mode 100644 htdocs/langs/en_AU/projects.lang
delete mode 100644 htdocs/langs/en_AU/sendings.lang
delete mode 100644 htdocs/langs/en_AU/stocks.lang
delete mode 100644 htdocs/langs/en_GB/companies.lang
delete mode 100644 htdocs/langs/en_GB/products.lang
delete mode 100644 htdocs/langs/en_GB/projects.lang
delete mode 100644 htdocs/langs/en_GB/sendings.lang
delete mode 100644 htdocs/langs/en_GB/stocks.lang
delete mode 100644 htdocs/langs/en_IN/companies.lang
delete mode 100644 htdocs/langs/en_IN/products.lang
delete mode 100644 htdocs/langs/en_IN/projects.lang
delete mode 100644 htdocs/langs/en_IN/sendings.lang
delete mode 100644 htdocs/langs/en_IN/stocks.lang
delete mode 100644 htdocs/langs/es_AR/companies.lang
delete mode 100644 htdocs/langs/es_AR/products.lang
delete mode 100644 htdocs/langs/es_AR/projects.lang
delete mode 100644 htdocs/langs/es_AR/sendings.lang
delete mode 100644 htdocs/langs/es_AR/stocks.lang
delete mode 100644 htdocs/langs/es_BO/companies.lang
delete mode 100644 htdocs/langs/es_BO/products.lang
delete mode 100644 htdocs/langs/es_BO/projects.lang
delete mode 100644 htdocs/langs/es_BO/sendings.lang
delete mode 100644 htdocs/langs/es_BO/stocks.lang
delete mode 100644 htdocs/langs/es_CL/sendings.lang
delete mode 100644 htdocs/langs/es_CL/stocks.lang
delete mode 100644 htdocs/langs/es_CO/products.lang
delete mode 100644 htdocs/langs/es_CO/projects.lang
delete mode 100644 htdocs/langs/es_CO/sendings.lang
delete mode 100644 htdocs/langs/es_CO/stocks.lang
delete mode 100644 htdocs/langs/es_DO/companies.lang
delete mode 100644 htdocs/langs/es_DO/products.lang
delete mode 100644 htdocs/langs/es_DO/projects.lang
delete mode 100644 htdocs/langs/es_DO/sendings.lang
delete mode 100644 htdocs/langs/es_DO/stocks.lang
delete mode 100644 htdocs/langs/es_MX/companies.lang
delete mode 100644 htdocs/langs/es_MX/products.lang
delete mode 100644 htdocs/langs/es_MX/projects.lang
delete mode 100644 htdocs/langs/es_MX/sendings.lang
delete mode 100644 htdocs/langs/es_MX/stocks.lang
delete mode 100644 htdocs/langs/es_PE/products.lang
delete mode 100644 htdocs/langs/es_PE/projects.lang
delete mode 100644 htdocs/langs/es_PE/sendings.lang
delete mode 100644 htdocs/langs/es_PE/stocks.lang
delete mode 100644 htdocs/langs/es_PY/products.lang
delete mode 100644 htdocs/langs/es_PY/projects.lang
delete mode 100644 htdocs/langs/es_PY/sendings.lang
delete mode 100644 htdocs/langs/es_PY/stocks.lang
delete mode 100644 htdocs/langs/fr_BE/companies.lang
delete mode 100644 htdocs/langs/fr_BE/products.lang
delete mode 100644 htdocs/langs/fr_BE/projects.lang
delete mode 100644 htdocs/langs/fr_BE/sendings.lang
delete mode 100644 htdocs/langs/fr_BE/stocks.lang
delete mode 100644 htdocs/langs/fr_CA/products.lang
delete mode 100644 htdocs/langs/fr_CA/projects.lang
delete mode 100644 htdocs/langs/fr_CA/sendings.lang
delete mode 100644 htdocs/langs/fr_CA/stocks.lang
delete mode 100644 htdocs/langs/fr_CH/companies.lang
delete mode 100644 htdocs/langs/fr_CH/products.lang
delete mode 100644 htdocs/langs/fr_CH/projects.lang
delete mode 100644 htdocs/langs/fr_CH/sendings.lang
delete mode 100644 htdocs/langs/fr_CH/stocks.lang
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 36d12421055..c0af9185d35 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -422,6 +422,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='', $withpleasewait=0)
global $conf,$langs;
$langs->load("main");
+ $langs->load("other");
$langs->load("admin");
print '</td></tr></table>'."\n";
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index c8a77e9d8e7..d6a26534586 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -48,6 +48,7 @@ $versionto=GETPOST("versionto",'',3)?GETPOST("versionto",'',3):(empty($argv[2])?
$langs->load("admin");
$langs->load("install");
+$langs->load("other");
if ($dolibarr_main_db_type == "mysql") $choix=1;
if ($dolibarr_main_db_type == "mysqli") $choix=1;
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index 7c9cc7fd325..b9aef70445e 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -63,6 +63,7 @@ $ignoredbversion=(GETPOST('ignoredbversion','',3)=='ignoredbversion')?GETPOST('i
$langs->load("admin");
$langs->load("install");
+$langs->load("other");
$langs->load("errors");
if ($dolibarr_main_db_type == "mysql") $choix=1;
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index ab96669de7c..83993de7882 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=لا أمن الحدث وقد سجلت حتى الآن. ه
NoEventFoundWithCriteria=لا أمن حال تم العثور على مثل هذا البحث criterias.
SeeLocalSendMailSetup=انظر المحلية الإعداد sendmail
BackupDesc=لتقديم دعم كامل للDolibarr ، يجب عليك :
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=الأرشيف دليل ينبغي أن تحفظ في مكان آمن.
BackupDescY=وقد ولدت وينبغي التخلص من الملفات المخزنة في مكان آمن.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=الدعم الاقتصادي Taxe (WEEE)
SetDefaultBarcodeTypeProducts=النوع الافتراضي لاستخدام الباركود للمنتجات
SetDefaultBarcodeTypeThirdParties=النوع الافتراضي لاستخدام الباركود لأطراف ثالثة
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=ارسال وحدة الإعداد
SendingsReceiptModel=ارسال استلام نموذج
SendingsNumberingModules=Sendings ترقيم الوحدات
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=في معظم الحالات ، تستخدم الإرسال إيصالات سواء صحائف لتسليم العميل (قائمة المنتجات ارسال) ، وصحائف التي وقعت عليها recevied الزبون. حتى المنتج تسليم الإيصالات هي سمة مزدوجة ونادرا ما تفعيلها.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index ed4584d2c14..178b91e1ac4 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= كل أحداثي/ مهامي
AllActions= جميع الأحداث / المهام
-ViewList=عرض قائمة
ViewCal=عرض شهري
ViewDay=عرض يومي
ViewWeek=عرض اسبوعي
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index 9f0e152a7dc..1596bee9364 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=احتمال وضع
DraftPropals=صياغة مقترحات تجارية
SearchPropal=بحث اقتراح التجاري
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index eb3980baa1b..dbdec0f5a93 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=طرف ثالث اتصال
StatusContactValidated=مركز الاتصال
Company=شركة
CompanyName=اسم الشركة
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=الشركات
CountryIsInEEC=البلد داخل المجموعة الاقتصادية الأوروبية
ThirdPartyName=اسم طرف ثالث
@@ -68,6 +69,7 @@ Country=قطر
CountryCode=رمز البلد
CountryId=بلد معرف
Phone=الهاتف
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 896548735a9..8aba631f78d 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=ميدان <b>٪ ق</b> يجب ألا يحتوي على أحرف خاصة.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+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.
ErrorLDAPSetupNotComplete=Dolibarr - LDAP المطابقة وليس كاملا.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ar_SA/languages.lang b/htdocs/langs/ar_SA/languages.lang
index 377ac35877b..59168057cd4 100644
--- a/htdocs/langs/ar_SA/languages.lang
+++ b/htdocs/langs/ar_SA/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=الفرنسية (كندا)
Language_fr_CH=الفرنسية (سويسرا)
Language_fr_FR=الفرنسية
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=المجري
@@ -70,6 +71,7 @@ Language_sv_SV=السويدية
Language_sv_SE=السويدية
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 28d64afe39f..5cd1d67200c 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=يوم الاثنين
Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/margins.lang b/htdocs/langs/ar_SA/margins.lang
index ac4c2201717..736a9f57554 100644
--- a/htdocs/langs/ar_SA/margins.lang
+++ b/htdocs/langs/ar_SA/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index acf87d7a9e2..7ffa7c4b8ae 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index a1e617ee548..b106e982b96 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=مشروع زعيم
TypeContact_project_external_PROJECTLEADER=مشروع زعيم
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index de637e4c14b..79703f807c2 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -5,7 +5,7 @@ Sendings=الإرسال
AllSendings=All Shipments
Shipment=إرسال
Shipments=شحنات
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=منطقة الإرسال
ListOfSendings=قائمة الإرسال
@@ -26,8 +26,8 @@ QtyToShip=لشحن الكمية
QtyReceived=الكمية الواردة
KeepToShip=Remain to ship
OtherSendingsForSameOrder=الإرسال الأخرى لهذا النظام
-DateSending=وحتى الآن من أجل إرسال
-DateSendingShort=وحتى الآن من أجل إرسال
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=الإرسال لهذا النظام
SendingsAndReceivingForSameOrder=الإرسال وreceivings لهذا النظام
SendingsToValidate=للمصادقة على إرسال
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index f35a1045369..460dc49b3c7 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=قاعدة لإدارة المخزون النقص
RuleForStockManagementIncrease=قاعدة لإدارة المخزون وزيادة
DeStockOnBill=خفض مخزونات حقيقية على فواتير الزبائن / الائتمان التحقق من صحة الملاحظات
DeStockOnValidateOrder=خفض مخزونات حقيقية على التحقق من صحة أوامر العملاء
-DeStockOnShipment=انخفاض الاسهم الحقيقي على شحنة المصادقة (مستحسن)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=زيادة المخزون الحقيقي في فواتير الموردين / الائتمان التحقق من صحة الملاحظات
ReStockOnValidateOrder=زيادة مخزونات حقيقية على استحسان أوامر الموردين
ReStockOnDispatchOrder=زيادة مخزونات دليل حقيقي على إيفاد في المستودعات ، وبعد تلقي أمر المورد
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index a919f7d5e0a..4e7476f44e1 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index bdd524f9d35..dc64a22e9fc 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=Списък
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index b297b07dbfe..ff2b4cda589 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Полета
Module59000Desc=Модул за управление на маржовете
Module60000Name=Комисии
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Няма да се иска никакво обезпеч
NoEventFoundWithCriteria=Няма да се иска никакво обезпечение събитие е за такива критерии за търсене.
SeeLocalSendMailSetup=Вижте настройка Sendmail
BackupDesc=За да направите пълно архивно копие на Dolibarr, трябва да:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Архива на директорията трябва да се съхранява на сигурно място.
BackupDescY=Генерирания дъмп файл трябва да се съхранява на сигурно място.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Подкрепа Eco-Taxe (ОЕЕО)
SetDefaultBarcodeTypeProducts=Тип баркод по подразбиране за продукти
SetDefaultBarcodeTypeThirdParties=Тип баркод по подразбиране за трети страни
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Модул за генериране и проверка на кода на продукта (продукт или услуга)
ProductOtherConf= Продукт / услуга конфигурация
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Изпращане модул за настройка
SendingsReceiptModel=Изпращане получаване модел
SendingsNumberingModules=Sendings номериране модули
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=В повечето случаи, sendings постъпления се използват както за листа за клиентите доставки (списък на продукти за изпращане) и листове, че е recevied и подписан от клиента. Така че продукти доставки постъпления е дублирана функция и рядко се активира.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/bg_BG/agenda.lang b/htdocs/langs/bg_BG/agenda.lang
index d13f1c2e70d..51f74f10b72 100644
--- a/htdocs/langs/bg_BG/agenda.lang
+++ b/htdocs/langs/bg_BG/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Всички мои събития/задачи
AllActions= Всички събития/задачи
-ViewList=Списъчен изглед
ViewCal=Месечен изглед
ViewDay=Дневен изглед
ViewWeek=Седмичен изглед
diff --git a/htdocs/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang
index b194f60814c..8367ebe7127 100644
--- a/htdocs/langs/bg_BG/commercial.lang
+++ b/htdocs/langs/bg_BG/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect статус
DraftPropals=Проектът на търговски предложения
SearchPropal=Търсене на търговско предложение
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 85778f1cff0..da2d1230ebb 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=От страна на трети лица за контакт
StatusContactValidated=Състояние на контакт/адрес
Company=Фирма
CompanyName=Име на фирмата
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Фирми
CountryIsInEEC=Държавата е част от Европейската икономическа общност
ThirdPartyName=Име на Трета страна
@@ -68,6 +69,7 @@ Country=Държава
CountryCode=Код на държавата
CountryId=ID на държава
Phone=Телефон
+PhoneShort=Phone
Skype=Скайп
Call=Call
Chat=Чат
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 9d5ceeb9c54..87c2ef202fd 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Полеви <b>%s,</b> не трябва да съдържа специални знаци.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+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.
ErrorLDAPSetupNotComplete=Dolibarr LDAP съвпадение не е пълна.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
diff --git a/htdocs/langs/bg_BG/languages.lang b/htdocs/langs/bg_BG/languages.lang
index a930f8303c1..85f04febc01 100644
--- a/htdocs/langs/bg_BG/languages.lang
+++ b/htdocs/langs/bg_BG/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Френски (Канада)
Language_fr_CH=Френски (Швейцария)
Language_fr_FR=Френски
Language_fr_NC=French (Нова Каледония)
+Language_fy_NL=Frisian
Language_he_IL=Иврит
Language_hr_HR=Хърватски
Language_hu_HU=Унгарски
@@ -70,6 +71,7 @@ Language_sv_SV=Шведски
Language_sv_SE=Шведски
Language_sq_AL=Албански
Language_sk_SK=Словашки
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Украински
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index dc20004f0ce..f3d8668545e 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Понеделник
Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/margins.lang b/htdocs/langs/bg_BG/margins.lang
index 30f7dca7544..8194efe044b 100644
--- a/htdocs/langs/bg_BG/margins.lang
+++ b/htdocs/langs/bg_BG/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index a9f8c7638be..ef58242d288 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index c4edf29c736..39365c4bec1 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Ръководител на проекта
TypeContact_project_external_PROJECTLEADER=Ръководител на проекта
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 5e5cb41a298..b267af3a531 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Превозите
AllSendings=All Shipments
Shipment=Пратка
Shipments=Превозите
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Превозите област
ListOfSendings=Списък на пратки
@@ -26,8 +26,8 @@ QtyToShip=Количество за кораба
QtyReceived=Количество получи
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Други пратки за изпълнение на поръчката
-DateSending=Дата на изпращане ред
-DateSendingShort=Дата на изпращане ред
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Превозите за тази поръчка
SendingsAndReceivingForSameOrder=Пратки и receivings за тази поръчка
SendingsToValidate=Превозите за валидация
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index ac66d71557b..5d3f2fc9302 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Правило за намаляване на у
RuleForStockManagementIncrease=Правило за увеличаване на управление на запасите
DeStockOnBill=Намаляване реалните запаси на клиентите фактури / кредитни известия за валидиране
DeStockOnValidateOrder=Намаляване реалните запаси на клиентите за валидиране на поръчката
-DeStockOnShipment=Намаляване реалните запаси за проверка на пратката
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Увеличаване на реалните запаси на доставчици фактури / кредитни известия за валидиране
ReStockOnValidateOrder=Увеличаване на реалните запаси на доставчиците поръчки апробиране
ReStockOnDispatchOrder=Увеличаване на реалните запаси на ръководство за експедиция в складове, след доставчика за получаване на
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index 4aa42a982ad..472539e8bdd 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/bn_BD/accountancy.lang b/htdocs/langs/bn_BD/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/bn_BD/accountancy.lang
+++ b/htdocs/langs/bn_BD/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/bn_BD/agenda.lang b/htdocs/langs/bn_BD/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/bn_BD/agenda.lang
+++ b/htdocs/langs/bn_BD/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/bn_BD/commercial.lang b/htdocs/langs/bn_BD/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/bn_BD/commercial.lang
+++ b/htdocs/langs/bn_BD/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bn_BD/languages.lang b/htdocs/langs/bn_BD/languages.lang
index f1da5549014..3d9bf981568 100644
--- a/htdocs/langs/bn_BD/languages.lang
+++ b/htdocs/langs/bn_BD/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/bn_BD/main.lang b/htdocs/langs/bn_BD/main.lang
index 12d9337641d..0802b693ffd 100644
--- a/htdocs/langs/bn_BD/main.lang
+++ b/htdocs/langs/bn_BD/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/bn_BD/margins.lang b/htdocs/langs/bn_BD/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/bn_BD/margins.lang
+++ b/htdocs/langs/bn_BD/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/bn_BD/sendings.lang b/htdocs/langs/bn_BD/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/bn_BD/sendings.lang
+++ b/htdocs/langs/bn_BD/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/bn_BD/trips.lang b/htdocs/langs/bn_BD/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/bn_BD/trips.lang
+++ b/htdocs/langs/bn_BD/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
index 17c4a8bac6c..88ec288d22e 100644
--- a/htdocs/langs/bs_BA/accountancy.lang
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index fb14be76b78..1e8b7fef97e 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Defaultni tip barkoda koji se koristi za treće stranke
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/bs_BA/agenda.lang b/htdocs/langs/bs_BA/agenda.lang
index a1e6488139d..d458fbebe68 100644
--- a/htdocs/langs/bs_BA/agenda.lang
+++ b/htdocs/langs/bs_BA/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Svi moji događaji/zadaci
AllActions= Svi događaji/zadaci
-ViewList=Lista
ViewCal=Mjesečni pregled
ViewDay=Dnevni pregled
ViewWeek=Sedmični pregled
diff --git a/htdocs/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang
index 62bbf25f7a1..469611edd06 100644
--- a/htdocs/langs/bs_BA/commercial.lang
+++ b/htdocs/langs/bs_BA/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index 67d3f9723e3..e3b45bf5c3b 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -12,12 +12,12 @@ MenuNewCompany=Nova kompanija
MenuNewCustomer=Novi kupac
MenuNewProspect=Novi mogući klijent
MenuNewSupplier=Novi dobavljač
-MenuNewPrivateIndividual=Nova privatna individua
+MenuNewPrivateIndividual=Novo fizičko lice
MenuSocGroup=Grupe
NewCompany=Nova kompanija (mogući klijent, kupac, dobavljač)
NewThirdParty=Novi subjekt (mogući klijent, kupac, dobavljač)
NewSocGroup=Nova grupa kompanije
-NewPrivateIndividual=Nova privatna individua (mogući klijent, kupac, dobavljač)
+NewPrivateIndividual=Novo fizičko lice (mogući klijent, kupac, dobavljač)
CreateDolibarrThirdPartySupplier=Create a third party (supplier)
ProspectionArea=Područje za moguće kupce
SocGroup=Grupa kompanija
@@ -30,7 +30,8 @@ ThirdPartyContact=Kontakt/Adresa subjekta
StatusContactValidated=Status kontakta/adrese
Company=Kompanija
CompanyName=Ime kompanije
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Kompanije
CountryIsInEEC=Zemlja je unutar Evropske ekonomske zajednice
ThirdPartyName=Ime subjekta
@@ -45,7 +46,7 @@ ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
ThirdPartySuppliers=Dobavljači
ThirdPartyType=Tip subjekta
Company/Fundation=Kompanija/Fondacija
-Individual=Privatna individua
+Individual=Fizičko lice
ToCreateContactWithSameName=Ovo će automatski kreirati fizički kontakt sa istim informacijama
ParentCompany=Matična kompanija
Subsidiary=Podružnica
@@ -68,6 +69,7 @@ Country=Država
CountryCode=Šifra države
CountryId=ID države
Phone=Telefon
+PhoneShort=Phone
Skype=Skajp
Call=Pozovi
Chat=Chat
@@ -76,7 +78,7 @@ PhonePerso=Privatni telefon
PhoneMobile=Mobitel
No_Email=Don't send mass e-mailings
Fax=Fax
-Zip=ZIP kod
+Zip=Poštanski broj
Town=Grad
Web=Web
Poste= Pozicija
@@ -238,7 +240,7 @@ VATIntra=PDV broj
VATIntraShort=PDV broj
VATIntraVeryShort=PDV
VATIntraSyntaxIsValid=Sintaksa je nevažeća
-VATIntraValueIsValid=Vrijednost je nevažeća
+VATIntraValueIsValid=Vrijednost je važeća
ProspectCustomer=Mogući klijent / Kupac
Prospect=Mogući klijent
CustomerCard=Kartica kupca
@@ -345,7 +347,7 @@ TE_ADMIN=Državna kompanija
TE_SMALL=Mala kompanija
TE_RETAIL=Maloprodaja
TE_WHOLE=Veleprodaja
-TE_PRIVATE=Privatna individua
+TE_PRIVATE=Fizičko lice
TE_OTHER=Ostalo
StatusProspect-1=Ne kontaktirati
StatusProspect0=Nikada kontaktirano
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bs_BA/languages.lang b/htdocs/langs/bs_BA/languages.lang
index 85a56b0bc9c..6e1afb8af6a 100644
--- a/htdocs/langs/bs_BA/languages.lang
+++ b/htdocs/langs/bs_BA/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francuski (Kanada)
Language_fr_CH=Francuski (Švajcarska)
Language_fr_FR=Francuski
Language_fr_NC=Francuski (Nova Kaledonija)
+Language_fy_NL=Frisian
Language_he_IL=Jevrejski
Language_hr_HR=Hrvatski
Language_hu_HU=Mađarski
@@ -70,6 +71,7 @@ Language_sv_SV=Švedski
Language_sv_SE=Švedski
Language_sq_AL=Albanian
Language_sk_SK=Slovački
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrajinski
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 5931030500c..9926930e934 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/bs_BA/margins.lang b/htdocs/langs/bs_BA/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/bs_BA/margins.lang
+++ b/htdocs/langs/bs_BA/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 9cee0564251..5dc5a859d09 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 5a597e06157..7fab581af5b 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index daff6d59a94..af559e5d138 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Pošiljke
AllSendings=All Shipments
Shipment=Pošiljka
Shipments=Pošiljke
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Područje za pošiljke
ListOfSendings=Lista pošiljki
@@ -26,8 +26,8 @@ QtyToShip=Količina za slanje
QtyReceived=Primljena količina
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Druge pošiljke za ovu narudžbu
-DateSending=Datum slanja narudžbe
-DateSendingShort=Datum slanja narudžbe
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Pošiljke za ovu narudžbu
SendingsAndReceivingForSameOrder=Pošiljke i primanja za ovu narudžbu
SendingsToValidate=Pošiljke za potvrditi
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index d4aad9a4ec1..11fe5e2302b 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Pravilo za upravljanje smanjenja zaliha
RuleForStockManagementIncrease=Pravilo za upravljanje povećanja zaliha
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Smanji stvarne zalihe nakon potvrđivanja narudžbe kupca
-DeStockOnShipment=Smanji stvarne zalije na potvrđivanju pošiljke
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Increase real stocks on suppliers invoices/credit notes validation
ReStockOnValidateOrder=Povećaj stvarne zalihe na odobrenju narudžbe dobavljaču
ReStockOnDispatchOrder=Povećaj stvarne zalihe na ručnom otpremanju u skladište, nakon primanja narudžbe dobavljača
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 4fc5889cf99..38b20c22e1c 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 00a9929f987..eac7ef67bfe 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -1,46 +1,54 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
+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 the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
Accounting=Comptabilitat experta
Globalparameters=Paràmetres globals
Chartofaccounts=Pla comptable
Fiscalyear=Anys fiscals
Menuaccount=Comptes de comptabilitat
-Menuthirdpartyaccount=Thirdparty accounts
+Menuthirdpartyaccount=Comptes de tercers
MenuTools=Utilitats
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
+ConfigAccountingExpert=Configuració del mòdul Compatibilitat avançada
+Journaux=Diaris
+JournalFinancial=Diaris financers
+Exports=Exportacions
Export=Exporta
-Modelcsv=Model of export
+Modelcsv=Model d'exportació
OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
+Selectmodelcsv=Selecciona un model d'exportació
+Modelcsv_normal=Exportació clàssica
Modelcsv_CEGID=Export towards CEGID Expert
BackToChartofaccounts=Return chart of accounts
Back=Return
Definechartofaccounts=Define a chart of accounts
Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
+Validate=Validar
Addanaccount=Add an accounting account
AccountAccounting=Accounting account
Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
+ToDispatch=A desglossar
+Dispatched=Desglossats
CustomersVentilation=Breakdown customers
SuppliersVentilation=Breakdown suppliers
TradeMargin=Trade margin
-Reports=Reports
+Reports=Informes
ByCustomerInvoice=By invoices customers
-ByMonth=By Month
+ByMonth=Per mes
NewAccount=New accounting account
Update=Update
-List=List
-Create=Create
+List=Llistat
+Create=Crear
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -60,7 +68,7 @@ IntoAccount=In the accounting account
Ventilate=Ventilate
VentilationAuto=Automatic breakdown
-Processing=Processing
+Processing=Processant
EndProcessing=The end of processing
AnyLineVentilate=Any lines to ventilate
SelectedLines=Selected lines
@@ -76,14 +84,15 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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_SELL_JOURNAL=Sell journal
ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
ACCOUNTING_SOCIAL_JOURNAL=Social journal
ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
@@ -138,13 +147,13 @@ Pcgversion=Versió del pla
Pcgtype=Class of account
Pcgsubtype=Under class of account
Accountparent=Root of the account
-Active=Statement
+Active=Extracte
-NewFiscalYear=New fiscal year
+NewFiscalYear=Nou any fiscal
DescVentilCustomer=Consult here the annual breakdown accounting of your invoices customers
TotalVente=Total turnover HT
-TotalMarge=Total sales margin
+TotalMarge=Marge total de vendes
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:
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 6402601b9ca..53bf412d442 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Comptabilitat (avançat)
Module50400Desc=Gestió experta de la comptabilitat (doble partida)
Module54000Name=PrintIPP
Module54000Desc=L'impressió directa (sense obrir els documents) utilitza l'interfície Cups IPP (L'impressora té que ser visible pel servidor i CUPS té que estar instal·lat en el servidor)
-Module55000Name=Obrir enquesta
-Module55000Desc=Mòdul per fer enquestes en línia (com Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marges
Module59000Desc=Mòdul per gestionar els marges de benefici
Module60000Name=Comissions
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No s'han registrat esdeveniments de seguretat. Això pot s
NoEventFoundWithCriteria=No s'han trobat esdeveniments de seguretat per a aquests criteris de cerca.
SeeLocalSendMailSetup=Veure la configuració local d'sendmail
BackupDesc=Per realitzar una còpia de seguretat completa de Dolibarr, vostè ha de:
-BackupDesc2=Guardar el contingut del directori de documents (<b>%s</b>) que contingui tots els arxius pujats a generats (comprimint el directori, per exemple).
+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=Guardar el contingut de la seva base de dades (<b>%s</b>) a un archiu de bolcat. Per aixo pot utilitzar l'asistent a continuació
BackupDescX=La carpeta arxivada haurà de guardar-se en un lloc segur
BackupDescY=L'arxiu de bolcat generat haurà de guardar-se en un lloc segur.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Utilitzeu un formulari de cerca per triar un producte (
UseEcoTaxeAbility=Assumir ecotaxa (DEEE)
SetDefaultBarcodeTypeProducts=Tipus de codi de barres utilitzat per defecte per als productes
SetDefaultBarcodeTypeThirdParties=Tipus de codi de barres utilitzat per defecte per als tercers
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Mòdul per a la generació i comprovació del codi d'un producte o servei
ProductOtherConf= Configuració de productes/serveis
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Destinatari fixe
SendingsSetup=Configuració del mòdul Expedicions
SendingsReceiptModel=Model de notes de lliurament
SendingsNumberingModules=Mòduls de numeració de notes de lliurament
-SendingsAbility=Ús de notes de lliurament per als enviaments a clients
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=En la majoria dels casos, les notes de lliurament (llista de productes enviats) també actuen com a notes de recepció i són signades pel client. La gestió de les notes de recepció és per tant redundant i poques vegades s'activarà.
FreeLegalTextOnShippings=Text lliure en els enviaments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index e18876efc92..49d7ade117b 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Esdeveniments per tots els usuaris del grup
ActionAssignedTo=Esdeveniment assignat a
AllMyActions= Tots els meus esdeveniments/tasques
AllActions= Tots els esdeveniments/tasques
-ViewList=Vista llistat
ViewCal=Vista mensual
ViewDay=Vista diària
ViewWeek=Vista setmanal
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 92ceb20f492..bc7c6e97a4e 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Client potencial
Prospects=Clients potencials
DeleteAction=Eliminar un esdeveniment
NewAction=Nou esdeveniment
-AddAction=Create event/task
-AddAnAction=Create an event/task
-AddActionRendezVous=Create a Rendez-vous event
+AddAction=Crea un esdeveniment/tasca
+AddAnAction=Crear un esdeveniment/tasca
+AddActionRendezVous=Crear una cita
Rendez-Vous=Cita
ConfirmDeleteAction=Esteu segur de voler eliminar aquest esdeveniment?
CardAction=Fitxa esdeveniment
@@ -44,8 +44,8 @@ DoneActions=Llista d'esdeveniments realitzats
DoneActionsFor=Llista d'esdeveniments realitzats per %s
ToDoActions=Llista d'esdevenimentss incomplets
ToDoActionsFor=Llista d'esdeveniments incomplets %s
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
+SendPropalRef=Enviament del pressupost %s
+SendOrderRef=Enviament de la comanda %s
StatusNotApplicable=No aplicable
StatusActionToDo=A realitzar
StatusActionDone=Realitzat
@@ -62,7 +62,7 @@ LastProspectContactDone=Clients potencials contactats
DateActionPlanned=Data planificació
DateActionDone=Data realització
ActionAskedBy=Acció registrada per
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Acció assignada a
ActionDoneBy=Acció realitzada per
ActionUserAsk=Registrada per
ErrorStatusCantBeZeroIfStarted=Si el camp '<b>Data de realització</b>' conté dades l'acció està en curs, per la qual cosa el camp 'Estat' no pot ser 0%%.
@@ -71,7 +71,7 @@ ActionAC_FAX=Enviament Fax
ActionAC_PROP=Enviament pressupost per correu
ActionAC_EMAIL=Enviament E-Mail
ActionAC_RDV=Cita
-ActionAC_INT=Intervention on site
+ActionAC_INT=Lloc d'intervenció
ActionAC_FAC=Enviament factura a client per correu
ActionAC_REL=Recordatori factura a client per correu
ActionAC_CLO=Tancament
@@ -94,3 +94,4 @@ StatusProsp=Estat prospecció
DraftPropals=Pressupostos esborrany
SearchPropal=Cercar un pressupost
CommercialDashboard=Resum comercial
+NoLimit=No limit
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 529fdcca833..53669e6b9af 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contacte tercer
StatusContactValidated=Estat del contacte
Company=Empresa
CompanyName=Raó social
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Empreses
CountryIsInEEC=Pais de la Comunitat Econòmica Europea
ThirdPartyName=Nom del tercer
@@ -68,6 +69,7 @@ Country=Pais
CountryCode=Codi pais
CountryId=Id pais
Phone=Telèfon
+PhoneShort=Phone
Skype=Skype
Call=Trucar
Chat=Xat
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 8b06efb8a5f..cf61ade09a4 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Els valors de la llista han de ser indicats
ErrorNoValueForRadioType=Els valors de la llista han de ser indicats
ErrorBadFormatValueList=Els valors de la llista no peudo contenir més d'una coma: <u>%s </u>, però necessita una: clau, valors
ErrorFieldCanNotContainSpecialCharacters=El camp <b>%s</b> no ha de contenir caràcters especials
-ErrorFieldCanNotContainSpecialNorUpperCharacters=El camp <b>%s</b> no ha de contenir majúscules ni caràcters especials
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Mòdul de comptabilitat no activat
ErrorExportDuplicateProfil=El nom d'aquest perfil ja existeix per aquest conjunt d'exportació
ErrorLDAPSetupNotComplete=La configuració Dolibarr-LDAP és incompleta.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Sense variable global seleccionada
ErrorFieldMustBeANumeric=El camp <b>%s</b> ha de contenir un valor numèric
ErrorFieldMustBeAnInteger=El camp <b>%s</b> ha de ser un enter
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index 30adc3edf96..3f85b08717e 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francès (Canadà)
Language_fr_CH=Francès (Suïssa)
Language_fr_FR=Francès
Language_fr_NC=Francès (Nova Caledònia)
+Language_fy_NL=Frisian
Language_he_IL=Hebreu
Language_hr_HR=Croat
Language_hu_HU=Hongarès
@@ -70,6 +71,7 @@ Language_sv_SV=Suec
Language_sv_SE=Suec
Language_sq_AL=Albania
Language_sk_SK=Eslovac
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tailandès
Language_uk_UA=Ucraïnès
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index aef2fc896f8..79b1a1b3edd 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -710,6 +710,8 @@ Denied=Denegad
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Dilluns
Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/margins.lang b/htdocs/langs/ca_ES/margins.lang
index e8431ab5dcf..4a4ee106ac1 100644
--- a/htdocs/langs/ca_ES/margins.lang
+++ b/htdocs/langs/ca_ES/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Com un producte
UseDiscountAsService=Com un servei
UseDiscountOnTotal=Sobre el total
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descompte global es pren en compte com un producte, servei o només en el total a l'hora de calcular els marges.
-MARGIN_TYPE=Tipus de marge gestionat
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Marge brut
MargeNette=Marge net
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Marge brut: Preu de venda sense IVA - Preu de compra sense IVA <br/> Marge net: Preu de venda sense IVA - Costos
+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
CostPrice=Preu de compra
BuyingCost=Costos
UnitCharges=Càrrega unitària
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index f364d23d0b9..a24ced9d6b6 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Preus únics per producte/servei
PricingRule=Regles per preus a clients
AddCustomerPrice=Afegir preus per client
ForceUpdateChildPriceSoc=Establir el mateix preu a les filials dels clients
-PriceByCustomerLog=Log de preus per clients
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=El preu mínim recomenat es: %s
PriceExpressionEditor=Editor de expresió de preus
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index bcf754acffd..d55b4c294ef 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=La tasca %s a sigut creada
TaskModifiedInDolibarr=La tasca %s a sigut modificada
TaskDeletedInDolibarr=La tasca %s a sigut eliminada
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Cap de projecte
TypeContact_project_external_PROJECTLEADER=Cap de projecte
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 8a261349a20..33117d8fa29 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Enviaments
AllSendings=Tots els enviaments
Shipment=Enviament
Shipments=Enviaments
-ShowSending=Mostrar enviament
+ShowSending=Show Shipments
Receivings=Recepcions
SendingsArea=Àrea enviaments
ListOfSendings=Llista d'enviaments
@@ -26,8 +26,8 @@ QtyToShip=Qt. a enviar
QtyReceived=Qt. rebuda
KeepToShip=Resta a enviar
OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda
-DateSending=Data d'expedició
-DateSendingShort=Data d'expedició
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Expedicions d'aquesta comanda
SendingsAndReceivingForSameOrder=Enviaments i recepcions d'aquesta comanda
SendingsToValidate=Enviaments a validar
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 1e63bbc41ba..0e083325a99 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regla de gestió de decrements d'estoc
RuleForStockManagementIncrease=Regla de gestió d'increments d'estoc
DeStockOnBill=Decrementar els estocs físics sobre les factures/abonaments a clients
DeStockOnValidateOrder=Decrementar els estocs físics sobre les comandes de clients
-DeStockOnShipment=Decrementar els estocs físics sobre els enviaments
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Incrementar els estocs físics sobre les factures/abonaments de proveïdors
ReStockOnValidateOrder=Incrementar els estocs físics sobre les comandes a proveïdors
ReStockOnDispatchOrder=Incrementa els estocs físics en el desglossament manual de la recepció de les comandes a proveïdors en els magatzems
@@ -134,7 +134,7 @@ IsInPackage=Contingut del paquet
ShowWarehouse=Mostrar magatzem
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Transferencia d'estoc del producte %s a un altre magatzem
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Codi Inv./Mov.
NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/serie (<strong%s</strong>) ja existeix, però amb una data de caducitat o venda diferent (trobat <strong>%s</strong> però ha introduït <strong>%s</strong>).
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index e20590a746b..389c33caf76 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 62ec8d5c6ad..a704fc38094 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -1,5 +1,12 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Oddělovač sloupců pro export souboru
+ACCOUNTING_EXPORT_DATE=Formát data pro export souboru
+ACCOUNTING_EXPORT_PIECE=Export počtu kusu?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export s globálním účtem?
+ACCOUNTING_EXPORT_LABEL=Export štítku?
+ACCOUNTING_EXPORT_AMOUNT=Export částky?
+ACCOUNTING_EXPORT_DEVISE=Export návrhu?
Accounting=Účetnictví
Globalparameters=Globální parametry
@@ -41,6 +48,7 @@ NewAccount=Nový účetní účet
Update=Aktualizovat
List=Seznam
Create=Vytvořit
+CreateMvts=Create movement
UpdateAccount=Změna účetního účtu
UpdateMvts=Změna pohybu
WriteBookKeeping=Účetní záznamy v hlavní účetní knize
@@ -60,7 +68,7 @@ IntoAccount=V účetním účtu
Ventilate=Prověřit
VentilationAuto=Automatické členění
-Processing=Pracuji .....
+Processing=Dřu jako kůň .....
EndProcessing=Konec zpracování
AnyLineVentilate=Prověřit všechny řádky
SelectedLines=Vybrané řádky
@@ -76,14 +84,15 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začněte třídění rozpisu stránek "Br
AccountLength=Délka účetnické osnovy uvedené v Dolibarr
AccountLengthDesc=Funkce povolující simulovat délku účetního účtu nahrazením místa prostřednictvím nulového obrázku. Tato funkce se týká pouze zobrazení, to nemění účetní účty zaregistrované v Dolibarr. Pro export této funkce je nutné, aby byla kompatibilní s daným softwarem.
+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_SELL_JOURNAL=Prodejní deník
ACCOUNTING_PURCHASE_JOURNAL=Nákupní deník
-ACCOUNTING_BANK_JOURNAL=Bankovní deník
-ACCOUNTING_CASH_JOURNAL=Peněžní deník
ACCOUNTING_MISCELLANEOUS_JOURNAL=Ostatní deník
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Rozšířený výpis deníku
ACCOUNTING_SOCIAL_JOURNAL=Sociální deník
ACCOUNTING_ACCOUNT_TRANSFER_CASH=Převodní účet
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index bc242c4c9eb..7ef7f5f6f6b 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Účetnictví (pokročilé)
Module50400Desc=Manažerské účetnictví (dvojité strany)
Module54000Name=PrintIPP
Module54000Desc=Přímý tisk (bez otevření dokumentů) pomocí poháry IPP rozhraní (tiskárna musí být viditelné ze serveru, a CUPS musí být installe na serveru).
-Module55000Name=Otevřít anketu
-Module55000Desc=Modul, tvorbu on-line průzkumů a anket (jako Doodle, šroub, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Okraje
Module59000Desc=Modul pro správu marže
Module60000Name=Provize
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Žádná událost zabezpečení byl zaznamenán ještě. T
NoEventFoundWithCriteria=Žádná událost zabezpečení byl nalezen na těchto vyhledávacích kritérii.
SeeLocalSendMailSetup=Podívejte se na místní sendmail nastavení
BackupDesc=Chcete-li provést kompletní zálohu Dolibarr, musíte:
-BackupDesc2=Uložení obsahu dokumentů adresáře <b>(% s),</b> který obsahuje všechny nahrané a vytvořené soubory (můžete udělat zip například).
+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=Uložte obsah databáze <b>(%s),</b> do souboru výpisu. K tomu můžete použít následující asistenta.
BackupDescX=Archivní adresář by měl být skladován na bezpečném místě.
BackupDescY=Vygenerovaný soubor výpisu by měl být skladován na bezpečném místě.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Použijte vyhledávací formulář pro výběr produku
UseEcoTaxeAbility=Podpora Eco-taxe (WEEE)
SetDefaultBarcodeTypeProducts=Výchozí typ čárového kódu použít pro produkty
SetDefaultBarcodeTypeThirdParties=Výchozí typ čárového kódu použít k třetím osobám
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul pro generování kódu produktu a přezkušování (výrobku nebo služby)
ProductOtherConf= Katalog / Konfigurace služby
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Pevná emailový cíl
SendingsSetup=Odeslání Nastavení modulu
SendingsReceiptModel=Odeslání stvrzenky modelu
SendingsNumberingModules=Sendings číslování moduly
-SendingsAbility=Podpora zásilka listy pro dodávky zákazníkům
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Ve většině případů jsou sendings příjmy použity jak listů pro dodávky zákazníkům (seznam výrobků k odeslání) a na arších, které je recevied a podepsán zákazníkem. Takže dodávek výrobků příjmy je duplicitní funkce a je zřídka aktivován.
FreeLegalTextOnShippings=Volný text o přepravě
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/cs_CZ/agenda.lang b/htdocs/langs/cs_CZ/agenda.lang
index 64c3a844b7f..a7551351e9d 100644
--- a/htdocs/langs/cs_CZ/agenda.lang
+++ b/htdocs/langs/cs_CZ/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Události pro všechny uživatelské skupiny
ActionAssignedTo=Událost přiřazena
AllMyActions= Všechny mé události/úkoly
AllActions= Všechny události / úkoly
-ViewList=Zobrazení seznamu
ViewCal=Měsíční zobrazení
ViewDay=Denní zobrazení
ViewWeek=Týdenní zobrazení
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
index e70be787f8f..a473b1acef6 100644
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Stav cíle
DraftPropals=Navrhnout obchodní návrhy
SearchPropal=Hledat obchodní návrh
CommercialDashboard=Obchodní shrnutí
+NoLimit=No limit
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index f312dd24be8..429d194ce05 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Kontakty/adresy třetí strany
StatusContactValidated=Stav kontaktu/adresy
Company=Společnost
CompanyName=Název společnosti
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Společnosti
CountryIsInEEC=Země je uvnitř Evropského hospodářského společenství
ThirdPartyName=Název třetí strany
@@ -68,6 +69,7 @@ Country=Země
CountryCode=Kód země
CountryId=ID země
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Hovor
Chat=Chat
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index e95e5910bd9..294120cc28c 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Vyplňte, prosím, hodnotu checkbox seznamu
ErrorNoValueForRadioType=Prosím vyplňte hodnotu pro rozhlasové seznamu
ErrorBadFormatValueList=Seznam Hodnota nemůže mít více než jeden přijde: <u>%s,</u> ale potřebujete alespoň jeden: Llave, Valores
ErrorFieldCanNotContainSpecialCharacters=Terénní <b>%s</b> nesmí obsahuje speciální znaky.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Ne účetnictví modul aktivován
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP shoda není úplná.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
diff --git a/htdocs/langs/cs_CZ/languages.lang b/htdocs/langs/cs_CZ/languages.lang
index c5a9c743a71..5c481b8a766 100644
--- a/htdocs/langs/cs_CZ/languages.lang
+++ b/htdocs/langs/cs_CZ/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francouzština (Kanada)
Language_fr_CH=Francouzština (Švýcarsko)
Language_fr_FR=Francouzsky
Language_fr_NC=Francouzština (Nová Kaledonie)
+Language_fy_NL=Frisian
Language_he_IL=Hebrejština
Language_hr_HR=Chorvatský
Language_hu_HU=Maďarština
@@ -70,6 +71,7 @@ Language_sv_SV=Švédsky
Language_sv_SE=Švédský
Language_sq_AL=Albánština
Language_sk_SK=Slovenština
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thajsko
Language_uk_UA=Ukrajina
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 87c426be740..91976b2996d 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -710,6 +710,8 @@ Denied=Odmítnuto
ListOfTemplates=Seznam šablon
Genderman=Muž
Genderwoman=Žena
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Pondělí
Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/margins.lang b/htdocs/langs/cs_CZ/margins.lang
index 872f41bfa4d..23d2f01ecb5 100644
--- a/htdocs/langs/cs_CZ/margins.lang
+++ b/htdocs/langs/cs_CZ/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Jako produkt
UseDiscountAsService=Jako služba
UseDiscountOnTotal=Na mezisoučet
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, zda globální sleva je považován za výrobek, službu, nebo pouze za mezisoučet pro výpočet marže.
-MARGIN_TYPE=Typ marže
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Hrubá marže
MargeNette=Čistá marže
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Hrubá marže: prodejní cena - nákupní cena <br/> Čistá marže: prodejní cena - pořizovací cena.
+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
CostPrice=Náklady
BuyingCost=Náklady
UnitCharges=Jednotkové poplatky
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 6655cfb0665..8033a157170 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=metr
m=m
-linear metr = lineární metr
+linearmeter=linear meter
lm=lm
-square metr = metr čtvereční
+squaremeter=square meter
m2=m²
-cubic metr = metr krychlový
+cubicmeter=cubic meter
m3=m³
liter=litr
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unikátní cena pro produkt/službu
PricingRule=Pravidla pro zákaznických ceny
AddCustomerPrice=Přidejte cenu pro zákazníka
ForceUpdateChildPriceSoc=Nastavit stejné ceny pro dceřiné společnosti zákazníka
-PriceByCustomerLog=Cena dle protokolu zákazníka
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimální cena nesmí být nižší než %s
MinimumRecommendedPrice=Minimální doporučená cena je: %s
PriceExpressionEditor=Editor cenových výrazů
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index ea31077e07c..7b77a0f80f1 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Úkol %s vytvořen
TaskModifiedInDolibarr=Úkol %s upraven
TaskDeletedInDolibarr=Úkol %s smazán
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Vedoucí projektu
TypeContact_project_external_PROJECTLEADER=Vedoucí projektu
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index 7020cd17ac8..3546f733199 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Zásilky
AllSendings=Všechny zásilky
Shipment=Doprava
Shipments=Zásilky
-ShowSending=Ukázat odeslání
+ShowSending=Show Shipments
Receivings=Doklady
SendingsArea=Oblast zásilek
ListOfSendings=Seznam zásilek
@@ -26,8 +26,8 @@ QtyToShip=Množství na loď
QtyReceived=Množství přijaté
KeepToShip=Zůstaňte na loď
OtherSendingsForSameOrder=Další zásilky pro tuto objednávku
-DateSending=Datum odeslání objednávky
-DateSendingShort=Datum odeslání objednávky
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Zásilky pro tuto objednávku
SendingsAndReceivingForSameOrder=Zásilky a vratky pro tuto objednávku
SendingsToValidate=Zásilky se ověřují
@@ -67,7 +67,7 @@ SendingRunning=Produkt z objednaných zákaznických objednávek
SuppliersReceiptRunning=Produkt z objednaných dodavatelských objednávek
ProductQtyInCustomersOrdersRunning=Množství výrobku do otevřených objednávek zákazníků
ProductQtyInSuppliersOrdersRunning=Množství výrobku do otevřených dodavatelů zakázek
-ProductQtyInShipmentAlreadySent=Množství již odeslaných produktů z objednávek zákazníka
+ProductQtyInShipmentAlreadySent=Množství již odeslaných produktů z objednávek zákazníka
ProductQtyInSuppliersShipmentAlreadyRecevied=Množství již dodaných produktů z otevřených dodavatelských objednávek
# Sending methods
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index b96fdc71ed5..cea149cfd8e 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -2,14 +2,14 @@
WarehouseCard=Karta skladiště
Warehouse=Skladiště
Warehouses=Skladiště
-NewWarehouse=Nový skladiště/skladová oblast
+NewWarehouse=Nové skladiště/skladová oblast
WarehouseEdit=Upravit skladiště
MenuNewWarehouse=Nové skladiště
WarehouseOpened=Skladiště otevřeno
WarehouseClosed=Skladiště uzavřeno
WarehouseSource=Zdrojový sklad
WarehouseSourceNotDefined=Není definován žádné skladiště
-AddOne=Přidat jeden
+AddOne=Přidat jedno
WarehouseTarget=Cílový sklad
ValidateSending=Smazat odeslání
CancelSending=Zrušit zasílání
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Pravidlo pro snížení řízení zásob
RuleForStockManagementIncrease=Pravidlo pro zvýšení řízení zásob
DeStockOnBill=Pokles reálných zásob na zákaznických fakturách/dobropisech validace
DeStockOnValidateOrder=Pokles reálné zásoby na objednávky zákazníků validace
-DeStockOnShipment=Pokles reálné zásoby na odeslání potvrzení
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Zvýšení reálné zásoby na dodavatele faktur/dobropisů validace
ReStockOnValidateOrder=Zvýšení reálné zásoby na dodavatele objednávek schválení
ReStockOnDispatchOrder=Zvýšení reálné zásoby na ruční dispečinku do skladů poté, co dodavatel objedná zasílání
@@ -95,15 +95,16 @@ SelectWarehouseForStockDecrease=Zvolte skladiště pro použití snížení zás
SelectWarehouseForStockIncrease=Zvolte skladiště pro zvýšení stavu zásob
NoStockAction=Žádné akce ve skladu
LastWaitingSupplierOrders=Čekající objednávky na přijetí
-DesiredStock=Požadovaná skladem
+DesiredStock=Požadovaná minimální zásoba
+DesiredMaxStock=Požadovaný maximální sklad
StockToBuy=Chcete-li objednat
Replenishment=Naplnění
ReplenishmentOrders=Doplňování objednávky
-VirtualDiffersFromPhysical=Podle zvýšení/snížení skladové možnosti se fyzické a virtuální zásoby (fyzické aktuální objednávky) mohou lišit.
+VirtualDiffersFromPhysical=Podle zvýšení/snížení skladové možnosti se fyzické a virtuální zásoby (fyzické aktuální objednávky) mohou lišit.
UseVirtualStockByDefault=Použijte virtuální sklad ve výchozím nastavení, namísto fyzického skladu pro funkci doplňování
UseVirtualStock=Použít virtuální zásoby
UsePhysicalStock=Použít fyzický sklad
-CurentSelectionMode=Režim aktuálního výběru
+CurentSelectionMode=Režim Aktuální výběr
CurentlyUsingVirtualStock=Virtuální zásoby
CurentlyUsingPhysicalStock=Fyzické zásoby
RuleForStockReplenishment=Pravidlo pro doplňování zásob
@@ -112,8 +113,8 @@ AlertOnly= Pouze upozornění
WarehouseForStockDecrease=Skladiště <b>%s</b> budou použity pro snížení skladu
WarehouseForStockIncrease=Skladiště <b>%s</b> budou použity pro zvýšení stavu zásob
ForThisWarehouse=Z tohoto skladiště
-ReplenishmentStatusDesc=Toto je seznam všech produktů s nižší než požadovanou zásobou skladem (nebo nižší než hodnota výstrahy, pokud pole "pouze upozornění" je zaškrtnuto), a doporučuji vám vytvořit dodavatelské objednávky pro doplnění rozdílu.
-ReplenishmentOrdersDesc=Toto je seznam všech otevřených dodavatelských objednávek, včetně předem stanovených výrobků. Jen otevřené objednávky s předdefinovanými produkty, které mohou mít vliv na zásoby jsou zde viditelné.
+ReplenishmentStatusDesc=Toto je seznam všech produktů s nižší než požadovanou zásobou skladem (nebo nižší než hodnota výstrahy, pokud je pole "pouze upozornění" zaškrtnuto), a doporučuje vám vytvořit dodavatelské objednávky pro doplnění rozdílu.
+ReplenishmentOrdersDesc=Toto je seznam všech otevřených dodavatelských objednávek, včetně předem stanovených výrobků. Jen otevřené objednávky s předdefinovanými produkty, které mohou mít vliv na zásoby, jsou zde viditelné.
Replenishments=Splátky
NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (< %s)
NbOfProductAfterPeriod=Množství produktů %s na skladě po zvolené období (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Záznam převodu
ReceivingForSameOrder=Příjmy pro tuto objednávku
StockMovementRecorded=Zaznamenány pohyby zásob
RuleForStockAvailability=Pravidla o požadavcích na skladě
-StockMustBeEnoughForInvoice=Úroveň zásob musí být dostatečná pro přidání výrobku/služby do faktury
-StockMustBeEnoughForOrder=Úroveň zásob musí být dostatečná pro přidání výrobku/služby do objednávky
-StockMustBeEnoughForShipment= Úroveň zásob musí být dostatečná pro přidání výrobku/služby do zásilky
+StockMustBeEnoughForInvoice=Úroveň zásob musí být dostatečná pro přidání výrobku/služby do faktury
+StockMustBeEnoughForOrder=Úroveň zásob musí být dostatečná pro přidání výrobku/služby do objednávky
+StockMustBeEnoughForShipment= Úroveň zásob musí být dostatečná pro přidání výrobku/služby do zásilky
MovementLabel=Štítek pohybu
InventoryCode=Kód pohybu nebo zásob
IsInPackage=Obsažené v zásilce
ShowWarehouse=Ukázat skladiště
MovementCorrectStock=Sklad obsahuje korekci pro produkt %s
MovementTransferStock=Přenos skladových produktů %s do jiného skladiště
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Zdrojové skladiště zde musí být definováno při "množství produktu" v modulu. To bude použito na seznam který obsahuje množství/sérii a je k dispozici pro výrobek, který požaduje data množství/sérii pro pohyb. Chcete-li poslat výrobky z různých skladišť, sestavujete zásilku do několika kroků.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Inventární/pohybový kód
NoPendingReceptionOnSupplierOrder=Nečeká na příjem kvůli otevřené dodavatelské objednávce
ThisSerialAlreadyExistWithDifferentDate=Toto množství/sériové číslo (<strong>%s</strong>) už ale s odlišnou spotřebou nebo datem prodeje existuje (found <strong>%s</strong> ale zadáte <strong>%s</strong>).
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 671ab7b5311..2f34bd518a8 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Ověřit zprávu o výdajích
ConfirmSaveTrip=Jste si jisti, že chcete ověřit tuto zprávu o výdajích?
NoTripsToExportCSV=Žádná zpráva o výdajích na export pro toto období.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 8b51a014b7a..b57d4b7a7d8 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=By regnskabskonto
Update=Opdater
List=Liste
Create=Opret
+CreateMvts=Create movement
UpdateAccount=Ændring af en regnskabsmæssig konto
UpdateMvts=Ændring af en bevægelse
WriteBookKeeping=Optage konti i kontoplanen
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Længde af regnskabssystemet konti i Dolibarr
AccountLengthDesc=Funktion gør det muligt at foregive en længde på regnskabsmæssig konto ved at erstatte mellemrum med tallet nul. Da denne funktion kun vises på skærmen ændrer det ikke ved de bogføring registreret i Dolibarr konti. For eksport, er det nødvendigt denne funktion til at være kompatibel med bestemt software.
+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
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 79fec3f7750..021177fec25 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Margin
Module59000Desc=Module to manage margins
Module60000Name=Commissions
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Ingen sikkerhed tilfælde er blevet registreret endnu. Det
NoEventFoundWithCriteria=Ingen sikkerhed tilfælde er fundet for sådanne søgefelter.
SeeLocalSendMailSetup=Se din lokale sendmail setup
BackupDesc=Hvis du vil foretage en komplet sikkerhedskopi af Dolibarr, skal du:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Arkiveret mappe skal opbevares på et sikkert sted.
BackupDescY=De genererede dump fil bør opbevares på et sikkert sted.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default stregkode type bruge til produkter
SetDefaultBarcodeTypeThirdParties=Default stregkode type bruge til tredjemand
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sender modul opsætning
SendingsReceiptModel=Afsendelse modtagelsen model
SendingsNumberingModules=Sendings nummerering moduler
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=I de fleste tilfælde sendings indtægter anvendes både som plader til kunden leverancer (listen over produkter til at sende) og plader, der er recevied og underskrevet af kunden. Så produkt leverancer kvitteringer er en overlappes træk og er sjældent aktiveret.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index 74dda526a4c..29c6a44ac64 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Alle mine handlinger / opgaver
AllActions= Alle les handlinger / opgaver
-ViewList=Vis liste
ViewCal=Vis kalender
ViewDay=Dagsvisning
ViewWeek=Ugevisning
diff --git a/htdocs/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang
index 8a226198cad..1668ce45ce4 100644
--- a/htdocs/langs/da_DK/commercial.lang
+++ b/htdocs/langs/da_DK/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Forslaget til handelslov forslag
SearchPropal=Søg en kommerciel forslag
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 06d8a91d905..af6fb31a8eb 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Tredjepart kontakt
StatusContactValidated=Status for kontakt
Company=Firma
CompanyName=Firmanavn
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Selskaber
CountryIsInEEC=Landet er inde i Det Europæiske Økonomiske Fællesskab
ThirdPartyName=Tredjeparts navn
@@ -68,6 +69,7 @@ Country=Land
CountryCode=Landekode
CountryId=Land id
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Ring
Chat=Chat
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 5fb545dd8a3..1095897a77c 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=<b>Felt %s</b> må ikke indeholder specialtegn.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nr. regnskabspool modul aktiveret
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchende er ikke komplet.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index fb5f3669b8d..67306764c52 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Fransk (Canada)
Language_fr_CH=Fransk (Schweiz)
Language_fr_FR=Fransk
Language_fr_NC=Fransk (Ny Kaledonien)
+Language_fy_NL=Frisian
Language_he_IL=Hebræisk
Language_hr_HR=Kroatisk
Language_hu_HU=Ungarsk
@@ -70,6 +71,7 @@ Language_sv_SV=Svensk
Language_sv_SE=Svensk
Language_sq_AL=Albanian
Language_sk_SK=Slovakisk
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainsk
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 391b505df6c..a91a2492007 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Mandag
Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/margins.lang b/htdocs/langs/da_DK/margins.lang
index 4490f67cc03..3296c068471 100644
--- a/htdocs/langs/da_DK/margins.lang
+++ b/htdocs/langs/da_DK/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index d9ddbb1b3d1..159c331a4e9 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 208b0aa13e5..531e1d07cf4 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projektleder
TypeContact_project_external_PROJECTLEADER=Projektleder
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index 7f7bbb81c0b..42698c03145 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Sendings
AllSendings=All Shipments
Shipment=Sender
Shipments=Forsendelser
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Sendings område
ListOfSendings=Liste over sendings
@@ -26,8 +26,8 @@ QtyToShip=Qty til skibet
QtyReceived=Antal modtagne
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Andre sendings for denne ordre
-DateSending=Dato for afsendelse orden
-DateSendingShort=Dato for afsendelse orden
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Sendings for denne ordre
SendingsAndReceivingForSameOrder=Sendings og receivings for denne ordre
SendingsToValidate=Henvist til validere
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index 2ab6b7a89fb..0d771434010 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Reglen for lagerstyring fald
RuleForStockManagementIncrease=Reglen for lagerstyring stigning
DeStockOnBill=Fraførsel reelle bestande på fakturaer / kreditnotaer
DeStockOnValidateOrder=Fraførsel reelle bestande om ordrer noter
-DeStockOnShipment=Formindsk reelle bestande om overførsel validering
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Forhøjelse reelle bestande på fakturaer / kreditnotaer
ReStockOnValidateOrder=Forhøjelse reelle bestande om ordrer noter
ReStockOnDispatchOrder=Øge den reelle bestande på manuel ekspedition i pakhuse, efter at leverandøren ordremodtagelse
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
index feed40fa6c3..7bb48e358af 100644
--- a/htdocs/langs/da_DK/trips.lang
+++ b/htdocs/langs/da_DK/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 4036061bb77..c8a1bdddc06 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -103,7 +103,4 @@ InterventionsSetup=Eingriffsmoduleinstellungen
FreeLegalTextOnInterventions=Freier Rechtstext für Eingriffe
WatermarkOnDraftInterventionCards=Wasserzeichen auf Intervention Karte Dokumente (alle, wenn leer)
UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl verwenden
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
PathToGeoIPMaxmindCountryDataFile=Pfad zur Datei mit Maxmind IP to Country Übersetzung. <br> Beispiel: / usr / local / share / GeoIP / GeoIP.dat
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang
index 60e517eb98c..5d03cea798a 100644
--- a/htdocs/langs/de_AT/companies.lang
+++ b/htdocs/langs/de_AT/companies.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - companies
NewCompany=Neuer Partner (Leads, Kunden, Lieferanten)
IdCompany=Firma ID
-AliasNames=Alias names (commercial, trademark, ...)
Companies=Partner
UserTitle=Titel
PhoneMobile=Handy
diff --git a/htdocs/langs/de_AT/products.lang b/htdocs/langs/de_AT/products.lang
index 1929574a66c..e3084cb4bc5 100644
--- a/htdocs/langs/de_AT/products.lang
+++ b/htdocs/langs/de_AT/products.lang
@@ -37,4 +37,3 @@ Finished=Eigenerzeugung
CloneProduct=Produkt/Service duplizieren
CloneContentProduct=Allgemeine Informationen des Produkts/Services duplizieren
NewRefForClone=Artikel Nr. des neuen Produkts/Services
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index e5690ec6ba8..a480ec09913 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -17,4 +17,3 @@ DoNotShowMyTasksOnly=Zeige auch die Aufgaben Anderer
TypeContact_project_task_internal_TASKEXECUTIVE=Task Exekutive
TypeContact_project_task_external_TASKEXECUTIVE=Task Exekutive
DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, ...)
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/de_AT/sendings.lang b/htdocs/langs/de_AT/sendings.lang
index fcfe2c4ee13..91f6929c0e4 100644
--- a/htdocs/langs/de_AT/sendings.lang
+++ b/htdocs/langs/de_AT/sendings.lang
@@ -1,6 +1,4 @@
# Dolibarr language file - Source file is en_US - sendings
Shipments=Sendungen
-ShowSending=Show Sending
-DateSendingShort=Date sending order
DateReceived=Datum des Warenerhalts
DocumentModelSirocco=Einfache Dokumentvorlage Scirocco für die Lieferungscheine
diff --git a/htdocs/langs/de_AT/stocks.lang b/htdocs/langs/de_AT/stocks.lang
index 5b3b1124724..b953c95c459 100644
--- a/htdocs/langs/de_AT/stocks.lang
+++ b/htdocs/langs/de_AT/stocks.lang
@@ -1,4 +1,2 @@
# Dolibarr language file - Source file is en_US - stocks
PMPValue=Warenwert
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/de_CH/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/de_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/de_CH/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/de_CH/sendings.lang b/htdocs/langs/de_CH/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/de_CH/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/de_CH/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index 9bfb16bbbb8..b383bb2eba0 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Neues Buchhaltungskonto
Update=Aktualisieren
List=Liste
Create=Erstelle
+CreateMvts=Create movement
UpdateAccount=Änderung eines Bilanz-Kontos
UpdateMvts=Änderung einer Bewegung
WriteBookKeeping=Konten ins Hauptbuch übernehmen
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie die Sortierung der Abbau Seit
AccountLength=Länge der in Dolibarr gezeigten Rechnungskonten
AccountLengthDesc=Funktion ermöglicht, eine Länge von Rechnungslegungs Konto indem Räume, die durch den Nullwert vorzutäuschen. Diese Funktion berührt nur die Anzeige, ist es nicht die in Dolibarr registriert Rechnungswesen Konten ändern. Für den Export ist diese Funktion erforderlich, bei bestimmten Software-kompatibel zu sein.
+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änge der Finanzbuchführung
ACCOUNTING_LENGTH_AACCOUNT=Länge der Partner
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 09ab333ac3b..b26d57e4963 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -168,7 +168,7 @@ Restore=Wiederherstellen
RunCommandSummary=Die Sicherung wird über folgenden Befehl ausgeführt
RunCommandSummaryToLaunch=Die Sicherung kann über folgenden Befehl ausgeführt werden
WebServerMustHavePermissionForCommand=Ihr Webserver muss die Ausführung des entsprechenden Befehls unterstützen
-BackupResult=Sicherungszusammenfassung
+BackupResult=Sicherung Ergebnisse
BackupFileSuccessfullyCreated=Sicherungsdatei erfolgreich erzeugt
YouCanDownloadBackupFile=Sie können die erstellte Sicherungsdatei jetzt herunterladen
NoBackupFileAvailable=Keine verfügbare Sicherungsdatei
@@ -554,8 +554,8 @@ Module50400Name=Buchhaltung (erweitert)
Module50400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
Module54000Name=PrintIPP
Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein und auf dem Server muss CUPS installiert sein)
-Module55000Name=Offene Umfrage
-Module55000Desc=Modul um online Umfragen zu starten. (Wie Doodle, Studs, Rdvz,...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Gewinnspannen
Module59000Desc=Modul zur Verwaltung von Gewinnspannen
Module60000Name=Kommissionen
@@ -949,7 +949,7 @@ NoActiveBankAccountDefined=Keine aktiven Finanzkonten definiert
OwnerOfBankAccount=Kontoinhaber %s
BankModuleNotActive=Finanzkontenmodul nicht aktiv
ShowBugTrackLink=Zeige Link <strong>%s</strong>
-ShowWorkBoard=Zeige 'Aufgabenübersicht' auf der Startseite
+ShowWorkBoard=Zeige "Arbeitsplatz" auf der Startseite
Alerts=Benachrichtigungen
Delays=Verspätungen
DelayBeforeWarning=Frist bis zur Benachrichtigung
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Keine sicherheitsrelevanten Protokollereignisse. Überprü
NoEventFoundWithCriteria=Kein sicherheitsrelevantes Protokollereignis zu Ihren Suchkriterien gefunden
SeeLocalSendMailSetup=Lokale sendmail-Einstellungen anzeigen
BackupDesc=Um eine vollständige Systemsicherung durchzuführen müssen Sie:
-BackupDesc2=Sichern des Dokumenten-Verzeichnis (<b>%s</b>) welches alle hochgeladenen und erzeugt Dateien enthält (Sie können zum Beispiel eine Zip Datei machen).
+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=Sicherung der Datenbank (<b>%s</b>) über Dump-Befehl anlegen. Dafür können Sie folgende Assistenten verwenden.
BackupDescX=Bewahren Sie die archivierten Verzeichnisse an einem sicheren Ort auf.
BackupDescY=Bewahren Sie den Datenbank-Dump an einem sicheren Ort auf.
@@ -1327,7 +1327,7 @@ LDAPFieldMailExample=Beispiel: E-Mail
LDAPFieldPhone=Telefonnummer, beruf.
LDAPFieldPhoneExample=Beispiel : telefonnummer
LDAPFieldHomePhone=Privatnummer
-LDAPFieldHomePhoneExample=Beispiel : privatnummer
+LDAPFieldHomePhoneExample=Beispiel : Telefon Privat
LDAPFieldMobile=Handy
LDAPFieldMobileExample=Beispiel : handy
LDAPFieldFax=Faxnummer
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Suchfeld statt Listenansicht für die Produktauswahl ve
UseEcoTaxeAbility=Umweltabgaben unterstüzten
SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Partner
-UseUnits=Nutze Einheiten
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul für Produktcode-Erstellung und -Überprüfung (Produkt oder Service)
ProductOtherConf= Konfiguration Produkt-/Services
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Festes E-Mail-Ziel
SendingsSetup=Versandmoduleinstellungen
SendingsReceiptModel=Versandbelegsvorlage
SendingsNumberingModules=Nummerierungsmodell Auslieferungen
-SendingsAbility=Unterstützung Lieferunterlagen für Kunden
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferschein sowohl als Versand- (für die Zusammenstellung der Auslieferung), als auch als Zustellsscheine (vom Kunden zu unterschreiben) verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
FreeLegalTextOnShippings=Freier Text auf Lieferungen
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Fügen sie zwischen den eckigen Klammern die Unicode Zeichenwert
PositionIntoComboList=Zeilenposition in der Combo-Listen
SellTaxRate=Mehrwertsteuersatz
RecuperableOnly=Ja für MwSt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
-UrlTrackingDesc=Falls der Liefer- oder Transportdienst ein Statuscheck Ihrer Lieferung via Webseite zulässt, kann die URL hier angegeben werden. Der Zeichenfolge {TRACKID} wird mit dem Wert der Trackingnummer aus dem Lieferschein ersetzt.
+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=Wenn Sie eine Möglichkeit schaffen, wird ein geschätzter Betrag an einem Projekt / Lead definiert. Entsprechend der Chance kann diese Menge durch diese Rate multipliziert werden, um die Gesamtmenge, die alle ihre Möglichkeiten erzeugen, generieren kann. Ist der Prozentwert (zwischen 0 und 100).
TemplateForElement=Diese Vorlage gehört zu diesem Element
TypeOfTemplate=Type der Vorlage
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 79f538947a1..6661044aa40 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Ereignisse für Benutzer der Gruppe
ActionAssignedTo=Ereignis zugewiesen an
AllMyActions= Alle meine Ereignisse
AllActions= Alle Ereignisse
-ViewList=Listenansicht
ViewCal=Kalenderansicht
ViewDay=Tagesansicht
ViewWeek=Wochenansicht
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index aa67fb9f083..a386bcc9b9f 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -5,7 +5,7 @@ BillsCustomers=Kundenrechnungen
BillsCustomer=Kundenrechnung
BillsSuppliers=Lieferantenrechnungen
BillsCustomersUnpaid=Offene Kundenrechnungen
-BillsCustomersUnpaidForCompany=Unbezahlte Rechnungen für Kunden %s
+BillsCustomersUnpaidForCompany=Offene Kundenrechnungen von %s
BillsSuppliersUnpaid=Unbezahlte Lieferanten-Rechnungen
BillsSuppliersUnpaidForCompany=Unbezahlte Rechnungen des Lieferanten %s
BillsLate=Verspätete Zahlungen
@@ -87,7 +87,7 @@ ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
ClassifyCanceled=Rechnung 'aufgegeben'
ClassifyClosed=Als 'geschlossen' markieren
ClassifyUnBilled=Als "nicht verrechnet" markieren
-CreateBill=Erstelle Rechnung
+CreateBill=Rechnung erstellen
AddBill=Rechnung/Gutschrift erstellen
AddToDraftInvoices=Zu Rechnungsentwurf hinzufügen
DeleteBill=Lösche Rechnung
@@ -121,7 +121,7 @@ BillShortStatusConverted=Verarbeitete
BillShortStatusCanceled=Storniert
BillShortStatusValidated=Freigegeben
BillShortStatusStarted=Begonnen
-BillShortStatusNotPaid=offen
+BillShortStatusNotPaid=Offen
BillShortStatusClosedUnpaid=Geschlossen
BillShortStatusClosedPaidPartially=Bezahlt (teilweise)
PaymentStatusToValidShort=Freizugeben
@@ -216,7 +216,7 @@ DateEcheance=Zahlungsfrist (Limit)
DateInvoice=Rechnungsdatum
NoInvoice=Keine Rechnung
ClassifyBill=Rechnung einordnen
-SupplierBillsToPay=Zu zahlende Lieferantenrechnungen
+SupplierBillsToPay=Offene Lieferantenrechnungen
CustomerBillsUnpaid=Offene Kundenrechnungen
DispenseMontantLettres=Bei den generierten Rechnungen wird auf die alphabetische Sortierreihenfolge verzichtet
NonPercuRecuperable=Nicht erstattungsfähig
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 3f6cfa6b610..cbb0b1a9d18 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -1,8 +1,8 @@
# Dolibarr language file - Source file is en_US - boxes
-BoxLastRssInfos=RSS-Informationen
-BoxLastProducts=Letzte %s bearbeitete Produkte/Leistungen
+BoxLastRssInfos=RSS-Information
+BoxLastProducts=Letzte %s Produkte/Leistungen
BoxProductsAlertStock=Lagerbestands-Warnungen
-BoxLastProductsInContract=Letzte %s verkaufte Waren in Verträgen
+BoxLastProductsInContract=Letzte %s verkauften Leistungen in Verträgen
BoxLastSupplierBills=Zuletzt bearbeitete Lieferantenrechnungen
BoxLastCustomerBills=Zuletzt bearbeitete Kundenrechnungen
BoxOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen
@@ -19,7 +19,7 @@ BoxLastContracts=Zuletzt abgeschlossene Verträge
BoxLastContacts=Letzte Kontakte/Adressen
BoxLastMembers=Letzte Mitglieder
BoxFicheInter=Neueste Eingriffe
-BoxCurrentAccounts=Saldo offener Konten
+BoxCurrentAccounts=Saldo offene Konten
BoxSalesTurnover=Umsatz
BoxTotalUnpaidCustomerBills=Summe offener Kundenrechnungen (OP Gesamt)
BoxTotalUnpaidSuppliersBills=Summe offener Lieferantenrechnungen
@@ -47,7 +47,7 @@ BoxTitleLastModifiedMembers=Letzte %s Mitglieder
BoxTitleLastFicheInter=Neueste %s veränderte Eingriffe
BoxTitleOldestUnpaidCustomerBills=Älteste %s offene Kundenrechnungen
BoxTitleOldestUnpaidSupplierBills=Älteste %s offene Lieferantenrechnungen
-BoxTitleCurrentAccounts=Saldo des offenen Kontos
+BoxTitleCurrentAccounts=Salden offene Konten
BoxTitleSalesTurnover=Umsatz
BoxTitleTotalUnpaidCustomerBills=Offene Kundenrechnungen
BoxTitleTotalUnpaidSuppliersBills=Unbezahlte Lieferantenrechnungen
@@ -94,4 +94,4 @@ BoxProductDistributionFor=Verteilung von %s für %s
ForCustomersInvoices=Kundenrechnungen
ForCustomersOrders=Kundenaufträge
ForProposals=Angebote
-LastXMonthRolling=Die letzten %s Monate rollier
+LastXMonthRolling=Die letzten %s Monate gleitend
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index e74d95134c3..b9e68579204 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - categories
Rubrique=#tag/Kategorie
Rubriques=#tags/Kategorien
-categories=#tags/Kategorien
+categories=Tags/Kategorien
TheCategorie=Die Kategorie
NoCategoryYet=Keine Kategorie/#tags von dieser Art erstellt
In=In
@@ -70,12 +70,12 @@ ConfirmDeleteCategory=Möchten Sie diese Kategorie wirklich löschen?
RemoveFromCategory=Entferne Link mit Tag/Kategorie
RemoveFromCategoryConfirm=Soll die Verknüpfung zwischen Transaktion und Tag/Kategorie wirklich entfernt werden?
NoCategoriesDefined=Keine Kategorie definiert
-SuppliersCategoryShort=Lieferanten- Kategorie/#tag
+SuppliersCategoryShort=Lieferantenkategorien
CustomersCategoryShort=Kunden- Kategorie/#tag
ProductsCategoryShort=Produkt- Kategorie/#tag
MembersCategoryShort=Mitglieds- Kategorie/#tag
-SuppliersCategoriesShort=Lieferanten- Kategorien/#tags
-CustomersCategoriesShort=Kunden- Kategorien/#tags
+SuppliersCategoriesShort=Lieferantenkategorien/#tags
+CustomersCategoriesShort=Kundenkategorien/#tags
CustomersProspectsCategoriesShort=Kunden- / Leadkategorien
ProductsCategoriesShort=Produktkategorien
MembersCategoriesShort=Mitgliederkategorien
@@ -103,7 +103,7 @@ DeleteFromCat=Aus Kategorie entfernen
DeletePicture=Bild löschen
ConfirmDeletePicture=Bild wirklich löschen?
ExtraFieldsCategories=Ergänzende Attribute
-CategoriesSetup=Konfiguration von #tags/Kategorien
+CategoriesSetup=Suchwörter/Kategorien Einstellungen
CategorieRecursiv=Automatisch mit übergeordneter Kategorie verbinden
CategorieRecursivHelp=Wenn aktiviert, wird das Produkt auch zur übergeordneten Kategorie zugewiesen, wenn es einer Unterkategorie zugewiesen wird
AddProductServiceIntoCategory=Folgendes Produkt/Service hinzufügen
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 98dbeaa8599..b00afd11fdc 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Lead Status
DraftPropals=Entworfene Angebote
SearchPropal=Ein Angebot suchen
CommercialDashboard=Vertriebsusammenfassung
+NoLimit=No limit
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index e1c4d856948..20a2ca562a5 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Partnerkontakt
StatusContactValidated=Status des Kontakts
Company=Firma
CompanyName=Firmenname
-AliasNames=Alias-Namen (kommerziell, Marke, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Unternehmen
CountryIsInEEC=Land ist innerhalb der EU
ThirdPartyName=Name des Partners
@@ -68,6 +69,7 @@ Country=Land
CountryCode=Ländercode
CountryId=Länder-ID
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Anruf
Chat=Chat
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 9657804b241..48d55ab2dda 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -53,7 +53,7 @@ ListOfClosedServices=Liste der geschlossenen Services
ListOfRunningContractsLines=Liste der aktiven Vertragspositionen
ListOfRunningServices=Liste aktiver Services
NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
-BoardNotActivatedServices=Zu aktivierende Services (in freigegebenen Verträgen)
+BoardNotActivatedServices=Zu aktivierende Leistungen in freigegebenen Verträgen
LastContracts=Letzte %s Verträge
LastActivatedServices=%s zuletzt aktivierte Services
LastModifiedServices=%s zuletzt bearbeitete Services
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 34d42d0a8bb..4f3a962fc23 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Bitte Wert für Checkbox-Liste eingeben
ErrorNoValueForRadioType=Bitte Wert für Radiobutton-Liste eingeben
ErrorBadFormatValueList=Die Liste darf nicht mehr als ein <u>%s</u> enthalten, muss aber mindestens eines aus "llave,valores" beinhalten
ErrorFieldCanNotContainSpecialCharacters=Das Feld <b>%s</b> darf keine Sonderzeichen enthalten.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf weder Sonderzeichen noch Großbuchstaben enthalten.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Kein Buchhaltungsmodul aktiviert
ErrorExportDuplicateProfil=Dieser Profilname existiert bereits für dieses Exportprofil.
ErrorLDAPSetupNotComplete=Der LDAP-Abgleich für dieses System ist nicht vollständig eingerichtet.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Keine globale Variable ausgewählt
ErrorFieldMustBeANumeric=Feld <b>%s</b> muss ein numerischer Wert sein
ErrorFieldMustBeAnInteger=Feld <b>%s</b> muss eine ganze Zahl sein
ErrorMandatoryParametersNotProvided=Erforderliche(r) Parameter wird nicht angeboten
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index 840e155d284..6da0aabb9fd 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Französisch (Kanada)
Language_fr_CH=Französisch (Schweiz)
Language_fr_FR=Französisch
Language_fr_NC=Französisch (Neukaledonien)
+Language_fy_NL=Frisian
Language_he_IL=Hebräisch
Language_hr_HR=Kroatisch
Language_hu_HU=Ungarisch
@@ -70,6 +71,7 @@ Language_sv_SV=Schwedisch
Language_sv_SE=Schwedisch
Language_sq_AL=Albanisch
Language_sk_SK=Slovakisch
+Language_sr_RS=Serbian
Language_sw_SW=Kisuaheli
Language_th_TH=Thailändisch
Language_uk_UA=Ukrainisch
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 53ab8d362f4..89b0736da44 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -399,9 +399,9 @@ Available=Verfügbar
NotYetAvailable=Noch nicht verfügbar
NotAvailable=Nicht verfügbar
Popularity=Beliebtheit
-Categories= Schlagwörter/Kategorien
-Category=Kategorie/Bezeichnung
-By=Von
+Categories= Suchwörter/Kategorien
+Category=Suchwort/Kategorie
+By=Durch
From=Von
to=An
and=und
@@ -686,7 +686,7 @@ ModulesSystemTools=Module Werkzeuge
Test=Testen
Element=Element
NoPhotoYet=Noch keine Bilder verfügbar
-HomeDashboard=Übersichts-Startseite
+HomeDashboard=Startseite Übersicht
Deductible=absetzbar
from=von
toward=zu
@@ -710,6 +710,8 @@ Denied=abgelehnt
ListOfTemplates=Liste der Vorlagen
Genderman=Mann
Genderwoman=Frau
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Montag
Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 735b6d604a7..67e385fb07d 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -6,17 +6,17 @@ TotalMargin=Gesamt-Spanne
MarginOnProducts=Gewinnspanne / Produkte
MarginOnServices=Gewinnspanne / Services
MarginRate=Gewinnspannen-Rate
-MarkRate=Mark rate
+MarkRate=Gewinnspannen-Rate
DisplayMarginRates=Zeige Gewinnspannen-Raten an
-DisplayMarkRates=Display mark rates
+DisplayMarkRates=Zeige Gewinnspannen-Raten an
InputPrice=Eingabe Preis
margin=Gewinnspannen-Verwaltung
-margesSetup=Profit margins management setup
+margesSetup=Gewinnspannen Einstellungen
MarginDetails=Details zu Gewinnspannen
ProductMargins=Produkt-Gewinnspannen
CustomerMargins=Kunden-Gewinnspannen
SalesRepresentativeMargins=Vertreter-Gewinnspannen
-UserMargins=User margins
+UserMargins=Spannen nach Benutzer
ProductService=Produkt oder Service
AllProducts=Alle Produkte und Services
ChooseProduct/Service=Produkt oder Service wählen
@@ -25,21 +25,24 @@ EndDate=Vertragsende
Launch=Start
ForceBuyingPriceIfNull=Einkaufspreis erzwingen wenn Null
ForceBuyingPriceIfNullDetails=falls "AN", wird die Spanne der Zeile als Null angezeigt (Kaufpreis = Verkaufspreis), andernfalls ("AUS"), ist die Gewinnspanne gleich dem Verkaufspreis (Kaufpreis = 0)
-MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
+MARGIN_METHODE_FOR_DISCOUNT=Margin-Methode für globale Rabatte
UseDiscountAsProduct=Als Produkt
UseDiscountAsService=Als Service
UseDiscountOnTotal=Auf Zwischensumme
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiert, ob ein globaler Rabatt als Produkt, Service oder nur als Zwischensumme für die Gewinnberechnung benutzt wird.
-MARGIN_TYPE=Gewinnspannen-Art
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Roherlös
MargeNette=Nettoerlös
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Roherlös: Verkaufspreis - Einkaufspreis<br/>Nettoerlös: Verkaufspreis - Kosten
+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
CostPrice=Kosten
BuyingCost=Kosten
-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
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
-ShowMarginInfos=Show margin infos
+UnitCharges=Einheit Kosten
+Charges=Kosten
+AgentContactType=Kontaktart Handelsvertreter
+AgentContactTypeDetails=Definieren Sie, welche Kontaktart (auf Rechnungen verknüpft) für die Meldung von Gewinnspannen pro Handelsvertreter verwendet wird
+rateMustBeNumeric=Die Rate muss ein numerischer Wert sein
+markRateShouldBeLesserThan100=Die markierte Rate sollte kleiner sein als 100
+ShowMarginInfos=Zeige Spannen-Informationen
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 8f248b0b897..04953cbdfea 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -62,7 +62,7 @@ SearchACustomerOrder=Kundenauftrag suchen
SearchASupplierOrder=Suche Lieferantenbestellung
ShipProduct=Produkt versenden
Discount=Rabatt
-CreateOrder=Erzeuge Bestellung
+CreateOrder=Bestellung erstellen
RefuseOrder=Bestellung ablehnen
ApproveOrder=Bestellung genehmigen
Approve2Order=Genehmige Bestellung (2. Bestätigung)
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index f815fea182b..ff56243b226 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -206,11 +206,11 @@ gram=Gramm
g=g
meter=Meter
m=m
-linear Meter = Laufmeter
+linearmeter=linear meter
lm=lm
-square Meter = Quadratmeter
+squaremeter=square meter
m2=m²
-cubic Meter = Kubikmeter
+cubicmeter=cubic meter
m3=m³
liter=Liter
l=L
@@ -225,7 +225,7 @@ AlwaysUseNewPrice=Immer aktuellen Preis von Produkt/Leistung nutzen
AlwaysUseFixedPrice=Festen Preis nutzen
PriceByQuantity=Unterschiedliche Preise nach Menge
PriceByQuantityRange=Bereich der Menge
-ProductsDashboard=Produkt- und Leistungs-Zusammenfassung
+ProductsDashboard=Produkte/Leistungen Zusammenfassung
UpdateOriginalProductLabel=Ursprüngliches Label verändern
HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten
### composition fabrication
@@ -264,7 +264,7 @@ PriceCatalogue=Einzigartiger Preis pro Produkt/Leistung
PricingRule=Preisregel für Kundenpreise
AddCustomerPrice=Preis je Kunde hinzufügen
ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
-PriceByCustomerLog=Preis nach Kunde
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Mindestpreis darf nicht kleiner als %s sein
MinimumRecommendedPrice=Minimaler empfohlener Preis: %s
PriceExpressionEditor=Preis Ausdrucks Editor
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index cfe3333dcc0..dcd3a12e19f 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Aufgabe %s erstellt
TaskModifiedInDolibarr=Aufgabe %s geändert
TaskDeletedInDolibarr=Aufgabe %s gelöscht
OpportunityStatus=Gelegenheit Status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Gelegenheit Menge
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projektleiter
TypeContact_project_external_PROJECTLEADER=Projektleiter
@@ -165,7 +167,18 @@ ProjectOverview=Projekt-Übersicht
ManageTasks=Verwende Projekte um Aufgaben und Zeitaufwand zu verwalten
ManageOpportunitiesStatus=Verwende Projekte um Leads und Chancen zu verwalten
ProjectNbProjectByMonth=Anzahl der Projekte pro Monat
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
ProjectsStatistics=Statistik über Projekte und Leads
TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe sollte möglich sein.
OpenedProjectsByThirdparties=Offene Projekte nach Partner
-OpportunityPonderatedAmount=Gelegenheit eingeschätze Menge
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index 567a1d8d679..e93b9f1431b 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Auslieferungen
AllSendings=Alle Lieferungen
Shipment=Versand
Shipments=Lieferungen
-ShowSending=Zeige Versand
+ShowSending=Show Shipments
Receivings=Beleg
SendingsArea=Versandübersicht
ListOfSendings=Versandliste
@@ -26,8 +26,8 @@ QtyToShip=Versandmenge
QtyReceived=Erhaltene Menge
KeepToShip=Zum Versand behalten
OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung
-DateSending=Datum des Versands
-DateSendingShort=Versanddatum
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Lieferungen zu dieser Bestellung
SendingsAndReceivingForSameOrder=An- und Auslieferungen zu dieser Bestellung
SendingsToValidate=Freizugebende Auslieferungen
@@ -67,7 +67,7 @@ SendingRunning=Die Produktion von dem bestellten Kundenaufträge
SuppliersReceiptRunning=Produkt aus Lieferantenbestellung
ProductQtyInCustomersOrdersRunning=Produktmenge in geöffneter Kunden Bestellungen
ProductQtyInSuppliersOrdersRunning=Produktmenge in geöffneter Lieferantenbestellungen
-ProductQtyInShipmentAlreadySent=Produktmenge bereits in offenen Kundenaufträgen enthalten
+ProductQtyInShipmentAlreadySent=Produktmenge von offenem Kundenauftrag bereits geliefert
ProductQtyInSuppliersShipmentAlreadyRecevied=Produktmenge aus Lieferantenbestellung bereits erhalten
# Sending methods
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 3053ba30ab0..2bf1897dc4d 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -5,7 +5,7 @@ Warehouses=Warenlager
NewWarehouse=Neues Warenlager
WarehouseEdit=Warenlager bearbeiten
MenuNewWarehouse=Neues Warenlager
-WarehouseOpened=Warenlager aktiv
+WarehouseOpened=Warenlager geöffnet
WarehouseClosed=Warenlager geschlossen
WarehouseSource=Ursprungslager
WarehouseSourceNotDefined=Keine Lager definiert,
@@ -49,7 +49,7 @@ PMPValueShort=DSWP
EnhancedValueOfWarehouses=Lagerwert
UserWarehouseAutoCreate=Beim Anlegen eines Benutzers automatisch neues Warenlager erstellen
IndependantSubProductStock=Produkt Lager und Unterprodukt Lager sind unabhängig
-QtyDispatched=Menge
+QtyDispatched=Versandmenge
QtyDispatchedShort=Menge versandt
QtyToDispatchShort=Menge zu versenden
OrderDispatch=Bestellabwicklung
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regel für Lagerstandsanpassung (Verringerung)
RuleForStockManagementIncrease=Regel für Lagerstandsanpassung (Erhöhung)
DeStockOnBill=Verringere realen Bestände in den Rechnungen / Gutschriften
DeStockOnValidateOrder=Decrease realen Bestände auf Bestellungen stellt fest
-DeStockOnShipment=Verringere Lagerstände nach erfolgtem Versand (empfohlen)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Erhöhung der tatsächlichen Bestände in den Rechnungen / Gutschriften
ReStockOnValidateOrder=Erhöhung der realen Bestände auf Bestellungen stellt fest
ReStockOnDispatchOrder=Reale Bestände auf manuelle Dispatching in Hallen, nach Erhalt Lieferanten bestellen
@@ -95,7 +95,8 @@ SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme
SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
NoStockAction=Keine Vorratsänderung
LastWaitingSupplierOrders=Bestellungen warten auf Wareneingang
-DesiredStock=gewünschter Lagerbestand
+DesiredStock=gewünschter minimaler Lagerbestand
+DesiredMaxStock=gewünschter Höchstbestand
StockToBuy=zu bestellen
Replenishment=Nachbestellung
ReplenishmentOrders=Nachbestellungen
@@ -124,16 +125,16 @@ RecordMovement=Eintrag verschoben
ReceivingForSameOrder=Empfänger zu dieser Bestellung
StockMovementRecorded=aufgezeichnete Lagerbewegungen
RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit
-StockMustBeEnoughForInvoice=Ausreichender Lagerbestand ist erforderlich, um das Produkt / den Service einer Rechnung hinzu zu fügen
-StockMustBeEnoughForOrder=Ausreichender Lagerbestand ist erforderlich, um das Produkt / den Service einer Bestellung hinzu zu fügen
-StockMustBeEnoughForShipment= Ausreichender Lagerbestand ist erforderlich, um das Produkt / den Service einer Lieferung hinzu zu fügen
+StockMustBeEnoughForInvoice=Ausreichender Lagerbestand ist erforderlich, um das Produkt / die Leistung einer Rechnung anzufügen.
+StockMustBeEnoughForOrder=Ausreichender Lagerbestand ist erforderlich, um das Produkt / die Leistung einem Auftrag anzufügen
+StockMustBeEnoughForShipment= Ausreichender Lagerbestand ist erforderlich, um das Produkt / die Leistung einer Lieferung anzufügen
MovementLabel=Titel der Lagerbewegung
InventoryCode=Bewegungs- oder Bestandscode
IsInPackage=In Paket enthalten
ShowWarehouse=Zeige Lager
-MovementCorrectStock=Lager korrigiert für Produkt %s
+MovementCorrectStock=Lagerkorrektur für Produkt %s
MovementTransferStock=Umlagerung des Produkt %s in ein anderes Lager
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Quelle Lager muss hier definiert werden wenn das "Produkt Posten" Modul aktiviert ist. \nEs wird zum auflisten welche Posten/Serien verfügbar für Produkte die erforderliche Posten/Serien Daten für die Bewegung erforderlich.\nWenn Sie Produkte aus verschiedenen Lagern versenden, erstellen sie den Versand einfach in mehreren Schritten.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Inv. / Mov. Kode
-NoPendingReceptionOnSupplierOrder=Keine anstehenden Eingänge aufgrund geöffneter Lieferantenbestellungen
+NoPendingReceptionOnSupplierOrder=Keine anstehenden Liefereingänge aufgrund offener Lieferantenbestellungen
ThisSerialAlreadyExistWithDifferentDate=Diese Charge- / Seriennummer (<strong>%s</strong>) ist bereits vorhanden, jedoch mit unterschiedlichen Haltbarkeits- oder Verfallsdatum. \n(Gefunden: <strong>%s</strong> Erfasst: <strong>%s</strong>)
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index 3d21e2d4e91..6bdb8124733 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Bestätige Spesenabrechnung
ConfirmSaveTrip=Sind Sie sicher, dass Sie diese Spesenabrechnung überprüfen wollen?
NoTripsToExportCSV=Keine Spesenabrechnung für diesen Zeitraum zu exportieren.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 04445c78676..26bc6462cf4 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Νέος λογιστικός λογαριασμός
Update=Ενημέρωση
List=Λίστα
Create=Δημιουργία
+CreateMvts=Create movement
UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού
UpdateMvts=Τροποποίηση μιας κίνησης
WriteBookKeeping=Εγγραφή λογαριασμών στο γενικό καθολικό
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή τ
AccountLength=Μήκος των λογιστικών λογαριασμών που φαίνονται στο Dolibarr
AccountLengthDesc=Λειτουργία που επιτρέπει να υποκρίνεαι μήκος του λογιστικού λογαριασμού αντικαθιστώντας χώρους από τον αριθμό μηδέν. Η λειτουργία αυτή αγγίζει μόνο την οθόνη, δεν τροποποιούν τους λογιστικούς λογαριασμούς στο Dolibarr. Για την εξαγωγή, αυτή η λειτουργία είναι απαραίτητη για να είναι συμβατή με το συγκεκριμένο λογισμικό.
+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=Μήκος λογαριασμών τρίτων
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 371127031ee..54beeba8a96 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Λογιστική (για προχωρημένους)
Module50400Desc=Λογιστική διαχείριση (διπλά μέρη)
Module54000Name=PrintIPP
Module54000Desc=Απευθείας εκτύπωση (χωρίς να ανοίξετε τα έγγραφα) χρησιμοποιώντας Cups IPP διασύνδεση (Ο Εκτυπωτής πρέπει να είναι ορατός από τον server, και το CUPS πρέπει να έχει εγκατασταθεί στο server).
-Module55000Name=Ανοικτή Ψηφοφορία
-Module55000Desc=Πρόσθετο για την δημιουργία μιας διαδικτυακής έρευνας (όπως Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Χρησιμοποιήστε μια φόρμα αναζ
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Σταθερός email στόχος
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Σας αποστολές αρίθμησης ενοτήτων
-SendingsAbility=Δελτία αποστολής για τις παραδόσεις των πελατών
+SendingsAbility=Support shipping sheets for customer deliveries
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=Ελεύθερο κείμενο για τις μεταφορές
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index c3d3223a501..0ae446807b0 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Γεγονότα όλων των χρηστών της ομ
ActionAssignedTo=Ενέργεια ανατεθειμένη σε
AllMyActions= Όλες οι ενέργειες/εργασίες μου
AllActions= Όλες οι ενέργειες/εργασίες
-ViewList=Εμφάνιση Λίστας
ViewCal=Μηνιαία προβολή
ViewDay=Προβολή ημέρας
ViewWeek=Προβολή εβδομάδας
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index be14a9cfb36..5cd2c16772f 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -178,7 +178,7 @@ NumberOfBills=Πλήθος τιμολογίων
NumberOfBillsByMonth=Nb των τιμολογίων ανά μήνα
AmountOfBills=Ποσό τιμολογίων
AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
-ShowSocialContribution=Show social/fiscal tax
+ShowSocialContribution=Εμφάνιση κοινωνικών εισφορών / Φορολογικά
ShowBill=Εμφάνιση τιμολογίου
ShowInvoice=Εμφάνιση τιμολογίου
ShowInvoiceReplace=Εμφάνιση τιμολογίου αντικατάστασης
@@ -270,7 +270,7 @@ BillAddress=Διεύθυνση χρέωσης
HelpEscompte=This discount is a discount granted to customer because its payment was made before term.
HelpAbandonBadCustomer=This amount has been abandoned (customer said to be a bad customer) and is considered as an exceptional loose.
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
+IdSocialContribution=Κοινωνική εισφορά / Φορολογικά id πληρωμής
PaymentId=Κωδ. Πληρωμής
InvoiceId=Κωδ. Τιμολογίου
InvoiceRef=Κωδ. Τιμολογίου
@@ -417,7 +417,7 @@ TypeContact_invoice_supplier_external_SHIPPING=Αντιπρόσωπος αποσ
TypeContact_invoice_supplier_external_SERVICE=Αντιπρόσωπος υπηρεσίας προμηθευτή
# Situation invoices
InvoiceFirstSituationAsk=Κατάσταση πρώτου τιμολογίου
-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.
+InvoiceFirstSituationDesc=Η <b>κατάσταση τιμολογίων</b> συνδέονται με καταστάσεις που σχετίζονται σε πρόοδο, για παράδειγμα, της προόδου μιας κατασκευής. Κάθε κατάσταση είναι συνδεδεμένη με ένα τιμολόγιο.
InvoiceSituation=Κατάσταση τιμολογίου
InvoiceSituationAsk=Τιμολόγιο που έπεται της κατάστασης
InvoiceSituationDesc=Δημιουργία μιας νέας κατάστασης μετά από μια ήδη υπάρχουσα
@@ -429,6 +429,6 @@ CreateNextSituationInvoice=Δημιουργήστε την επόμενη κατ
NotLastInCycle=Το τιμολόγιο αυτό δεν είναι το τελευταίο στον κύκλο και δεν πρέπει να τροποποιηθεί.
DisabledBecauseNotLastInCycle=Η επόμενη κατάσταση υπάρχει ήδη.
DisabledBecauseFinal=Η κατάσταση αυτή είναι οριστική.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
+CantBeLessThanMinPercent=Η πρόοδος δεν μπορεί να είναι μικρότερη από την αξία του στην προηγούμενη κατάσταση.
+NoSituations=Δεν υπάρχουν ανοικτές καταστάσεις
InvoiceSituationLast=Τελικό και γενικό τιμολόγιο
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 1f1bc892da0..5a650c19ddd 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Κατάσταση προοπτικής
DraftPropals=Σχέδιο εμπορικών προσφορών
SearchPropal=Αναζήτηση εμπορικής προσφοράς
CommercialDashboard=Εμπορική περίληψη
+NoLimit=Κανένα όριο
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 25dbcfb2e95..755a5a52201 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Αντιπρόσωπος στοιχείου
StatusContactValidated=Κατάσταση αντιπροσώπου
Company=Εταιρία
CompanyName=Όνομα εταιρίας
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Ψευδώνυμο (εμπορικό, εμπορικό σήμα, ...)
+AliasNameShort=Ψευδώνυμο
Companies=Εταιρίες
CountryIsInEEC=Η χώρα βρίσκετε στην Ε.Ε.
ThirdPartyName=Όνομα Πελ./Προμ.
@@ -68,6 +69,7 @@ Country=Χώρα
CountryCode=Κωδικός χώρας
CountryId=Id Χώρας
Phone=Τηλέφωνο
+PhoneShort=Τηλέφωνο
Skype=Skype
Call=Κλήση
Chat=Συνομιλία
@@ -411,10 +413,10 @@ OutstandingBillReached=Έφτασε στο όριο. για των εκκρεμ
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.
LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
-SearchThirdparty=Search third party
+SearchThirdparty=Αναζήτηση Πελ./Προμ.
SearchContact=Αναζήτηση επαφής
-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
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
+MergeOriginThirdparty=Διπλότυπο Πελ./Προμ. ( Πελ./Προμ. θέλετε να διαγραφεί)
+MergeThirdparties=Συγχώνευση Πελ./Προμ.
+ConfirmMergeThirdparties=Είστε σίγουροι ότι θέλετε να συγχωνεύσετε το Πελ./Προμ. στην τρέχουσα; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μεταφερθεί στο τωρινό Πελ./Προμ., έτσι θα είστε σε θέση να διαγράψετε το διπλότυπο.
+ThirdpartiesMergeSuccess= Πελ./Προμ. έχουν συγχωνευθεί
+ErrorThirdpartiesMerge=Υπήρξε ένα σφάλμα κατά τη διαγραφή των Πελ./Προμ.. Παρακαλώ ελέγξτε το αρχείο καταγραφής. Αλλαγές έχουν επανέλθει.
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index e74f0571b20..5aeb8b79cb6 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -35,7 +35,7 @@ ECMSearchByEntity=Search by object
ECMSectionOfDocuments=Directories of documents
ECMTypeManual=Χειροκίνητα
ECMTypeAuto=Αυτόματα
-ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
+ECMDocsBySocialContributions=Έγγραφα που συνδέονται με την κοινωνική εισφορά ή φόρους
ECMDocsByThirdParties=Έγγραφα συνδεδεμένα με στοιχεία
ECMDocsByProposals=Έγγραφα που σχετίζονται με τις προτάσεις
ECMDocsByOrders=Έγγραφα συνδεδεμένα με παραγγελίες πελατών
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 3ec461331d0..8886b754a8b 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> πεδίου δεν πρέπει να περιέχει ειδικούς χαρακτήρες.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Το πεδίο <b>%s</b> δεν πρέπει να περιέχει ειδικούς χαρακτήρες, ούτε κεφαλαία γράμματα.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Δεν λογιστική μονάδα ενεργοποιηθεί
ErrorExportDuplicateProfil=Αυτό το όνομα προφίλ υπάρχει ήδη για αυτό το σύνολο των εξαγωγών.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP αντιστοίχιση δεν είναι πλήρης.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index 56fcc81c4d0..60b35d55797 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -132,4 +132,4 @@ SelectFilterFields=Αν θέλετε να φιλτράρετε ορισμένε
FilterableFields=Πεδία φιλτραρίσματος
FilteredFields=Φιλτραρισμένα πεδία
FilteredFieldsValues=Αξία φίλτρου
-FormatControlRule=Format control rule
+FormatControlRule=Μορφοποίηση του κανόνα ελέγχου
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index 41ad95df252..21b78cc3c89 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Γαλλικά (Καναδά)
Language_fr_CH=Γαλλικά (Ελβετία)
Language_fr_FR=Γαλλικά
Language_fr_NC=Γαλλικά (Νέα Καληδονία)
+Language_fy_NL=Frisian
Language_he_IL=Εβραϊκά
Language_hr_HR=Κροατία
Language_hu_HU=Ουγγρικά
@@ -70,6 +71,7 @@ Language_sv_SV=Σουηδικά
Language_sv_SE=Σουηδικά
Language_sq_AL=Αλβανικά
Language_sk_SK=Σλοβακική
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Ταϊλάνδης
Language_uk_UA=Ουκρανικά
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 7698f2505b2..cefd2b07328 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -220,7 +220,7 @@ Next=Επόμ.
Cards=Καρτέλες
Card=Καρτέλα
Now=Τώρα
-HourStart=Start hour
+HourStart=Έναρξη ωρών
Date=Ημερομηνία
DateAndHour=Ημερομηνία και ώρα
DateStart=Ημερομηνία Έναρξης
@@ -243,8 +243,8 @@ DatePlanShort=Προγρ/σμένη Ημερ.
DateRealShort=Πραγμ. Ημερ.
DateBuild=Αναφορά ημερομηνία κατασκευής
DatePayment=Ημερομηνία πληρωμής
-DateApprove=Approving date
-DateApprove2=Approving date (second approval)
+DateApprove=Ημερομηνία έγκρισης
+DateApprove2=Ημερομηνία έγκρισης (δεύτερο έγκριση)
DurationYear=έτος
DurationMonth=μήνας
DurationWeek=εβδομάδα
@@ -412,10 +412,10 @@ OtherInformations=Άλλες Πληροφορίες
Quantity=Ποσότητα
Qty=Ποσ.
ChangedBy=Τροποποιήθηκε από
-ApprovedBy=Approved by
-ApprovedBy2=Approved by (second approval)
-Approved=Approved
-Refused=Refused
+ApprovedBy=Εγκρίθηκε από
+ApprovedBy2=Εγκρίθηκε από (δεύτερη έγκριση)
+Approved=Εγκρίθηκε
+Refused=Αρνήθηκε
ReCalculate=Επανυπολογισμός
ResultOk=Επιτυχία
ResultKo=Αποτυχία
@@ -424,7 +424,7 @@ Reportings=Αναφορές
Draft=Προσχέδιο
Drafts=Προσχέδια
Validated=Επικυρωμένο
-Opened=Open
+Opened=Ανοιχτό
New=Νέο
Discount=Έκπτωση
Unknown=Άγνωστο
@@ -705,11 +705,13 @@ SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κ
PrintFile=Εκτύπωση του αρχείου %s
ShowTransaction=Εμφάνιση συναλλαγών
GoIntoSetupToChangeLogo=Πηγαίνετε Αρχική - Ρυθμίσεις - Εταιρία να αλλάξει το λογότυπο ή πηγαίνετε Αρχική - Ρυθμίσεις - Προβολή για απόκρυψη.
-Deny=Deny
-Denied=Denied
-ListOfTemplates=List of templates
-Genderman=Man
+Deny=Άρνηση
+Denied=Άρνηση
+ListOfTemplates=Κατάλογος των προτύπων
+Genderman=Άνθρωπος
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Δευτέρα
Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index c9d654ce3ef..0f24ba50092 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Ως προϊόν
UseDiscountAsService=Ως υπηρεσία
UseDiscountOnTotal=Στο υποσύνολο
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Καθορίζει αν η συνολική έκπτωση που θεωρείται ως ένα προϊόν, μια υπηρεσία, ή μόνον επί του υποσυνόλου για τον υπολογισμό του περιθωρίου κέρδους.
-MARGIN_TYPE=Τύπος περιθωρίου
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Αρχικό περιθώριο
MargeNette=Το καθαρό περιθώριο
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Αρχικό περιθώριο: τιμή πώλησης - τιμή αγοράς<br/>Το καθαρό περιθώριο: τιμή πώλησης - τιμή κόστους
+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
CostPrice=Τιμή κόστους
BuyingCost=Τιμή κόστους
UnitCharges=Χρεώσεων
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index de2ad9d4968..9bd6bfdc3bb 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -199,8 +199,8 @@ Entreprises=Εταιρείες
DOLIBARRFOUNDATION_PAYMENT_FORM=Για να κάνετε την πληρωμή της συνδρομής σας χρησιμοποιώντας μια τραπεζική μεταφορά, δείτε τη σελίδα <a target="_blank" href="http://wiki.dolibarr.org/index.php/Subscribe#To_subscribe_making_a_bank_transfer">http://wiki.dolibarr.org/index.php/Subscribe</a> . <br> Για να πληρώσετε με πιστωτική κάρτα ή Paypal, κάντε κλικ στο κουμπί στο κάτω μέρος της σελίδας. <br>
ByProperties=Με χαρακτηριστικά
MembersStatisticsByProperties=Στατιστικά στοιχεία μελων από τα χαρακτηριστικά
-MembersByNature=This screen show you statistics on members by nature.
-MembersByRegion=This screen show you statistics on members by region.
+MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη του από τη φύση τους.
+MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά για τα μέλη κατά περιοχή.
VATToUseForSubscriptions=Συντελεστή ΦΠΑ που θα χρησιμοποιηθεί για τις συνδρομές
NoVatOnSubscription=No TVA for subscriptions
MEMBER_PAYONLINE_SENDEMAIL=Στείλτε e-mail για να προειδοποιήσει όταν Dolibarr λάβετε μια επιβεβαίωση της μια επικυρωμένη πληρωμής για την εγγραφή
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index d2b7f0c3d49..b1723bf35f7 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -204,7 +204,7 @@ ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο
YouMustClickToChange=Θα πρέπει πρώτα να κάνετε κλικ στον παρακάτω σύνδεσμο για να επικυρώσει την αλλαγή του κωδικού πρόσβασης
ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απλά ξεχάστε αυτό το email. Τα διαπιστευτήριά σας παραμένουν ασφαλή.
IfAmountHigherThan=Εάν το ποσό υπερβαίνει <strong>%s</strong>
-SourcesRepository=Repository for sources
+SourcesRepository=Αποθετήριο για τις πηγές
##### Calendar common #####
AddCalendarEntry=Προσθήκη εγγραφής στο ημερολόγιο %s
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index a7111840140..3a1fed6e818 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Μοναδική τιμή ανά προϊόν/υπηρεσία
PricingRule=Κανόνες για τις τιμές των πελατών
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Ορισμός ίδιας τιμής για τις θυγατρικές του πελάτη
-PriceByCustomerLog=Τιμή ανά πελάτη log
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Ελάχιστη συνιστώμενη τιμή είναι: %s
PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index ef1b8cfb453..aebc4bfbd9b 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Εργασία %s δημιουργήθηκε
TaskModifiedInDolibarr=Εργασία %s τροποποιήθηκε
TaskDeletedInDolibarr=Εργασία %s διαγράφηκε
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Επικεφαλής του σχεδίου
TypeContact_project_external_PROJECTLEADER=Επικεφαλής του σχεδίου
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index 64fafbf69eb..ebd0dc0111e 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Αποστολές
AllSendings=Όλες οι αποστολές
Shipment=Αποστολή
Shipments=Αποστολές
-ShowSending=Προβολή αποστολής
+ShowSending=Show Shipments
Receivings=Αποδείξεις
SendingsArea=Περιοχή αποστολών
ListOfSendings=Κατάλογος των αποστολών
@@ -26,8 +26,8 @@ QtyToShip=Ποσότητα προς αποστολή
QtyReceived=Ποσότητα παραλαβής
KeepToShip=Αναμένει για αποστολή
OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό
-DateSending=Ημερομηνία αποστολή της παραγγελίας
-DateSendingShort=Ημερομηνία αποστολή της παραγγελίας
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Αποστολές για αυτό το σκοπό
SendingsAndReceivingForSameOrder=Αποστολές και παραλαβές για αυτό το σκοπό
SendingsToValidate=Αποστολές για επικύρωση
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 836bdc162ae..1f37f4c2766 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Κανόνας για μείωση της δια
RuleForStockManagementIncrease=Κανόνας για την αύξηση της διαχείρισης των αποθεμάτων
DeStockOnBill=Μείωση πραγματικών αποθεμάτων για τους πελάτες τιμολόγια / πιστωτικά επικύρωση σημειώσεις
DeStockOnValidateOrder=Μείωση πραγματικών αποθεμάτων σχετικά με τις παραγγελίες των πελατών επικύρωσης
-DeStockOnShipment=Μείωση πραγματικών αποθεμάτων για την επικύρωση αποστολή
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Αύξηση πραγματικού αποθέματα για τους προμηθευτές τιμολόγια / πιστωτικά επικύρωση σημειώσεις
ReStockOnValidateOrder=Αύξηση πραγματικού αποθεμάτων σχετικά με τις παραγγελίες τους προμηθευτές επιδοκιμασίας
ReStockOnDispatchOrder=Αύξηση των αποθεμάτων σε πραγματικό εγχειρίδιο αποστολή σε αποθήκες, μετά από σειρά προμηθευτής που λαμβάνει
@@ -134,7 +134,7 @@ IsInPackage=Περιεχόμενα συσκευασίας
ShowWarehouse=Εμφάνιση αποθήκης
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Μετακίνηση του προϊόντος %s σε μια άλλη αποθήκη
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index 8f7d24ec1dd..c6fda295a0d 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 63aa48ea233..ded759f92d1 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -57,7 +57,7 @@ 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=Χρήστες και Ομάδες
-MenuMyUserCard=My user card
+MenuMyUserCard=Κάρτα χρήστη
LastGroupsCreated=Last %s created groups
LastUsersCreated=Last %s users created
ShowGroup=Εμφάνιση ομάδας
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
deleted file mode 100644
index 42069924aee..00000000000
--- a/htdocs/langs/en_AU/companies.lang
+++ /dev/null
@@ -1,6 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-VATIsUsed=GST is used
-VATIsNotUsed=GST is not used
-VATIntra=GST number
-VATIntraShort=GST number
-VATIntraVeryShort=GST
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index e9516954cb2..2e691473326 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -2,37 +2,20 @@
DIRECTION=ltr
FONTFORPDF=helvetica
FONTSIZEFORPDF=10
-SeparatorDecimal=,
-SeparatorThousand=Space
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
-UnitPriceHT=Unit price (excl GST)
-AmountHT=Amount (excl GST)
-AmountTTC=Amount (incl GST)
-AmountVAT=Amount GST
-PriceQtyHT=Price for this quantity excl GST
-PriceQtyMinHT=Price quantity min. excl GST
-PriceQtyTTC=Price for this quantity incl GST
-PriceQtyMinTTC=Price quantity min. incl GST
-TotalHT=Total (excl GST)
-TotalTTC=Total (incl GST)
-TotalTTCToYourCredit=Total (incl GST) to your credit
-TotalVAT=Total GST
-IncludedVAT=Included GST
-HT=excl GST
-TTC=Incl GST
-VAT=GST
-VATRate=GST Rate
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/en_AU/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/en_AU/projects.lang b/htdocs/langs/en_AU/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/en_AU/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/en_AU/sendings.lang b/htdocs/langs/en_AU/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/en_AU/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/en_AU/stocks.lang b/htdocs/langs/en_AU/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/en_AU/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/en_GB/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/en_GB/products.lang b/htdocs/langs/en_GB/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/en_GB/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/en_GB/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/en_GB/sendings.lang b/htdocs/langs/en_GB/sendings.lang
deleted file mode 100644
index cceb71550e2..00000000000
--- a/htdocs/langs/en_GB/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-DateDeliveryPlanned=Planed date of delivery
diff --git a/htdocs/langs/en_GB/stocks.lang b/htdocs/langs/en_GB/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/en_GB/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
deleted file mode 100644
index 6c3e1637652..00000000000
--- a/htdocs/langs/en_IN/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-Zip=Pin Code
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 1847a4b4ab1..2e691473326 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -4,25 +4,18 @@ FONTFORPDF=helvetica
FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
FormatHourShortJQuery=HH:MI
FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y
-FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourShort=%m/%d/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y, %I:%M %p
-FormatDateHourText=%d %B %Y, %I:%M %p
-AmountVAT=Amount VAT
-TotalVAT=Total VAT
-IncludedVAT=Included VAT
-TTC=Inc. VAT
-VAT=VAT
-VATRate=VAT Rate
-CommercialProposalsShort=Quotations
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/en_IN/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/en_IN/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/en_IN/sendings.lang b/htdocs/langs/en_IN/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/en_IN/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/en_IN/stocks.lang b/htdocs/langs/en_IN/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/en_IN/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 0c61ce35e2e..fada78c04c6 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -35,7 +35,6 @@ IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and unc
WarningBrowserTooOld=Too old version of browser. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommanded.
PHPVersion=PHP Version
YouCanContinue=You can continue...
-PleaseBePatient=Please be patient...
License=Using license
ConfigurationFile=Configuration file
WebPagesDirectory=Directory where web pages are stored
diff --git a/htdocs/langs/en_US/paybox.lang b/htdocs/langs/en_US/paybox.lang
index 4e6798a21b6..c0a55888e7c 100644
--- a/htdocs/langs/en_US/paybox.lang
+++ b/htdocs/langs/en_US/paybox.lang
@@ -12,7 +12,6 @@ Creditor=Creditor
PaymentCode=Payment code
PayBoxDoPayment=Go on payment
YouWillBeRedirectedOnPayBox=You will be redirected on secured Paybox page to input you credit card information
-PleaseBePatient=Please, be patient
Continue=Next
ToOfferALinkForOnlinePayment=URL for %s payment
ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment user interface for a customer order
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/es_AR/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/es_AR/products.lang b/htdocs/langs/es_AR/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_AR/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_AR/projects.lang b/htdocs/langs/es_AR/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_AR/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_AR/sendings.lang b/htdocs/langs/es_AR/sendings.lang
deleted file mode 100644
index cceb71550e2..00000000000
--- a/htdocs/langs/es_AR/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-DateDeliveryPlanned=Planed date of delivery
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_AR/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_BO/companies.lang b/htdocs/langs/es_BO/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/es_BO/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_BO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_BO/projects.lang b/htdocs/langs/es_BO/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_BO/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_BO/sendings.lang b/htdocs/langs/es_BO/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/es_BO/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/es_BO/stocks.lang b/htdocs/langs/es_BO/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_BO/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index d043a9b4764..e43afc7fe86 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -21,7 +21,4 @@ ProposalsPDFModules=Modelos de documentos de cotizaciones
HideTreadedPropal=Ocultar las cotizaciones procesados del listado
FreeLegalTextOnProposal=Texto libre en cotizaciones
WatermarkOnDraftProposal=Marca de agua en cotizaciones borrador (en caso de estar vacío)
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
FCKeditorForProductDetails=Creación/edición WYSIWIG de las líneas de detalle de los productos (en pedidos, cotizaciones, facturas, etc.)
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index e83dd8670f8..66d1f1d9dc1 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -1,4 +1,3 @@
# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
ContactForProposals=Contacto de cotizaciones
NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index dc549dfb838..69191c18485 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -19,4 +19,5 @@ FormatDateHourShort=%d/%m/%Y %H:%M
FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
+Deprecated=Deprecated
CommercialProposalsShort=Cotizaciones
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index 187ab78fa20..9c1f2378871 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -2,4 +2,3 @@
AddToMyProposals=Añadir a mis cotizaciones
AddToOtherProposals=Añadir a otras cotizaciones
NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.)
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index 4ac300704ad..d483e1e5659 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -1,3 +1,2 @@
# Dolibarr language file - Source file is en_US - projects
ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_CL/sendings.lang b/htdocs/langs/es_CL/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/es_CL/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/es_CL/stocks.lang b/htdocs/langs/es_CL/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_CL/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_CO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_CO/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_CO/sendings.lang b/htdocs/langs/es_CO/sendings.lang
deleted file mode 100644
index cceb71550e2..00000000000
--- a/htdocs/langs/es_CO/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-DateDeliveryPlanned=Planed date of delivery
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_CO/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index c518f30b166..6e4943b17e7 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -18,11 +18,8 @@ LocalTax1IsUsedDesc=Uso de un 2º tipo de impuesto (Distinto del ITBIS)
LocalTax1IsNotUsedDesc=No usar un 2º tipo de impuesto (Distinto del ITBIS)
UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
ShowVATIntaInAddress=Ocultar el identificador ITBIS en las direcciones de los documentos
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
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.
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
deleted file mode 100644
index 564a9951b97..00000000000
--- a/htdocs/langs/es_DO/companies.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-VATIsUsed=Sujeto a ITBIS
-VATIsNotUsed=No sujeto a ITBIS
-VATIntraCheckDesc=El link <b>%s</b> permite consultar al servicio europeo de control de números de ITBIS intracomunitario. Se requiere acceso a internet para que el servicio funcione
diff --git a/htdocs/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang
index 21cb2cca37c..2e691473326 100644
--- a/htdocs/langs/es_DO/main.lang
+++ b/htdocs/langs/es_DO/main.lang
@@ -2,28 +2,20 @@
DIRECTION=ltr
FONTFORPDF=helvetica
FONTSIZEFORPDF=10
-SeparatorDecimal=,
-SeparatorThousand=.
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
-FormatDateShortJQuery=dd/mm/yy
-FormatDateShortJQueryInput=dd/mm/yy
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
-ErrorNoVATRateDefinedForSellerCountry=Error, ningún tipo de ITBIS definido para el país '%s'.
-AmountVAT=Importe ITBIS
-TotalVAT=Total ITBIS
-IncludedVAT=ITBIS incluido
-HT=Sin ITBIS
-TTC=ITBIS incluido
-VAT=ITBIS
-VATRate=Tasa ITBIS
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+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
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_DO/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_DO/projects.lang b/htdocs/langs/es_DO/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_DO/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_DO/sendings.lang b/htdocs/langs/es_DO/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/es_DO/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/es_DO/stocks.lang b/htdocs/langs/es_DO/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_DO/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index 487078605dc..bbaf0fe0994 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -1,5 +1,12 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de columnas en el archivo de exportación
+ACCOUNTING_EXPORT_DATE=Formato de fecha en el archivo de exportación
+ACCOUNTING_EXPORT_PIECE=¿Exportar cantidades?
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=¿Exportar con la cuenta global?
+ACCOUNTING_EXPORT_LABEL=¿Exportar la etiqueta?
+ACCOUNTING_EXPORT_AMOUNT=¿Exportar el importe?
+ACCOUNTING_EXPORT_DEVISE=¿Exportar la divisa?
Accounting=Contabilidad
Globalparameters=Configuración global
@@ -41,6 +48,7 @@ NewAccount=Nueva cuenta contable
Update=Actualizar
List=Listado
Create=Crear
+CreateMvts=Create movement
UpdateAccount=Modificar una cuenta contable
UpdateMvts=Modificar un movimiento
WriteBookKeeping=Registrar los asientos en el libro mayor
@@ -76,14 +84,15 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ordenar las páginas de contabilización "
AccountLength=Longitud de las cuentas contables mostradas en Dolibarr
AccountLengthDesc=Función para simular una longitud de cuenta contable sustituyendo los espacios por cero. Esta función sólo afecta a la pantalla, no cambia las cuentas contables registradas en Dolibarr. Esta función es necesaria para la exportación, para ser compatible con algunos programas.
+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=Longitud de las cuentas generales
ACCOUNTING_LENGTH_AACCOUNT=Longitud de las subcuentas
ACCOUNTING_SELL_JOURNAL=Diario de ventas
ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
-ACCOUNTING_BANK_JOURNAL=Diario bancario
-ACCOUNTING_CASH_JOURNAL=Diario de caja
ACCOUNTING_MISCELLANEOUS_JOURNAL=Diario de operaciones diversas
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Informe de gastos diario
ACCOUNTING_SOCIAL_JOURNAL=Diario social
ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cuenta de caja
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index b53445f8a4f..30c48292026 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Contabilidad (avanzada)
Module50400Desc=Gestión contable (doble partida)
Module54000Name=PrintIPP
Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz Cups IPP (La impresora debe ser visible por el servidor y CUPS debe estar instalado en el servidor)
-Module55000Name=OpenSurvey
-Module55000Desc=Módulo para realizar encuestas online (Como Doodle, Studs, Rdvz, etc.)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Márgenes
Module59000Desc=Módulo para gestionar los márgenes de beneficio
Module60000Name=Comisiones
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No se han registrado eventos de seguridad. Esto puede ser
NoEventFoundWithCriteria=No se han encontrado eventos de seguridad para tales criterios de búsqueda.
SeeLocalSendMailSetup=Ver la configuración local de sendmail
BackupDesc=Para realizar una copia de seguridad completa de Dolibarr, usted debe:
-BackupDesc2=Guardar el contenido del directorio de documentos (<b>%s</b>) que contiene todos los archivos subidos o generados (comprimiendo el directorio, por ejemplo).
+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=Guardar el contenido de su base de datos (<b>%s</b>) en un archivo de volcado. Para ello puede utilizar el asistente a continuación.
BackupDescX=El directorio archivado deberá guardarse en un lugar seguro.
BackupDescY=El archivo de volcado generado deberá guardarse en un lugar seguro.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Utilice un formulario de búsqueda para elegir un produ
UseEcoTaxeAbility=Asumir ecotasa (DEEE)
SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defecto para los productos
SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defecto para los terceros
-UseUnits=Unidades disponibles
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Módulo para la generación y comprobación del código de un producto o servicio
ProductOtherConf= Configuración de productos/servicios
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Destinatario fijo
SendingsSetup=Configuración del módulo Expediciones
SendingsReceiptModel=Modelo de notas de entrega
SendingsNumberingModules=Módulos de numeración de notas de entrega
-SendingsAbility=Uso de notas de entrega para los envíos a clientes
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=En la mayoría de los casos, las notas de entrega (lista de productos enviados) también actúan como notas de recepción y son firmadas por el cliente. La gestión de las notas de recepción es por lo tanto redundante y rara vez se activará.
FreeLegalTextOnShippings=Texto libre en envíos
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que repres
PositionIntoComboList=Posición de la línea en listas de combo
SellTaxRate=Tasa de IVA
RecuperableOnly=Sí para el IVA "Non Perçue Récupérable" usados en algunas provincias en Francia. Mantenga el valor a "No" en los demás casos.
-UrlTrackingDesc=Si el proveedor o el servicio de transporte ofrece una página o un sitio web para comprobar el estado de su envío, puede ingresarlo aquí. Puede utilizar la tecla {TRACKID} en los parámetros de URL para que el sistema lo reemplace con el valor del número de seguimiento introducido en la ficha de envío
+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=Cuando crea una oportunidad, defina una cantidad estimada del proyecto/lead. De acuerdo con el estado de la oportunidad, esta cantidad puede ser multiplicateda por esta tasa para evaluar importe global que todas sus oportunidades pueden generar. El valor es por ciento (entre 0 y 100).
TemplateForElement=Este registro de plantilla se dedica a qué elemento
TypeOfTemplate=Tipo de plantilla
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 72bf7739605..3e7c3913229 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Acontecimientos de todos los usuarios del grupo
ActionAssignedTo=Evento asignado a
AllMyActions= Todos mis eventos/tareas
AllActions= Todos los eventos/tareas
-ViewList=Vista listado
ViewCal=Vista mensual
ViewDay=Vista diaria
ViewWeek=Vista semanal
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index 47607cdb605..fe5d1dd3767 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Estado prospección
DraftPropals=Presupuestos borrador
SearchPropal=Buscar un presupuesto
CommercialDashboard=Resumen comercial
+NoLimit=No limit
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index f55695213a8..ab4793afadf 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contacto tercero
StatusContactValidated=Estado del contacto
Company=Empresa
CompanyName=Razón social
-AliasNames=Alias (comercial, marca registrada, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Empresas
CountryIsInEEC=País de la Comunidad Económica Europea
ThirdPartyName=Nombre del tercero
@@ -68,6 +69,7 @@ Country=País
CountryCode=Código país
CountryId=Id país
Phone=Teléfono
+PhoneShort=Phone
Skype=Skype
Call=Llamar
Chat=Chat
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 260eab9b352..8885a19254e 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Los valores de la lista deben ser indicados
ErrorNoValueForRadioType=Los valores de la lista deben ser indicados
ErrorBadFormatValueList=Los valores de la lista no peudo contener mas de una coma : <u>%s</u>, pero necessita una: llave,valores
ErrorFieldCanNotContainSpecialCharacters=El campo <b>%s</b> no debe contener carácteres especiales
-ErrorFieldCanNotContainSpecialNorUpperCharacters=El campo <b>%s</b> no debe contener mayúsculas ni caracteres especiales.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Módulo de contabilidad no activado
ErrorExportDuplicateProfil=El nombre de este perfil ya existe para este conjunto de exportación
ErrorLDAPSetupNotComplete=La configuración Dolibarr-LDAP es incompleta.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Sin variable global seleccionada
ErrorFieldMustBeANumeric=El campo <b>%s</b> debe contener un valor numérico
ErrorFieldMustBeAnInteger=El campo <b>%s</b> debe de ser un entero
ErrorMandatoryParametersNotProvided=Los parámetro(s) obligatorio(s) no están todavía definidos
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index eeb6fac4948..3b62bff1ff8 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francés (Canadá)
Language_fr_CH=Francés (Suiza)
Language_fr_FR=Francés
Language_fr_NC=Francés (Nueva Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebreo
Language_hr_HR=Croata
Language_hu_HU=Húngaro
@@ -70,6 +71,7 @@ Language_sv_SV=Sueco
Language_sv_SE=Sueco
Language_sq_AL=Albanés
Language_sk_SK=Eslovaco
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tailandés
Language_uk_UA=Ucranio
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index a1a83e98081..f96675a130b 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -710,6 +710,8 @@ Denied=Denegada
ListOfTemplates=Listado de plantillas
Genderman=Hombre
Genderwoman=Mujer
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Lunes
Tuesday=Martes
diff --git a/htdocs/langs/es_ES/margins.lang b/htdocs/langs/es_ES/margins.lang
index 7b585ad9630..db56122c432 100644
--- a/htdocs/langs/es_ES/margins.lang
+++ b/htdocs/langs/es_ES/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Como un producto
UseDiscountAsService=Como un servicio
UseDiscountOnTotal=Sobre el total
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Indica si un descuento global se toma en cuenta como un producto, servicio o sólo en el total a la hora de calcular los márgenes.
-MARGIN_TYPE=Tipo de margen gestionado
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Margen bruto
MargeNette=Margen neto
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Margen bruto: Precio de venta sin IVA - Precio de compra sin IVA<br/>Margen neto: Precio de venta sin IVA - Costos
+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
CostPrice=Precio de compra
BuyingCost=Costos
UnitCharges=Carga unitaria
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index fa5a7995540..6d5ebec6053 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -206,11 +206,11 @@ gram=gramo
g=g
meter=metro
m=m
-linear metro=metro lineal
+linearmeter=linear meter
lm=ml
-square metro= metro cuadrado
+squaremeter=square meter
m2=m²
-cubic metro=metro cúbico
+cubicmeter=cubic meter
m3=m³
liter=litro
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Precio único por producto/servicio
PricingRule=Reglas para precios a clientes
AddCustomerPrice=Añadir precio a cliente
ForceUpdateChildPriceSoc=Establecer el mismo precio en las filiales de los clientes
-PriceByCustomerLog=Log de precios por clientes
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=El precio mínimo no puede ser menor que %s
MinimumRecommendedPrice=El precio mínimo recomendado es: %s
PriceExpressionEditor=Editor de expresión de precios
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 51720cf92e2..fe990020b18 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=La tarea %s fue creada
TaskModifiedInDolibarr=La tarea %s fue modificada
TaskDeletedInDolibarr=La tarea %s fue eliminada
OpportunityStatus=Estado de oportunidad
+OpportunityStatusShort=Opp. status
OpportunityAmount=Importe Oportunidad
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Jefe de proyecto
TypeContact_project_external_PROJECTLEADER=Jefe de proyecto
@@ -165,7 +167,18 @@ ProjectOverview=Resumen
ManageTasks=Usar proyectos para seguir tareas y tiempos
ManageOpportunitiesStatus=Usar proyectos para seguir leads/oportunidades
ProjectNbProjectByMonth=Nº de proyectos creados por mes
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
ProjectsStatistics=Estadísticas de proyectos/leads
TaskAssignedToEnterTime=Tarea asignada. Debería poder introducir tiempos en esta tarea.
OpenedProjectsByThirdparties=Proyectos abiertos de terceros
-OpportunityPonderatedAmount=Importe medio oportunidades
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index 9a5a4a59826..68e0d3ef8b8 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Envíos
AllSendings=Todos los envíos
Shipment=Envío
Shipments=Envíos
-ShowSending=Mostrar envío
+ShowSending=Show Shipments
Receivings=Recepciones
SendingsArea=Área envíos
ListOfSendings=Listado de envíos
@@ -26,8 +26,8 @@ QtyToShip=Cant. a enviar
QtyReceived=Cant. recibida
KeepToShip=Resto a enviar
OtherSendingsForSameOrder=Otros envíos de este pedido
-DateSending=Fecha de expedición
-DateSendingShort=Fecha de expedición
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Expediciones de este pedido
SendingsAndReceivingForSameOrder=Envíos y recepciones de este pedido
SendingsToValidate=Envíos a validar
@@ -67,7 +67,7 @@ SendingRunning=Producto de pedidos de clientes
SuppliersReceiptRunning=Producto de pedidos a proveedores
ProductQtyInCustomersOrdersRunning=Cantidad en pedidos de clientes abiertos
ProductQtyInSuppliersOrdersRunning=Cantidad en pedidos a proveedores abiertos
-ProductQtyInShipmentAlreadySent=Cantidad en pedidos de clientes ya enviados
+ProductQtyInShipmentAlreadySent=Ya ha sido enviada la cantidad del producto del pedido de cliente abierto
ProductQtyInSuppliersShipmentAlreadyRecevied=Cantidad en pedidos a proveedores ya recibidos
# Sending methods
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index 513727f022f..5b433808fc8 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regla de gestión de decrementos de stock
RuleForStockManagementIncrease=Regla de gestión de incrementos de stock
DeStockOnBill=Decrementar los stocks físicos sobre las facturas/abonos a clientes
DeStockOnValidateOrder=Decrementar los stocks físicos sobre los pedidos de clientes
-DeStockOnShipment=Decrementar los stocks físicos sobre los envíos
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Incrementar los stocks físicos sobre las facturas/abonos de proveedores
ReStockOnValidateOrder=Incrementar los stocks físicos sobre los pedidos a proveedores
ReStockOnDispatchOrder=Incrementa los stocks físicos en el desglose manual de la recepción de los pedidos a proveedores en los almacenes
@@ -95,11 +95,12 @@ SelectWarehouseForStockDecrease=Seleccione el almacén a usar en el decremento d
SelectWarehouseForStockIncrease=Seleccione el almacén a usar en el incremento de stock
NoStockAction=Sin acciones sobre el stock
LastWaitingSupplierOrders=Pedidos en espera de recepción
-DesiredStock=Stock deseado
+DesiredStock=Stock mínimo deseado
+DesiredMaxStock=Stock máximo deseado
StockToBuy=A pedir
Replenishment=Reaprovisionamiento
ReplenishmentOrders=Ordenes de reaprovisionamiento
-VirtualDiffersFromPhysical=De acuerdo con las opciones de incremento/decremento de stock, el stock físico y el stock virtual (físico + pedidos actuales) puede diferir
+VirtualDiffersFromPhysical=Según las opciones de aumento/disminución, el stock físico y virtual (pedidos en curso+stock físico) puede diferir
UseVirtualStockByDefault=Usar stock virtual por defecto, en lugar de stock físico, para la funcionalidad de aprovisionamiento
UseVirtualStock=Usar stock virtual
UsePhysicalStock=Usar stock físico
@@ -112,8 +113,8 @@ AlertOnly= Sólo alertas
WarehouseForStockDecrease=Para el decremento de stock se usará el almacén <b>%s</b>
WarehouseForStockIncrease=Para el incremento de stock se usará el almacén <b>%s</b>
ForThisWarehouse=Para este almacén
-ReplenishmentStatusDesc=Esta es la lista de todos los productos con un stock menor que el stock deseado (o menor que el valor de alerta si el checkbox "sólo alertas" está marcado) y que sugiere crear pedidos de proveedor para rellenar la diferencia.
-ReplenishmentOrdersDesc=Este es el listado de todos los pedidos a proveedor con productos predefinidos. Solo son visibles pedidos abiertos con productos que puedan afectar al stock.
+ReplenishmentStatusDesc=Este es un listado de todos los productos con un stock menor que el deseado (o menor que el valor de alerta si la casilla de verificación "alerta" está marcada), y le sugieren que cree pedidos a proveedor para cubrir la diferencia.
+ReplenishmentOrdersDesc=Esta es un listado de todos los pedidos a proveedor abiertos que incluyen productos predefinidos. Sólo pedidos abiertos con productos predefinidos, así que sólo son visibles aquí los pedidos que pueden afectar al stock.
Replenishments=Reaprovisionamiento
NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
@@ -124,16 +125,16 @@ RecordMovement=Registrar transferencias
ReceivingForSameOrder=Recepciones de este pedido
StockMovementRecorded=Movimiento de stock registrado
RuleForStockAvailability=Reglas de requerimiento de stock
-StockMustBeEnoughForInvoice=El nivel de existencias debe ser suficiente para añadir productos/servicios en facturas
-StockMustBeEnoughForOrder=El nivel de existencias debe ser suficiente para añadir productos/servicios en pedidos
-StockMustBeEnoughForShipment= El nivel de existencias debe ser suficiente para añadir productos/servicios en envíos
+StockMustBeEnoughForInvoice=El nivel de existencias debe ser suficiente para añadir productos/servicios a facturas
+StockMustBeEnoughForOrder=El nivel de existencias debe ser suficiente para añadir productos/servicios a pedidos
+StockMustBeEnoughForShipment= El nivel de existencias debe ser suficiente para añadir productos/servicios a envíos
MovementLabel=Etiqueta del movimiento
InventoryCode=Movimiento o código de inventario
IsInPackage=Contenido en el paquete
ShowWarehouse=Mostrar almacén
-MovementCorrectStock=Corrección de stock del producto %s
+MovementCorrectStock=Correción de sotck del producto %s
MovementTransferStock=Transferencia de stock del producto %s a otro almacén
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Debe definirse aquí un almacén origen cuando el módulo de lotes está activado. Se utiliza para enumerar lotes/series disponibles del producto para realizar un movimiento. Si desea enviar productos de diferentes almacenes, simplemente haga el envío en varios pasos.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Código Inv./Mov.
-NoPendingReceptionOnSupplierOrder=No existen recepciones pendientes ya que el pedido está abierto
+NoPendingReceptionOnSupplierOrder=Sin recepción en espera del pedido a proveedor
ThisSerialAlreadyExistWithDifferentDate=Este número de lote/serie (<strong>%s</strong>) ya existe, pero con una fecha de caducidad o venta diferente (encontrada <strong>%s</strong> pero ha introducido <strong>%s</strong>).
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index 3c91bb222e5..25f796f2ddf 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validar gasto
ConfirmSaveTrip=¿Está seguro de querer validar este gasto?
NoTripsToExportCSV=Sin gastos a exportar para este periodo.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/es_MX/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/es_MX/products.lang b/htdocs/langs/es_MX/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_MX/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_MX/projects.lang b/htdocs/langs/es_MX/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_MX/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_MX/sendings.lang b/htdocs/langs/es_MX/sendings.lang
deleted file mode 100644
index cceb71550e2..00000000000
--- a/htdocs/langs/es_MX/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-DateDeliveryPlanned=Planed date of delivery
diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
deleted file mode 100644
index 3a989d45e7d..00000000000
--- a/htdocs/langs/es_MX/stocks.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 3ddc4a4c007..75aff423366 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -10,9 +10,6 @@ VATManagement=Gestión IGV
VATIsUsedDesc=El tipo de IGV propuesto por defecto en las creaciones de presupuestos, facturas, pedidos, etc. Responde a la siguiente regla:<br>Si el vendedor no está sujeto a IVU, IVU por defecto=0. Final de regla.<br>Si el país del vendedor= país del comprador entonces IVU por defecto=IVU del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y el bien vendido= nuevo medio de transportes (auto, barco, avión), IVU por defecto=0 (el IVU debe ser pagado por comprador a la hacienda pública de su país y no al vendedor). Final de regla<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= particular o empresa sin NIF intracomunitario entonces IVU por defecto=IVU del producto vendido. Final de regla.<br>Si vendedor y comprador residen en la Comunidad Europea y comprador= empresa con NIF intracomunitario entonces IVU por defecto=0. Final de regla.<br>Si no, IVU propuesto por defecto=0. Final de regla.<br>
VATIsNotUsedDesc=El tipo de IGV propuesto por defecto es 0. Este es el caso de asociaciones, particulares o algunas pequeñas sociedades.
UnitPriceOfProduct=Precio unitario sin IGV de un producto
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
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
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang
index d7dc13c172a..70edcf69a8f 100644
--- a/htdocs/langs/es_PE/companies.lang
+++ b/htdocs/langs/es_PE/companies.lang
@@ -1,5 +1,4 @@
# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
VATIsUsed=Sujeto a IGV
VATIsNotUsed=No sujeto a IGV
VATIntra=RUC
diff --git a/htdocs/langs/es_PE/products.lang b/htdocs/langs/es_PE/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_PE/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_PE/projects.lang b/htdocs/langs/es_PE/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_PE/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_PE/sendings.lang b/htdocs/langs/es_PE/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/es_PE/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/es_PE/stocks.lang b/htdocs/langs/es_PE/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_PE/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index d3765cc2d96..1c53b65c99c 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -2,6 +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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
-UrlTrackingDesc=If the provider or transport service offer a page or web site to check status of your shipment, 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.
diff --git a/htdocs/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
index 1ad8f23e84b..226b0004e9f 100644
--- a/htdocs/langs/es_PY/companies.lang
+++ b/htdocs/langs/es_PY/companies.lang
@@ -1,5 +1,4 @@
# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
VATIntra=RUC
VATIntraShort=RUC
VATIntraVeryShort=RUC
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/es_PY/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/es_PY/projects.lang b/htdocs/langs/es_PY/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/es_PY/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/es_PY/sendings.lang b/htdocs/langs/es_PY/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/es_PY/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/es_PY/stocks.lang b/htdocs/langs/es_PY/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/es_PY/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
index 28cfd06f2b7..77898db3458 100644
--- a/htdocs/langs/et_EE/accountancy.lang
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -1,5 +1,12 @@
# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
+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 the label ?
+ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
+ACCOUNTING_EXPORT_DEVISE=Export the devise ?
Accounting=Raamatupidamine
Globalparameters=Globaalsed parameetrid
@@ -41,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -76,14 +84,15 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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_SELL_JOURNAL=Sell journal
ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_BANK_JOURNAL=Bank journal
-ACCOUNTING_CASH_JOURNAL=Cash journal
ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
ACCOUNTING_SOCIAL_JOURNAL=Social journal
ACCOUNTING_ACCOUNT_TRANSFER_CASH=Account of transfer
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 2835cf6851f..0281abb83d5 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Ava küsitlus
-Module55000Desc=Online küsitluste korraldamise moodul (nagu Doodle, Studs, Rdvz jms)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marginaalid
Module59000Desc=Marginaalide haldamise moodu
Module60000Name=Komisjonitasu
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Ühtki turvasündmust pole veel salvestatud. See on täies
NoEventFoundWithCriteria=Selliste otsingutingimustega ei leitud ühtkik turvasündmust.
SeeLocalSendMailSetup=Vaata oma kohaliku sendmaili seadistust
BackupDesc=Dolibarrist täieliku varukoopia tegemiseks pead:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Arhiveeritud kausta peaks säilitama turvalises kohas.
BackupDescY=Loodud tõmmisfaili peaks säilitama turvalises kohas.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Kasuta toote valimiseks otsinguvormi (rippmenüü aseme
UseEcoTaxeAbility=Eco-Taxe (WEEE) tugi
SetDefaultBarcodeTypeProducts=Vaikimisi vöötkoodi tüüp toodetel
SetDefaultBarcodeTypeThirdParties=Vaikimisi vöötkoodi tüüpi kolmandatel isikutel
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Tootekoodide (tooted või teenused) genereerimiseks kasutatav moodul
ProductOtherConf= Toodete/teenuste seadistamine
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Saatmiste mooduli seadistamine
SendingsReceiptModel=Saatekviitungi mudel
SendingsNumberingModules=Saatmiste numeratsiooni moodulid
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Enamikul juhtudel on saatedokumendid kasutatud nii kontrollehtedena (nimekiri toodetest, mida saata) kui lehtedena, mille saab klient endale ja allkirjastab. Seega on saatedokumentide väljastamine dubleeritud võimalus ja aktiveeritakse harva.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/et_EE/agenda.lang b/htdocs/langs/et_EE/agenda.lang
index 9db611fd738..4b65dff8939 100644
--- a/htdocs/langs/et_EE/agenda.lang
+++ b/htdocs/langs/et_EE/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Kõik minu tegevused/ülesanded
AllActions= Kõik tegevused/ülesanded
-ViewList=Nimekirja vaade
ViewCal=Kuu vaade
ViewDay=Päeva vaade
ViewWeek=Nädala vaade
diff --git a/htdocs/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang
index 59657233c22..fcd8ff80276 100644
--- a/htdocs/langs/et_EE/commercial.lang
+++ b/htdocs/langs/et_EE/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Huviliste staatus
DraftPropals=Mustandi staatuses olevad pakkumised
SearchPropal=Otsi pakkumist
CommercialDashboard=Äritegevuse kokkuvõte
+NoLimit=No limit
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index e1d1860cfad..0fe3a755493 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Kolmanda isiku kontakt/aadress
StatusContactValidated=Kontakti/aadressi staatus
Company=Ettevõte
CompanyName=Ettevõtte nimi
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Ettevõtted
CountryIsInEEC=Riik on Euroopa Majandusühenduse liige
ThirdPartyName=Kolmanda isiku nimi
@@ -68,6 +69,7 @@ Country=Riik
CountryCode=Riigi kood
CountryId=Riigi ID
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Helista
Chat=Vestle
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 8e91c994255..e592bd8fe33 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Palun sisesta märkenuppude väärtused
ErrorNoValueForRadioType=Palun sisesta raadionuppude väärtused
ErrorBadFormatValueList=Nimekirja väärtus ei saa olla rohkem, kui ühe komaga: <u>%s</u>, ent on vaja vähemalt üht: võti,väärtused
ErrorFieldCanNotContainSpecialCharacters=Väli <b>%s</b> ei tohi sisaldada erisümboleid.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Ühtki raamatupidamise moodulit pole aktiveeritud
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP sobitamine ei ole täielik.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/languages.lang b/htdocs/langs/et_EE/languages.lang
index 1d9b697341a..5528b88573c 100644
--- a/htdocs/langs/et_EE/languages.lang
+++ b/htdocs/langs/et_EE/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Prantsuse (Kanada)
Language_fr_CH=Prantsuse (Šveits)
Language_fr_FR=Prantsuse
Language_fr_NC=Prantsuse (Uus-Kaledoonia)
+Language_fy_NL=Frisian
Language_he_IL=Heebrea
Language_hr_HR=Horvaadi
Language_hu_HU=Ungari
@@ -70,6 +71,7 @@ Language_sv_SV=Rootsi
Language_sv_SE=Rootsi
Language_sq_AL=Albanian
Language_sk_SK=Slovaki
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tai
Language_uk_UA=Ukraina
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index a9b927e3613..2a6c4970354 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -710,6 +710,8 @@ Denied=Tagasi lükatud
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# 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 530c796faee..f8bdcf27861 100644
--- a/htdocs/langs/et_EE/margins.lang
+++ b/htdocs/langs/et_EE/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Tootena
UseDiscountAsService=Teenusena
UseDiscountOnTotal=Vahesumma peal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Määratleb, kas üldist allahindlust käsitletakse tootena, teenusena või ainult vahesummana marginaali arvutamisel.
-MARGIN_TYPE=Marginaali lii
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Toores marginaal
MargeNette=Netomarginaal
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Toores marginaal: müügihind - ostuhind<br/>Netomarginaal: müügihind - tootmishind
+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
CostPrice=Tootmishind
BuyingCost=Tootmishind
UnitCharges=Ühiku kulud
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index be6678f39d9..394d832f4cf 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 0de4ce81704..5e1e6edb058 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Ülesanne %s on loodud
TaskModifiedInDolibarr=Ülesannet %s on muudetud
TaskDeletedInDolibarr=Ülesanne %s on kustutatud
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projektijuht
TypeContact_project_external_PROJECTLEADER=Projektijuht
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index b424d1b3903..d41bc90c19d 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Saadetised
AllSendings=All Shipments
Shipment=Saadetis
Shipments=Saadetised
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Saadetiste ala
ListOfSendings=Saadetiste nimekiri
@@ -26,8 +26,8 @@ QtyToShip=Kogus saata
QtyReceived=Saabunud kogus
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Tellimusega seotud teised saadetised
-DateSending=Tellimuse saatmise kuupäev
-DateSendingShort=Tellimuse saatmise kuupäev
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Tellimusega seotud saadetised
SendingsAndReceivingForSameOrder=Tellimusega seotud saadetised ja saabumised
SendingsToValidate=Kinnitamast vajavad saadetised
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index a0ed7afed62..6f39ecc9ce1 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Laojäägi haldamise vähenemise reegel
RuleForStockManagementIncrease=Laojäägi suurenemise haldamise reegel
DeStockOnBill=Vähenda reaalset laojääki müügiarve/kreeditarve kinnitamisel
DeStockOnValidateOrder=Vähenda reaalset laojääki müügitellimuse kinnitamisel
-DeStockOnShipment=Vähenda reaalset laojääki saatmise kinnitamisel
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Suurenda reaalset laojääki ostuarvete/kreeditarvete kinnitamisel
ReStockOnValidateOrder=Suurenda reaalset laojääki ostutellimuste heaks kiitmisel
ReStockOnDispatchOrder=Suurenda reaalset laojääki käsitsi ladudesse saatmisel pärast ostutellimuse vastu võtmist
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index 8124aa8f68b..993da46ec5c 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/eu_ES/accountancy.lang
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index d923b59c9b4..f84c5eb2b58 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marjinak
Module59000Desc=Marjinak kudeatzeko modulua
Module60000Name=Commissions
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/eu_ES/agenda.lang b/htdocs/langs/eu_ES/agenda.lang
index 2bc71d15a5f..4cc623b87d0 100644
--- a/htdocs/langs/eu_ES/agenda.lang
+++ b/htdocs/langs/eu_ES/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index 5e6f75fc30c..e494e42111e 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Proiektuaren egoera
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index e670d6e25ca..22cc5753e88 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/languages.lang b/htdocs/langs/eu_ES/languages.lang
index 0ca58f629e4..9aa81632586 100644
--- a/htdocs/langs/eu_ES/languages.lang
+++ b/htdocs/langs/eu_ES/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Frantsesa (Kanada)
Language_fr_CH=Frantsea (Suitza)
Language_fr_FR=Frantsesa
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index f952789d6ac..b4fd2ad096a 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/margins.lang b/htdocs/langs/eu_ES/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/eu_ES/margins.lang
+++ b/htdocs/langs/eu_ES/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index 910b9df623a..dd115be61bf 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 8935f87894f..17fc795a814 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=حساب حسابداری جدید
Update=به روز رسانی
List=فهرست
Create=ایجاد کردن
+CreateMvts=Create movement
UpdateAccount=اصلاح حساب حسابداری
UpdateMvts=اصلاح نقل و انتقال
WriteBookKeeping=ثبت حساب ها در دفتر کل
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index dd604e09f3b..ae8341c00c8 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=نظرسنجی گسترش
-Module55000Desc=ماژول را به نظر سنجی آنلاین (مانند دودل، خاتم کاری، Rdvz، ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=حاشیه
Module59000Desc=ماژول برای مدیریت حاشیه
Module60000Name=کمیسیون ها
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=هیچ رویداد امنیتی ثبت نشده است.
NoEventFoundWithCriteria=هیچ رویداد امنیتی شده است برای چنین معیارهای جستجو در بر داشت.
SeeLocalSendMailSetup=مشاهده راه اندازی از sendmail محلی خود
BackupDesc=برای ایجاد یک پشتیبان کامل از Dolibarr، شما باید:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=دایرکتوری آرشیو شده باید در یک مکان امن ذخیره می شود.
BackupDescY=فایل روگرفت تولید باید در یک مکان امن ذخیره می شود.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=استفاده از یک فرم جستجو برای ا
UseEcoTaxeAbility=پشتیبانی سازگار با محیط زیست Taxe (WEEE)
SetDefaultBarcodeTypeProducts=فرض نوع بارکد استفاده برای محصولات
SetDefaultBarcodeTypeThirdParties=فرض نوع بارکد استفاده برای اشخاص ثالث
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= ماژول برای تولید کد محصول و چک کردن (محصول یا خدمات)
ProductOtherConf= پیکربندی محصولات / خدمات
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=در حال ارسال راه اندازی ماژول
SendingsReceiptModel=ارسال مدل رسید
SendingsNumberingModules=Sendings تعداد ماژول ها
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=در اغلب موارد، sendings رسید هر دو به عنوان ورق برای تحویل به مشتری (لیستی از محصولات برای ارسال) و ورق است که recevied و امضا شده توسط مشتری استفاده می شود. بنابراین تحویل محصول رسید یکی از ویژگی های تکرار است و به ندرت فعال می شود.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/fa_IR/agenda.lang b/htdocs/langs/fa_IR/agenda.lang
index 2dd1cc1ede7..e01537a5cf3 100644
--- a/htdocs/langs/fa_IR/agenda.lang
+++ b/htdocs/langs/fa_IR/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=رویدادها برای همه کاربران گروه
ActionAssignedTo=Event assigned to
AllMyActions= همه رویدادها من / وظایف
AllActions= همه رویدادها / وظایف
-ViewList=مشاهده لیست
ViewCal=مشاهده ماه
ViewDay=نمای روز
ViewWeek=مشاهده هفته
diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
index 58154b70276..508da233871 100644
--- a/htdocs/langs/fa_IR/commercial.lang
+++ b/htdocs/langs/fa_IR/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=وضعیت چشم انداز
DraftPropals=طرح تجاری پیش نویس
SearchPropal=جستجوی یک طرح تجاری
CommercialDashboard=خلاصه تجاری
+NoLimit=No limit
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index a353a5dc680..dd1a50d1632 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=شخص ثالث تماس با ما / آدرس
StatusContactValidated=وضعیت تماس / آدرس
Company=شرکت
CompanyName=نام شرکت
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=شرکت
CountryIsInEEC=کشور است در داخل جامعه اقتصادی اروپا
ThirdPartyName=نام و نام خانوادگی شخص ثالث
@@ -68,6 +69,7 @@ Country=کشور
CountryCode=کد کشور
CountryId=شناسه کشور
Phone=تلفن
+PhoneShort=Phone
Skype=اسکایپ
Call=تماس
Chat=انجمن
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index ecb133e4984..0c7364b3fea 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=لطفا ارزش برای استخراج را پر
ErrorNoValueForRadioType=لطفا ارزش برای فهرست های رادیویی را پر کنید
ErrorBadFormatValueList=ارزش لیست نیست می توانید بیش از یک آمده <u>است:٪ s را،</u> اما باید حداقل یک: هیدرولیکی Llave، VALORES
ErrorFieldCanNotContainSpecialCharacters=<b>٪</b> درست <b>ها</b> باید شامل کاراکترهای خاص نیست.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>٪</b> درست <b>ها</b> باید شامل کاراکترهای خاص، و نه حروف بزرگ نیست.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=بدون ماژول حسابداری فعال
ErrorExportDuplicateProfil=این نام مشخصات در حال حاضر برای این مجموعه صادرات وجود دارد.
ErrorLDAPSetupNotComplete=تطبیق Dolibarr-LDAP کامل نیست.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/languages.lang b/htdocs/langs/fa_IR/languages.lang
index 4f4389fcb77..8c6da590400 100644
--- a/htdocs/langs/fa_IR/languages.lang
+++ b/htdocs/langs/fa_IR/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=فرانسوی کانادا
Language_fr_CH=فرانسوی سوییس
Language_fr_FR=فرانسوی
Language_fr_NC=فرانسه (کالدونیای جدید)
+Language_fy_NL=Frisian
Language_he_IL=عبری
Language_hr_HR=کرواتی
Language_hu_HU=مجارستانی
@@ -70,6 +71,7 @@ Language_sv_SV=سوئدی
Language_sv_SE=سوئدی
Language_sq_AL=آلبانی
Language_sk_SK=اسلواکی
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=تایلندی
Language_uk_UA=اوکراین
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 0aa1e890116..d01fe84f4c2 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=دوشنبه
Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/margins.lang b/htdocs/langs/fa_IR/margins.lang
index 78fccc0e2b7..176c477189b 100644
--- a/htdocs/langs/fa_IR/margins.lang
+++ b/htdocs/langs/fa_IR/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=به عنوان یک محصول
UseDiscountAsService=به عنوان یک سرویس
UseDiscountOnTotal=در ساب توتال
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=معرفی می کند اگر تخفیف های جهانی به عنوان یک محصول، سرویس و یا فقط در ساب توتال برای محاسبه حاشیه درمان می شود.
-MARGIN_TYPE=نوع حاشیه
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=حاشیه خام
MargeNette=حاشیه خالص
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=حاشیه خام: فروش قیمت - خرید قیمت <br/> حاشیه خالص: فروش قیمت - قیمت تمام شده
+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
CostPrice=قیمت تمام شده
BuyingCost=قیمت تمام شده
UnitCharges=اتهامات واحد
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index b24a107c259..8bb1663c5c8 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=قيمت منحصر به فرد در هر محصول / خدمات
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=همان قيمت تعيين شده در شرکت های تابعه مشتری
-PriceByCustomerLog=قيمت های ورود مشتری
+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
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 7c48bf34a0a..0f1b438807c 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=وظیفه٪ s را ایجاد
TaskModifiedInDolibarr=وظیفه٪ s تغییر
TaskDeletedInDolibarr=وظیفه٪ s را حذف
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=رهبر پروژه
TypeContact_project_external_PROJECTLEADER=رهبر پروژه
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index 45384d2f781..c84340b4fec 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=حمل و نقل
AllSendings=All Shipments
Shipment=حمل
Shipments=حمل و نقل
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=منطقه حمل و نقل
ListOfSendings=فهرست محموله
@@ -26,8 +26,8 @@ QtyToShip=تعداد به کشتی
QtyReceived=تعداد دریافت
KeepToShip=Remain to ship
OtherSendingsForSameOrder=دیگر محموله برای این منظور
-DateSending=عضویت جهت ارسال
-DateSendingShort=عضویت جهت ارسال
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=حمل و نقل برای این منظور
SendingsAndReceivingForSameOrder=حمل و نقل و receivings برای این منظور
SendingsToValidate=حمل و نقل به اعتبار
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 09e1b608823..2f4bc034588 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=قانون کاهش مدیریت سهام
RuleForStockManagementIncrease=قانون برای افزایش مدیریت سهام
DeStockOnBill=کاهش سهام واقعی بر روی مشتریان اعتبار فاکتورها / یادداشت های اعتباری
DeStockOnValidateOrder=کاهش سهام واقعی در اعتبار سنجی سفارشات مشتریان
-DeStockOnShipment=کاهش سهام واقعی در اعتبار حمل و نقل
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=افزایش سهام واقعی در تامین کنندگان فاکتورها / یادداشت های اعتباری اعتبار
ReStockOnValidateOrder=افزایش سهام واقعی در سفارشات تامین کنندگان موافقت
ReStockOnDispatchOrder=افزایش سهام واقعی در اعزام کتابچه راهنمای کاربر به انبارها، بعد از دریافت سفارش کالا
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index 34d4751b7c0..bb2098c0c55 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/fi_FI/accountancy.lang
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 8a953808d23..531535d94ff 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=O turvallisuus tapahtuma on kirjattu vielä. Tämä voi ol
NoEventFoundWithCriteria=O turvallisuus tapauksessa on todettu tällaisen haun criterias.
SeeLocalSendMailSetup=Katso paikallisen sendmail setup
BackupDesc=Voit tehdä täydellinen varmuuskopio Dolibarr sinun tulee:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Arkistoidut hakemistossa on säilytettävä turvallisessa paikassa.
BackupDescY=Luotu dump tiedosto on säilytettävä turvallisessa paikassa.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Tuki Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Oletus viivakoodi tyyppi käyttää tuotteita
SetDefaultBarcodeTypeThirdParties=Oletus viivakoodi tyyppi käyttämään kolmansien osapuolten
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Lähetysvalinnat-moduulin asetukset
SendingsReceiptModel=Lähettävä vastaanottanut malli
SendingsNumberingModules=Lähetysten numerointi moduulit
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Useimmissa tapauksissa sendings tulot käytetään sekä piirturilevyt asiakas toimitukset (tuotteiden luettelon lähettää) ja levyt on recevied ja allekirjoittanut asiakas. Joten tuotteen toimitusten kuitit on kahdennettu ominaisuus ja se on harvoin käytössä.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/fi_FI/agenda.lang b/htdocs/langs/fi_FI/agenda.lang
index e2c119cb106..a86101e70b8 100644
--- a/htdocs/langs/fi_FI/agenda.lang
+++ b/htdocs/langs/fi_FI/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Kaikki toimet / tehtävät
AllActions= Toutes les actions / tehtävät
-ViewList=Näytä lista
ViewCal=Näytä kalenteri
ViewDay=Päivä näkymä
ViewWeek=Viikkonäkymä
diff --git a/htdocs/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang
index a3dc28186cc..d42b003ece4 100644
--- a/htdocs/langs/fi_FI/commercial.lang
+++ b/htdocs/langs/fi_FI/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Mahdollisuuden tila
DraftPropals=Kaupallisten ehdotusten luonnos
SearchPropal=Hae kaupallisia ehdotuksia
CommercialDashboard=Kaupallinen yhteenveto
+NoLimit=No limit
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 0cbcd606af8..e74e8aea9c6 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Kolmannen osapuolen yhteystiedot/osoitteet
StatusContactValidated=Yhteystietojen/osoitteiden tila
Company=Yritys
CompanyName=Yrityksen nimi
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Yritykset
CountryIsInEEC=Maa kuuluu EU:hun
ThirdPartyName=Kolmannen osapuolen nimi
@@ -68,6 +69,7 @@ Country=Maa
CountryCode=Maakoodi
CountryId=Maatunnus
Phone=Puhelin
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 7e6ddfe2f76..369eb94481e 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=<b>Kenttä %s</b> ei saa sisältää erikoismerkkejä.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=O kirjanpito moduuli aktivoitu
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP yhteensovitus ei ole täydellinen.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fi_FI/languages.lang b/htdocs/langs/fi_FI/languages.lang
index 117a45e7236..0213b11ecb8 100644
--- a/htdocs/langs/fi_FI/languages.lang
+++ b/htdocs/langs/fi_FI/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Ranska (Kanada)
Language_fr_CH=Ranska (Sveitsi)
Language_fr_FR=Ranskalainen
Language_fr_NC=Ranskan (Uusi-Kaledonia)
+Language_fy_NL=Frisian
Language_he_IL=Heprea
Language_hr_HR=Kroaatti
Language_hu_HU=Unkari
@@ -70,6 +71,7 @@ Language_sv_SV=Ruotsi
Language_sv_SE=Ruotsi
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thaimaalainen
Language_uk_UA=Ukrainalainen
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 6645f2f45d2..c3f5c7551fd 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Maanantai
Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/margins.lang b/htdocs/langs/fi_FI/margins.lang
index 4836c72cf6d..9c81c1b2bf5 100644
--- a/htdocs/langs/fi_FI/margins.lang
+++ b/htdocs/langs/fi_FI/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 05bf4b5e855..60ee665fa57 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 40fa15b2563..1f4e40d23cc 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projektin johtaja
TypeContact_project_external_PROJECTLEADER=Projektin johtaja
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index fa5e296d529..589227cd1c5 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Sendings
AllSendings=All Shipments
Shipment=Lähettävä
Shipments=Toimitukset
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Sendings alueella
ListOfSendings=Luettelo sendings
@@ -26,8 +26,8 @@ QtyToShip=Kpl alusten
QtyReceived=Kpl saanut
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Muut sendings tässä tilauksessa
-DateSending=Päiväys lähettämistä, jotta
-DateSendingShort=Päiväys lähettämistä, jotta
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Sendings tässä tilauksessa
SendingsAndReceivingForSameOrder=Sendings ja receivings tässä tilauksessa
SendingsToValidate=Lähetysvalinnat validoida
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index 863972bacd8..258eb61c005 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Sääntö varaston hallintaan lasku
RuleForStockManagementIncrease=Sääntö varaston hallintaan lisätä
DeStockOnBill=Decrease todellinen varastot laskuista / hyvityslaskuja
DeStockOnValidateOrder=Decrease todellinen varastot tilaukset toteaa
-DeStockOnShipment=Otto real varastojen siirtoa validointi
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Lisäys todellinen varastot laskuista / hyvityslaskuja
ReStockOnValidateOrder=Lisäys todellinen varastot tilaukset toteaa
ReStockOnDispatchOrder=Lisäys real varastot käsikirja lähettämistä osaksi varastot, kun toimittaja voidaan vastaanottaa
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index c3173235df9..cd63f6865d0 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index 19059fcef4b..a7b7f36bd74 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -27,5 +27,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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
diff --git a/htdocs/langs/fr_BE/companies.lang b/htdocs/langs/fr_BE/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/fr_BE/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/fr_BE/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/fr_BE/projects.lang b/htdocs/langs/fr_BE/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/fr_BE/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/fr_BE/sendings.lang b/htdocs/langs/fr_BE/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/fr_BE/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/fr_BE/stocks.lang b/htdocs/langs/fr_BE/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/fr_BE/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 02a0f1bad66..14bb51a0754 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -21,6 +21,7 @@ Permission93=Supprimer les charges et la TVA (TPS)
Permission94=Exporter les charges
Permission141=Consulter tous les projets et tâches (y compris privés dont je ne suis pas contact)
Permission144=Supprimer tous les projets et tâches (y compris privés dont je ne suis pas contact)
+Permission771=Voir les notes de frais (Les vôtres et les utilisateurs autorisés)
DictionarySocialContributions=Types de charges sociales
DictionaryVAT=Taux de TVA (TPS) ou de Taxes de Ventes
VATManagement=Gestion TVA (TPS)
@@ -33,7 +34,6 @@ LocalTax2IsNotUsedDesc=Pas d'utilisation de 3ème type taxe (autre que TVA(TPS))
ShowBugTrackLink=Afficher le lien "Signaler un défaut"
MAIN_ROUNDING_RULE_TOT=Taille du pas des arrondis (pour les très rares pays qui arrondissent sur une autre base que la base 10)
OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles que soient les permissions de ces utilisateurs) :
-UseUnits=Support units
TaxSetup=Configuration du module Taxes, charges sociales et dividendes
YourCompanyDoesNotUseVAT=Votre institution est configurée comme non assujettie à la TVA (TPS) (Accueil - Configuration - Société/Institution), aussi il n'y a aucune option sur la gestion TVA à paramétrer.
Opened=Ouverte
diff --git a/htdocs/langs/fr_CA/companies.lang b/htdocs/langs/fr_CA/companies.lang
index 8e1df09eed8..bf49d3870ee 100644
--- a/htdocs/langs/fr_CA/companies.lang
+++ b/htdocs/langs/fr_CA/companies.lang
@@ -1,5 +1,4 @@
# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
VATIsUsed=Assujetti à la TVA (TPS)
VATIsNotUsed=Non assujetti à la TVA (TPS)
VATIntra=Numéro de TVA (TPS)
diff --git a/htdocs/langs/fr_CA/products.lang b/htdocs/langs/fr_CA/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/fr_CA/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/fr_CA/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/fr_CA/sendings.lang b/htdocs/langs/fr_CA/sendings.lang
deleted file mode 100644
index cceb71550e2..00000000000
--- a/htdocs/langs/fr_CA/sendings.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-DateDeliveryPlanned=Planed date of delivery
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/fr_CA/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index 45ade9fe447..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
-UseUnits=Support units
-SendingsAbility=Support shipment sheets for customer deliveries
diff --git a/htdocs/langs/fr_CH/companies.lang b/htdocs/langs/fr_CH/companies.lang
deleted file mode 100644
index 6dbc0710440..00000000000
--- a/htdocs/langs/fr_CH/companies.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - companies
-AliasNames=Alias names (commercial, trademark, ...)
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
deleted file mode 100644
index 255754ff779..00000000000
--- a/htdocs/langs/fr_CH/products.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - products
-PriceByCustomerLog=Price by customer log
diff --git a/htdocs/langs/fr_CH/projects.lang b/htdocs/langs/fr_CH/projects.lang
deleted file mode 100644
index ef9e5ce9d8d..00000000000
--- a/htdocs/langs/fr_CH/projects.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - projects
-OpportunityPonderatedAmount=Opportunities ponderated amount
diff --git a/htdocs/langs/fr_CH/sendings.lang b/htdocs/langs/fr_CH/sendings.lang
deleted file mode 100644
index 83b37980117..00000000000
--- a/htdocs/langs/fr_CH/sendings.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - sendings
-ShowSending=Show Sending
-DateSendingShort=Date sending order
diff --git a/htdocs/langs/fr_CH/stocks.lang b/htdocs/langs/fr_CH/stocks.lang
deleted file mode 100644
index 1af77b56a14..00000000000
--- a/htdocs/langs/fr_CH/stocks.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - stocks
-DeStockOnShipment=Decrease real stocks on shipment validation
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 11481f5a2ac..a015020b4e6 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Nouveau compte comptable
Update=Modifier
List=Liste
Create=Créer
+CreateMvts=Create movement
UpdateAccount=Modification de compte comptable
UpdateMvts=Modification de mouvements
WriteBookKeeping=Enregistrer les écritures dans le grand livre
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation
AccountLength=Longueur des comptes comptables affichés dans Dolibarr
AccountLengthDesc=Fonction permettant de simuler une longueur de compte comptable en remplaçant les espaces par le chiffre zéro. Cette fonction touche uniquement à l'affichage, elle ne modifie pas les comptes comptables enregistrés dans Dolibarr. Pour l'export, cette fonction est nécessaire pour être compatible avec certains logiciels.
+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=Longueur des comptes généraux
ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 51379c4caf2..c935528237f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Comptabilité (avancée)
Module50400Desc=Gestion de la comptabilité (doubles parties)
Module54000Name=PrintIPP
Module54000Desc=Impression directe (sans ouvrir les documents) en utilisant l'interface Cups IPP (l'imprimante doit être visible depuis le serveur, et CUPS doit être installé sur le serveur).
-Module55000Name=Sondages
-Module55000Desc=Module pour intégrer un sondage (comme Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marges
Module59000Desc=Module pour gérer les marges
Module60000Name=Commissions
@@ -730,7 +730,7 @@ Permission538=Exporter les services
Permission701=Consulter les dons
Permission702=Créer/modifier les dons
Permission703=Supprimer les dons
-Permission771=Voir les notes de frais (Les vôtres et les utilisateurs autorisés)
+Permission771=Voir les notes de frais (les vôtres et celles de vos subordonnés)
Permission772=Créer/modifier les notes de frais
Permission773=Supprimer les notes de frais
Permission774=Lire toutes les notes de frais (même pour les utilisateurs en dehors de ma hierarchie)
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Aucun événement d'audit de sécurité n'a été enregist
NoEventFoundWithCriteria=Aucun événement d'audit de sécurité trouvé avec ces critères.
SeeLocalSendMailSetup=Voir la configuration locale de sendmail
BackupDesc=Pour réaliser une sauvegarde complète de Dolibarr, vous devez :
-BackupDesc2=Sauvegardez le contenu du répertoire document (<b>%s</b>) qui contient tous les fichiers envoyés ou générés (vous pouvez créer un zip du répertoire par exemple).
+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=Sauvez le contenu de votre base de données (<b>%s</b>) dans un fichier « dump ». Pour cela vous pouvez utiliser l'assistant ci-dessous.
BackupDescX=Le répertoire archivé devra être placé en lieu sûr.
BackupDescY=Le fichier « dump » généré devra être placé en lieu sûr.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Utilisez un champ avec auto-complétion pour choisir le
UseEcoTaxeAbility=Prise en charge des éco-taxes (DEEE)
SetDefaultBarcodeTypeProducts=Type de code-barre utilisé par défaut pour les produits
SetDefaultBarcodeTypeThirdParties=Type de code-barre utilisé par défaut pour les tiers
-UseUnits=Support des unités
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modèles de numérotation des produits / services
ProductOtherConf= Paramètres des produits / services
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Email fixe cible destinataires
SendingsSetup=Configuration du module Expédition/Livraison
SendingsReceiptModel=Modèles de bordereau d'expédition
SendingsNumberingModules=Modèles de numérotation des expéditions
-SendingsAbility=Prise en charge des bons d'expédition vers le client
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Dans la plupart des cas, ce sont les bons d'expédition/livraison (liste des produits à envoyer par le transporteur) qui font office de bons de réception et qui sont signés par le client. La gestion des bons de réception fait donc double emploi et sera rarement activée.
FreeLegalTextOnShippings=Mention complémentaire sur les expéditions
##### Deliveries #####
@@ -1566,7 +1566,7 @@ EndPointIs=Les clients SOAP doivent envoyer leur requêtes vers le point de sort
ApiSetup=Configuration du module API REST
ApiDesc=En activant ce module, Dolibarr devient aussi serveur de services API de type REST
KeyForApiAccess=Clé pour utiliser les API (paramètre "api_key")
-ApiProductionMode=Enable production mode
+ApiProductionMode=Activer le mode « production »
ApiEndPointIs=Vous pouvez accéder aux API par l'URL
ApiExporerIs=Vous pouvez consulter la liste des API par l'URL
OnlyActiveElementsAreExposed=Seuls les éléments en rapport avec un module actif sont présentés.
@@ -1600,7 +1600,7 @@ ProjectsSetup=Configuration du module Projets
ProjectsModelModule=Modèles de document de rapport projets
TasksNumberingModules=Modèles de numérotation des références tâches
TaskModelModule=Modèles de document de rapport tâches
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
+UseSearchToSelectProject=Utilisez un champ avec auto-complétion pour choisir les projets (plutôt qu'une liste déroulante).
##### ECM (GED) #####
ECMSetup = Configuration du module GED
ECMAutoTree = L'arborescence automatique est disponible
@@ -1651,24 +1651,24 @@ LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
BackgroundTableTitleColor=Couleur de fond pour la ligne de titre des tables
BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires des tables
BackgroundTableLineEvenColor=Couleur de fond pour les lignes paires des tales
-MinimumNoticePeriod=Minimum notice period (Your leave request must be done before this delay)
+MinimumNoticePeriod=Période de préavis minimum (Votre demande de congé doit être faite avant ce délai)
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
+UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
+PositionIntoComboList=Position de la ligne dans des listes déroulantes
SellTaxRate=Sale tax rate
-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 shipment, 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
+RecuperableOnly=Oui pour une TVA "Perçue Non Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas.
+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=Lorsque vous créez une opportunité, vous aurez défini un montant estimatif de projet/affaire. Selon le statut de l'opportunité, ce montant peut être multiplié par ce taux pour évaluer montant probable que vos opportunités sont susceptibles de générer. La valeur est un pourcentage (entre 0 et 100).
+TemplateForElement=Cet enregistrement modèle est dédié à quel élément
TypeOfTemplate=Type de modèle
-TemplateIsVisibleByOwnerOnly=Template is visible by owner only
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+TemplateIsVisibleByOwnerOnly=Le modèle est visible par le propriétaire seulement
+MailToSendProposal=Pour l'envoi de proposition commerciale client
+MailToSendOrder=Pour l'envoi de commande client
+MailToSendInvoice=Pour l'envoi de facture client
+MailToSendShipment=Pour l'envoi de bon de livraison
+MailToSendIntervention=Pour l'envoi de fiche intervention
+MailToSendSupplierRequestForQuotation=Pour l'envoi de demande de prix fournisseur
+MailToSendSupplierOrder=Pour l'envoi de commande fournisseur
+MailToSendSupplierInvoice=Pour l'envoi de facture fournisseur
+MailToThirdparty=Pour l'envoi d'email depuis la fiche Tiers
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index e255ed0690d..ded99209c3b 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Evénements de tous les utilisateurs du groupe
ActionAssignedTo=Evénement assigné à
AllMyActions= Tous mes événements
AllActions= Tous les événements
-ViewList=Vue liste
ViewCal=Vue mois
ViewDay=Vue jour
ViewWeek=Vue semaine
@@ -96,7 +95,7 @@ MyAvailability=Ma disponibilité
ActionType=Type événement
DateActionBegin=Date début événément
CloneAction=Cloner l'événement
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b> ?
+ConfirmCloneEvent=Êtes-vous sûr de vouloir cloner cet événement <b>%s</b> ?
RepeatEvent=Répétez événement
EveryWeek=Chaque semaine
EveryMonth=Chaque mois
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 89aef8f7e66..fb888bc82e3 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -166,7 +166,7 @@ ConfirmDeleteRib=Etes vous sur de vouloir supprimé ce RIB ?
StartDate=Date de début
EndDate=Date de fin
RejectCheck=Vérifiez rejet
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
+ConfirmRejectCheck=Êtes-vous sûr de vouloir marquer ce chèque comme rejeté ?
RejectCheckDate=Date de vérification des rejets
CheckRejected=Chèques rejetés
CheckRejectedAndInvoicesReopened=Chèques rejetées et factures réouvertes
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index e4547c3b53d..162cec90e55 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Status prospection
DraftPropals=Propositions brouillons
SearchPropal=Rechercher une proposition
CommercialDashboard=Synthèse commercial
+NoLimit=No limit
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index 602fb4b11e4..29cde240a19 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contact tiers
StatusContactValidated=État du contact
Company=Société
CompanyName=Raison sociale
-AliasNames=Nom alternatif (commercial, marque, abbréviation)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Sociétés
CountryIsInEEC=Pays de la Communauté Économique Européenne
ThirdPartyName=Nom du tiers
@@ -68,6 +69,7 @@ Country=Pays
CountryCode=Code pays
CountryId=Identifiant pays
Phone=Téléphone
+PhoneShort=Phone
Skype=Skype
Call=Appeler
Chat=Tchat
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 53a30490eb5..7ae01f74535 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -119,7 +119,7 @@ NbOfCheques=Nb de chèques
PaySocialContribution=Payer une charge sociale/fiscale
ConfirmPaySocialContribution=Êtes-vous sûr de vouloir classer cette charge sociale ou fiscale à payé ?
DeleteSocialContribution=Effacer une charge fiscale ou sociale
-ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment?
+ConfirmDeleteSocialContribution=Êtes-vous sûr de vouloir supprimer ce paiement de taxe sociale/fiscale ?
ExportDataset_tax_1=Taxes sociales et fiscales et paiements
CalcModeVATDebt=Mode <b>%sTVA sur débit%s</b>.
CalcModeVATEngagement=Mode <b>%sTVA sur encaissement%s</b>.
@@ -198,9 +198,9 @@ CalculationRuleDescSupplier=Selon le mode utilisé par le fournisseur, choisisse
TurnoverPerProductInCommitmentAccountingNotRelevant=Le chiffre d'affaires par produit, dans une comptabilité en mode <b>comptabilité de caisse</b> n'est pas définissable. Ce rapport n'est disponible qu'en mode de comptabilité dit <b>comptabilité d'engagement</b> (voir la configuration du module de comptabilité).
CalculationMode=Mode de calcul
AccountancyJournal=Code journal comptabilité
-ACCOUNTING_VAT_SOLD_ACCOUNT=Default accountancy code for collecting VAT
+ACCOUNTING_VAT_SOLD_ACCOUNT=Code comptable par défaut pour la TVA encaissé
ACCOUNTING_VAT_BUY_ACCOUNT=Code comptable par défaut pour l'encaissement de TVA
-ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_PAY_ACCOUNT=Code comptable par défaut pour le paiement de la TVA
ACCOUNTING_ACCOUNT_CUSTOMER=Code comptable par défaut des tiers clients
ACCOUNTING_ACCOUNT_SUPPLIER=Code comptable par défaut des tiers fournisseurs
CloneTax=Cloner une charge sociale/fiscale
@@ -210,5 +210,5 @@ SimpleReport=Rapport simple
AddExtraReport=Rapports supplémentaires
OtherCountriesCustomersReport=Rapport client étranger
BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant différent du code de pays de votre propre entreprise
-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
+SameCountryCustomersWithVAT=Rapport clients nationaux
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basé sur les deux premières lettres du numéro de TVA étant les mêmes que le code pays de votre propre entreprise
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 1eb9af27e0a..085e0c336a6 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Les valeurs de la liste de case à cochées doivent
ErrorNoValueForRadioType=Les valeurs de la liste d'options doivent être renseignées
ErrorBadFormatValueList=Les valeurs de la liste ne peuvent pas contenir plus d'une virgule : <b>%s</b>, mais doivent en avoir au moins une: clef,valeur
ErrorFieldCanNotContainSpecialCharacters=Le champ <b>%s</b> ne peut contenir de caractères spéciaux.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Le champ <b>%s</b> ne doit pas contenir de caractères spéciaux, ni de caractères en majuscule.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Aucun module de comptabilité activé
ErrorExportDuplicateProfil=Ce nom de profil existe déjà pour ce lot d'export.
ErrorLDAPSetupNotComplete=Le matching Dolibarr-LDAP est incomplet.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Pas de variable globale
ErrorFieldMustBeANumeric=Le champ <b>%s</b> doit être un numérique
ErrorFieldMustBeAnInteger=Le champ <b>%s</b> doit être un numérique
ErrorMandatoryParametersNotProvided=Paramètre(s) obligatoire(s) non fournis
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
@@ -191,4 +192,4 @@ WarningNotRelevant=Opération non pertinente pour cet ensemble de données
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. Utilisez des filtres plus précis.
-WarningSomeLinesWithNullHourlyRate=Some times were recorded by users when their hourly rate was not defined. A value of 0 was used but this may result in wrong valuation of time spent.
+WarningSomeLinesWithNullHourlyRate=Des temps ont été enregistrés par des utilisateurs lorsque leur taux horaire n'était défini. Une valeur de 0 a été utilisé, mais cela peut entraîner une mauvaise évaluation du temps passé.
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index c015f294d9a..7f8bda6daea 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -71,7 +71,7 @@ MotifCP=Motif
UserCP=Utilisateur
ErrorAddEventToUserCP=Une erreur est survenue durant l'ajout du congé exceptionnel.
AddEventToUserOkCP=L'ajout du congé exceptionnel à bien été effectué.
-MenuLogCP=Voir notes de changement de version
+MenuLogCP=Voir historique modif.
LogCP=Historique de la mise à jours de jours de congés disponibles
ActionByCP=Réalisée par
UserUpdateCP=Pour l'utilisateur
@@ -93,7 +93,7 @@ ValueOptionCP=Valeur
GroupToValidateCP=Groupe ayant la possibilité d'approuver les congés
ConfirmConfigCP=Valider la configuration
LastUpdateCP=Dernière mise à jour automatique de l'allocation des congés
-MonthOfLastMonthlyUpdate=Month of last automatic update of leaves allocation
+MonthOfLastMonthlyUpdate=Mois de la dernière mise à jour automatique des attributions de congès
UpdateConfCPOK=Mise à jour effectuée avec succès.
ErrorUpdateConfCP=Une erreur à eu lieu durant la mise à jour, merci de réessayer.
AddCPforUsers=Veuillez ajouter le solde des congés des utilisateurs en <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">cliquant ici</a>.
@@ -148,4 +148,4 @@ Permission20004=Lire les demandes de congès de tout le monde
Permission20005=Créer/modifier les congés pour tout le monde
Permission20006=Administration des demande de congès (configuration et mise à jour du solde)
NewByMonth=Ajouté par mois
-GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type of leaves</strong> to setup the different types of leaves.
+GoIntoDictionaryHolidayTypes=Aller dans <strong>Accueil - Configuration - Dictionnaires - Type de congés</strong> pour configurer les différents types de congés.
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 6cc2628b8df..26f18302c79 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Français (Canada)
Language_fr_CH=Français (Suisse)
Language_fr_FR=Français
Language_fr_NC=Français (Nouvelle Calédonie)
+Language_fy_NL=Frisian
Language_he_IL=Hébreux
Language_hr_HR=Croate
Language_hu_HU=Hongrois
@@ -70,6 +71,7 @@ Language_sv_SV=Suédois
Language_sv_SE=Suédois
Language_sq_AL=Albanais
Language_sk_SK=Slovaque
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thaï
Language_uk_UA=Ukrainien
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index 3b424410c32..ecac9ee612c 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -17,21 +17,21 @@ ConfirmDeleteLoan=Confirmer la suppression de cet emprunt ?
LoanDeleted=Emprunt supprimé avec succès
ConfirmPayLoan=Classer cet emprunt comme payé
LoanPaid=Emprunt payé
-ErrorLoanCapital=Loan amount has to be numeric and greater than zero.
-ErrorLoanLength=Loan length has to be numeric and greater than zero.
-ErrorLoanInterest=Annual interest has to be numeric and greater than zero.
+ErrorLoanCapital=Le montant du prêt doit être numérique et positif.
+ErrorLoanLength=La durée du prêt doit être numérique et positive.
+ErrorLoanInterest=Le taux d'intérêt annuel doit être numérique et positif.
# Calc
-LoanCalc=Bank Loans Calculator
-PurchaseFinanceInfo=Purchase & Financing Information
-SalePriceOfAsset=Sale Price of Asset
-PercentageDown=Percentage Down
-LengthOfMortgage=Length of Mortgage
-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)
+LoanCalc=Calculateur d'Emprunt Bancaire
+PurchaseFinanceInfo=Information de Financement et d'Achat
+SalePriceOfAsset=Prix de vente du Bien
+PercentageDown=Réduction Pourcentage
+LengthOfMortgage=Durée de l'Hypothèque
+AnnualInterestRate=Taux d'Intérêts Annuel
+ExplainCalculations=Expliquer les Calculs
+ShowMeCalculationsAndAmortization=Montrer les calculs et l'ammortissement
+MortgagePaymentInformation=Information de Paiement de l'Hypothèque
+DownPayment=Acompte
+DownPaymentDesc=L'<b>acompte</b> = Le prix de la maison multiplié par le pourcentage divisé par 100 (5% devient 5/100 ou 0,05)
InterestRateDesc=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)
@@ -40,7 +40,7 @@ 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
+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 home mortgage loan, based on the home's sale price, the term of the loan desired, buyer's down payment percentage, and the loan's interest rate.<br> This calculator factors in 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
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 16d46353415..8107683a860 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -710,6 +710,8 @@ Denied=Refusé
ListOfTemplates=Liste des modèles
Genderman=Homme
Genderwoman=Femme
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Lundi
Tuesday=Mardi
diff --git a/htdocs/langs/fr_FR/margins.lang b/htdocs/langs/fr_FR/margins.lang
index 480b22ffbfa..3f89f13a45e 100644
--- a/htdocs/langs/fr_FR/margins.lang
+++ b/htdocs/langs/fr_FR/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Comme un produit
UseDiscountAsService=Comme un service
UseDiscountOnTotal=Sur le total
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Définit si une remise globale est prise en compte comme un produit, comme un service ou uniquement sur le total lors du calcul des marges.
-MARGIN_TYPE=Type de marge gérée
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Marge brute
MargeNette=Marge nette
-MARGIN_TYPE_DETAILS=Marge brute : Prix de vente HT - Prix d'achat HT<br/>Marge nette : Prix de vente HT - Coût de revient
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
+MARGIN_TYPE_DETAILS=Marge brute : Prix de vente HT - Prix d'achat HT<br/>Marge nette : Prix de vente HT - Weighted Average 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
CostPrice=Prix de revient
BuyingCost=Coût de revient
UnitCharges=Charge unitaire
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index df0ee27c7c6..f8e6230f8d0 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -200,7 +200,7 @@ DOLIBARRFOUNDATION_PAYMENT_FORM=Pour réaliser le paiement de votre cotisation p
ByProperties=Par caractéristiques
MembersStatisticsByProperties=Statistiques des adhérents par caractéristiques
MembersByNature=Cet écran vous montre les statistiques sur les membres par nature.
-MembersByRegion=This screen show you statistics on members by region.
+MembersByRegion=Cet écran vous montre les statistiques sur les membres par région.
VATToUseForSubscriptions=Taux de TVA pour les adhésions
NoVatOnSubscription=Pas de TVA sur les adhésions
MEMBER_PAYONLINE_SENDEMAIL=Email à avertir en cas de retour de paiement validé pour une cotisation
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index b1bb18289cc..94d801fe150 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -189,30 +189,30 @@ CustomCode=Code douane
CountryOrigin=Pays d'origine
HiddenIntoCombo=Caché dans les listes
Nature=Nature
-ShortLabel=Short label
-Unit=Unit
+ShortLabel=Libellé court
+Unit=Unité
p=u.
-set=set
-se=set
-second=second
+set=ensemble
+se=ensemble
+second=seconde
s=s
-hour=hour
+hour=heure
h=h
-day=day
-d=d
-kilogram=kilogram
+day=jour
+d=ré
+kilogram=kilogramme
kg=Kg
-gram=gram
+gram=gramme
g=g
-meter=meter
+meter=mètre
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
-liter=liter
+liter=litre
l=L
ProductCodeModel=Masque pour les produits
ServiceCodeModel=Masque pour les services
@@ -264,7 +264,7 @@ PriceCatalogue=Un seul prix unique 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
-PriceByCustomerLog=Trace des prix par clients
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Le prix minimum ne peut pas être inférieure à %s
MinimumRecommendedPrice=Prix minimum recommandé : %s
PriceExpressionEditor=Éditeur d'expression de prix
@@ -292,8 +292,7 @@ GlobalVariableUpdaterHelpFormat1=Le format est {"URL": "http://example.com/urlof
UpdateInterval=Intervale de mise à jour (minutes)
LastUpdated=Dernière mise à jour
CorrectlyUpdated=Mise à jour avec succès
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=Select PDF files
-IncludingProductWithTag=Including product with tag
-DefaultPriceRealPriceMayDependOnCustomer=Default price, real price may depend on customer
-DefaultUnitToShow=Default unit to show
\ No newline at end of file
+PropalMergePdfProductActualFile=Fichiers utilisés pour l'ajout au PDF Azur sont
+PropalMergePdfProductChooseFile=Sélectionnez les fichiers PDF
+IncludingProductWithTag=Incluant un produit ayant le tag/catégorie
+DefaultPriceRealPriceMayDependOnCustomer=Prix par défaut, le prix réel peut dépendre du client
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 5549ac6423c..8b841ecd240 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -14,8 +14,8 @@ MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous
OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
-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.
+AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches de ce projet sont visibles, mais vous pouvez entrer le temps seulement pour une tâche qui vous est attribuée. Attribuez-vous la tâche si vous voulez entrer du temps dessus.
+OnlyYourTaskAreVisible=Seules les tâches qui vous sont attribuées sont visibles. Attribuez-vous la tâche si vous voulez entrer du temps dessus.
ProjectsArea=Espace projet
NewProject=Nouveau projet
AddProject=Créer projet
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Tâche %s créée
TaskModifiedInDolibarr=Tâche %s modifiée
TaskDeletedInDolibarr=Tâche %s supprimée
OpportunityStatus=Statut opportunité
+OpportunityStatusShort=Opp. status
OpportunityAmount=Montant opportunité
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Chef de projet
TypeContact_project_external_PROJECTLEADER=Chef de projet
@@ -165,7 +167,18 @@ ProjectOverview=Vue d'ensemble
ManageTasks=Utiliser les projets pour suivre les tâches
ManageOpportunitiesStatus=Utiliser les projets pour suivre les affaires / opportunités
ProjectNbProjectByMonth=Nb de projets créés par mois
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
ProjectsStatistics=Statistics sur les projets
TaskAssignedToEnterTime=Tâche assignée. La saisie de temps sur cette tâche devrait être possible.
OpenedProjectsByThirdparties=Projets ouvert par le tiers
-OpportunityPonderatedAmount=Montant pondéré des opportunités
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 1a92875cc65..516c28ec3c0 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -11,5 +11,5 @@ ShowSalaryPayment=Afficher règlement de salaire
THM=Tarif horaire moyen
TJM=Tarif journalier moyen
CurrentSalary=Salaire courant
-THMDescription=This value may be used to calculate cost of time consumed on a project entered by users if module project is used
+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/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index e884820d042..094397af39c 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Expéditions
AllSendings=Toutes les expéditions
Shipment=Expédition
Shipments=Expéditions
-ShowSending=Afficher expédition
+ShowSending=Show Shipments
Receivings=Réceptions
SendingsArea=Espace expéditions
ListOfSendings=Liste des expéditions
@@ -26,8 +26,8 @@ QtyToShip=Qté. à expédier
QtyReceived=Qté. reçue
KeepToShip=Reste à expédier
OtherSendingsForSameOrder=Autres expéditions pour cette commande
-DateSending=Date ordre d'expédition
-DateSendingShort=Date ordre exp.
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Expéditions pour cette commande
SendingsAndReceivingForSameOrder=Expéditions et réceptions pour cette commande
SendingsToValidate=Expéditions à valider
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 6ef5a2190d3..9eca01511f6 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Règle de gestion des décrémentations de stock
RuleForStockManagementIncrease=Règle de gestion des incrémentations de stock
DeStockOnBill=Décrémente les stocks physiques sur validation des factures/avoirs clients
DeStockOnValidateOrder=Décrémente les stocks physiques sur validation des commandes clients
-DeStockOnShipment=Décrémente les stocks physiques sur validation des expéditions
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Incrémente les stocks physiques sur validation des factures/avoirs fournisseurs
ReStockOnValidateOrder=Incrémente les stocks physiques sur approbation des commandes fournisseurs
ReStockOnDispatchOrder=Incrémente les stocks physiques sur ventilation manuelle de la réception des commandes fournisseurs dans les entrepôts
@@ -134,7 +134,7 @@ IsInPackage=Inclus dans un package
ShowWarehouse=Afficher entrepôt
MovementCorrectStock=Correction du stock pour le produit %s
MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=L'entrepôt source doit être définie ici quand le module "Numéro Lot/Série" est activé. Il sera utilisé pour lister quel numéro de lot/série est utilisé pour les produits qui requierent un numéro de lot/série pour le mouvement. Si vous voulez envoyer des produits de différents entrepôts, enregistrez l'expédition en plusieurs étapes.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Code Inv./Mouv.
NoPendingReceptionOnSupplierOrder=Pas de réception en attente consécutive à des commandes fournisseurs
ThisSerialAlreadyExistWithDifferentDate=Ce lot/numéro de série (<strong>%s</strong>) existe déjà mais avec des dates de consommation ou péremption différente (trouvé <strong>%s</strong> mais vous avez entré <strong>%s</strong>).
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 5eef37dc782..b765a6420d3 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Valider note de frais
ConfirmSaveTrip=Êtes-vous sûr de vouloir valider cette note de frais ?
NoTripsToExportCSV=Pas de note de frais à exporter dans cette période
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/he_IL/accountancy.lang
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 45c580d5c58..c1484fdf2c8 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=בשום מקרה לא ביטחון נרשמה עד כה.
NoEventFoundWithCriteria=בשום מקרה לא ביטחון כבר מצאו criterias חיפוש כאלה.
SeeLocalSendMailSetup=ראה הגדרת sendmail המקומי
BackupDesc=כדי לבצע גיבוי מלא של Dolibarr, עליך:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=מדריך בארכיון יש לאחסן במקום בטוח.
BackupDescY=קובץ dump שנוצר יש לאחסן במקום בטוח.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=תמיכה Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=ברקוד מסוג ברירת מחדל עבור מוצרים
SetDefaultBarcodeTypeThirdParties=ברקוד מסוג ברירת מחדל עבור צדדים שלישיים
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=שליחת ההתקנה מודול
SendingsReceiptModel=שליחת מודל קבלת
SendingsNumberingModules=Sendings מספור מודולים
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=ברוב המקרים, קבלות sendings משמשים הן יריעות עבור משלוחים של לקוחות (רשימת המוצרים לשלוח) ויריעות כי הוא recevied ונחתם על ידי הלקוח. אז משלוחים קבלות המוצר הוא תכונה כפולות מופעל לעתים נדירות.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/he_IL/agenda.lang b/htdocs/langs/he_IL/agenda.lang
index 1f575cb5954..12e7dde3403 100644
--- a/htdocs/langs/he_IL/agenda.lang
+++ b/htdocs/langs/he_IL/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang
index 49d3d353137..a67317331e3 100644
--- a/htdocs/langs/he_IL/commercial.lang
+++ b/htdocs/langs/he_IL/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index 6e5bd6b3c33..a8667165d4a 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=חברה
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=מדינה
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/he_IL/languages.lang b/htdocs/langs/he_IL/languages.lang
index c9f3b8a0a91..421e5cf95ff 100644
--- a/htdocs/langs/he_IL/languages.lang
+++ b/htdocs/langs/he_IL/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=צרפתית (קנדה)
Language_fr_CH=צרפתית (שוויץ)
Language_fr_FR=צרפתי
Language_fr_NC=צרפתית (קלדוניה החדשה)
+Language_fy_NL=Frisian
Language_he_IL=עברית
Language_hr_HR=קרואטי
Language_hu_HU=הונגרי
@@ -70,6 +71,7 @@ Language_sv_SV=שוודי
Language_sv_SE=שוודי
Language_sq_AL=Albanian
Language_sk_SK=סלובקי
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=תאילנדי
Language_uk_UA=אוקראיני
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 997904e9d86..886ed204818 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/margins.lang b/htdocs/langs/he_IL/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/he_IL/margins.lang
+++ b/htdocs/langs/he_IL/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index d7acb3d35e3..a08a1808d40 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index ad8ea436353..ce3d81b4112 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=מנהל הפרויקט
TypeContact_project_external_PROJECTLEADER=מנהל הפרויקט
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 91fdb33254a..67e1464e07f 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -5,7 +5,7 @@ Sendings=משלוחים
AllSendings=All Shipments
Shipment=Shipment
Shipments=משלוחים
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index e4b0fb5f963..054bb194131 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index b666cc74fa2..44152f252f0 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index e8bc5899fa9..2242bb69587 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index 8e607407cfd..5a61aa263a4 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Svi moji događaji/zadaci
AllActions= Svi događaji/zadaci
-ViewList=Lista
ViewCal=Mjesečni pregled
ViewDay=Dnevni pregled
ViewWeek=Tjedni pregled
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index 0be24ffda59..bbe595a6cb5 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index 2b7392a227c..78a9b8ccf13 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Stranka kontakt / adresa
StatusContactValidated=Status of contact/address
Company=Kompanija
CompanyName=Ime kompanije
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Kompanije
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Ime treće stranke
@@ -68,6 +69,7 @@ Country=Država
CountryCode=Šifra države
CountryId=ID države
Phone=Telefon:
+PhoneShort=Phone
Skype=Skype
Call=Poziv
Chat=Chat
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index f8b8bb2e1da..2b639db2f95 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -41,6 +41,7 @@ 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_he_IL=Hebrew
Language_hr_HR=Hrvatski
Language_hu_HU=Mađarski
@@ -70,6 +71,7 @@ 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_th_TH=Tajlandski
Language_uk_UA=Ukrajinski
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index d32c863260b..fc0c0420f1a 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 6603ec0ce14..6d8f8b77554 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 0a5a45e9200..bcb62f2e8b7 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index 3f368223ab7..2a5f5760166 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Pošiljke
AllSendings=All Shipments
Shipment=Pošiljka
Shipments=Pošiljke
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=Popis pošiljki
@@ -26,8 +26,8 @@ QtyToShip=Količina za poslat
QtyReceived=Količina primljena
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 0f0e6dfdce8..0ab9bffdc05 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Frissítés
List=Lista
Create=Készít
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 73cfdf07f96..a9541a804f6 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Nincs biztonsági esemény lett felvéve még. Ez lehet no
NoEventFoundWithCriteria=Nincs biztonsági esemény találtak ilyen keresési kritériumot.
SeeLocalSendMailSetup=Nézze meg a helyi sendmail beállítása
BackupDesc=Ahhoz, hogy egy teljes biztonsági mentést Dolibarr kell tennie:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Archivált könyvtárban kell tárolni biztonságos helyen.
BackupDescY=A generált dump fájlt kell tárolni biztonságos helyen.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Támogatás Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Alapértelmezett típusú vonalkód használatát termékek
SetDefaultBarcodeTypeThirdParties=Alapértelmezett típusú vonalkód használatát harmadik felek számára
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Küldő modul beállítása
SendingsReceiptModel=Küldése modell átvételét
SendingsNumberingModules=Küldések számozási modulok
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=A legtöbb esetben a küldések bevételek egyaránt felhasználják lapok átadások (termékek listája küldeni), és a lapok recevied és aláírja ügyfél. Tehát a termék szállítás bevételek egy kettős funkció aktiválódik, és ritkán.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index 62b9c8ce19e..470ea04ce86 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Az én cselekvéseim/feladataim
AllActions= Az összes cselekvés/feladat
-ViewList=Lista megtekintése
ViewCal=Naptár megtekintése
ViewDay=Nap nézet
ViewWeek=Hét nézet
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index e3bd1fedfda..d21d3eb114e 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect állapot
DraftPropals=Készítsen üzleti ajánlatot
SearchPropal=Keressen egy kereskedelmi javaslatot
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 6627613b7a5..3369500d3cf 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Paertner Kapcsolat/Cím
StatusContactValidated=Kapcsolat/Cím állapota
Company=Cég
CompanyName=Cégnév
-AliasNames=Alias név (kereskedelmi, márkanév, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Cégek
CountryIsInEEC=EU tagország
ThirdPartyName=Partner neve
@@ -68,6 +69,7 @@ Country=Ország
CountryCode=Az ország hívószáma
CountryId=Ország id
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Hívás
Chat=Chat
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 72a9189859b..149148b2812 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> mező nem tartalmaz speciális karaktereket.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nem számviteli modul aktiválódik
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr LDAP-egyezés nem teljes.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hu_HU/languages.lang b/htdocs/langs/hu_HU/languages.lang
index 2379e88780a..e7c2bf3aa0b 100644
--- a/htdocs/langs/hu_HU/languages.lang
+++ b/htdocs/langs/hu_HU/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francia (Kanada)
Language_fr_CH=Francia (Svájc)
Language_fr_FR=Francia
Language_fr_NC=Francia (Új-Kaledónia)
+Language_fy_NL=Frisian
Language_he_IL=Héber
Language_hr_HR=Horvát
Language_hu_HU=Magyar
@@ -70,6 +71,7 @@ Language_sv_SV=Svéd
Language_sv_SE=Svéd
Language_sq_AL=Albanian
Language_sk_SK=Szlovák
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrán
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 58046e6a3e8..e95fb2ea174 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Hétfő
Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index 678ce8969b3..b4ae55ba939 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index d9a655f8b1f..9127d2a6ff1 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 5f24eb31b78..d10db399239 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projekt vezető
TypeContact_project_external_PROJECTLEADER=Projekt vezető
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index 54be9f7005e..c594aa8b968 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Szállítások
AllSendings=All Shipments
Shipment=Szállítás
Shipments=Szállítások
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Szállítási terület
ListOfSendings=Szállítások listája
@@ -26,8 +26,8 @@ QtyToShip=Szállítandó mennyiség
QtyReceived=Átvett mennyiség
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Más szállítások ehhez a megrendeléshez
-DateSending=Date sending order
-DateSendingShort=Küldési dátum sorrend
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Szállítások ehhez a megrendeléshez
SendingsAndReceivingForSameOrder=Szállítások és átvételek ehhez a rendeléshez
SendingsToValidate=Hitelesítésre váró szállítások
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index b0d13bb6b75..4d937fb05ca 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Készlet kerezelés szabály csökkentése
RuleForStockManagementIncrease=Készlet kerezelés szabály emelése
DeStockOnBill=Tényleges készlet csökkentése számla/hitel jóváhagyásakor
DeStockOnValidateOrder=Tényleges készlet csökkentése ügyfél rendelés jóváhagyásakor
-DeStockOnShipment=Tényleges készlet csökkentése szállítás jóváhagyásakor
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Tényleges készlet növelése számla/hitel jóváhagyásakor
ReStockOnValidateOrder=Tényleges készlet növelése beszállítótól való rendelés jóváhagyásakor
ReStockOnDispatchOrder=Tényleges készlet növelése manuális raktárba való feladáskor miután a beszállítói rendelés beérkezett
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index 879a984bde3..0e023025eb8 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index f3ad8d5fc79..401c22fdae8 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Akun akuntansi baru
Update=Membarui
List=Daftar
Create=Buat
+CreateMvts=Create movement
UpdateAccount=Modifikasi akun akuntansi
UpdateMvts=Modification of a movement
WriteBookKeeping=Mencatat akun di buku besar
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index f75b4b7f52a..e061f930ce4 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Margin
Module59000Desc=Module to manage margins
Module60000Name=Komisi
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/id_ID/agenda.lang b/htdocs/langs/id_ID/agenda.lang
index 445bc01817a..e098e2099ae 100644
--- a/htdocs/langs/id_ID/agenda.lang
+++ b/htdocs/langs/id_ID/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Semua acara saya / tugas
AllActions= Semua acara / tugas
-ViewList=Tampilan daftar
ViewCal=Tampilan bulan
ViewDay=Tampilan hari
ViewWeek=Tampilan minggu
diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/id_ID/commercial.lang
+++ b/htdocs/langs/id_ID/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 030c17faacc..c3a516b7fc8 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Perusahaan
CompanyName=Nama Perusahaan
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Perusahaan
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/id_ID/languages.lang b/htdocs/langs/id_ID/languages.lang
index cfb62c0f6f4..690c0d39912 100644
--- a/htdocs/langs/id_ID/languages.lang
+++ b/htdocs/langs/id_ID/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Perancis (Kanada)
Language_fr_CH=Perancis (Swiss)
Language_fr_FR=Perancis
Language_fr_NC=Perancis (Kaledonia Baru)
+Language_fy_NL=Frisian
Language_he_IL=Ibrani
Language_hr_HR=Kroasia
Language_hu_HU=Hongaria
@@ -70,6 +71,7 @@ Language_sv_SV=Swedia
Language_sv_SE=Swedia
Language_sq_AL=Albania
Language_sk_SK=Slovakia
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukraina
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 68e8ec31f63..c629e4d49de 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/margins.lang b/htdocs/langs/id_ID/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/id_ID/margins.lang
+++ b/htdocs/langs/id_ID/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/id_ID/trips.lang
+++ b/htdocs/langs/id_ID/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/is_IS/accountancy.lang
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 42510991f45..e76d121faa2 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Nei öryggi atburður hefur verið skráð enn. Þetta get
NoEventFoundWithCriteria=Nei öryggi atburður hefur fundist um slíka viðmiðun leit.
SeeLocalSendMailSetup=Sjá sveitarfélaga sendmail uppsetningu
BackupDesc=Til að ljúka öryggisafrit af Dolibarr, verður þú að:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Eldri mappa ætti að vera geymd á öruggum stað.
BackupDescY=The mynda sorphaugur skrá öxl vera geymd á öruggum stað.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Stuðningur Eco-Taxe (raf-og rafeindabúnaðarúrgang)
SetDefaultBarcodeTypeProducts=Default barcode tegund til nota fyrir vörur
SetDefaultBarcodeTypeThirdParties=Default barcode tegund til notkunar fyrir þriðju aðila
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sendi mát skipulag
SendingsReceiptModel=Sending kvittun líkan
SendingsNumberingModules=Sendings númera einingar
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Í flestum tilfellum er sendings kvittunum notað bæði sem lak fyrir afgreiðsla viðskiptavina (listi af vörum til að senda) og lak sem er recevied og undirrituð af viðskiptavini. Svo vara afgreiðsla greiðslukvittun er afrit lögun og er sjaldnast virkur.
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/is_IS/agenda.lang b/htdocs/langs/is_IS/agenda.lang
index dca501a37d8..add89497eaa 100644
--- a/htdocs/langs/is_IS/agenda.lang
+++ b/htdocs/langs/is_IS/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= Allar aðgerðir mínar / verkefni
AllActions= Allar aðgerðir / verkefni
-ViewList=Skoða lista
ViewCal=Skoða dagatal
ViewDay=Dagsskjár
ViewWeek=Vikuskjár
diff --git a/htdocs/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang
index d80b68c1c53..f3d13eff15b 100644
--- a/htdocs/langs/is_IS/commercial.lang
+++ b/htdocs/langs/is_IS/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect stöðu
DraftPropals=Drög auglýsing tillögur
SearchPropal=Leita að auglýsing tillögu
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 2e7be412a34..cd79d026856 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Í þriðja aðila samband
StatusContactValidated=Staða Hafðu samband
Company=Fyrirtæki
CompanyName=Nafn fyrirtækis
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Stofnanir
CountryIsInEEC=Landið er inni Evrópubandalagið
ThirdPartyName=Í þriðja aðila Nafn
@@ -68,6 +69,7 @@ Country=Land
CountryCode=Landsnúmer
CountryId=Land id
Phone=Sími
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 28b6598bfce..bf60d5db1f5 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=<b>Akur %s </b> verður ekki innihalda sértákn.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nei bókhalds mát virkja
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP samsvörun er ekki lokið.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/is_IS/languages.lang b/htdocs/langs/is_IS/languages.lang
index dede4cc2a7d..92a9f9ddbcd 100644
--- a/htdocs/langs/is_IS/languages.lang
+++ b/htdocs/langs/is_IS/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Franska (Kanada)
Language_fr_CH=Franska (Sviss)
Language_fr_FR=Franska
Language_fr_NC=Franska (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebreska
Language_hr_HR=Króatíska
Language_hu_HU=Ungverska
@@ -70,6 +71,7 @@ Language_sv_SV=Sænska
Language_sv_SE=Sænska
Language_sq_AL=Albanian
Language_sk_SK=Slóvakísku
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 42675df8b2b..9c346bb8d29 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# 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 e0357dc27c1..2f48814aaa7 100644
--- a/htdocs/langs/is_IS/margins.lang
+++ b/htdocs/langs/is_IS/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 7e79b37df40..5108b03d62e 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 2235069c34f..95844ace24f 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leiðtogi
TypeContact_project_external_PROJECTLEADER=Project leiðtogi
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index b37f32cab64..a51ed097625 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Sendingar
AllSendings=All Shipments
Shipment=Sendingunni
Shipments=Sendingar
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Sendingar area
ListOfSendings=Listi yfir sendings
@@ -26,8 +26,8 @@ QtyToShip=Magn til skip
QtyReceived=Magn móttekin
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Aðrar sendingar fyrir þessari röð
-DateSending=Date senda til
-DateSendingShort=Date senda til
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Sendingum fyrir í þessari röð
SendingsAndReceivingForSameOrder=Sendingar og receivings fyrir þessari röð
SendingsToValidate=Sendi til að sannreyna
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 385190f10bc..fab3f38e962 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regla fyrir lager stjórnun lækka
RuleForStockManagementIncrease=Regla fyrir lager stjórnun aukast
DeStockOnBill=Minnka raunverulegur birgðir á viðskiptavini reikningum / kredit athugasemdir löggilding
DeStockOnValidateOrder=Minnka raunverulegur birgðir á viðskiptavini pantanir löggilding
-DeStockOnShipment=Minnka alvöru stofnum á sendingunni löggilding
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Auka raunverulegur birgðir birgja reikningum / kredit athugasemdir löggilding
ReStockOnValidateOrder=Auka raunverulegur birgðir birgja pantanir approbation
ReStockOnDispatchOrder=Auka raunverulegur birgðir á handbók dispatching í vöruhús, eftir röð birgja sem fá
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
index a615596f57d..f64e428e1e6 100644
--- a/htdocs/langs/is_IS/trips.lang
+++ b/htdocs/langs/is_IS/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index 5a58612b67d..87f7f468323 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Nuovo account di contabilità
Update=Aggiorna
List=Elenco
Create=Crea
+CreateMvts=Create movement
UpdateAccount=Modifica di un account di contabilità
UpdateMvts=Modifica di un movimento
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index f05690aba54..8661f996253 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=PrintIPP
Module54000Desc=Stampa diretta (senza aprire i documenti) tramite l'interfaccia CUPS IPP (la stampante deve essere visibile dal server, e il server deve avere CUPS installato).
-Module55000Name=Sondaggio aperto
-Module55000Desc=Modulo per creare sondaggi online (Doodle, Studs, Rdvz o simili)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Margini
Module59000Desc=Modulo per gestire margini
Module60000Name=Commissioni
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Nessun evento di sicurezza registrato. Questo può essere
NoEventFoundWithCriteria=Nessun evento di sicurezza trovato con i criteri di ricerca impostati.
SeeLocalSendMailSetup=Controllare le impostazioni locali del server di posta (sendmail)
BackupDesc=Per effettuare un backup completo di Dolibarr è necessario:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Salva il contenuto del tuo database <b>(%s)</b> in un file dump. È possibile utilizzare il seguente assistente.
BackupDescX=L'archivio delle directory va conservato in un luogo sicuro.
BackupDescY=Il file generato va conservato in un luogo sicuro.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Utilizza il form di ricerca per scegliere un prodotto (
UseEcoTaxeAbility=Usare l'eco-Tax (RAEE)
SetDefaultBarcodeTypeProducts=Tipo di codici a barre predefinito da utilizzare per i prodotti
SetDefaultBarcodeTypeThirdParties=Tipo di codici a barre predefinito da utilizzare per terze parti
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modulo per la generazione e verifica dei codici prodotto (prodotto o servizio)
ProductOtherConf= Configurazione Prodotto/servizio
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Impostazione del modulo di consegna
SendingsReceiptModel=Modello di ricevuta consegna (D.D.T.)
SendingsNumberingModules=Moduli per la numerazione delle spedizioni
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Nella maggior parte dei casi, i moduli possono essere utilizzati sia come documenti di trasporto (elenco dei prodotti per l'invio) che come ricevute. Le ricevute di consegna risultano quindi una funzione duplicata che raramente viene attivata.
FreeLegalTextOnShippings=Testo libero per le spedizioni
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 4c49d7ca53f..64630737ab3 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Eventi per tutti gli utenti del gruppo
ActionAssignedTo=Evento assegnato a
AllMyActions= Tutte i miei compiti/azioni
AllActions= Tutte i compiti/azioni
-ViewList=Vista elenco
ViewCal=Vista mensile
ViewDay=Vista giornaliera
ViewWeek=Vista settimanale
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index c374b674761..03b27302fab 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Stato del cliente potenziale
DraftPropals=Bozze di proposte commerciali
SearchPropal=Cerca una proposta commerciale
CommercialDashboard=Riassunto commerciale
+NoLimit=No limit
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index 4c90e34ab74..2c53528e9fd 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contatto soggetto terzo
StatusContactValidated=Stato del contatto/indirizzo
Company=Società
CompanyName=Ragione Sociale
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Società
CountryIsInEEC=Paese appartenente alla Comunità Economica Europea
ThirdPartyName=Nome soggetto terzo
@@ -68,6 +69,7 @@ Country=Paese
CountryCode=Codice del paese
CountryId=Id paese
Phone=Telefono
+PhoneShort=Phone
Skype=Skype
Call=Chiamata
Chat=Chat
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index b68464e2f33..38b574ba264 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Per favore immetti un valore per la lista di control
ErrorNoValueForRadioType=Per favore immetti un valore per la lista radio
ErrorBadFormatValueList=La lista non può avere più di un'entrata : <u>%s</u>, ma ne serve almeno una: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Il campo <b>%s</b> non può contenere caratteri speciali.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Il campo <b>%s</b> non deve contenere caratteri speciali o maiuscole.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Modulo contabilità disattivato
ErrorExportDuplicateProfil=Questo nome profilo già esiste per questo set di esportazione
ErrorLDAPSetupNotComplete=La configurazione per l'uso di LDAP è incompleta
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Il campo <b>%s</b> deve essere un valore numerico
ErrorFieldMustBeAnInteger=Il campo <b>%s</b> deve essere un numero intero
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
diff --git a/htdocs/langs/it_IT/languages.lang b/htdocs/langs/it_IT/languages.lang
index 8bf3b13692d..a6696e24e69 100644
--- a/htdocs/langs/it_IT/languages.lang
+++ b/htdocs/langs/it_IT/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francese (Canada)
Language_fr_CH=Francese (Svizzera)
Language_fr_FR=Francese
Language_fr_NC=Francese (Nuova Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Ebraico
Language_hr_HR=Croato
Language_hu_HU=Ungherese
@@ -70,6 +71,7 @@ Language_sv_SV=Svedese
Language_sv_SE=Svedese
Language_sq_AL=Albanese
Language_sk_SK=Slovacco
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ucraino
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 2c105ceed16..58e1e3b00c8 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -710,6 +710,8 @@ Denied=Rifiutata
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Lunedì
Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/margins.lang b/htdocs/langs/it_IT/margins.lang
index b8d1c820d80..1ce6d6b936f 100644
--- a/htdocs/langs/it_IT/margins.lang
+++ b/htdocs/langs/it_IT/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Come prodotto
UseDiscountAsService=Come servizio
UseDiscountOnTotal=Sul subtotale
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definisce se, ai fini del calcolo del margine, uno sconto globale debba essere trattato come un prodotto, un servizio o usato solo sul subtotale.
-MARGIN_TYPE=Tipo di margine
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Margine lordo
MargeNette=Margine netto
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Margine lordo = Prezzo di vendita - Prezzo di acquisto<br/>Margine netto = Prezzo di vendita - Prezzo di costo
+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
CostPrice=Prezzo di costo
BuyingCost=Prezzo di costo
UnitCharges=Carico unitario
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 9a79f0768bc..39649ad5d11 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Prezzo unico per prodotto/servizio
PricingRule=Regole dei prezzi al cliente
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Imposta lo stesso prezzo per i clienti sussidiari
-PriceByCustomerLog=Prezzo per log cliente
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Il prezzo minimo raccomandato è: %s
PriceExpressionEditor=Editor della formula del prezzo
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index b7fe6bc4b2d..f5d9f522af2 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Attività %s creata
TaskModifiedInDolibarr=Attività %s modificata
TaskDeletedInDolibarr=Attività %s cancellata
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Capo progetto
TypeContact_project_external_PROJECTLEADER=Capo progetto
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index 165e80fb0e4..03948d583e9 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Spedizioni
AllSendings=All Shipments
Shipment=Spedizione
Shipments=Spedizioni
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Sezione spedizioni
ListOfSendings=Elenco delle spedizioni
@@ -26,8 +26,8 @@ QtyToShip=Quantità da spedire
QtyReceived=Quantità ricevuta
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Altre Spedizioni per questo ordine
-DateSending=Data spedizione
-DateSendingShort=Data di invio
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Spedizioni per lo stesso ordine
SendingsAndReceivingForSameOrder=Spedizioni e ricezioni per lo stesso ordine
SendingsToValidate=Spedizione da convalidare
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index ba25edaed7c..d4e14cb6885 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regola per la gestione della diminuzione delle sc
RuleForStockManagementIncrease=Regola per la gestione dell'aumento delle scorte
DeStockOnBill=Riduci scorte effettive all'emissione della fattura/nota di credito
DeStockOnValidateOrder=Riduci scorte effettive alla convalida dell'ordine
-DeStockOnShipment=Riduci scorte effettive alla spedizione (Raccomandato)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Incrementa scorte effettive alla fattura/nota di credito
ReStockOnValidateOrder=Aumenta scorte effettive alla convalida dell'ordine
ReStockOnDispatchOrder=Incrementa scorte effettive alla consegna manuale in magazzino, dopo il ricevimento dell'ordine fornitore
@@ -134,7 +134,7 @@ IsInPackage=Contenuto nel pacchetto
ShowWarehouse=Mostra magazzino
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Codice di inventario o di spostamento
NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
ThisSerialAlreadyExistWithDifferentDate=Questo lotto/numero seriale (<strong>%s</strong>) esiste già con una differente data di scadenza o di validità (trovata <strong>%s</strong>, inserita <strong>%s</strong> )
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index e08fddb8a6b..a01a0e3f88b 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Convalida la nota spese
ConfirmSaveTrip=Vuoi davvero convalidare questa nota spese?
NoTripsToExportCSV=Nessuna nota spese da esportare per il periodo
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 693187839a7..8cca362e205 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=は、セキュリティイベントがまだ記録され
NoEventFoundWithCriteria=は、セキュリティイベントは、このような検索のcriterias見つかりませんされています。
SeeLocalSendMailSetup=ローカルのsendmailの設定を参照してください。
BackupDesc=Dolibarrの完全なバックアップを作成するには、以下を行う必要があります。
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=アーカイブディレクトリは安全な場所に格納する必要があります。
BackupDescY=生成されたダンプ·ファイルは安全な場所に格納する必要があります。
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=エコTaxe（WEEE）をサポート
SetDefaultBarcodeTypeProducts=製品に使用するデフォルトのバーコードの種類
SetDefaultBarcodeTypeThirdParties=第三者のために使用するデフォルトのバーコードの種類
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=送信モジュールのセットアップ
SendingsReceiptModel=領収書のモデルを送信する
SendingsNumberingModules=モジュールの番号Sendings
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=ほとんどの場合、sendingsの領収書は、お客様の納品（送信する製品のリスト）とreceviedと顧客によって署名されたシートのシートの両方に使用されます。したがって、製品の納入の領収書は複製機能であり、まれに活性化されていません。
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 559972c2bcd..b79fb4e3f49 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= すべての私のイベント/タスク
AllActions= すべてのイベント/タスク
-ViewList=リストビュー
ViewCal=月間表示
ViewDay=日表示
ViewWeek=週ビュー
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 6953d91769a..520613932bd 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=見通しの状態
DraftPropals=ドラフト商業の提案
SearchPropal=商業的提案を検索
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 9d2fbdcc353..a23a4894836 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=サードパーティの連絡先
StatusContactValidated=接点の状態
Company=会社
CompanyName=会社名
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=企業
CountryIsInEEC=国が欧州経済共同体の内部にある
ThirdPartyName=サードパーティの名前
@@ -68,6 +69,7 @@ Country=国
CountryCode=国コード
CountryId=国番号
Phone=電話
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 3ccebb9e081..786ace098e8 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=フィールド<b>%sは、</b>特殊文字が含まれてはいけません。
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+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.
ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではありません。
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index f3329cf51fb..c3a374015c0 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=フランス語 (カナダ)
Language_fr_CH=フランス語 (スイス)
Language_fr_FR=フランス語
Language_fr_NC=フランス（ニューカレドニア）
+Language_fy_NL=Frisian
Language_he_IL=ヘブライ語の
Language_hr_HR=クロアチア語
Language_hu_HU=ハンガリー語
@@ -70,6 +71,7 @@ Language_sv_SV=スウエーデん語
Language_sv_SE=スウェーデン語
Language_sq_AL=Albanian
Language_sk_SK=スロバキア
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=タイの
Language_uk_UA=ウクライナ語
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index d2c33dd1e44..b1488f64382 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=月曜日
Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index 095d25dd7e0..b175642b31f 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 6796d67e83a..f976f216cde 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 6691ec45ab6..8f36b51bd48 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=プロジェクトリーダー
TypeContact_project_external_PROJECTLEADER=プロジェクトリーダー
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index cfed0dce619..704cdf82204 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -5,7 +5,7 @@ Sendings=出荷
AllSendings=All Shipments
Shipment=出荷
Shipments=出荷
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=出荷エリア
ListOfSendings=出荷のリスト
@@ -26,8 +26,8 @@ QtyToShip=出荷する数量
QtyReceived=個数は、受信した
KeepToShip=Remain to ship
OtherSendingsForSameOrder=このため、他の出荷
-DateSending=オーダーを送信した日付
-DateSendingShort=オーダーを送信した日付
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=この注文の出荷
SendingsAndReceivingForSameOrder=この注文の出荷とreceivings
SendingsToValidate=検証するために出荷
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 3e2b04997ae..a1a8167a262 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=在庫管理の減少のためのルール
RuleForStockManagementIncrease=在庫管理の増加のためのルール
DeStockOnBill=お客様の請求書/クレジットメモの検証で本物の株式を減少させる
DeStockOnValidateOrder=お客様の注文検証上の実在庫を減らす
-DeStockOnShipment=出荷の検証を実際の株式を減少させる
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=仕入先請求書/クレジットメモの検証で本物の株式を増加させる
ReStockOnValidateOrder=サプライヤの注文賛同上の実際の株式を増加させる
ReStockOnDispatchOrder=サプライヤーの順序が受信した後、倉庫に派遣マニュアルに本物の株式を増加させる
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index cbf330ddc1b..58bf162dd8b 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/ka_GE/accountancy.lang b/htdocs/langs/ka_GE/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/ka_GE/accountancy.lang
+++ b/htdocs/langs/ka_GE/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ka_GE/agenda.lang b/htdocs/langs/ka_GE/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/ka_GE/agenda.lang
+++ b/htdocs/langs/ka_GE/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/ka_GE/commercial.lang
+++ b/htdocs/langs/ka_GE/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ka_GE/languages.lang b/htdocs/langs/ka_GE/languages.lang
index f1da5549014..3d9bf981568 100644
--- a/htdocs/langs/ka_GE/languages.lang
+++ b/htdocs/langs/ka_GE/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 12d9337641d..0802b693ffd 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/ka_GE/margins.lang b/htdocs/langs/ka_GE/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/ka_GE/margins.lang
+++ b/htdocs/langs/ka_GE/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/ka_GE/trips.lang
+++ b/htdocs/langs/ka_GE/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/kn_IN/accountancy.lang b/htdocs/langs/kn_IN/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/kn_IN/accountancy.lang
+++ b/htdocs/langs/kn_IN/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/kn_IN/agenda.lang b/htdocs/langs/kn_IN/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/kn_IN/agenda.lang
+++ b/htdocs/langs/kn_IN/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/kn_IN/commercial.lang b/htdocs/langs/kn_IN/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/kn_IN/commercial.lang
+++ b/htdocs/langs/kn_IN/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 18dd00f389d..2a53f749223 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=ತೃತೀಯ ಸಂಪರ್ಕ / ವಿಳಾಸ
StatusContactValidated=ಸಂಪರ್ಕ / ವಿಳಾಸದ ಸ್ಥಿತಿ
Company=ಸಂಸ್ಥೆ
CompanyName=ಸಂಸ್ಥೆಯ ಹೆಸರು
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=ಕಂಪನಿಗಳು
CountryIsInEEC=ದೇಶವು ಯುರೋಪಿಯನ್ ಎಕನಾಮಿಕ್ ಕಮ್ಯುನಿಟಿಯಲ್ಲಿದೆ
ThirdPartyName=ಮೂರನೇ ಪಾರ್ಟಿ ಹೆಸರು
@@ -68,6 +69,7 @@ Country=ದೇಶ
CountryCode=ದೇಶ ಕೋಡ್
CountryId=ದೇಶ ಐಡಿ
Phone=ದೂರವಾಣಿ
+PhoneShort=Phone
Skype=ಸ್ಕೈಪ್
Call=ಕರೆ
Chat=ಚಾಟ್
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/kn_IN/languages.lang b/htdocs/langs/kn_IN/languages.lang
index f1da5549014..3d9bf981568 100644
--- a/htdocs/langs/kn_IN/languages.lang
+++ b/htdocs/langs/kn_IN/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/kn_IN/main.lang b/htdocs/langs/kn_IN/main.lang
index 12d9337641d..0802b693ffd 100644
--- a/htdocs/langs/kn_IN/main.lang
+++ b/htdocs/langs/kn_IN/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/kn_IN/margins.lang b/htdocs/langs/kn_IN/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/kn_IN/margins.lang
+++ b/htdocs/langs/kn_IN/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/kn_IN/sendings.lang b/htdocs/langs/kn_IN/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/kn_IN/sendings.lang
+++ b/htdocs/langs/kn_IN/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/kn_IN/stocks.lang b/htdocs/langs/kn_IN/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/kn_IN/stocks.lang
+++ b/htdocs/langs/kn_IN/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/kn_IN/trips.lang b/htdocs/langs/kn_IN/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/kn_IN/trips.lang
+++ b/htdocs/langs/kn_IN/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/ko_KR/accountancy.lang
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index c6119435d3f..69a9d9765ed 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ko_KR/agenda.lang b/htdocs/langs/ko_KR/agenda.lang
index 84745cf8676..8c49a9e7d09 100644
--- a/htdocs/langs/ko_KR/agenda.lang
+++ b/htdocs/langs/ko_KR/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/ko_KR/commercial.lang
+++ b/htdocs/langs/ko_KR/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index b4fea21be29..f2b26a2ad32 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ko_KR/languages.lang b/htdocs/langs/ko_KR/languages.lang
index e6f8bf9fd2c..34396d295bb 100644
--- a/htdocs/langs/ko_KR/languages.lang
+++ b/htdocs/langs/ko_KR/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=프랑스어 (캐나다)
Language_fr_CH=프랑스어 (스위스)
Language_fr_FR=프랑스의
Language_fr_NC=불어 (뉴 칼레도니아)
+Language_fy_NL=Frisian
Language_he_IL=히브리어
Language_hr_HR=Horvātijas
Language_hu_HU=헝가리의
@@ -70,6 +71,7 @@ Language_sv_SV=스웨덴어
Language_sv_SE=스웨덴어
Language_sq_AL=Albanian
Language_sk_SK=Slovākijas
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 083779a848d..91725da0fb6 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=월요일
Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/margins.lang b/htdocs/langs/ko_KR/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/ko_KR/margins.lang
+++ b/htdocs/langs/ko_KR/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 535b18e83f0..89c0d812490 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/ko_KR/trips.lang
+++ b/htdocs/langs/ko_KR/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 7ae27cc7751..5d1156487c6 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=ປັບປຸງ
List=ລາຍການ
Create=ສ້າງ
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/lo_LA/agenda.lang b/htdocs/langs/lo_LA/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/lo_LA/agenda.lang
+++ b/htdocs/langs/lo_LA/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/lo_LA/commercial.lang b/htdocs/langs/lo_LA/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/lo_LA/commercial.lang
+++ b/htdocs/langs/lo_LA/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/lo_LA/languages.lang b/htdocs/langs/lo_LA/languages.lang
index f1da5549014..3d9bf981568 100644
--- a/htdocs/langs/lo_LA/languages.lang
+++ b/htdocs/langs/lo_LA/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index 12d9337641d..0802b693ffd 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/lo_LA/margins.lang b/htdocs/langs/lo_LA/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/lo_LA/margins.lang
+++ b/htdocs/langs/lo_LA/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/lo_LA/sendings.lang b/htdocs/langs/lo_LA/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/lo_LA/sendings.lang
+++ b/htdocs/langs/lo_LA/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/lo_LA/stocks.lang b/htdocs/langs/lo_LA/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/lo_LA/stocks.lang
+++ b/htdocs/langs/lo_LA/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/lo_LA/trips.lang b/htdocs/langs/lo_LA/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/lo_LA/trips.lang
+++ b/htdocs/langs/lo_LA/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
index 4d686cce900..411d852b4d7 100644
--- a/htdocs/langs/lt_LT/accountancy.lang
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Nauja apskaitos sąskaita
Update=Atnaujinimas
List=Sąrašas
Create=Sukurti
+CreateMvts=Create movement
UpdateAccount=Apskaitos sąskaitos modifikavimas
UpdateMvts=Judėjimo modifikavimas
WriteBookKeeping=Įrašyti sąskaitas Didžiąją knygą
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Apskaitos sąskaitų, parodytų Dolibarr, ilgis
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 888ea669c55..17451995292 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Apskaita (Išankstinė)
Module50400Desc=Apskaitos tvarkymas (sudvejintas)
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=Atidaryti apklausą
-Module55000Desc=Modulis interneto apklausų sudarymui (pvz.: Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Paraštės
Module59000Desc=Paraščių valdymo modulis
Module60000Name=Komisiniai
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Dar nėra užfiksuotų saugumo įvykių. Tai yra normalu,
NoEventFoundWithCriteria=Saugumo įvykių pagal užduotus paieškos kriterijus nerasta.
SeeLocalSendMailSetup=Žiūrėti į vietinio el. pašto konfigūraciją
BackupDesc=Norint padaryti pilną atsarginę Dolibarr kopiją, reikia:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Suarchyvuotas katalogas turi būti laikomas saugioje vietoje.
BackupDescY=Sukurtas sandėlio failas turi būti laikomas saugioje vietoje.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Naudokite paieškos formą norint pasirinkti produktą
UseEcoTaxeAbility=Palaikyti Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Brūkšninio kodo tipas produktams pagal nutylėjimą
SetDefaultBarcodeTypeThirdParties=Brūkšninio kodo tipas trečiosioms šalims pagal nutylėjimą
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Produkto kodo generavimo ir tikrinimo modulis (produktui arba paslaugai)
ProductOtherConf= Produkto/paslaugos konfigūracija
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fiksuota el. pašto užduotis
SendingsSetup=Siuntimo modulio nuostatos
SendingsReceiptModel=Įplaukų siuntimo modelis
SendingsNumberingModules=Siuntinių numeravimo modulis
-SendingsAbility=Palaikyti siutų dokumentus klientų pristatymams
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Daugeliu atvejų, siuntinių kvitai naudojami tiek pristatymo klientams žiniaraščiams (produktų sąrašas siuntimui), tiek gaunamiems žiniaraščiams pasirašytiems klientų. Taigi produkto pristatymo kvitai yra dubliuojanti funkcija ir retai aktyvuota.
FreeLegalTextOnShippings=Laisvas tekstas siuntų dokumentuose
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/lt_LT/agenda.lang b/htdocs/langs/lt_LT/agenda.lang
index b39e9ec80f8..ad09b32b079 100644
--- a/htdocs/langs/lt_LT/agenda.lang
+++ b/htdocs/langs/lt_LT/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Įvykiai visiems grupės vartotojams
ActionAssignedTo=Įvykis priskirtas
AllMyActions= Visi mano įvykiai/užduotys
AllActions= Visi įvykiai/užduotys
-ViewList=Sąrašo vaizdas
ViewCal=Mėnesio vaizdas
ViewDay=Dienos vaizdas
ViewWeek=Savaitės vaizdas
diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang
index 5d869b8b930..d078e034064 100644
--- a/htdocs/langs/lt_LT/commercial.lang
+++ b/htdocs/langs/lt_LT/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Plano būklė
DraftPropals=Komercinių pasiūlymų projektai
SearchPropal=Ieškoti komercinio pasiūlymo
CommercialDashboard=Komercinė suvestinė
+NoLimit=No limit
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index e1b97bd0d13..ef7b36094b3 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Trečiosios šalies kontaktas/adresas
StatusContactValidated=Adresato/adreso būklė
Company=Įmonė
CompanyName=Įmonės pavadinimas
-AliasNames=Pseudonimai (komerciniai, prekių ženklų, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Įmonės
CountryIsInEEC=Šalis yra Europos Ekonominėje Bendrijoje
ThirdPartyName=Trečiosios šalies pavadinimas
@@ -68,6 +69,7 @@ Country=Šalis
CountryCode=Šalies kodas
CountryId=Šalies ID
Phone=Telefonas
+PhoneShort=Phone
Skype=Skype
Call=Kvietimas
Chat=Kalbėtis
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index f4819352df6..87a36b5dc46 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Prašome užpildyti reikšmę žymės laukelių sąr
ErrorNoValueForRadioType=Prašome užpildyti reikšmę žymių (radio) sąrašui
ErrorBadFormatValueList=Sąrašo reikšmė negali būti daugiau nei viena <u>%s</u>, bet reikia bent vienos: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Laukelyje <b>%s</b> neturi būti specialiųjų simbolių
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Laukelyje <b>%s</b> negali būti nei specialių simbolių, nei didžiųjų raidžių.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nėra aktyvaus apskaitos modulio
ErrorExportDuplicateProfil=Profilio vardas jau egzistuoja šiam eksporto rinkiniui
ErrorLDAPSetupNotComplete=Dolibarr-LDAP derinimas nėra pilnas
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/languages.lang b/htdocs/langs/lt_LT/languages.lang
index 8747ba26771..92aa5702fec 100644
--- a/htdocs/langs/lt_LT/languages.lang
+++ b/htdocs/langs/lt_LT/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Prancūzų (Kanada)
Language_fr_CH=Prancūzų (Šveicarija)
Language_fr_FR=Prancūzų
Language_fr_NC=Prancūzų (Naujoji Kaledonija)
+Language_fy_NL=Frisian
Language_he_IL=Hebrajų
Language_hr_HR=Kroatijos
Language_hu_HU=Vengrų
@@ -70,6 +71,7 @@ Language_sv_SV=Švedų
Language_sv_SE=Švedų
Language_sq_AL=Albanų
Language_sk_SK=Slovakijos
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tailando
Language_uk_UA=Ukrainiečių
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index 2f83757a486..bd829e0d4c6 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -710,6 +710,8 @@ Denied=Atmestas
ListOfTemplates=Šablonų sąrašas
Genderman=Vyras
Genderwoman=Moteris
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Pirmadienis
Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/margins.lang b/htdocs/langs/lt_LT/margins.lang
index de908b3ef47..ab49a052176 100644
--- a/htdocs/langs/lt_LT/margins.lang
+++ b/htdocs/langs/lt_LT/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Kaip produktas
UseDiscountAsService=Kaip paslauga
UseDiscountOnTotal=Tarpinė suma
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Apibrėžia, ar visuotinė nuolaida yra traktuojama kaip produktas, kaip paslaugos ar tik tarpinė sumamaržos skaičiavimui.
-MARGIN_TYPE=Maržos tipas
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Maržos eilutė
MargeNette=Grynojo pelno marža
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Maržos eilutė: Pardavimo kaina - Pirkimo kaina<br/> Grynoji marža: Pardavimo kaina - Savikaina
+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
CostPrice=Savikaina
BuyingCost=Savikaina
UnitCharges=Vieneto sąnaudos
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 40e3b683071..69336b098de 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Nustatykite tą pačią kainą ir kliento dukterinėms įmonėms
-PriceByCustomerLog=Kaina pagal kliento žurnalą
+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
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 733817e220d..d19e70a3561 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Užduotis %s sukurta
TaskModifiedInDolibarr=Užduotis %s modifikuota
TaskDeletedInDolibarr=Užduotis %s ištrinta
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projekto vadovas
TypeContact_project_external_PROJECTLEADER=Projekto vadovas
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 7d864bdf4a3..bccfb7d8569 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Pakrovimai
AllSendings=All Shipments
Shipment=Siunta
Shipments=Pakrovimai
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Gabenimų sritis
ListOfSendings=Gabenimų sąrašas
@@ -26,8 +26,8 @@ QtyToShip=Kiekis išsiuntimui
QtyReceived=Gautas kiekis
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Kiti vežimai, skirti šiam užsakymui
-DateSending=Užsakymo išsiuntimo data
-DateSendingShort=Užsakymo išsiuntimo data
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Šio užsakymo vežimas
SendingsAndReceivingForSameOrder=Šio užsakymo vežimai ir gavimai
SendingsToValidate=Vežimai patvirtinimui
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 80eea875ee4..655ab6d107c 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Atsargų valdymo mažinimo taisyklė
RuleForStockManagementIncrease=Atsargų valdymo didinimo taisyklė
DeStockOnBill=Mažinti realių atsargų klientų sąskaitų-faktūrų/kreditinių sąskaitų patvirtinimuose
DeStockOnValidateOrder=Sumažinti realias atsargas klientų užsakymų patvirtinime
-DeStockOnShipment=Sumažinti realias atsargas gabenimo patvirtinime
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Padidinti realių atsargų tiekėjams sąskaitos / kreditinės pastabos patvirtinimo
ReStockOnValidateOrder=Padidinti realias atsargas tiekėjų užsakymų patvirtinime
ReStockOnDispatchOrder=Padidinti realias atsargas, rankiniu būdu atliekant išsiuntimą į sandėlius, gavus tiekėjo užsakymą
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index eb4865cf787..494394846d7 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Patvirtinti išlaidų ataskaitą
ConfirmSaveTrip=Ar tikrai norite patvirtinti šią išlaidų ataskaitą ?
NoTripsToExportCSV=Už šį laikotarpį nėra išlaidų ataskaitų eksportui
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 482f3a7b193..dd8aa568023 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Atjaunot
List=Saraksts
Create=Izveidot
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d71f0f0a0e2..d16a520f43f 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Atvērta aptauja
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Malas
Module59000Desc=Moduli, lai pārvaldītu peļņu
Module60000Name=Komisijas
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Nav drošības pasākums ir ierakstīta vēl. Tas var būt
NoEventFoundWithCriteria=Nav drošības pasākums ir atzīts par šādiem meklēšanas kritērijiem ir.
SeeLocalSendMailSetup=Skatiet sendmail iestatījumus
BackupDesc=Lai izveidotu pilnu Dolibarr rezerves kopiju jums ir:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Arhivēto katalogs jāglabā drošā vietā.
BackupDescY=Radītais dump fails jāglabā drošā vietā.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Atbalsts Eco-taxe (EEIA)
SetDefaultBarcodeTypeProducts=Noklusējuma svītrkoda veids izmantojams produktiem
SetDefaultBarcodeTypeThirdParties=Svītrkodu veids pēc noklusējuma trešām personām
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modulis produkta koda paaudzes un pārbaudes (produkts vai pakalpojums)
ProductOtherConf= Produktu / pakalpojumu konfigurācija
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Nosūtot modulis iestatīšanu
SendingsReceiptModel=Nosūtot saņemšanas modeli
SendingsNumberingModules=Sendings numerācijas moduļus
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Vairumā gadījumu, sendings ieņēmumi tiek izmantoti gan kā loksnes klientu piegādēm (produktu sarakstu, lai nosūtītu) un loksnes, kas tiek recevied un paraksta klientu. Tātad produkta piegādes kvītis ir dublēta iezīme, un reti aktivizēts.
FreeLegalTextOnShippings=Brīvais teksts piegādēs
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index aa919676656..189d872dd35 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Notikumi visiem grupas lietotājiem
ActionAssignedTo=Notikums piešķirts
AllMyActions= Visi mani notikumi/uzdevumi
AllActions= Visi notikumi/uzdevumi
-ViewList=Saraksta skats
ViewCal=Mēneša skats
ViewDay=Dienas skats
ViewWeek=Nedēļas skats
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index 9b4726c1f0e..f0cdbf85b87 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospekta statuss
DraftPropals=Izstrādā komerciālos priekšlikumus
SearchPropal=Meklēšana komerciālu priekšlikumu
CommercialDashboard=Commercial kopsavilkums
+NoLimit=No limit
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index 384651e615b..678d1c5a4f7 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Trešās puses kontakts / adrese
StatusContactValidated=Kontaktu/ adrešu statuss
Company=Uzņēmums
CompanyName=Uzņēmuma nosaukums
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Uzņēmumi
CountryIsInEEC=Valsts ir Eiropas Ekonomikas kopienas dalībvalsts
ThirdPartyName=Trešās puses nosaukums
@@ -68,6 +69,7 @@ Country=Valsts
CountryCode=Valsts kods
CountryId=Valsts id
Phone=Telefons
+PhoneShort=Phone
Skype=Skype
Call=Zvanīt
Chat=Čats
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index 5002cffff74..71cdf7300fd 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Lūdzu, aizpildiet vērtību rūtiņu sarakstā
ErrorNoValueForRadioType=Lūdzu, aizpildiet vērtību radio pogu sarakstā
ErrorBadFormatValueList=Saraksts vērtība nevar būt vairāk kā viens nāk: <u>%s,</u> bet ir nepieciešams vismaz viens: Llave, Valores
ErrorFieldCanNotContainSpecialCharacters=Lauks <b>%s</b> nedrīkst saturēt speciālos simbolus.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nav grāmatvedības modulis aktivizēts
ErrorExportDuplicateProfil=Šāds profila nosaukums jau eksistē šim eksportam.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP saskaņošana nav pilnīga.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index c7a593f737f..f5acd94dfe2 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Franču (Kanāda)
Language_fr_CH=Franču (Šveices)
Language_fr_FR=Franču
Language_fr_NC=Franču (Jaunkaledonija)
+Language_fy_NL=Frisian
Language_he_IL=Ebreju
Language_hr_HR=Horvātu
Language_hu_HU=Ungāru
@@ -70,6 +71,7 @@ Language_sv_SV=Zviedru
Language_sv_SE=Zviedru
Language_sq_AL=Albāņu
Language_sk_SK=Slovāku
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukraiņu
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index fb0d6329059..2f30f0561da 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Pirmdiena
Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/margins.lang b/htdocs/langs/lv_LV/margins.lang
index f81504f5dda..5df181098c4 100644
--- a/htdocs/langs/lv_LV/margins.lang
+++ b/htdocs/langs/lv_LV/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Kā produktu
UseDiscountAsService=Kā pakalpojums
UseDiscountOnTotal=Par starpsummu
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Nosaka, ja globālā atlaide tiek uzskatīts par produktu, pakalpojumu, vai tikai starpsumma starpības aprēķinu.
-MARGIN_TYPE=Maržinālā veids
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw rezerve
MargeNette=Neto starpība
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw rezervi: Pārdošanas cena - Pērk cena <br/> Neto starpība: Pārdošanas cena - Iepirkuma cena
+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
CostPrice=Pašizmaksa
BuyingCost=Pašizmaksa
UnitCharges=Vienības izmaksas
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index e2c35f803f2..942f5ab3ce7 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unikāla cena poduktam/pakalpojumam
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Minimālā rekomendējamā cena : %s
PriceExpressionEditor=Price expression editor
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index b04460127c7..9a2aa8be7a7 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Uzdevums %s izveidots
TaskModifiedInDolibarr=Uzdevums %s labots
TaskDeletedInDolibarr=Uzdevums %s dzēsts
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projekta vadītājs
TypeContact_project_external_PROJECTLEADER=Projekta vadītājs
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index 3e5f28e7e06..5ba3e011961 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Sūtījumi
AllSendings=All Shipments
Shipment=Sūtījums
Shipments=Sūtījumi
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Sūtījumu sadaļa
ListOfSendings=Sūtījumu saraksts
@@ -26,8 +26,8 @@ QtyToShip=Daudzums, kas jānosūta
QtyReceived=Saņemtais daudzums
KeepToShip=Vēl jāpiegādā
OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu
-DateSending=Datums nosūtot kārtība
-DateSendingShort=Datums nosūtot kārtība
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Sūtījumiem uz šo rīkojumu
SendingsAndReceivingForSameOrder=Sūtījumiem un Receivings par šo rīkojumu
SendingsToValidate=Sūtījumi apstiprināšanai,
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 8a9ce83000a..2b74fbd70ae 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Noteikums krājumu pārvaldības samazināšanos
RuleForStockManagementIncrease=Noteikums krājumu pārvaldības palielināšanu
DeStockOnBill=Samazināt nekustamā krājumi uz klientu rēķinu / kredīta piezīmes apstiprināšanu
DeStockOnValidateOrder=Samazināt nekustamā krājumus klientu pasūtījumus apstiprināšanu
-DeStockOnShipment=Samazināt nekustamā krājumus sūtījumu apstiprināšanu
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Palielināt nekustamā krājumus piegādātāju rēķinu / kredīta piezīmes apstiprināšanu
ReStockOnValidateOrder=Palielināt nekustamā krājumi piegādātājiem pasūtījumu aprobācijai
ReStockOnDispatchOrder=Palielināt reālās par rokasgrāmatas krājumus dispečervadības uz noliktavās, pēc tam, kad piegādātājs, lai saņemšanas
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Rādīt noliktavu
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 4fda81f3560..c9ba2dca62e 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/mk_MK/accountancy.lang
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/mk_MK/agenda.lang b/htdocs/langs/mk_MK/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/mk_MK/agenda.lang
+++ b/htdocs/langs/mk_MK/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/mk_MK/commercial.lang
+++ b/htdocs/langs/mk_MK/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mk_MK/languages.lang b/htdocs/langs/mk_MK/languages.lang
index 14138b22743..0d463e9ff6d 100644
--- a/htdocs/langs/mk_MK/languages.lang
+++ b/htdocs/langs/mk_MK/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Француски (Канада)
Language_fr_CH=Француски (Швајцарија)
Language_fr_FR=Француски
Language_fr_NC=Француски (Нова Каледонија)
+Language_fy_NL=Frisian
Language_he_IL=Хебрејски
Language_hr_HR=Хрватската
Language_hu_HU=Унгарската
@@ -70,6 +71,7 @@ Language_sv_SV=Шведската
Language_sv_SE=Шведската
Language_sq_AL=Albanian
Language_sk_SK=Словачки
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Тајландски
Language_uk_UA=Украинскиот
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 68e8ec31f63..c629e4d49de 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/margins.lang b/htdocs/langs/mk_MK/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/mk_MK/margins.lang
+++ b/htdocs/langs/mk_MK/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/mk_MK/trips.lang
+++ b/htdocs/langs/mk_MK/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 484fdcb5544..9b2685de3b2 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Ny regnskapskonto
Update=Oppdater
List=Liste
Create=Opprett
+CreateMvts=Create movement
UpdateAccount=Endring av regnskapskonto
UpdateMvts=Endring av bevegelse
WriteBookKeeping=Legg til kontoer i hovedbok
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begynn sortering av fordelingssidene "Ford
AccountLength=Lengde på regnskapskontoer vist i Dolibarr
AccountLengthDesc=Funksjon for å redusere lengden på regnskapskontoene ved å erstatte mellomrom med null. Denne funksjonen berører bare visning, det endrer ikke regnskapskontoene registrert i Dolibarr. For eksport, er denne funksjonen nødvendig for å være kompatibel med enkelte programvarer.
+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=Lengde på generelle kontoer
ACCOUNTING_LENGTH_AACCOUNT=Lengde på tredjepartskontoer
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 5070d6e2cee..ab0e255fdfb 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Regnskap (avansert)
Module50400Desc=Regnskapshåndtering (doble parter)
Module54000Name=PrintIPP
Module54000Desc=Direkteutskrift (uten å åpne dokumentet)ved hjelp av CUPS IPP inteface (Skriveren må være synlig for serveren, og CUPS må være installert på serveren)
-Module55000Name=Åpne meningsmåling
-Module55000Desc=Modul for å lage online meningsmålinger (som Doodle,Studs, Rdvz, m.m)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marginer
Module59000Desc=Modul for å administrere marginer
Module60000Name=Provisjoner
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Ingen sikkerhetsinnstillinger er registrert ennå. Dette k
NoEventFoundWithCriteria=Ingen søketreff i sikkerhetshendelser.
SeeLocalSendMailSetup=Se lokalt sendmail-oppsett
BackupDesc=For å lage en komplett sikkerhetskopi av Dolibarr, må du:
-BackupDesc2=Lagre innhold av dokumentmappen (<b>%s</b>) som inneholder alle opplastede og genererte filer (du kan lage en zip for eksempel).
+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=Lagre innholdet i databasen (<b>%s</b>) i en dump-fil. For å gjøre dette, kan du bruke følgende assistent:
BackupDescX=Arkiverte mapper bør oppbevares på et trygt sted.
BackupDescY=Den genererte dumpfilen bør oppbevares på et trygt sted.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Bruk et søkeskjema for å velge vare (i stedet for en
UseEcoTaxeAbility=Støtt Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Standard strekkodetype for varer
SetDefaultBarcodeTypeThirdParties=Standard strekkodetype for tredjeparter
-UseUnits=Støtter enheter
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul for varekode-generering og kontroll (vare eller tjeneste)
ProductOtherConf= Oppsett av Varer/Tjenester
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fast e-post mål
SendingsSetup=Oppsett av forsendelsesmodulen
SendingsReceiptModel=Modell for forsendelseskvitteringer
SendingsNumberingModules=Nummereringsmodell for for sendelser
-SendingsAbility=Støtt forsendelsesskjema for kundeleveranser
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=I de fleste tilfeller er forsendelseskvitteringer brukt både som ark for kundeleveranser (liste over varer som skal sendes) og ark som er mottatt og signert av kunden. Så vareleveringskvitteringer er en dobbel funksjon og er sjelden aktivert.
FreeLegalTextOnShippings=Fritekst på leveringer
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer
PositionIntoComboList=Plassering av linje i kombinasjonslister
SellTaxRate=Salgs-skattesats
RecuperableOnly=Ja for MVA "Non Perçue Récupérable", gjelder kun Frankrike. Nei i alle andre tilfeller.
-UrlTrackingDesc=Hvis leverandøren eller transporttjenesten tilbyr en side eller et nettsted for å sjekke status på din forsendelse, kan du skrive det her. Du kan bruke tasten {TrackID} for å sette inn sporingnummer på webstedet.
+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=Når du oppretter en mulighet, vil du estimere et visst beløp for prosjekt. Ifølge status på muligheter, kan dette beløpet multipliseres med denne raten for å finne global verdi alle dine muligheter kan generere. Verdien er en prosentverdi (mellom 0 og 100).
TemplateForElement=Mal dedikert til element
TypeOfTemplate=Mal-type
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 35cc4ff5c77..461e51d343c 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Hendelser for alle brukerene i gruppen
ActionAssignedTo=Hendelse tilordnet
AllMyActions= Alle mine handlinger/oppgaver
AllActions= Alle handlinger/oppgaver
-ViewList=Vis liste
ViewCal=Månedsvisning
ViewDay=Dagsvisning
ViewWeek=Ukesvisning
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index 76681a752a4..21c86dc1b36 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Utkast kommersielle tilbud
SearchPropal=Søk etter kommersielt tilbud
CommercialDashboard=Kommersiell oppsummering
+NoLimit=No limit
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 3d3b6d57209..3a4e0962cad 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Tredjepartskontakt
StatusContactValidated=Status for kontakt
Company=Bedrift
CompanyName=Firmanavn
-AliasNames=Aliaser (kommersielle, varemerke, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Bedrifter
CountryIsInEEC=Landet er en del av det europeiske økonomiske fellesskap
ThirdPartyName=Tredjepart navn
@@ -68,6 +69,7 @@ Country=Land
CountryCode=Landskode
CountryId=Land-ID
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Ring
Chat=Chat
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 73003055630..db8923e30b7 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Sett inn verdi for å velge avkrysningsboks-liste
ErrorNoValueForRadioType=Sett i verdi for radioknapp-liste
ErrorBadFormatValueList=Listeverdien kan ikke føres opp mer enn en gang: <u>%s</u>, men kreves minst en gang
ErrorFieldCanNotContainSpecialCharacters=Feltet <b>%s</b> kan ikke inneholde spesialtegn.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Feltet <b>%s</b> må ikke inneholde spesialtegn eller store bokstaver
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Ingen regnskapsmodul aktivert
ErrorExportDuplicateProfil=Profilnavnet til dette eksport-oppsettet finnes allerede
ErrorLDAPSetupNotComplete=Dolibarr-LDAP oppsett er ikke komplett.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Ingen global variabel valgt
ErrorFieldMustBeANumeric=Feltet <b>%s</b> må være en numerisk verdi
ErrorFieldMustBeAnInteger=Feltet <b>%s</b> må være et heltall
ErrorMandatoryParametersNotProvided=Obligatorisk(e) parametre ikke angitt
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Obligatoriske parametre er enda ikke satt opp
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index 1d07f35afd5..a137dc111ff 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Fransk (Canada)
Language_fr_CH=Fransk (Sveits)
Language_fr_FR=Fransk
Language_fr_NC=Fransk (Ny Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebraisk
Language_hr_HR=Kroatisk
Language_hu_HU=Ungarsk
@@ -70,6 +71,7 @@ Language_sv_SV=Svensk
Language_sv_SE=Svensk
Language_sq_AL=Albansk
Language_sk_SK=Slovakisk
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainsk
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 2a089c4cc0f..f0be936c90f 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -710,6 +710,8 @@ Denied=Avvist
ListOfTemplates=Liste over maler
Genderman=Mann
Genderwoman=Kvinne
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Mandag
Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 24c72d3a537..a722c4019fc 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Som vare
UseDiscountAsService=Som tjeneste
UseDiscountOnTotal=Subtota
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Defineres om en global rabatt skal gjelde for et vare, en tjeneste, eller bare som en subtotal for margin-kalkulasjon
-MARGIN_TYPE=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Bruttomargin
MargeNette=Nettomargin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Brutto margin = Utsalgspris - Innkjøpspris<br/>Nettomargin = Utsalgspris - Kostpris
+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
CostPrice=Kostpris
BuyingCost=Kostpris
UnitCharges=Enhets-avgifter
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 54082694b4b..352602d5523 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linjær meter
+linearmeter=linear meter
lm=lm
-square meter=kvadratmeter
+squaremeter=square meter
m2=m²
-cubic meter=kubikkmeter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=l
@@ -264,7 +264,7 @@ PriceCatalogue=Unik pris pr. vare/tjeneste
PricingRule=Regler for kundepriser
AddCustomerPrice=Legg til pris for kunde
ForceUpdateChildPriceSoc=Sett samme pris for kundens datterselskaper
-PriceByCustomerLog=Pris fra kundens logg
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minstepris kan ikke være lavere enn %s
MinimumRecommendedPrice=Anbefalt minstepris er %s
PriceExpressionEditor=Pris-formel editor
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 304ed73ebe3..22145ed6a86 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Oppgave %s opprettet
TaskModifiedInDolibarr=Oppgave %s endret
TaskDeletedInDolibarr=Oppgave %s slettet
OpportunityStatus=Mulighet-status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Mulighet beløp
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Prosjektleder
TypeContact_project_external_PROJECTLEADER=Prosjektleder
@@ -165,7 +167,18 @@ ProjectOverview=Oversikt
ManageTasks=Bruk prosjekter for å følge oppgaver og tidsbruk
ManageOpportunitiesStatus=Bruk prosjekter for å følge muligheter
ProjectNbProjectByMonth=Antall prosjekter opprettet etter måned
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
ProjectsStatistics=Statistikk over muligheter
TaskAssignedToEnterTime=Oppgave tildelt. Tidsbruk kan legges til
OpenedProjectsByThirdparties=Prosjekter åpnet av tredjeparter
-OpportunityPonderatedAmount=Antatt beløp for muligheter
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index e993e202551..13a5263f908 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Leveringer
AllSendings=Alle forsendelser
Shipment=Levering
Shipments=Leveringer
-ShowSending=Vis forsendelse
+ShowSending=Show Shipments
Receivings=Kvitteringer
SendingsArea=Leveringsområde
ListOfSendings=Oversikt over leveringer
@@ -26,8 +26,8 @@ QtyToShip=Ant. å levere
QtyReceived=Ant. mottatt
KeepToShip=Gjenstår å sende
OtherSendingsForSameOrder=Andre leveringer på denne ordren
-DateSending=Leveringsdato
-DateSendingShort=Leveringsdato
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Leveringer på denne ordre
SendingsAndReceivingForSameOrder=Leveringer og mottak på denne ordren
SendingsToValidate=Leveringer til validering
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index d454ff4a7e4..d1db7493ed9 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regel for lagerreduksjon
RuleForStockManagementIncrease=Regel for lagerøkning
DeStockOnBill=Reduser virkelig beholdning ut fra faktura/kreditnota
DeStockOnValidateOrder=Reduser virkelig beholdning ut fra ordre
-DeStockOnShipment=reduser virkelig beholdning ved forsendelse (anbefalt)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Øk virkelig beholdning ut fra faktura/kreditnota
ReStockOnValidateOrder=Øk virkelig beholdning ut fra ordre
ReStockOnDispatchOrder=Øk virkelig lager ved manuell utsendelse til lager, etter mottak av leverandørordre
@@ -134,7 +134,7 @@ IsInPackage=Innhold i pakken
ShowWarehouse=Vis lager
MovementCorrectStock=Lagerkorreksjon for var %s
MovementTransferStock=Lageroverførsel av vare %s til annet lager
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Kildelageret må defineres her når Varelot-modul er aktiv. Den vil bli brukt til å liste hvilke lot/serienummer som er tilgjengelig for varer som krever lot/serienummer for bevegelse. Hvis du ønsker å sende produkter fra forskjellige lager, del opp forsendelsen i flere trinn.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Lag./bev.-kode
NoPendingReceptionOnSupplierOrder=Ingen ventende mottak grunnet åpen leverandørordre
ThisSerialAlreadyExistWithDifferentDate=Dette lot/serienummeret (<strong>%s</strong>) finnes allerede, men med ulik "best før" og "siste forbruksdag" (funnet <strong>%s</strong> , men tastet inn <strong>%s</strong>).
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index 53cbe3e2282..c53dd4938d3 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Godkjenn reiseregning
ConfirmSaveTrip=Er du sikker på at du vil validere denne reiseregningen?
NoTripsToExportCSV=Ingen reiseregning å eksportere for denne perioden
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index a8c78e8651b..f2c3503b206 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Boekhouding
Module50400Desc=Boekhoudkundig beheer
Module54000Name=PrintIPP
Module54000Desc=Direct print (zonder het openen van de documenten) met behulp van Cups IPP-interface (Printer moet zichtbaar zijn vanaf de server zijn, en CUPS moet geinstalleerd zijn op de server).
-Module55000Name=Poll
-Module55000Desc=Module om online polls (zoals Doodle, Studs, Rdvz, ...) te maken
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marges
Module59000Desc=Module om de marges te beheren
Module60000Name=Commissies
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Geen geregistreerde auditgebeurtenis. Dit is normaal als d
NoEventFoundWithCriteria=Geen beveiligingsgebeurtenis gevonden met deze zoek criteria.
SeeLocalSendMailSetup=Controleer de instellingen van uw lokale "sendmail"-programma
BackupDesc=Om een complete backup van Dolibarr te maken, dient u:
-BackupDesc2=- Bewaar de inhoud van de documenten map (<b>%s</b>) welke alle uploads en gegenereerde bestanden bevat (bijvoorbeeld als zip-bestand).
+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=- Bewaar de inhoud van uw database in een dump bestand. Om dit te doen, kunt u gebruik maken van de volgende assistent.
BackupDescX=Gearchiveerde map-bestand moet op een veilige plaats worden opgeslagen.
BackupDescY=De gemaakte dump bestand moet op een veilige plaats worden opgeslagen.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Gebruik een zoekformulier om een product te kieze
UseEcoTaxeAbility=Ondersteuning voor Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Standaard streepjescodetype voor produkten
SetDefaultBarcodeTypeThirdParties=Standaard streepjescodetype voor derde partijen
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Module om product codes te genereren en te controleren (product of dienst)
ProductOtherConf= Product / dienst configuratie
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Vaste email bestemmeling
SendingsSetup=Verzendingsmoduleinstellingen
SendingsReceiptModel=Verzendontvangstsjabloon
SendingsNumberingModules=Verzendingen nummering modules
-SendingsAbility=Ondersteun verzendingsbrieven voor afnemersleveringen
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=In de meeste gevallen worden de verzendingsbrieven gebruikt als brieven voor de afnemersleveringen (lijst van te verzenden producten ) evenals voor ontvangstbewijzen ondertekend door de afnemer. Derhalve zijn ontvangstbevestigingen een dubbele functionaliteit en worden deze zelden geactiveerd.
FreeLegalTextOnShippings=Vrije tekst op verzendingen
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/nl_NL/agenda.lang b/htdocs/langs/nl_NL/agenda.lang
index d180072664b..951b0c1454b 100644
--- a/htdocs/langs/nl_NL/agenda.lang
+++ b/htdocs/langs/nl_NL/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Evenementen voor alle gebruikers van de groep
ActionAssignedTo=Taken toegewezen aan
AllMyActions= Al mijn acties / taken
AllActions= Alle acties / taken
-ViewList=Bekijk de lijst
ViewCal=Bekijk kalender
ViewDay=Dag te bekijken
ViewWeek=Weekweergave
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 8302407576c..de3f61bbe22 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect-status
DraftPropals=Ontwerp van commerciële voorstellen
SearchPropal=Zoek een commercieel voorstel
CommercialDashboard=Verkoopsoverzicht
+NoLimit=No limit
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index b540ec2eca6..7e876e0cbf8 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contactpersoon van Klant
StatusContactValidated=Status van contactpersoon
Company=Bedrijf
CompanyName=Bedrijfsnaam
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Bedrijven
CountryIsInEEC=Lidstaat van de Europese Unie
ThirdPartyName=Naam van Klant
@@ -68,6 +69,7 @@ Country=Land
CountryCode=Landcode
CountryId=Land-ID
Phone=Telefoonnummer
+PhoneShort=Phone
Skype=Skype
Call=Bel
Chat=Chat
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 6d799dee2fc..02f25961ef2 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Vul waarde in voor checkbox lijst
ErrorNoValueForRadioType=Vul waarde in voor knoppen lijst
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Veld <b>%s</b> mag geen speciale tekens bevat.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Veld <b>%s</b> mag geen speciale tekens bevatten, noch hoofdletters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Geen boekhoudingsmodule geactiveerd
ErrorExportDuplicateProfil=Deze profile naam bestaat al voor deze export set.
ErrorLDAPSetupNotComplete=De Dolibarr-LDAP installatie is niet compleet.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/languages.lang b/htdocs/langs/nl_NL/languages.lang
index 50bdcb138a8..4a9d8dc1641 100644
--- a/htdocs/langs/nl_NL/languages.lang
+++ b/htdocs/langs/nl_NL/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Frans (Canada)
Language_fr_CH=Frans (Zwitserland)
Language_fr_FR=Frans (Frankrijk)
Language_fr_NC=Frans (Nieuw-Caledonië)
+Language_fy_NL=Frisian
Language_he_IL=Hebreeuws
Language_hr_HR=Kroatisch
Language_hu_HU=Hongaars
@@ -70,6 +71,7 @@ Language_sv_SV=Zweeds
Language_sv_SE=Zweeds
Language_sq_AL=Albanees
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Oekraïens
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 98df67dde00..b71b1fee9f4 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -710,6 +710,8 @@ Denied=Gewijgerd
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Maandag
Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/margins.lang b/htdocs/langs/nl_NL/margins.lang
index 3f86ef5cc18..45db59ec1af 100644
--- a/htdocs/langs/nl_NL/margins.lang
+++ b/htdocs/langs/nl_NL/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Als een training
UseDiscountAsService=Als een dienst
UseDiscountOnTotal=Op subtotaal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definieert als een globale discount wordt behandelt als een training, een dienst, of alleen een subtotaal voor marge berekening.
-MARGIN_TYPE=Marge type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Groffe marge
MargeNette=Netto marge
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Groffe marge : Verkoopprijs - Inkoopprijs<br/>Netto marge : Verkoopprijs - Kostprijs
+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
CostPrice=Kostprijs
BuyingCost=Kostprijs
UnitCharges=Unit toeslag
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 506738a2906..af7745f815c 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unieke prijs per product/dienst
PricingRule=Regels voor prijzen klant
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Stel dezelfde prijs in dochterondernemingen klant
-PriceByCustomerLog=Prijs per klant log
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Minimaal aanbevolen prijs is:% s
PriceExpressionEditor=Prijs expressie editor
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 1681d5886b2..25a776442f6 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Taak %s gecreëerd
TaskModifiedInDolibarr=Taak %s gewijzigd
TaskDeletedInDolibarr=Taak %s verwijderd
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projectmanager
TypeContact_project_external_PROJECTLEADER=Projectleider
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index 7cc0ea95dd4..0218f3442ae 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Verzendingen
AllSendings=Alle zendingen
Shipment=Verzending
Shipments=Verzendingen
-ShowSending=Toon te versturen
+ShowSending=Show Shipments
Receivings=Ontvangsten
SendingsArea=Zendingenoverzicht
ListOfSendings=Verzendlijst
@@ -26,8 +26,8 @@ QtyToShip=Aantal te verzenden
QtyReceived=Aantal ontvangen
KeepToShip=Resterend te verzenden
OtherSendingsForSameOrder=Andere verzendingen voor deze opdracht
-DateSending=Datum versturing opdracht
-DateSendingShort=Datum versturing opdracht
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Verzendingen voor deze opdracht
SendingsAndReceivingForSameOrder=Verzendingen en ontvangsten voor deze opdracht
SendingsToValidate=Te valideren verzendingen
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index 35e4c9c4bf0..ec3e676fc3f 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regel voor voorraadbeheerafname
RuleForStockManagementIncrease=Regel voor voorraadbeheertoename
DeStockOnBill=Verlaag de echte voorraad na het valideren van afnemersfacturen / creditnota's
DeStockOnValidateOrder=Verlaag de echte voorraad na het valideren van opdrachten
-DeStockOnShipment=Verlaag de echte voorraad na het valideren van verzendingen
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Verhoog de echte voorraad na het valideren van leveranciersfacturen / creditnota's
ReStockOnValidateOrder=Verhoog de echte voorraad na het valideren van leveranciersopdrachten
ReStockOnDispatchOrder=Verhoog de echte voorraad na het handmatig verzenden naar magazijnen, nadat de leveranciersopdracht ontvangst
@@ -134,7 +134,7 @@ IsInPackage=Vervat in pakket
ShowWarehouse=Toon magazijn
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Voorraad overdracht van het product %s in een ander magazijn
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Inv./Verpl. code
NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
ThisSerialAlreadyExistWithDifferentDate=Deze lot/serienummer (<strong>%s</strong>) bestaat al, maar met verschillende verval of verkoopen voor datum <strong>(gevonden %s</strong> maar u gaf in<strong>%s</strong>).
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 8230f6f9b5a..30f706e2a44 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index bf58f2d2339..9fbe0aa78de 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Nowe konto księgowe
Update=Aktualizacja
List=Lista
Create=Utworzyć
+CreateMvts=Create movement
UpdateAccount=Modyfikacja konta księgowego
UpdateMvts=Modyfikacja ruch
WriteBookKeeping=Konta rekord w księdze głównej
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Rozpocznij sortowanie stron rozpadu "Break
AccountLength=Długość rozliczania rachunków przedstawiono w Dolibarr
AccountLengthDesc=Funkcja pozwala udawać długość koncie księgowym zastępując obowiązuje przez cyfrę zero. Funkcja ta dotyka tylko wyświetlacz, to nie zmienia kont księgowych zarejestrowanych w Dolibarr. Na wywóz, funkcja ta jest konieczna, aby być zgodne z określonym oprogramowaniem.
+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ść ogólnych rachunków
ACCOUNTING_LENGTH_AACCOUNT=Długość z rachunków osób trzecich
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 860a5af17a0..108c858fda1 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Rachunkowość (zaawansowane)
Module50400Desc=Rachunkowości zarządczej (podwójne strony)
Module54000Name=PrintIPP
Module54000Desc=Druk bezpośredni (bez otwierania dokumentów) za pomocą interfejsu Puchary IPP (drukarki muszą być widoczne z serwera, a CUPS musi być installé na serwerze).
-Module55000Name=Otwórz Sonda
-Module55000Desc=Moduł do ankiet internetowych (jak Doodle, Szpilki, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marże
Module59000Desc=Moduł do zarządzania marżami
Module60000Name=Prowizje
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Nr bezpieczeństwa zdarzenie zostało jeszcze zarejestrowa
NoEventFoundWithCriteria=Nr bezpieczeństwa zdarzenie zostało znalezionych dla takich kryteriów wyszukiwania.
SeeLocalSendMailSetup=Zobacz lokalnej konfiguracji sendmaila
BackupDesc=Aby wykonać pełną kopię zapasową Dolibarr, musisz:
-BackupDesc2=Zapisz zawartość dokumentów katalogu <b>( %s),</b> który zawiera wszystkie przesłane i wygenerowane pliki (można np. utworzyć archiwum ZIP).
+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=Zapisz zawartość Twojej bazy danych (<b>%s</b>) do kopi zapasowej. Aby tego dokonać, możesz użyć asystenta.
BackupDescX=Zarchiwizowane katalogu należy przechowywać w bezpiecznym miejscu.
BackupDescY=Wygenerowany plik zrzutu powinny być przechowywane w bezpiecznym miejscu.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Użyj wyszukiwarki aby wybrać produkt (zamiast listy r
UseEcoTaxeAbility=Wsparcie Eko-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Domyślny kod kreskowy typu użyć do produktów
SetDefaultBarcodeTypeThirdParties=Domyślny kod kreskowy typu do użytku dla osób trzecich
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Moduł do generowania kodu produktu i sprawdzeniu (produkt lub usługa)
ProductOtherConf= Konfiguracja produktu / usługi
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Naprawiono docelowy adres e-mail
SendingsSetup=Wysyłanie konfiguracji modułu
SendingsReceiptModel=Wysyłanie otrzymania modelu
SendingsNumberingModules=Sendings numerowania modułów
-SendingsAbility=Arkusze Wsparcie klienta na dostawy przesyłki
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=W większości przypadków, sendings wpływy są wykorzystywane zarówno jako karty klienta dostaw (wykaz produktów wysłać) i arkusze, które są recevied i podpisana przez klienta. Więc produktu dostaw wpływów jest powielony funkcji i rzadko jest włączony.
FreeLegalTextOnShippings=Dowolny tekst sprawie przemieszczania
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/pl_PL/agenda.lang b/htdocs/langs/pl_PL/agenda.lang
index 11da00c01ef..3df38f24474 100644
--- a/htdocs/langs/pl_PL/agenda.lang
+++ b/htdocs/langs/pl_PL/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Wydarzenia dla wszystkich użytkowników grupy
ActionAssignedTo=Wydarzenie przypisane do
AllMyActions= Wszystkie moje zdarzenia/zadania
AllActions= Wszystkie zdarzenia/zadania
-ViewList=Widok listy
ViewCal=Pokaż miesiąc
ViewDay=Pokaż dzień
ViewWeek=Pokaż tydzień
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index 5e8c6f36a04..6b802ff7c84 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -1,96 +1,97 @@
# Dolibarr language file - Source file is en_US - commercial
Commercial=Komercyjne
CommercialArea=Powierzchnia handlowa
-CommercialCard=Commercial karty
+CommercialCard=Karta komercyjna
CustomerArea=Klienci obszaru
Customer=Klient
Customers=Klienci
-Prospect=Prospect
+Prospect=Widok
Prospects=Potencjalni klienci
DeleteAction=Usuń działania / zadania
NewAction=Nowe działania / zadania
-AddAction=Create event/task
-AddAnAction=Create an event/task
-AddActionRendezVous=Create a Rendez-vous event
-Rendez-Vous=Spotkanie
+AddAction=Tworzenie zdarzenia / zadania
+AddAnAction=Załóż zdarzenia / zadania
+AddActionRendezVous=Stwórz umówione spotkanie
+Rendez-Vous=Umówione spotkanie
ConfirmDeleteAction=Czy na pewno chcesz usunąć to zadanie?
-CardAction=Działanie karty
-PercentDone=Procent zrobić
+CardAction=Karta wydarzenia
+PercentDone=Procent wykonanych
ActionOnCompany=Zadanie o firmie
-ActionOnContact=Zadanie o kontakt
+ActionOnContact=Zadanie o kontakcie
TaskRDV=Spotkania
TaskRDVWith=Spotkanie z %s
ShowTask=Pokaż zadanie
ShowAction=Pokaż działania
ActionsReport=Działania raport
-ThirdPartiesOfSaleRepresentative=Thirdparties with sales representative
+ThirdPartiesOfSaleRepresentative=Zamówienia z przedstawicielem handlowym
SalesRepresentative=Przedstawiciel handlowy
SalesRepresentatives=Przedstawiciele handlowi
SalesRepresentativeFollowUp=Przedstawiciel handlowy (kontynuacja)
SalesRepresentativeSignature=Przedstawiciel handlowy (podpis)
-CommercialInterlocutor=Commercial interlokutora
+CommercialInterlocutor=Osoba do kontaktu
ErrorWrongCode=Niewłaściwy kod
-NoSalesRepresentativeAffected=Nr szczególności przedstawiciel handlowy dotknięte
+NoSalesRepresentativeAffected=Brak informacji o przypisanych przedstawicielach handlowych
ShowCustomer=Pokaż klienta
-ShowProspect=Pokaż perspektywa
-ListOfProspects=Lista perspektyw
+ShowProspect=Pokaż potencjalnych
+ListOfProspects=Lista potencjalnych
ListOfCustomers=Lista klientów
-LastDoneTasks=Ostatnia %s wykonane zadania
+LastDoneTasks=Ostatnie %s wykonane zadania
LastRecordedTasks=Ostatnio zapisane zadania
-LastActionsToDo=Ostatnia %s najstarszych działania nie zakończyły
-DoneAndToDoActionsFor=Gotowe i zadania Aby zrobić dla %s
-DoneAndToDoActions=Sporządzono zadań oraz do uczynienia
-DoneActions=Sporządzono działania
-DoneActionsFor=Sporządzono działań dla %s
-ToDoActions=Niekompletne działań
-ToDoActionsFor=Niekompletne działań na rzecz %s
-SendPropalRef=Submission of commercial proposal %s
-SendOrderRef=Submission of order %s
+LastActionsToDo=Ostatnie %s najstarsze działanie nie wykonane.
+DoneAndToDoActionsFor=Wydarzenia wykonane i do zrobienia dla %s
+DoneAndToDoActions=Wydarzenia wykonane i do zrobienia
+DoneActions=Wykonane działania
+DoneActionsFor=Wykonane działania dla %s
+ToDoActions=Niekompletne wydarzenie
+ToDoActionsFor=Niekompletne wydarzenie dla %s
+SendPropalRef=Złożenie wniosku o oferte handlową %s
+SendOrderRef=Złożenie zamówienia %s
StatusNotApplicable=Nie dotyczy
-StatusActionToDo=Aby to zrobić
+StatusActionToDo=Do zrobienia
StatusActionDone=Zrobione
-MyActionsAsked=Działania Mam zapisane
-MyActionsToDo=Działania mam zrobić
-MyActionsDone=Działania wpływa do mnie
-StatusActionInProcess=W procesie
+MyActionsAsked=Działania gdzie się zapisałem
+MyActionsToDo=Działania do zrobienia
+MyActionsDone=Wydarzenia przypisane do mnie
+StatusActionInProcess=W trakcie
TasksHistoryForThisContact=Działania na rzecz tego kontaktu
-LastProspectDoNotContact=Nie kontakt
-LastProspectNeverContacted=Nigdy nie skontaktował
-LastProspectToContact=Aby skontaktować się
-LastProspectContactInProcess=Kontakt w procesie
-LastProspectContactDone=Kontakt zrobić
-DateActionPlanned=Data działania planowane na
+LastProspectDoNotContact=Nie kontaktować się
+LastProspectNeverContacted=Nigdy nie skontaktowano
+LastProspectToContact=Do skontaktowania
+LastProspectContactInProcess=W trakcie kontaktu
+LastProspectContactDone=Kontakt wykonany
+DateActionPlanned=Planowana data działania na
DateActionDone=Data zrobienia działania
-ActionAskedBy=Działanie zadawane przez
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Działania wykonywane przez
+ActionAskedBy=Działanie zadane przez
+ActionAffectedTo=Zdarzenie przypisane do
+ActionDoneBy=Działanie wykonywane przez
ActionUserAsk=Zarejestrowane przez
-ErrorStatusCantBeZeroIfStarted=Jeżeli pole <b>'Data zrobienia</b> "jest wypełniona, rozpoczęto działania (lub gotowy), więc pole" <b>Status</b> "nie może być 0%%.
+ErrorStatusCantBeZeroIfStarted=Jeżeli pole <b>'Data wykonania</b> "jest wypełniona, akcja się zaczęła (lub wykonała), więc pole" <b>Status</b> "nie może być 0%%.
ActionAC_TEL=Telefon
ActionAC_FAX=Wyślij faks
-ActionAC_PROP=Wyślij wniosek
+ActionAC_PROP=Wyślij propozycję pocztą
ActionAC_EMAIL=Wyślij e-mail
ActionAC_RDV=Spotkania
-ActionAC_INT=Intervention on site
-ActionAC_FAC=Wyślij rozliczeniowe
-ActionAC_REL=Wyślij rozliczeniowe (przypomnienie)
+ActionAC_INT=Interwencja na stronie
+ActionAC_FAC=Wyślij fakturę/rozliczenie pocztą
+ActionAC_REL=Wyślij fakturę/rozliczenie pocztą (ponaglenie)
ActionAC_CLO=Blisko
-ActionAC_EMAILING=Wyślij e-maila masa
-ActionAC_COM=Wyślij zamówienie pocztą
+ActionAC_EMAILING=Wyślij mass maila
+ActionAC_COM=Wyślij zamówienie klienta pocztą
ActionAC_SHIP=Wyślij wysyłki za pośrednictwem poczty
-ActionAC_SUP_ORD=aby dostawca przesłać pocztą
-ActionAC_SUP_INV=fakturze dostawcy przesłać pocztą
+ActionAC_SUP_ORD=Wyślij zamówienie dostawy pocztą.
+ActionAC_SUP_INV=Wyślij Fakture/rozliczenie dostawy pocztą
ActionAC_OTH=Inny
-ActionAC_OTH_AUTO=Other (automatically inserted events)
-ActionAC_MANUAL=Manually inserted events
-ActionAC_AUTO=Automatically inserted events
-Stats=Sales statistics
-CAOrder=Sales volume (validated orders)
-FromTo=from %s to %s
-MargeOrder=Margins (validated orders)
-RecapAnnee=Summary of the year
-NoData=There is no data
-StatusProsp=Stan perspektywa
-DraftPropals=Projekt komercyjne propozycje
+ActionAC_OTH_AUTO=Inne (automatycznie wstawione wydarzenia)
+ActionAC_MANUAL=Ręcznie wstawione wydarzenia
+ActionAC_AUTO=Automatycznie wstawione wydarzenia
+Stats=Statystyka sprzedaży
+CAOrder=Wielkość sprzedaży (potwierdzone zamówienia)
+FromTo=z %s do %s
+MargeOrder=Marże (potwierdzone zamówienia)
+RecapAnnee=Podsumowanie roku
+NoData=Nie ma danych
+StatusProsp=Stan oferty
+DraftPropals=Szkic oferty handlowej
SearchPropal=Szukaj komercyjnego projektu
-CommercialDashboard=Commercial summary
+CommercialDashboard=Podsumowanie Komercyjne
+NoLimit=No limit
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index d54baeede99..b0c19f0ba40 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Kontakty/adresy kontrahenta
StatusContactValidated=Status kontaktu/adresu
Company=Firma
CompanyName=Nazwa firmy
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Firmy
CountryIsInEEC=Kraj należy do Europejskiej Strefy Ekonomicznej
ThirdPartyName=Nazwa kontrahenta
@@ -68,6 +69,7 @@ Country=Kraj
CountryCode=Kod kraju
CountryId=ID kraju
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Zadzwoń
Chat=Czat
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index a74029ae31d..ee2aa5df388 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Proszę wypełnić pole wyboru wartości dla listy
ErrorNoValueForRadioType=Proszę wypełnić wartość liście radiowej
ErrorBadFormatValueList=Wartość lista nie może mieć więcej niż jeden <u>pochodzić:% s,</u> ale potrzeba co najmniej jeden: llave, valores
ErrorFieldCanNotContainSpecialCharacters=<b>Pole %s</b> nie zawiera znaki specjalne.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>Pole% s</b> nie musi zawiera znaki specjalne, ani dużych liter.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nr rachunkowych moduł aktywowany
ErrorExportDuplicateProfil=Ta nazwa profil już istnieje dla tego zestawu eksportu.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP dopasowywania nie jest kompletna.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Globalna zmienna wybrana
ErrorFieldMustBeANumeric=Pole <b>%s</b> musi mieć wartość numeryczną
ErrorFieldMustBeAnInteger=Pole <b>%s</b> musi być liczbą całkowitą
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Parametry konfiguracyjne obowiązkowe nie są jeszcze określone
diff --git a/htdocs/langs/pl_PL/languages.lang b/htdocs/langs/pl_PL/languages.lang
index 611ec33fbcb..9799430fab8 100644
--- a/htdocs/langs/pl_PL/languages.lang
+++ b/htdocs/langs/pl_PL/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francuski (Kanada)
Language_fr_CH=Francuski (Szwajcaria)
Language_fr_FR=Francuski
Language_fr_NC=Francuski (Nowa Kaledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrajski
Language_hr_HR=Chorwacki
Language_hu_HU=Węgierski
@@ -70,6 +71,7 @@ Language_sv_SV=Szwedzki
Language_sv_SE=Szwedzki
Language_sq_AL=Albański
Language_sk_SK=Słowacki
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tajski
Language_uk_UA=Ukraiński
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index e3f506cb384..d9047428d30 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -710,6 +710,8 @@ Denied=Zabroniony
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Poniedziałek
Tuesday=Wtorek
diff --git a/htdocs/langs/pl_PL/margins.lang b/htdocs/langs/pl_PL/margins.lang
index e15937923ee..f9872b09a07 100644
--- a/htdocs/langs/pl_PL/margins.lang
+++ b/htdocs/langs/pl_PL/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Jako produkt
UseDiscountAsService=Jako usługa
UseDiscountOnTotal=Na podsumy
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Określa, czy globalne rabatu jest traktowana jako produktu, usługi lub tylko na sumy częściowej obliczania marży.
-MARGIN_TYPE=Typ marża
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw marża
MargeNette=Rentowność netto
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin: Cena sprzedaży - cena zakupu <br/> Rentowność netto: Cena sprzedaży - cena kosztów
+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
CostPrice=Cena fabryczna
BuyingCost=Cena fabryczna
UnitCharges=Koszty jednostkowe
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 10308579b82..3ce082e5917 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Wyjątkowa cena za produkt / usługę
PricingRule=Zasady cen z klientami
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Ustaw sama cena na zależnych klientów
-PriceByCustomerLog=Cena od dziennika klienta
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Cena minimalna zalecana jest:% s
PriceExpressionEditor=Edytor Cena wyraz
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 291986ac65e..88e215c3dc9 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Zadanie %s utworzono
TaskModifiedInDolibarr=Zadań %s zmodyfikowano
TaskDeletedInDolibarr=Zadań %s usunięto
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Kierownik projektu
TypeContact_project_external_PROJECTLEADER=Lider projektu
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index 50de12cc965..8bda3a3038f 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Sendings
AllSendings=Wszystkie wysyłki
Shipment=Wysyłanie
Shipments=Wysyłek
-ShowSending=Pokaż Wysyłanie
+ShowSending=Show Shipments
Receivings=Wpływy
SendingsArea=Sendings obszarze
ListOfSendings=Lista sendings
@@ -26,8 +26,8 @@ QtyToShip=Ilosc do statku
QtyReceived=Ilość otrzymanych
KeepToShip=Pozostają do wysyłki
OtherSendingsForSameOrder=Inne sendings do tego celu
-DateSending=Data wysłania porządku
-DateSendingShort=Data wysłania porządku
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Sendings do tego celu
SendingsAndReceivingForSameOrder=Sendings i receivings do tego celu
SendingsToValidate=Wysyłanie do zatwierdzenia
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 29dafcd23e2..a303a531d79 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Artykuł na zarządzanie zapasami spadek
RuleForStockManagementIncrease=Artykuł na zarządzanie zapasami wzrost
DeStockOnBill=Spadek realnych zasobów faktur / not kredytowych
DeStockOnValidateOrder=Spadek realnych zasobów zamówień notatek
-DeStockOnShipment=Spadek realnych zasobów wysyłką (zaleciły)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Wzrost realnego zasobów faktur / not kredytowych
ReStockOnValidateOrder=Wzrost realnego zasobów zamówień notatek
ReStockOnDispatchOrder=Wzrost rzeczywisty stan zapasów w magazynach ręcznego wysyłki, po otrzymaniu zamówienia dostawca
@@ -134,7 +134,7 @@ IsInPackage=Zawarte w pakiecie
ShowWarehouse=Pokaż magazyn
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Transfer Zdjęcie produktu% s do innego magazynu
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Kod Fv/ Przesunięcia
NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
ThisSerialAlreadyExistWithDifferentDate=Ten lot/numer seryjny (<strong>%s</strong>) już istnieje ale z inna data do wykorzystania lub sprzedania (znaleziono <strong>%s</strong> a wszedłeś w <strong>%s</strong>)
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 3ca83320afa..3066539a7bb 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Weryfikacja raportu wydatków
ConfirmSaveTrip=Czy na pewno chcesz, aby potwierdzić ten raport wydatków?
NoTripsToExportCSV=Nie raport z wydatków na eksport za ten okres.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 9315946c955..9ca6b5e0351 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -301,6 +301,7 @@ ExtrafieldParamHelpradio=Lista de parâmetros tem que ser como chave, valor por
ExtrafieldParamHelpsellist=Lista Parâmetros vem de uma tabela <br> Sintaxe: table_name: label_field: id_field :: filtro <br> Exemplo: c_typent: libelle: id :: filtro <br><br> filtro pode ser um teste simples (por exemplo, ativo = 1) para exibir apenas o valor ativo <br> se você deseja filtrar extrafields usar syntaxt extra.fieldcode = ... (onde código de campo é o código de extrafield) <br><br> A fim de ter a lista dependendo outro: <br> c_typent: libelle: id: parent_list_code | parent_column: Filtro
LibraryToBuildPDF=Biblioteca utilizada para criar o PDF
WarningUsingFPDF=Atenção: Seu <b>conf.php</b> contém <b>dolibarr_pdf_force_fpdf</b> directiva <b>= 1.</b> Isto significa que você usar a biblioteca FPDF para gerar arquivos PDF. Esta biblioteca é velho e não suporta um monte de recursos (Unicode, a transparência da imagem, cirílicos, árabes e asiáticos, ...), por isso podem ocorrer erros durante a geração de PDF. <br> Para resolver isso e ter um apoio total de geração de PDF, faça o download <a href="http://www.tcpdf.org/" target="_blank">da biblioteca TCPDF</a> , em seguida, comentar ou remover a linha <b>$ dolibarr_pdf_force_fpdf = 1,</b> e adicione ao invés <b>$ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'</b>
+LocalTaxDesc=Alguns países aplicam impostos 2 ou 3 em cada linha da fatura. Se este for o caso, escolha o tipo de segundo e terceiro imposto e sua taxa. Tipo de possíveis são: <br> 1: impostos locais, aplicar sobre produtos e serviços sem IVA (localtax é calculada sobre o montante sem impostos) <br> 2: impostos locais, aplicadas aos produtos e serviços, incluindo IVA (localtax é calculada sobre o montante do imposto + principal) <br> 3: impostos locais, aplicar em produtos sem IVA (localtax é calculada sobre o montante sem impostos) <br> 4: impostos locais, aplicadas aos produtos, incluindo o IVA (localtax é calculada sobre o montante + iva principal) <br> 5: impostos locais, aplicar em serviços sem IVA (localtax é calculada sobre o montante sem impostos) <br> 6: impostos locais, aplicar sobre os serviços, incluindo o IVA (localtax é calculada sobre o montante + imposto)
SMS=Mensagem de texto
LinkToTestClickToDial=Digite um número de telefone para ligar para mostrar um link para testar a url ClickToDial para o <strong>usuário% s</strong>
LinkToTest=Link clicável gerado para o <strong>usuário% s</strong> (clique número de telefone para testar)
@@ -344,6 +345,7 @@ Module55Desc=Administração dos códigos de barra
Module56Name=Telefonia
Module56Desc=Administração da telefonia
Module57Name=Débitos Diretos
+Module57Desc=As ordens permanentes e gestão de retirada. Também inclui geração de arquivo SEPA para países europeus.
Module59Desc=Adicione função para gerar uma conta Bookmark4u desde uma conta do ERP
Module70Desc=Administração de Intervenções
Module75Name=Notas de despesas e deslocamentos
@@ -368,6 +370,7 @@ Module520Desc=Gestão dos empréstimos
Module600Desc=Enviar notificação via EMail para terceiros sobre algums eventos do Dolibarr ( configurado para cada terceiro)
Module700Desc=Administração de Bolsas
Module770Name=Relatórios de despesas
+Module770Desc=Gestão e reivindicação de relatórios de despesas (transporte, refeição, ...)
Module1120Name=Fornecedor - proposta comercial
Module1120Desc=Pedido fornecedor - proposta comercial e preços
Module1200Desc=Interface com o sistema de seguimento de incidências Mantis
@@ -387,7 +390,9 @@ Module2500Name=Administração Eletrônica de Documentos
Module2600Name=API de serviços (Web Services SOAP)
Module2600Desc=Permitir que os serviços da API servidor SOAP Dolibarr fornecendo
Module2610Name=API de serviços (Web services REST)
+Module2610Desc=Permitir que o servidor prestação de serviços de API REST do Dolibarr
Module2650Name=WebServices (cliente)
+Module2650Desc=Habilitar o webservices do Dolibarr (pode ser usado para empurrar de dados / pedidos de servidores externos. Ordens Fornecedor suporte apenas para o momento)
Module2700Name=Sobrescrito
Module2700Desc=Usar o serviço on-line Gravatar (www.gravatar.com) para mostrar fotos de usuários / membros (que se encontra com os seus e-mails). Precisa de um acesso à Internet
Module2800Desc=Cliente de FTP
@@ -398,14 +403,13 @@ Module5000Desc=Permite-lhe gerenciar várias empresas
Module6000Desc=Gestão de fluxo de trabalho
Module20000Name=Sair da configuração de pedidos
Module39000Name=Lote do produto
+Module39000Desc=Lote ou número de serie, para compra e venda administrado produtos
Module50000Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com PayBox
Module50100Desc=Caixa registradora
Module50200Desc=Módulo para oferecer uma página de pagamento on-line por cartão de crédito com Paypal
Module50400Name=Contabilidade (avançada)
Module50400Desc=Gestão de Contabilidade (partes duplas)
Module54000Desc=Impressão direta (sem abrir os documentos) usando a interface Cups IPP (Impressora deve ser visível a partir do servidor, e CUPS deve ser instaladas no servidor).
-Module55000Name=Abrir Enquete
-Module55000Desc=Módulo para fazer pesquisas on-line (como Doodle, Studs, Rdvz ...)
Module59000Name=Margems
Module59000Desc=Módulo para gerenciar as margens
Module60000Desc=Módulo para gerenciar comissões
@@ -500,6 +504,7 @@ Permission520=Leia Empréstimos
Permission522=Criar / modificar empréstimos
Permission524=Excluir empréstimos
Permission525=Acesso a Calculadora de empréstimo
+Permission527=Exportação de Empréstimos
Permission532=Criar ou modificar serviços
Permission534=Excluir serviços
Permission536=Visualizar ou gerenciar serviços ocultos
@@ -717,7 +722,6 @@ ParameterActiveForNextInputOnly=parâmetro efetivo somente a partir das próxima
NoEventOrNoAuditSetup=não são registrado eventos de segurança. Esto pode ser normal sim a auditoría não ha sido habilitado na página "configuração->segurança->auditoría".
NoEventFoundWithCriteria=não são encontrado eventos de segurança para tais criterios de pesquisa.
BackupDesc=Para realizar uma Cópia de segurança completa de Dolibarr, voçê deve:
-BackupDesc2=Salvar o conteúdo do diretório de documentos <b>(%s)</b> que contém todos os arquivos carregados e gerados (você pode fazer um zip por exemplo).
BackupDesc3=Salvar o conteúdo de seu banco de dados <b>(%s)</b> em um arquivo de despejo. Para isso, você pode usar o seguinte assistente.
BackupDescX=O Arquivo gerado deverá localizar-se em um lugar seguro.
BackupDescY=O arquivo gerado devevrá ser colocado em local seguro.
@@ -975,7 +979,6 @@ UseSearchToSelectProduct=Use um formulário de pesquisa para escolher um produto
UseEcoTaxeAbility=Asumir ecotaxa (DEEE)
SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por default para os produtos
SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por default para os Fornecedores
-UseUnits=Unidades de apoio
ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço)
ProductOtherConf=A configuração do produto / serviço
SyslogOutput=Saída do log
@@ -1009,7 +1012,6 @@ ListOfAvailableNotifications=Lista de eventos que você pode definir a notifica
FixedEmailTarget=Alvo fixo e-mail
SendingsSetup=configuração do módulos envios
SendingsNumberingModules=Expedição de numeração de módulos
-SendingsAbility=Support shipment sheets for customer deliveries
NoNeedForDeliveryReceipts=na maioria dos casos, as entregas utilizam como nota de entregas ao cliente (lista de produtos a enviar), se recebem e assinam por o cliente. Por o tanto, a hoja de entregas de produtos é uma característica duplicada e rara vez é ativada.
FreeLegalTextOnShippings=Texto livre sobre transferências
DeliveryOrderModel=Modelo de ordem de envio
@@ -1082,10 +1084,12 @@ WSDLCanBeDownloadedHere=Arquivos descritores WSDL dos serviços prestados pode s
EndPointIs=Clientes SOAP devem enviar seus pedidos para o terminal Dolibarr Disponível em URL
ApiSetup=Instalação de módulo de API
ApiDesc=Ao ativar este módulo, Dolibarr se tornar um servidor REST para fornecer serviços de web diversos.
+KeyForApiAccess=Chave para usar a API (parâmetro "api_key")
ApiProductionMode=Ative o modo de produção
ApiEndPointIs=Você pode acessar a API na url
ApiExporerIs=Você pode explorar a API na url
OnlyActiveElementsAreExposed=Somente elementos de módulos habilitados são expostos
+ApiKey=Chave para API
BankSetupModule=Configuração do módulo Banco
FreeLegalTextOnChequeReceipts=Texto livre em recibos de verificação
BankOrderShow=Ordem de apresentação das contas bancárias para os países usando o "número do banco detalhada"
@@ -1145,9 +1149,11 @@ BackgroundTableLineOddColor=A cor do fundo para as linhas ímpares da tabela
BackgroundTableLineEvenColor=A cor do fundo, mesmo para linhas de tabela
MinimumNoticePeriod=O período mínimo de observação (O seu pedido de licença deve ser feito antes de esse atraso)
NbAddedAutomatically=Número de dias adicionados para contadores de usuários (automaticamente) a cada mês
+EnterAnyCode=Este campo contém uma referência para identificar uma linha. Digite qualquer valor de sua escolha, mas sem caracteres especiais.
PositionIntoComboList=Posição de linha em listas de combinação
SellTaxRate=Taxa de imposto sobre venda
TypeOfTemplate=Tipo de modelo
+TemplateIsVisibleByOwnerOnly=Template é visível somente pelo proprietário
MailToSendProposal=Para enviar a proposta ao cliente
MailToSendOrder=Para enviar pedido do cliente
MailToSendInvoice=Para enviar fatura do cliente
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index b2e9914b3ce..a6d7b5ecf04 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -6,8 +6,11 @@ TheCategorie=A tag / categoria
NoCategoryYet=Nenhuma tag / categoria deste tipo criado
In=Em
CategoriesArea=Área Tags / Categorias
+ProductsCategoriesArea=Área tags / categorias de Produtos / Serviços
SuppliersCategoriesArea=Área tags / categorias de Fornecedores
CustomersCategoriesArea=Área tags / categorias de Clientes
+ThirdPartyCategoriesArea=Área tags / categorias de Clientes/Fornecedores
+MembersCategoriesArea=Área tags / categorias de Membros
ContactsCategoriesArea=Área tags / categorias de Contatos
MainCats=Principais tags / categorias
CatList=Lista de tags / categorias
@@ -20,6 +23,7 @@ CatCreated=Tag / categoria criada
CreateCat=Criar tag / categoria
CreateThisCat=Criar esta tag / categoria
NoSubCat=Esta categoria não contém Nenhuma subcategoria.
+FoundCats=Encontrada tags / categorias
FoundCatsForName=Tags / categorias encontradas para o nome:
FoundSubCatsIn=Subcategorias encontradas no tag / categoria
ErrSameCatSelected=Você selecionou a mesma tag / categoria várias vezes
@@ -36,6 +40,7 @@ MemberIsInCategories=Esse membro está vinculado a seguintes membros tags / cate
ContactIsInCategories=Este contato é ligado à sequência de contatos tags / categorias
ProductHasNoCategory=Este produto / serviço não está em nenhuma tags / categorias
SupplierHasNoCategory=Este fornecedor não está em nenhum 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
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 60165231b71..2808675f50d 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -53,7 +53,6 @@ ErrorNoValueForCheckBoxType=Por favor, preencha valor para a lista de caixa de s
ErrorNoValueForRadioType=Por favor, preencha valor para a lista de rádio
ErrorBadFormatValueList=O valor da lista não pode ter mais do que um <u>vir:% s,</u> mas precisa de pelo menos um: chave ou valores
ErrorFieldCanNotContainSpecialCharacters=o campo <b>%s</b> não deve contener caracter0es especiais
-ErrorFieldCanNotContainSpecialNorUpperCharacters=O <b>campo% s</b> não deve contém caracteres especiais, nem caracteres maiúsculos.
ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não ativado
ErrorExportDuplicateProfil=Este nome de perfil já existe para este lote de exportação.
ErrorLDAPSetupNotComplete=a configuração Dolibarr-LDAP é incompleta.
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index ff334d331f3..ba28ffa646b 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -4,6 +4,7 @@ CPTitreMenu=Folhas
MenuReportMonth=Relatorio mensal
MenuAddCP=Novo pedido de licença
NotActiveModCP=Você deve permitir módulo de folhas para visualizar esta página.
+NotConfigModCP=Você deve configurar o módulo de folhas para ver esta página. Para fazer isso, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click aqui </ a>.
NoCPforUser=Você não tem qualquer dia disponível.
AddCP=Faça um pedido de licença
Employe=Empregado
@@ -18,6 +19,7 @@ ValidatorCP=Aprovador
ListeCP=Lista de folhas
ReviewedByCP=Sera revisado por
SendRequestCP=Criar pedido de licença
+DelayToRequestCP=Solicitações devem ser feitas pelo menos<b> %s dias (s)</b> antes.
UpdateAllCP=Atualize as folhas
ErrorEndDateCP=Você deve selecionar uma data final posterior à data inicial.
ErrorSQLCreateCP=Ocorreu um erro no SQL durante a criação:
@@ -86,6 +88,7 @@ nbHolidayEveryMonthCP=Número de dias de férias adicionados a cada mês
Module27130Name=Gestão de pedidos de licença
Module27130Desc=Gestão de pedidos de licença
TitleOptionMainCP=Definições principais do pedido de licença
+TitleOptionEventCP=Configurações de requisição de licença para eventos
ValidEventCP=Confirmar
UpdateEventCP=Eventos de atualização
NameEventCP=Nome do evento
@@ -108,13 +111,17 @@ TitleAdminCP=Configuração das folhas
NoticePeriod=Período de aviso
HolidaysToValidate=Validar as solicitações de licença
HolidaysToValidateBody=Abaixo está um pedido de licença para validar
+HolidaysToValidateDelay=Este pedido de licença terá lugar dentro de um período de menos de %s dias.
HolidaysValidated=Pedidos de licença validados
HolidaysValidatedBody=O seu pedido de licença para %s para %s foi validado.
HolidaysRefused=Pedido negado
HolidaysRefusedBody=O seu pedido de licença para %s para %s foi negado pelo seguinte motivo:
HolidaysCanceledBody=O seu pedido de licença para %s para %s foi cancelada.
+Permission20001=Leia você possui pedidos de licença
+Permission20002=Criar / alterar os seus pedidos de licença
Permission20003=Excluir pedidos de licença
Permission20004=Leia pedidos de licença para todos
Permission20005=Criar / modificar pedidos de licença para todos
Permission20006=Pedidos de licença administrativas (configuração e atualização de balanço)
NewByMonth=Adicionado por mês
+GoIntoDictionaryHolidayTypes=Vá para <strong>Home- Configuração - Dicionários - Tipo de folhas</strong> para configurar os diferentes tipos de folhas.
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index f99035a990a..a34e4a29b3e 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -36,6 +36,7 @@ ErrorServiceUnavailableTryLater=Serviço não disponível atualmente. Volte a ex
ErrorConfigParameterNotDefined=O parâmetro <b>%s</b> não está definido ao arquivo de configuração Dolibarr <b>conf.php</b>.
ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> na base de dados do Dolibarr.
ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o país '%s'.
+ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
SelectDate=Selecionar uma data
SeeAlso=Ver tambem %s
@@ -151,6 +152,7 @@ UnitPriceTTC=Preço Unit. Total
PriceU=Preço Unit.
PriceUHT=Preço Unit.
AskPriceSupplierUHT=UP net solicitada
+PriceUTTC=U.P. (inc. Impostos)
AmountInvoice=Valor Fatura
AmountPayment=Valor Pagamento
AmountHTShort=Valor (neto)
@@ -290,7 +292,6 @@ IM=Mensagems instantaneas
AttributeCode=Codigo do atributo
OptionalFieldsSetup=Configuração dos atributos extra
URLPhoto=URL da photo/logo
-CreateDraft=Criar RascunhoCriar rascunho
SetToDraft=Voltar para modo rascunho
ObjectDeleted=Objeto %s apagado
ByMonthYear=Por mes/ano
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index bfb2f922086..8e9e0b18458 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -155,7 +155,6 @@ PriceCatalogue=Preço único por produto / serviço
PricingRule=Regras para os preços dos clientes
AddCustomerPrice=Adicione preço por cliente
ForceUpdateChildPriceSoc=Situado mesmo preço em outros pedidos dos clientes
-PriceByCustomerLog=Preço por cliente
MinimumPriceLimit=Preço mínimo não pode ser inferior, em seguida %s
MinimumRecommendedPrice=Preço minimo recomendado e: %s
PriceExpressionEditor=Editor de expressão Preço
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index 66125fb7eb0..1214dae7729 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - sendings
RefSending=Ref. Envio
AllSendings=Todos os embarques
-ShowSending=Mostrar Envio
SendingsArea=Área Envios
LastSendings=Os %s últimos Envios
SendingCard=Cartão de embarque
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index b6f29941aba..8bd611afceb 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -40,7 +40,6 @@ RuleForStockManagementDecrease=Regra de Administração de decrementos de estoqu
RuleForStockManagementIncrease=Regra de Administração de incrementos de estoque
DeStockOnBill=Diminuir ações reais em clientes validação facturas / notas de crédito
DeStockOnValidateOrder=Decrementar os estoques físicos sobre os pedidos
-DeStockOnShipment=Decrementar os estoques físicos sobre os envios (recomendado)
ReStockOnBill=Incrementar os estoques físicos sobre as faturas/recibos
ReStockOnValidateOrder=Incrementar os estoques físicos sobre os pedidos
ReStockOnDispatchOrder=Aumentar os estoques reais no envio manual para armazenamento, depois de receber ordem fornecedor
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 54e66fb7b1d..993531adf03 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Nova Conta Contabilistica
Update=Atualizar
List=Lista
Create=Criar
+CreateMvts=Create movement
UpdateAccount=Modificação de conta contabilistica
UpdateMvts=modificação de movimento
WriteBookKeeping= Gravar conta em contabilidade geral
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Comece a triagem das páginas repartidas "
AccountLength=Comprimento das contas de contabilidade mostradas em Dolibarr
AccountLengthDesc=Função que permite simular um comprimento de conta contábil, substituindo espaços pela figura zero. Esta função só toca a tela, ele não modifica as contas contábeis registradas no Dolibarr. Para a exportação, esta função é necessária para ser compatível com determinado software.
+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
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index b5bf8f156d1..cb83068ee21 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Margens
Module59000Desc=Módulo para gerir as margens
Module60000Name=Comissões
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Não registraram eventos de segurança. Pode ser normal se
NoEventFoundWithCriteria=Não se encontraram eventos de segurança para os criterios de pesquisa.
SeeLocalSendMailSetup=Ver a configuração local de sendmail
BackupDesc=Para realizar uma Cópia de segurança completa do ERP, deve:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=O ficheiro gerado deverá ser guardado num lugar seguro.
BackupDescY=O arquivo gerado deve ser armazenado em local seguro.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Assumir ecotaxa (DEEE)
SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defeito para os produtos
SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defeito para os Terceiros
-UseUnits=Support units
+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= Configuração de Produtos/Serviços
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Configuração do módulos envíos
SendingsReceiptModel=Modelo da ficha de expedição
SendingsNumberingModules=Envios módulos numerados
-SendingsAbility=Suporte para as folhas de expedição para as entregas do cliente
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Na maioria dos casos, as entregas utilizam a nota de entregas ao cliente (lista de produtos a enviar), quando recebido assinam pelo cliente. Portanto, a hora de entregas de produtos é uma operação duplicada sendo rara a vez que é ativada.
FreeLegalTextOnShippings=Texto livre nas expedições
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/pt_PT/agenda.lang b/htdocs/langs/pt_PT/agenda.lang
index 750cad70695..bb049880a7d 100644
--- a/htdocs/langs/pt_PT/agenda.lang
+++ b/htdocs/langs/pt_PT/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Eventos para todos os utilizadores do grupo
ActionAssignedTo=Event assigned to
AllMyActions= Todas as minhas acções
AllActions= Todas as Acções
-ViewList=Ver Lista
ViewCal=Ver Calendário
ViewDay=Modo de exibição Dia
ViewWeek=Vista da semana
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index 4e3973d67b1..213e68bee5b 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Estado Prospect
DraftPropals=Elaborar propostas comerciais
SearchPropal=Procure uma proposta comercial
CommercialDashboard=Resumo Comercial
+NoLimit=No limit
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index ab339498b39..99e61c85931 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contacto de Terceiro
StatusContactValidated=Estado do Contacto
Company=Empresa
CompanyName=Razão social
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Empresas
CountryIsInEEC=País da Comunidade Económica Europeia
ThirdPartyName=Nome de terceiros
@@ -68,6 +69,7 @@ Country=País
CountryCode=Código país
CountryId=ID país
Phone=Telefone
+PhoneShort=Phone
Skype=Skype
Call=Chamada
Chat=Chat
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index 13e8cd5c52d..fe518ee3118 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=O campo <b>%s</b> não deve conter carácteres especiais
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não activado
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=A configuração Dolibarr-LDAP é incompleta.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index 5b156e64557..8ffdd560f69 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francês (Canadá)
Language_fr_CH=Francês (Suíça)
Language_fr_FR=Francês
Language_fr_NC=Francês (Nova Caledónia)
+Language_fy_NL=Frisian
Language_he_IL=Hebreu
Language_hr_HR=Croata
Language_hu_HU=Húngaro
@@ -70,6 +71,7 @@ Language_sv_SV=Sueco
Language_sv_SE=Sueco
Language_sq_AL=Albanês
Language_sk_SK=Eslovaco
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tailandês
Language_uk_UA=Ucraniano
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 973cbf5de07..225cc06ea9f 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# 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 6ac9001ddfa..708c44c7b91 100644
--- a/htdocs/langs/pt_PT/margins.lang
+++ b/htdocs/langs/pt_PT/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Como um produto
UseDiscountAsService=Como um serviço
UseDiscountOnTotal=No subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global é tratado como um produto, um serviço, ou apenas no subtotal para cálculo de margem
-MARGIN_TYPE=Tipo de margem
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Preço de custo
BuyingCost=Preço de custo
UnitCharges=Custos unitários
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index f506c37959d..6d8d3388a38 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Preço único por produto/serviço
PricingRule=Regras para os preços de cliente
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Preço por registo de cliente
+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
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 55ceb70af6b..7df8fcb0731 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=%s tarefas criadas
TaskModifiedInDolibarr=%s tarefas modificadas
TaskDeletedInDolibarr=%s tarefas apagadas
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Líder do projeto
TypeContact_project_external_PROJECTLEADER=Líder do projeto
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index 9f55de4a9e2..3a9739a65f5 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Envios
AllSendings=All Shipments
Shipment=Envio
Shipments=Envios
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Área de Envios
ListOfSendings=Lista de Envios
@@ -26,8 +26,8 @@ QtyToShip=Quant. a Enviar
QtyReceived=Quant. Recebida
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Outros Envios deste Pedido
-DateSending=Data de Expedição
-DateSendingShort=Data de Expedição
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Expedições deste Pedido
SendingsAndReceivingForSameOrder=Envios e Recepções deste pedido
SendingsToValidate=Envios a Confirmar
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index cb8b8ca69b7..8cd3570c8ba 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regra de Gestão de decrementos de stock
RuleForStockManagementIncrease=Regra de Gestão de incrementos de stock
DeStockOnBill=Decrementar os stocks físicos sobre as facturas/recibos
DeStockOnValidateOrder=Decrementar os stocks físicos sobre os pedidos
-DeStockOnShipment=Decrementar os stocks físicos sobre os envíos (recomendado)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Incrementar os stocks físicos sobre as facturas/recibos
ReStockOnValidateOrder=Incrementar os stocks físicos sobre os pedidos
ReStockOnDispatchOrder=Aumentar o stock real de manual de expedição em armazéns, após receber ordem de fornecedor
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index c6561e3c762..ee6de171277 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validar relatório de despesas
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=nenhum relatório de despesas para exportar para este período.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 1e3f9c0c53e..c69f0afb506 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Cont contabil nou
Update=Modifică
List=List
Create=Crează
+CreateMvts=Create movement
UpdateAccount=Modificare cont contabil
UpdateMvts=Modificare mişcare
WriteBookKeeping=Înregistrare contabilă in Cartea Mare
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Începe sortarea paginilor ventilate "Vent
AccountLength=Lungimea conturilor contabile afişate în Dolibarr
AccountLengthDesc=Funcția pentru a simula lungirea unui cont contabil prin înlocuirea spatiile libere cu cifra zero. Această funcție afectează numai afişarea , aceasta nu va schimba conturile contabile înregistrate în Dolibarr. Pentru export, această funcţie este necesară să fie compatibil cu unele software-ul
+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
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 11a10c3a4d8..624ac7b3d5d 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Contabilitate (avansat)
Module50400Desc=Management Contabilitate (partidă dublă)
Module54000Name=Print lP IPrinter
Module54000Desc=Imprimare directă (fără a deschide documentele) folosind interfața CUPS IPP (imprimanta trebuie să fie vizibilă de pe server și CUPS trebuie să fie instalat pe server).
-Module55000Name=Deschide Sondaj
-Module55000Desc=Modul pentru a face sondaje online (ca Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marje
Module59000Desc=Modul management marje
Module60000Name=Comisioane
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Nici un eveniment de securitate a fost înregistrată înc
NoEventFoundWithCriteria=Nici un eveniment de securitate a fost găsit pentru o astfel de criterii de căutare.
SeeLocalSendMailSetup=Vedeţi-vă locale sendmail setup
BackupDesc=Pentru a face o copie de siguranţă completă de Dolibarr, trebuie să:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Arhivat directorul trebuie să fie depozitate într-un loc sigur.
BackupDescY=Generate de fişier de imagine memorie trebuie să fie depozitate într-un loc sigur.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Folositi un formular de căutare pentru a alege un prod
UseEcoTaxeAbility=Suport Eco-Taxe (DEEE)
SetDefaultBarcodeTypeProducts=Implicit tip de cod de bare de a utiliza pentru produse
SetDefaultBarcodeTypeThirdParties=Implicit tip de cod de bare de a utiliza pentru terţi
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul pentru generare de cod de produs și verificare (produs sau serviciu)
ProductOtherConf= Configurare Produse / Servicii
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Targhet email fixat
SendingsSetup=Trimiterea de modul de configurare
SendingsReceiptModel=Trimiterea primirea model
SendingsNumberingModules=Trimiteri de numerotare module
-SendingsAbility=Avize expediere suport pentru livrari clienti
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=În cele mai multe cazuri, sendings încasări sunt utilizate atât ca foi de client pentru livrări (lista de produse pentru a trimite) şi foi de faptul că este recevied şi semnat de către client. Deci, livrările de produse încasări este un duplicat caracteristică şi este rareori activat.
FreeLegalTextOnShippings=Text liber pe livrari
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index fa70316cdd4..f4db30e71b6 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Ev. pentru toți utilizatorii din grup
ActionAssignedTo=Eveniment atribuit lui
AllMyActions= Toate Ev. / sarcinile mele
AllActions= Toate Ev. / sarcini
-ViewList=Vedere listă
ViewCal=Vedere lunara
ViewDay=Vedere zilnica
ViewWeek=Vedere săptămânala
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 971a22ca59c..4cf4ca1aacf 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Statut Prospect
DraftPropals=Oferte Comerciale Schiţă
SearchPropal=Căutaţi o ofertă comercială
CommercialDashboard=Sinteza comercială
+NoLimit=No limit
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 814a3677371..f491b7f2dce 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Contact Terţ
StatusContactValidated=Status Contact
Company=Societate
CompanyName=Nume societate
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Societăţi
CountryIsInEEC=Ţara este în interiorul Comunităţii Economice Europene
ThirdPartyName=Nume Terţ
@@ -68,6 +69,7 @@ Country=Ţară
CountryCode=Cod ţară
CountryId=ID Ţara
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Apel
Chat=Chat
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 066a9f07336..4266e6712f8 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Completaţi valorile pentru lista checkbox
ErrorNoValueForRadioType=Completaţi valorile pentru lista radio
ErrorBadFormatValueList=Valorile din lista nu pot aveae mai mult de o virgulă: <b>% s </ b>, dar trebuie să aibă cel puțin una: cheie, valoare
ErrorFieldCanNotContainSpecialCharacters=<b>Câmp %s</b> trebuie să nu conţine caractere speciale.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul <b>%s</b> nu trebuie să conțină caractere speciale, nici litere mari.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Modul de contabilitate neactivat
ErrorExportDuplicateProfil=Acest profil nume există deja pentru acest set de export.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP de potrivire nu este completă.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index deb33b1db68..96e2dee03b1 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Franceză (Canada)
Language_fr_CH=Franceză (Elveţia)
Language_fr_FR=Franceză
Language_fr_NC=Franceză (Noua Caledonie)
+Language_fy_NL=Frisian
Language_he_IL=Ebraică
Language_hr_HR=Croat
Language_hu_HU=Maghiară
@@ -70,6 +71,7 @@ Language_sv_SV=Suedeză
Language_sv_SE=Suedeză
Language_sq_AL=Albaneză
Language_sk_SK=Slovacă
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Tailandez
Language_uk_UA=Ucrainean
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index 893d93e18aa..9a46cf3ed64 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Luni
Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/margins.lang b/htdocs/langs/ro_RO/margins.lang
index d2e5621b25e..6218c0ec8f0 100644
--- a/htdocs/langs/ro_RO/margins.lang
+++ b/htdocs/langs/ro_RO/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Ca produs
UseDiscountAsService=Ca serviciu
UseDiscountOnTotal=Pe subtotal
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definiti daca discontul global e tratat ca un produs, serviciu, sau numai pe total la calcularea marjei.
-MARGIN_TYPE=Tip Marjă
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Marja brută
MargeNette=Marja netă
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Marja brută: Preţ vânzare - Preţ cumpărare<br/> Marja netă : Preţ vânzare - Cost de preţ
+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
CostPrice=Preţ de cost
BuyingCost=Preţ de cost
UnitCharges=Cheluieli unitare
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index 1a537c9d173..2f2b37160f7 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Preţ unic pe produs/serviciu
PricingRule=Reguli pentru preţuri clienţi
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Setează acelasi preţ pe subsidiarele clientuli
-PriceByCustomerLog=Log Preţ pe client
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Preţul minim recomandat este: %s
PriceExpressionEditor=Editor expresie preț
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 73a308771dd..21c53f572c6 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s creat
TaskModifiedInDolibarr=Task %s modificat
TaskDeletedInDolibarr=Task %s sters
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Şef de Proiect
TypeContact_project_external_PROJECTLEADER=Şef de Proiect
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index f1e0094ffbc..ef674941952 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Livrari
AllSendings=All Shipments
Shipment=Livrare
Shipments=Livrari
-ShowSending=Arata expedieri
+ShowSending=Show Shipments
Receivings=Receptii
SendingsArea=Livrari
ListOfSendings=Lista Livrari
@@ -26,8 +26,8 @@ QtyToShip=Cant. de livrat
QtyReceived=Cant. primită
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Alte livrări pentru această comandă
-DateSending=Data dispoziţiei de livrare
-DateSendingShort=Data disp. de livrare
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Livrări pentru această comandă
SendingsAndReceivingForSameOrder=Livrările şi recepţiile pentru această comandă
SendingsToValidate=Livrări de validat
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 00be24c7917..6a82bbde091 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regulă de gestionare a scăderilor de stoc
RuleForStockManagementIncrease=Regulă de gestionare a creşterilor de stoc
DeStockOnBill=Descreşterea stocului fizic bazată pe validarea facturilor / note de credit
DeStockOnValidateOrder=Descreşterea stocului fizic bazată pe validarea comenzilor client
-DeStockOnShipment=Descreşterea stocului fizic bazată pe validarea notelor de livrare
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Creşterea stocului fizic bazată pe validarea facturilor / note de credit
ReStockOnValidateOrder=Creşterea stocului fizic bazată pe aprobarea comenzilor furnizor
ReStockOnDispatchOrder=Creşterea stocului fizic bazată pe dispecerizarea manuală , dupa recepţia comenzii
@@ -134,7 +134,7 @@ IsInPackage=Continute in pachet
ShowWarehouse=Arată depozit
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Transfer stoc al produsului %s in alt depozit
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index ff512000d47..2f024acc546 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Valideaza raport de cheltuieli
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index 4a31097ce20..d57459bc327 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Новый бухгалтерский счёт
Update=Обновить
List=Список
Create=Создать
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Записать счета в главную книгу
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 93123a74b05..dd72f882210 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
Module50400Desc=Accounting management (double parties)
Module54000Name=Модуль PrintIPP
Module54000Desc=Прямая печать (без открытия документа) использует интерфейс Cups IPP (Принтер должен быть доступен с сервера, и система печати CUPS должна быть установлена на сервере).
-Module55000Name=Управление Бизнес-Процессами
-Module55000Desc=Модуль для проведения онлайн голосований (такой как Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Наценки
Module59000Desc=Модуль управления наценками
Module60000Name=Комиссионные
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Нет безопасности событие было з
NoEventFoundWithCriteria=Нет событий безопасности была обнаружена в таких поисковых критериев.
SeeLocalSendMailSetup=См. вашей локальной настройки Sendmail
BackupDesc=Чтобы сделать полную резервную копию Dolibarr, Вам необходимо:
-BackupDesc2=Сохраняет содержимой папки с документами (<b>%s</b>), которая содержит все загруженные и сгенерированные файлы (вы можете использовать сжатие Zip)
+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=Сохраняет содержание вашей базы данных (<b>%s</b>) в файл. Для этого используйте следующей мастер.
BackupDescX=Архивированный каталог должны храниться в безопасном месте.
BackupDescY=Генерируемый файла дампа следует хранить в надежном месте.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Использовать форму поиска для
UseEcoTaxeAbility=Поддержка Эко-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Стандартный вид штрих-кода, используемого для продуктов
SetDefaultBarcodeTypeThirdParties=Стандартный вид штрих-кода, используемого для третьих сторон
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Модуль для генерации кода продукта и проверки (Товар или Услуга)
ProductOtherConf= Конфигурация Товаров / Услуг
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Отправка модуля настройки
SendingsReceiptModel=Отправка получения модели
SendingsNumberingModules=Отправки нумерации модулей
-SendingsAbility=Поддержка листов отгрузки для доставок клиенту
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=В большинстве случаев отправок поступления используются как бюллетени для заказчика поставки (перечень продуктов для передачи), и бюллетени, которые recevied и подписывается заказчиком. Поэтому поставки продукции квитанции является дублирует функции и редко активирована.
FreeLegalTextOnShippings=Дополнительный текст для поставок
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 60914ceffd7..ed37c1844e5 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=События всех пользователей в гр
ActionAssignedTo=Событие назначено для
AllMyActions= Все мои действия / задачи
AllActions= Все ле действия / задачи
-ViewList=Посмотреть список
ViewCal=Просмотр календаря
ViewDay=Обзор дня
ViewWeek=Обзор недели
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index b105861f7da..57bf3368793 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Проспект статус
DraftPropals=Проект коммерческих предложений
SearchPropal=Поиск коммерческих предложений
CommercialDashboard=Коммерческие итоги
+NoLimit=No limit
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index c41724b7bfc..3bbbd752348 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Контакт контрагента
StatusContactValidated=Статус контакта
Company=Компания
CompanyName=Название компании
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Компании
CountryIsInEEC=Страна входит в состав Европейского экономического сообщества
ThirdPartyName=Наименование контрагента
@@ -68,6 +69,7 @@ Country=Страна
CountryCode=Код страны
CountryId=Код страны
Phone=Телефон
+PhoneShort=Phone
Skype=Скайп
Call=Звонок
Chat=Чат
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index cdfc9c04051..fb10f8715d2 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Пожалуйста, заполните значе
ErrorNoValueForRadioType=Пожалуйста, заполните значени для списка переключателей
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=<b>Поле %s</b> не содержит специальных символов.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Нет бухгалтерского модуля активируется
ErrorExportDuplicateProfil=Имя этого профиля уже сущесвует для этого набора для экспорта.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP соответствия не является полной.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Не выбрана глобальная перем
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Обязательные параметры не определены
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index ac7e2fe139c..92cfa8e9ba4 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Французский (Канада)
Language_fr_CH=Французский (Швейцария)
Language_fr_FR=Французский
Language_fr_NC=Французский (Новая Каледония)
+Language_fy_NL=Frisian
Language_he_IL=Иврит
Language_hr_HR=Хорватский
Language_hu_HU=Венгерский
@@ -70,6 +71,7 @@ Language_sv_SV=Шведский
Language_sv_SE=Шведский
Language_sq_AL=Албанский
Language_sk_SK=Словацкий
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Тайский
Language_uk_UA=Украинский
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index c93051bb965..6a0dccff42e 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -710,6 +710,8 @@ Denied=Запрещено
ListOfTemplates=Список шаблонов
Genderman=Мужчина
Genderwoman=Женщина
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Понедельник
Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/margins.lang b/htdocs/langs/ru_RU/margins.lang
index 433e46a3a1c..9ea44b98a70 100644
--- a/htdocs/langs/ru_RU/margins.lang
+++ b/htdocs/langs/ru_RU/margins.lang
@@ -6,9 +6,9 @@ TotalMargin=Общая наценка
MarginOnProducts=Наценка / Товары
MarginOnServices=Наценка / Услуги
MarginRate=Ставка наценки
-MarkRate=Mark rate
+MarkRate=Отмеченная ставка
DisplayMarginRates=Отобразить ставки наценки
-DisplayMarkRates=Display mark rates
+DisplayMarkRates=Отобразить отмеченные ставки
InputPrice=Исходная цена
margin=Управление доходом с наценок
margesSetup=Настройка управления доходомом с наценок
@@ -23,17 +23,20 @@ ChooseProduct/Service=Выберите продукт или услугу
StartDate=Начальная дата
EndDate=Конечная дата
Launch=Главная
-ForceBuyingPriceIfNull=Force buying price if null
+ForceBuyingPriceIfNull=Форсировать цену покупки если пустое
ForceBuyingPriceIfNullDetails=if "ON", margin will be zero on line (buying price = selling price), otherwise ("OFF"), marge will be equal to selling price (buying price = 0)
MARGIN_METHODE_FOR_DISCOUNT=Margin method for global discounts
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=Тип наценки
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Наценка по строке
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Себестоимость
BuyingCost=Себестоимость
UnitCharges=Unit charges
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index c093e0dfb95..f4d899ab1f0 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Уникальная цена для товара/услуги
PricingRule=Правила для цен клиента
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Установить такую же цену для дочерних клиентов
-PriceByCustomerLog=Цена по журналу клиента
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Минимальная цена не может быть ниже %s
MinimumRecommendedPrice=Минимальная рекомендованная цена : %s
PriceExpressionEditor=Price expression editor
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index d3639298b0e..8923c09faff 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Задача %s создана
TaskModifiedInDolibarr=Задача %s изменена
TaskDeletedInDolibarr=Задача %s удалена
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Руководитель проекта
TypeContact_project_external_PROJECTLEADER=Руководитель проекта
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 1d162255dbe..ca90fc7d705 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Поставки
AllSendings=Все поставки
Shipment=Поставка
Shipments=Поставки
-ShowSending=Показать Отправку
+ShowSending=Show Shipments
Receivings=Получатели
SendingsArea=Раздел поставок
ListOfSendings=Список поставок
@@ -26,8 +26,8 @@ QtyToShip=Количество для отправки
QtyReceived=Количество получено
KeepToShip=Осталось отправить
OtherSendingsForSameOrder=Другие поставки для этого заказа
-DateSending=Дата отправки заказа
-DateSendingShort=Дата отправки заказа
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Поставок для этого заказа
SendingsAndReceivingForSameOrder=Поставки и получения для этого заказа
SendingsToValidate=Поставки для проверки
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 33273c12cfa..0f220287dce 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Правило для управления зап
RuleForStockManagementIncrease=Правило для управления запасами увеличить
DeStockOnBill=Снижение реальных запасов на счета / кредитных нот
DeStockOnValidateOrder=Снижение реальных запасов по заказам записки
-DeStockOnShipment=Снижение реальных запасов отгрузки проверки
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Увеличение реальных запасов на счета / кредитных нот
ReStockOnValidateOrder=Увеличение реальных запасов по заказам записки
ReStockOnDispatchOrder=Увеличение реальных запасов на ручной посылаем в склады, после получения заказа поставщиком
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Просмотр склада
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Перевозка товара %s на другой склад
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index b72dc182425..3ab8d875f71 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Проверить отчёт о завтратах
ConfirmSaveTrip=Вы точно хотите проверить данный отчёт о затратах?
NoTripsToExportCSV=Нет отчёта о затратах за этот период.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
index 6108ff6b4ec..4639e594d47 100644
--- a/htdocs/langs/sk_SK/accountancy.lang
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index eb4589f11ac..c5b86fb583b 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Okraje
Module59000Desc=Modul pre správu marže
Module60000Name=Provízie
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Žiadna udalosť zabezpečenia bol zaznamenaný ešte. To
NoEventFoundWithCriteria=Žiadna udalosť zabezpečenia bol nájdený na týchto vyhľadávacích kritériami.
SeeLocalSendMailSetup=Pozrite sa na miestne sendmail nastavenie
BackupDesc=Ak chcete vykonať kompletnú zálohu Dolibarr, musíte:
-BackupDesc2=Uložiť obsahu adresára dokumentov <b>(%s)</b>, ktorý obsahuje všetky nahraté a vytvorené súbory (môžete napríklad vytvoriť ZIP súbor ).
+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=Uložiť obsah databázy <b>(%s)</b> do súboru. Môžete k tomu použiť nasledujúceho asistenta.
BackupDescX=Archívne adresár by mal byť skladovaný na bezpečnom mieste.
BackupDescY=Vygenerovaný súbor výpisu by sa mal skladovať na bezpečnom mieste.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Použť vyhľadávací formulár pre výber produktu (n
UseEcoTaxeAbility=Podpora Eco-taxe (WEEE)
SetDefaultBarcodeTypeProducts=Predvolený typ čiarového kódu použiť pre produkty
SetDefaultBarcodeTypeThirdParties=Predvolený typ čiarového kódu použiť k tretím osobám
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul pre generovanie kódu produktu a preskúšavanie (výrobku alebo služby)
ProductOtherConf= Katalóg / Konfigurácia služby
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Odoslanie Nastavenie modulu
SendingsReceiptModel=Odoslanie potvrdenky modelu
SendingsNumberingModules=Sendings číslovanie moduly
-SendingsAbility=Support shipment sheets for customer deliveries
+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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/sk_SK/agenda.lang b/htdocs/langs/sk_SK/agenda.lang
index 4a3db47e04c..93dfc2e8a47 100644
--- a/htdocs/langs/sk_SK/agenda.lang
+++ b/htdocs/langs/sk_SK/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Udalosti pre všetkých užívateľov zo skupiny
ActionAssignedTo=Event assigned to
AllMyActions= Všetky moje akcie / úlohy
AllActions= Všetky udalosti / úlohy
-ViewList=Zobrazenie zoznamu
ViewCal=Mesačný pohľad
ViewDay=Denné zobrazenie
ViewWeek=Zobraziť týždeň
diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
index 7b31dcc3225..6b41f9a4b1a 100644
--- a/htdocs/langs/sk_SK/commercial.lang
+++ b/htdocs/langs/sk_SK/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect stav
DraftPropals=Navrhnúť obchodné návrhy
SearchPropal=Hľadať obchodné návrh
CommercialDashboard=Obchodné zhrnutie
+NoLimit=No limit
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index 938dd25fa6f..b598ae85a2e 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Treťou stranou kontakt / adresa
StatusContactValidated=Stav kontaktu / adresa
Company=Spoločnosť
CompanyName=Názov spoločnosti
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Firmy
CountryIsInEEC=Krajina je v rámci Európskeho hospodárskeho spoločenstva
ThirdPartyName=Tretia strana názov
@@ -68,6 +69,7 @@ Country=Krajina
CountryCode=Kód krajiny
CountryId=Krajina id
Phone=Telefón
+PhoneShort=Phone
Skype=Skype
Call=Volanie
Chat=Chat
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index dd640842567..cddefa9c532 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Vyplňte, prosím, hodnotu checkbox zoznamu
ErrorNoValueForRadioType=Prosím vyplňte hodnotu pre rozhlasové zoznamu
ErrorBadFormatValueList=Zoznam Hodnota nemôže mať viac ako jeden príde: <u>%s,</u> ale potrebujete aspoň jeden: Llave, Valores
ErrorFieldCanNotContainSpecialCharacters=Terénne <b>%s</b> nesmie obsahuje špeciálne znaky.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Nie účtovníctva modul aktivovaný
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP zhoda nie je úplná.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/languages.lang b/htdocs/langs/sk_SK/languages.lang
index cef835fa346..c8cdd4b66a8 100644
--- a/htdocs/langs/sk_SK/languages.lang
+++ b/htdocs/langs/sk_SK/languages.lang
@@ -41,6 +41,7 @@ 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_he_IL=Hebrejčina
Language_hr_HR=Chorvátsky
Language_hu_HU=Maďarčina
@@ -70,6 +71,7 @@ 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_th_TH=Thai
Language_uk_UA=Ukrajinec
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 5c373022c93..2a187433ec1 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Pondelok
Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/margins.lang b/htdocs/langs/sk_SK/margins.lang
index f8d6cd62e8b..3c510718a25 100644
--- a/htdocs/langs/sk_SK/margins.lang
+++ b/htdocs/langs/sk_SK/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Ako produkt
UseDiscountAsService=Ako služba
UseDiscountOnTotal=Na medzisúčet
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definuje, či globálna zľava je považovaný za výrobok, služba, alebo iba na medzisúčet pre výpočet marže.
-MARGIN_TYPE=Marža typ
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw marže
MargeNette=Čistá marža
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin: Konečná cena - nákupnou cenou <br/> Čistá marža: Predajná cena - obstarávacej ceny,
+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
CostPrice=Veľkoobchodná cena
BuyingCost=Veľkoobchodná cena
UnitCharges=Jednotkové náklady
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 761a8dfa6b6..ff7924b7b23 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 5985ddc0530..f4b9864a837 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Vedúci projektu
TypeContact_project_external_PROJECTLEADER=Vedúci projektu
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index f81ef904579..888d6014435 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Zásielky
AllSendings=All Shipments
Shipment=Náklad
Shipments=Zásielky
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Zásielky oblasť
ListOfSendings=Zoznam zásielok
@@ -26,8 +26,8 @@ QtyToShip=Množstvo na odoslanie
QtyReceived=Prijaté množstvo
KeepToShip=Zostáva odoslať
OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku
-DateSending=Dátum odoslania, aby
-DateSendingShort=Dátum odoslania, aby
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Zásielky pre túto objednávku
SendingsAndReceivingForSameOrder=Zásielky a Receivings pre túto objednávku
SendingsToValidate=Zásielky na overenie
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index fcdc695fae3..088017dd05c 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Pravidlo pre zníženie riadenie zásob
RuleForStockManagementIncrease=Pravidlo pre zvýšenie riadenie zásob
DeStockOnBill=Pokles reálnej zásoby na zákazníkov faktúr / dobropisov validácia
DeStockOnValidateOrder=Pokles reálnej zásoby na zákazníkov objednávky validáciu
-DeStockOnShipment=Pokles reálnej zásoby na odoslanie potvrdenie
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Zvýšenie reálnej zásoby na dodávateľa faktúr / dobropisov validácia
ReStockOnValidateOrder=Zvýšenie reálnej zásoby na dodávateľa objednávok kolaudáciu
ReStockOnDispatchOrder=Zvýšenie reálnej zásoby na ručné dispečingu do skladov, potom, čo sa s dodávateľmi účelom obdržania
@@ -134,7 +134,7 @@ IsInPackage=Vložené do balíka
ShowWarehouse=Ukázať sklad
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Transfer zásoby produktu %s do iného skladu
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index d5cb75937c5..b5469e0ce39 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
index f236029cea1..c33514aacaa 100644
--- a/htdocs/langs/sl_SI/accountancy.lang
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Novi računovodski račun
Update=Update
List=Seznam
Create=Ustvari
+CreateMvts=Create movement
UpdateAccount=Sprememba obračunskega računa
UpdateMvts=Sprememba pretoka
WriteBookKeeping=Evidenčnih računov v glavno knjigo
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Začni sortiranje strani za pregled "Pregl
AccountLength=Dolžina računovodstva računov prikazan v Dolibarrju
AccountLengthDesc=Funkcija omogoča, da Predstavljati dolžino obračunskega računa z zamenjavo prostorov z ničelno sliki. Ta funkcija se dotakne le zaslon, ne spreminja računovodskih račune registrirane v Dolibarrju. Za izvoz, to funkcijo je potrebno, da so združljivi z določeno programsko opremo.
+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=Dolžina glavne knjige
ACCOUNTING_LENGTH_AACCOUNT=Dolžina računih tretjih oseb
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 2b4c8bd29d2..c03860bee7e 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Računovodstvo (napredno)
Module50400Desc=Upravljanje računovodstva (dvostavno)
Module54000Name=Tiskanje IPP
Module54000Desc=Direktno tiskanje (brez odpiranja dokumenta) z uporabo Cups IPP vmesnika (tiskalnik mora biti viden na strežniku in nameščen mora biti CUPS ).
-Module55000Name=Odpri anketo
-Module55000Desc=Modul za online ankete (kot Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marže
Module59000Desc=Modul za upravljanje z maržami
Module60000Name=Provizije
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Do sedaj še ni bil zabeležen noben varnostno problemati
NoEventFoundWithCriteria=Noben varnostni dogodek ne obstaja glede na podane kriterije iskanja.
SeeLocalSendMailSetup=Glejte lokalne nastavitve za pošiljanje pošte
BackupDesc=Za izdelavo celotne Dolibarr varnostne kopije (backup), morate:
-BackupDesc2=Shrani vsebino mape z dokumenti (<b>%s</b>), ki vsebuje vse naložene in generirane datoteke (lahko na primer naredite zip datoteko).
+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=Shranite vsebino vaše baze podatkov (<b>%s</b>) v izpisno datoteko. Za izvedbo lahko sledite tem napotkom.
BackupDescX=Arhivsko mapo morate shraniti na varno mesto.
BackupDescY=Generirano dump datoteko morate shraniti na varno mesto.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Uporabi iskanje za izbiro proizvoda (raje kot padajoči
UseEcoTaxeAbility=Podpora ekološke takse (WEEE)
SetDefaultBarcodeTypeProducts=Privzet tip črtne kode za proizvode
SetDefaultBarcodeTypeThirdParties=Privzet tip črtne kode za partnerje
-UseUnits=Podprte enote
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul za generiranje kode proizvodov in kontrolo (proizvod ali storitev)
ProductOtherConf= Konfiguracija proizvodov/storitev
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Popravi ciljni email
SendingsSetup=Nastavitev modula za pošiljanje
SendingsReceiptModel=Obrazci odpremnic
SendingsNumberingModules=Moduli za številčenje pošiljk
-SendingsAbility=Podpora za odpremnice za dobavo kupcem
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=V večini primerov se dobavnice uporabljajo tako kot dokument za dostavo kupcem (seznam proizvodov, ki jih je potrebno poslati), kakor tudi kot dokument, ki ga dobi in podpiše kupec. Zato je odpremnica podvojena funkcija, ki je redko aktivirana.
FreeLegalTextOnShippings=Prosti tekst na pošiljkah
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Med oklepaja vnesite seznam bitnih števil, ki določajo valutni
PositionIntoComboList=Položaj vrstice v kombiniranih seznamih
SellTaxRate=Stopnja prodajnega davka
RecuperableOnly=Yes z DDV "Non Perçue Récupérable" določen za nekatera področja v Franciji. Obdržite vrednost "No" v vseh drugih primerih.
-UrlTrackingDesc=Če ponudnik transportnih storitev omogoča sledenje pošiljke preko spleta, lahko to povezavo vnesete tukaj. Uporabite lahko ključ {TRACKID} v URL parametrih, ki ga bo sistem nadomestil z dejansko številko, ki jo bo vnesel uporabnik.
+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=Ko kreirate priložnost, določite oceno vrednosti projekta/možnosti. Glede na status priložnosti lahko to vrednost pomnožite s to stopnjo za oceno globalne vrednosti vaših priložnosti. Vrednost je procent (med 0 in 100).
TemplateForElement=Ta podatek v predlogi je namenjen kateremu elementu
TypeOfTemplate=Vrsta predloge
diff --git a/htdocs/langs/sl_SI/agenda.lang b/htdocs/langs/sl_SI/agenda.lang
index 8555325c6f9..9aee752b495 100644
--- a/htdocs/langs/sl_SI/agenda.lang
+++ b/htdocs/langs/sl_SI/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Aktivnosti za vse uporabnike v skupini
ActionAssignedTo=Aktivnost se nanaša na
AllMyActions= Vsi moji dogodki/naloge
AllActions= Vse dogodki/naloge
-ViewList=Glej seznam
ViewCal=Mesečni pogled
ViewDay=Dnevni pogled
ViewWeek=Tedenski pogled
diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
index d69651c6025..bd31c4f0a69 100644
--- a/htdocs/langs/sl_SI/commercial.lang
+++ b/htdocs/langs/sl_SI/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt izveden
DateActionPlanned=Datum planirane aktivnosti za
DateActionDone=Datum izvedene aktivnosti
ActionAskedBy=Aktivnost zahteval
-ActionAffectedTo=Event assigned to
+ActionAffectedTo=Aktivnost, ki se tiče
ActionDoneBy=Aktivnost izvedel
ActionUserAsk=Zabeležil
ErrorStatusCantBeZeroIfStarted=Če je polje '<b>Date done</b>' izpolnjeno, je aktivnost začeta (ali končana), zato polje '<b>Status</b>' ne more biti 0%%.
@@ -94,3 +94,4 @@ StatusProsp=Status možne stranke
DraftPropals=Osnutek komercialne ponudbe
SearchPropal=Iskanje komercialne ponudbe
CommercialDashboard=Komercialna vsota
+NoLimit=No limit
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index d6a515a8a70..eb8dca29537 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Kontakt pri partnerju
StatusContactValidated=Status kontakta
Company=Podjetje
CompanyName=Ime podjetja
-AliasNames=Psevdonimi (komercialni, blagovne znamke, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Podjetja
CountryIsInEEC=Država je članica Evropske Unije
ThirdPartyName=Ime partnerja
@@ -68,6 +69,7 @@ Country=Država
CountryCode=Koda države
CountryId=ID države
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Kliči
Chat=Klepetaj
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index e0dbb16ce20..f39a4e2bc29 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Polje <b>%s</b> ne sme vsebovati posebnih znakov.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Ni aktiviran računovodski modul
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP združevanje ni popolno.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sl_SI/languages.lang b/htdocs/langs/sl_SI/languages.lang
index 187f0125391..0d3d7c867b7 100644
--- a/htdocs/langs/sl_SI/languages.lang
+++ b/htdocs/langs/sl_SI/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Francoščina (Kanada)
Language_fr_CH=Francoščina (Švica)
Language_fr_FR=Francoščina
Language_fr_NC=Francoski (Nova Kaledonija)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Hrvaški
Language_hu_HU=Madžarščina
@@ -70,6 +71,7 @@ Language_sv_SV=Švedščina
Language_sv_SE=Švedščina
Language_sq_AL=Albanščina
Language_sk_SK=Slovaški
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrajinski
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 6505229a291..ec1fed0f9a8 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -710,6 +710,8 @@ Denied=Zavrnjen
ListOfTemplates=Seznam predlog
Genderman=Moški
Genderwoman=Ženska
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Ponedeljek
Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/margins.lang b/htdocs/langs/sl_SI/margins.lang
index 6211cde7ac0..8454dcc10a0 100644
--- a/htdocs/langs/sl_SI/margins.lang
+++ b/htdocs/langs/sl_SI/margins.lang
@@ -16,7 +16,7 @@ MarginDetails=Podatki o marži
ProductMargins=Marže proizvoda
CustomerMargins=Marže kupcev
SalesRepresentativeMargins=Marža prodajnega predstavnika
-UserMargins=User margins
+UserMargins=Marže uporabnikov
ProductService=Proizvod ali storitev
AllProducts=Vsi proizvodi in storitve
ChooseProduct/Service=Izberi proizvod ali storitev
@@ -30,16 +30,19 @@ UseDiscountAsProduct=Kot proizvod
UseDiscountAsService=Kot storitev
UseDiscountOnTotal=V delni vsoti
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Določa, če se globalni popust smatra kot proizvod, storitev, ali samo delna vsota pri izračunu marže.
-MARGIN_TYPE=Tip marže
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Bruto marža
MargeNette=Neto marža
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Bruto marža : prodajna cena - nabavna cena<br/>Neto marža : prodajna cena - stroškovna cena
+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
CostPrice=Stroškovna cena
BuyingCost=Stroškovna cena
UnitCharges=Stroški po enoti
Charges=Stroški
AgentContactType=Tip kontakta komercialnega agenta
-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
+AgentContactTypeDetails=Določa, kateri tip kontakta (povezava na računu) bo uporabljen za poročilo o maržah po prodajnih predstavnikih
+rateMustBeNumeric=Stopnja mora biti numerična vrednost
+markRateShouldBeLesserThan100=Označena vrednost mora biti manjša od 100
+ShowMarginInfos=Prikaži informacije o marži
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 621431feabd..1a9f4a0ce1c 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Enolična cena po proizvodu/storitvi
PricingRule=Pravila za cene za kupce
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Določi enako ceno za podružnice stranke
-PriceByCustomerLog=Cena po imenu stranke
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Minimalna priporočena cena je : %s
PriceExpressionEditor=Urejevalnik prikaza cene
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 7531ce3b05c..26f3d618ac8 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Vodja projekta
TypeContact_project_external_PROJECTLEADER=Vodja projekta
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 58b077d5d93..c5c7b0cdd09 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Pošiljke
AllSendings=All Shipments
Shipment=Odprema
Shipments=Odpreme
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Področje pošiljk
ListOfSendings=Seznam pošiljk
@@ -26,8 +26,8 @@ QtyToShip=Količina za pošiljanje
QtyReceived=Prejeta količina
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Ostale pošiljke za to naročilo
-DateSending=Datum pošiljanja naročila
-DateSendingShort=Datum pošiljanja
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Pošiljke za to naročilo
SendingsAndReceivingForSameOrder=Pošiljke in prejemi za to naročilo
SendingsToValidate=Pošiljke za potrditev
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 272b7f4fc82..b367dacab6b 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Pravilo za upravljanje zmanjšanja zalog
RuleForStockManagementIncrease=Pravilo za upravljanje povečanja zalog
DeStockOnBill=Zmanjšanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
DeStockOnValidateOrder=Zmanjšanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
-DeStockOnShipment=Zmanjšanje dejanske zaloge po potrditvi odpreme (priporočeno)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Povečanje dejanske zaloge po potrditvi fakture/dobropisa (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
ReStockOnValidateOrder=Povečanje dejanske zaloge po potrditvi naročila (pozor, v tej verziji se zaloga spremeni samo v skladišču številka 1)
ReStockOnDispatchOrder=Povečanje dejanske zaloge po ročnem vnosu v skladišče, po prejemu naročila od dobavitelja
@@ -134,7 +134,7 @@ IsInPackage=Vsebina paketa
ShowWarehouse=Prikaži skladišče
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Koda zaloge/premika
NoPendingReceptionOnSupplierOrder=No pending reception due to open supplier order
ThisSerialAlreadyExistWithDifferentDate=Ta lot/serijska številka (<strong>%s</strong>) že obstaja, vendar z drugim datumom vstopa ali izstopa (najden je <strong>%s</strong>, vi pa ste vnesli <strong>%s</strong>).
diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
index d2e00e313dd..6825bef94d5 100644
--- a/htdocs/langs/sl_SI/trips.lang
+++ b/htdocs/langs/sl_SI/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/sq_AL/accountancy.lang
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/sq_AL/agenda.lang b/htdocs/langs/sq_AL/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/sq_AL/agenda.lang
+++ b/htdocs/langs/sq_AL/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/sq_AL/commercial.lang
+++ b/htdocs/langs/sq_AL/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sq_AL/languages.lang b/htdocs/langs/sq_AL/languages.lang
index f1da5549014..3d9bf981568 100644
--- a/htdocs/langs/sq_AL/languages.lang
+++ b/htdocs/langs/sq_AL/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index ff0b6414f1e..5e3061e557b 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/margins.lang b/htdocs/langs/sq_AL/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/sq_AL/margins.lang
+++ b/htdocs/langs/sq_AL/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/sr_RS/accountancy.lang b/htdocs/langs/sr_RS/accountancy.lang
index 40e2b65db42..1cc7f37bf22 100644
--- a/htdocs/langs/sr_RS/accountancy.lang
+++ b/htdocs/langs/sr_RS/accountancy.lang
@@ -8,72 +8,73 @@ ACCOUNTING_EXPORT_LABEL=Export the label ?
ACCOUNTING_EXPORT_AMOUNT=Export the amount ?
ACCOUNTING_EXPORT_DEVISE=Export the devise ?
-Accounting=Accounting
-Globalparameters=Global parameters
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
-Menuaccount=Accounting accounts
-Menuthirdpartyaccount=Thirdparty accounts
-MenuTools=Tools
-
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
+Accounting=Računovodstvo
+Globalparameters=Globalni parametri
+Chartofaccounts=Tabela računa
+Fiscalyear=Fiskalne godine
+Menuaccount=Računovodstveni nalozi
+Menuthirdpartyaccount=Ostali računi
+MenuTools=Alati
+
+ConfigAccountingExpert=Konfigurisanje eksperta računovodstvenog modula
+Journaux=Izveštaji
+JournalFinancial=Finansijski izveštaji
+Exports=Izvozi
Export=Export
-Modelcsv=Model of export
+Modelcsv=Model izvoza
OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
-Selectmodelcsv=Select a model of export
-Modelcsv_normal=Classic export
-Modelcsv_CEGID=Export towards CEGID Expert
-BackToChartofaccounts=Return chart of accounts
-Back=Return
-
-Definechartofaccounts=Define a chart of accounts
-Selectchartofaccounts=Select a chart of accounts
-Validate=Validate
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
-Ventilation=Breakdown
-ToDispatch=To dispatch
-Dispatched=Dispatched
-
-CustomersVentilation=Breakdown customers
-SuppliersVentilation=Breakdown suppliers
-TradeMargin=Trade margin
-Reports=Reports
-ByCustomerInvoice=By invoices customers
-ByMonth=By Month
-NewAccount=New accounting account
-Update=Update
-List=List
-Create=Create
-UpdateAccount=Modification of an accounting account
-UpdateMvts=Modification of a movement
-WriteBookKeeping=Record accounts in general ledger
-Bookkeeping=General ledger
-AccountBalanceByMonth=Account balance by month
-
-AccountingVentilation=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+Selectmodelcsv=Izaberite model izvoza
+Modelcsv_normal=Klasičan izvoz
+Modelcsv_CEGID=Izvoz ka CEGID ekspertu
+BackToChartofaccounts=Vrati tabelu računa
+Back=Vrati
+
+Definechartofaccounts=Definiši tabelu računa
+Selectchartofaccounts=Izaberi tabelu računa
+Validate=Potvrdi
+Addanaccount=Dodaj računovodstveni nalog
+AccountAccounting=Računovodstveni nalog
+Ventilation=Presek
+ToDispatch=Za slanje
+Dispatched=Isporučeno
+
+CustomersVentilation=Presek kupaca
+SuppliersVentilation=Presek dobavljača
+TradeMargin=Trgovinske marže
+Reports=Izveštaji
+ByCustomerInvoice=Po računima kupaca
+ByMonth=Po mesecu
+NewAccount=Novi knjigovodstveni račun
+Update=Ažuriraj
+List=Lista
+Create=Kreiraj
+CreateMvts=Create movement
+UpdateAccount=Izmena računovodstvenog naloga
+UpdateMvts=Izmena prenosa
+WriteBookKeeping=Snimanje računa u glavnoj knjizi
+Bookkeeping=Glavna knjiga
+AccountBalanceByMonth=Mesečno stanje računa
+
+AccountingVentilation=Računovodstveni presek
+AccountingVentilationSupplier=Presek računa dobavljača
+AccountingVentilationCustomer=Presek računa kupca
+Line=Linija
CAHTF=Total purchase supplier HT
-InvoiceLines=Lines of invoice to be ventilated
-InvoiceLinesDone=Ventilated lines of invoice
-IntoAccount=In the accounting account
+InvoiceLines=Linije računa za kontrolu
+InvoiceLinesDone=Kontrolisane linije računa
+IntoAccount=U toku obračunskog računa
-Ventilate=Ventilate
-VentilationAuto=Automatic breakdown
+Ventilate=Kontrola
+VentilationAuto=Automatski presek
-Processing=Processing
-EndProcessing=The end of processing
-AnyLineVentilate=Any lines to ventilate
-SelectedLines=Selected lines
-Lineofinvoice=Line of invoice
-VentilatedinAccount=Ventilated successfully in the accounting account
-NotVentilatedinAccount=Not ventilated in the accounting account
+Processing=Obrada
+EndProcessing=Kraj obrade
+AnyLineVentilate=Neka linija za kontrolu
+SelectedLines=Izabrane linije
+Lineofinvoice=Linija računa
+VentilatedinAccount=Kontrola uspešna u obračunskom računu
+NotVentilatedinAccount=Nije kontrolisano u obračunskom računu
ACCOUNTING_SEPARATORCSV=Column separator in export file
@@ -81,8 +82,10 @@ ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by pa
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
-AccountLength=Length of the accounting accounts shown in Dolibarr
-AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+AccountLength=Dužina obračunskih računa prikazanih u Dolibarru
+AccountLengthDesc=Funkcija omogućava pretvaranje dužine obračunskog računa zamenom razmaka nultim znakom . Ova funkcija utiče samo na prikaz, ne modifikuje obračunske račune registrovane u Dolibaru . Za izvoz , ova funkcija je potrebno da bude kompatibilna sa određenim softverom .
+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
@@ -100,25 +103,25 @@ ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold produ
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)
-Doctype=Type of document
-Docdate=Date
-Docref=Reference
-Numerocompte=Account
-Code_tiers=Thirdparty
-Labelcompte=Label account
-Debit=Debit
-Credit=Credit
-Amount=Amount
+Doctype=Tip dokumenta
+Docdate=Datum
+Docref=Referenca
+Numerocompte=Račun
+Code_tiers=Treće lice
+Labelcompte=Oznaka računa
+Debit=Zaduženje
+Credit=Kredit
+Amount=Iznos
Sens=Sens
-Codejournal=Journal
+Codejournal=Izveštaj
-DelBookKeeping=Delete the records of the general ledger
+DelBookKeeping=Brisanje evidencije glavne knjige
-SellsJournal=Sells journal
-PurchasesJournal=Purchases journal
-DescSellsJournal=Sells journal
-DescPurchasesJournal=Purchases journal
-BankJournal=Bank journal
+SellsJournal=Izveštaj prodaje
+PurchasesJournal=Izveštaj nabavke
+DescSellsJournal=Izveštaj prodaje
+DescPurchasesJournal=Izveštaj nabavke
+BankJournal=Izvod banke
DescBankJournal=Bank journal including all the types of payments other than cash
CashJournal=Cash journal
DescCashJournal=Cash journal including the type of payment cash
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/sr_RS/agenda.lang b/htdocs/langs/sr_RS/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/sr_RS/agenda.lang
+++ b/htdocs/langs/sr_RS/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 608f2d42468..35db6f5ff03 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -15,8 +15,8 @@ DisabledBecauseNotErasable=Disabled because can not be erased
InvoiceStandard=Standardni račun
InvoiceStandardAsk=Standardni račun
InvoiceStandardDesc=Ovaj tip računa je uobičajen
-InvoiceDeposit=Deposit invoice
-InvoiceDepositAsk=Deposit invoice
+InvoiceDeposit=Avansni račun
+InvoiceDepositAsk=Avansni račun
InvoiceDepositDesc=Ovaj tip računa se koristi kada je registrovana pretplata
InvoiceProForma=Predračun
InvoiceProFormaAsk=Predračun
@@ -34,11 +34,11 @@ ReplaceInvoice=Menja račun %s
ReplacementInvoice=Zamenski račun
ReplacedByInvoice=Zamenjeno računom %s
ReplacementByInvoice=Zamenjeno računom
-CorrectInvoice=Correct invoice %s
-CorrectionInvoice=Correction invoice
-UsedByInvoice=Used to pay invoice %s
-ConsumedBy=Consumed by
-NotConsumed=Not consumed
+CorrectInvoice=Ispravan račun %s
+CorrectionInvoice=Ispravka računa
+UsedByInvoice=Koristi se za plaćanje računa %s
+ConsumedBy=Potrošač
+NotConsumed=Ne potrošeno
NoReplacableInvoice=Nema računa koji se mogu zameniti
NoInvoiceToCorrect=Nema računa za korekciju
InvoiceHasAvoir=Korigovano jednim ili sa više računa
@@ -55,14 +55,14 @@ SuppliersInvoices=Računi dobavljača
SupplierBill=Račun dobavljača
SupplierBills=računi dobavljača
Payment=Plaćanje
-PaymentBack=Payment back
+PaymentBack=Refundiranje
Payments=Plaćanja
-PaymentsBack=Payments back
-PaidBack=Paid back
+PaymentsBack=Refundiranja
+PaidBack=Refundirano
DatePayment=Datum plaćanja
DeletePayment=Obriši plaćanje
ConfirmDeletePayment=Da li ste sigurni da želite da obrišete 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 da promenite kreditni limit ili depozit u apsolutni popust ?<br>Iznos će biti sačuvan među ostalim iznosina i može se koristiti kao popust za trenutnu ili buduće fakture za ovog klijenta.
SupplierPayments=Plaćanja dobavljačima
ReceivedPayments=Primljene uplate
ReceivedCustomersPayments=Uplate primljene od kupaca
@@ -71,7 +71,7 @@ ReceivedCustomersPaymentsToValid=Primljene uplate kupaca za validaciju
PaymentsReportsForYear=Izveštaj od plaćanjima za %s
PaymentsReports=Izveštaj o plaćanjima
PaymentsAlreadyDone=Plaćanje već izvršeno
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Izvršene refundacije
PaymentRule=Pravilo za plaćanje
PaymentMode=Tip plaćanja
PaymentTerm=Payment term
@@ -96,10 +96,10 @@ SearchASupplierInvoice=Traži račun dobavljača
CancelBill=Otkaži račun
SendRemindByMail=Pošalji podsetnik Emailom
DoPayment=Izvrši plaćanje
-DoPaymentBack=Do payment back
+DoPaymentBack=Izvrši povraćaj
ConvertToReduc=Konvertuj u budući popust
EnterPaymentReceivedFromCustomer=Unesi prijem uplate kupca
-EnterPaymentDueToCustomer=Make payment due to customer
+EnterPaymentDueToCustomer=Uplatiti zbog kupca
DisabledBecauseRemainderToPayIsZero=Onemogući jer je preostali iznos nula
Amount=Iznos
PriceBase=Osnovna cena
@@ -125,7 +125,7 @@ BillShortStatusNotPaid=Nije plaeno
BillShortStatusClosedUnpaid=Zatvoreno
BillShortStatusClosedPaidPartially=Plaćeno (delimično)
PaymentStatusToValidShort=Za potvrdu
-ErrorVATIntraNotConfigured=Intracommunautary VAT number not yet defined
+ErrorVATIntraNotConfigured=PIB broj nije definisan
ErrorNoPaiementModeConfigured=Nije definisan obrazac za plaćanje. Izvršite podešavanje modula "Računi" kako biste ovo ispravili
ErrorCreateBankAccount=Kreiraj bankovni račun, a potom idi u panel za podešavanje modula "Računi" da biste definisali načine plaćanja
ErrorBillNotFound=Račun %s ne postoji
@@ -136,7 +136,7 @@ ErrorInvoiceOfThisTypeMustBePositive=Greška! Ovaj tip računa mora imati poziti
ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne možete otkazati račun koji je zamenjen drugim računom, koji je još uvek u status nacrta.
BillFrom=Od
BillTo=Za
-ActionsOnBill=Actions on invoice
+ActionsOnBill=Akcije nad računom
NewBill=Novi račun
LastBills=Poslednji %s računi
LastCustomersBills=Poslednji %s računi kupaca
@@ -153,8 +153,8 @@ ConfirmUnvalidateBill=Da li ste sigurni da želite da izmenite račun <b>%s</b>
ConfirmClassifyPaidBill=Da li ste sigurni da želite da izmenite račun <b>%s</b> u status "plaćeno"?
ConfirmCancelBill=Da li ste sigurni da želite da otkažete račun <b>%s</b>?
ConfirmCancelBillQuestion=Zašto želite da klasifikujete ovaj račun kao "napušten"?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice <b>%s</b> to status paid ?
-ConfirmClassifyPaidPartiallyQuestion=This invoice has not been paid completely. What are reasons for you to close this invoice ?
+ConfirmClassifyPaidPartially=Da li ste sigurni da želite da izmenite račun <b>%s</b> u status "plaćeno"?
+ConfirmClassifyPaidPartiallyQuestion=Ovaj račun nije plaćen u potpunosti. Iz kog razloga želite da zatvorite ovaj račun?
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.
diff --git a/htdocs/langs/sr_RS/commercial.lang b/htdocs/langs/sr_RS/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/sr_RS/commercial.lang
+++ b/htdocs/langs/sr_RS/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sr_RS/languages.lang b/htdocs/langs/sr_RS/languages.lang
index 972b36a0702..73feb886a76 100644
--- a/htdocs/langs/sr_RS/languages.lang
+++ b/htdocs/langs/sr_RS/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/sr_RS/main.lang b/htdocs/langs/sr_RS/main.lang
index 12d9337641d..0802b693ffd 100644
--- a/htdocs/langs/sr_RS/main.lang
+++ b/htdocs/langs/sr_RS/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/sr_RS/margins.lang b/htdocs/langs/sr_RS/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/sr_RS/margins.lang
+++ b/htdocs/langs/sr_RS/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/sr_RS/sendings.lang b/htdocs/langs/sr_RS/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/sr_RS/sendings.lang
+++ b/htdocs/langs/sr_RS/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/sr_RS/trips.lang b/htdocs/langs/sr_RS/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/sr_RS/trips.lang
+++ b/htdocs/langs/sr_RS/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index eeb08266f77..3b521b7cf89 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Nytt redovisningskonto
Update=Uppdatera
List=Lista
Create=Skapa
+CreateMvts=Create movement
UpdateAccount=Ändring av ett redovisningskonto
UpdateMvts=Ändring av en rörelse
WriteBookKeeping=Record konton i huvudboken
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Börja sorteringen av nedbrytnings sidor "
AccountLength=Längd på redovisningen redovisning i Dolibarr
AccountLengthDesc=Funktion som gör det möjligt att låtsas en längd av bokföringskonto genom att ersätta mellanslag med noll siffra. Den här funktionen berör endast displayen, det ändrar inte redovisningskonton registrerade i Dolibarr. För export, är nödvändigt denna funktion för att vara kompatibel med viss programvara.
+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ängd på de allmänna räkenskaperna
ACCOUNTING_LENGTH_AACCOUNT=Längd av tredjepartskonton
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 264f6ad43cf..a26e8661075 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -8,11 +8,11 @@ VersionExperimental=Experimentell
VersionDevelopment=Utveckling
VersionUnknown=Okänd
VersionRecommanded=Rekommenderad
-FileCheck=Files Integrity
-FilesMissing=Missing Files
-FilesUpdated=Updated Files
-FileCheckDolibarr=Check Dolibarr Files Integrity
-XmlNotFound=Xml File of Dolibarr Integrity Not Found
+FileCheck=Filer Integritet
+FilesMissing=Saknade filer
+FilesUpdated=Uppdaterade filer
+FileCheckDolibarr=Kontrollera Dolibarr filer Integrity
+XmlNotFound=XML-fil av Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler för att spara sessioner
SessionSavePath=Lagring session lokalisering
@@ -231,8 +231,8 @@ Security=Säkerhet
Passwords=Lösenord
DoNotStoreClearPassword=Har ingen butik tydlig lösenord i databasen, men endast lagra krypterade värde (Aktiverad rekommenderas)
MainDbPasswordFileConfEncrypted=Databas lösenord krypterat i conf.php (Aktiverad rekommenderas)
-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=Att ha lösenord kodad i <b>conf.php</b> filen, ersätt raden <br> <b>$ Dolibarr_main_db_pass = "...";</b> <br> av <br> <b>$ Dolibarr_main_db_pass = "krypterad:%s";</b>
+InstrucToClearPass=Att ha lösenord avkodas (klar) i <b>conf.php</b> filen, ersätt raden <br> <b>$ Dolibarr_main_db_pass = "krypterat: ...";</b> <br> av <br> <b>$ Dolibarr_main_db_pass = "%s";</b>
ProtectAndEncryptPdfFiles=Skydd av genererade pdf-filer (Aktiverad rekommenderas inte, raster massa pdf generationen)
ProtectAndEncryptPdfFilesDesc=Skydd av ett PDF-dokument håller den tillgänglig att läsa och skriva ut alla PDF webbläsare. Det är dock redigering och kopiering inte möjligt längre. Observera att använda den här funktionen gör byggandet av en samlad global pdf inte fungerar (t.ex. obetalda fakturor).
Feature=Huvudnummer
@@ -296,16 +296,16 @@ MenuHandlers=Meny hanterar
MenuAdmin=Menu Editor
DoNotUseInProduction=Använd inte i poroduktion
ThisIsProcessToFollow=Detta är inställd för att behandla:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process:
+ThisIsAlternativeProcessToFollow=Detta är ett alternativ inställning till processen:
StepNb=Steg %s
FindPackageFromWebSite=Hitta ett paket som ger funktionen du vill ha (till exempel om %s webbplats).
-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=Hämta paket (till exempel från officiella hemsida%s).
+UnpackPackageInDolibarrRoot=Packa paketfil i Dolibarr serverkatalog tillägnad externa <b>moduler:%s</b>
SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten.
NotExistsDirect=Den alternativa rotkatalogen är inte definierad.<br>
InfDirAlt=Sedab version 3 är det möjligt att definiera en alternativ rotkatalog. Detta medger en gemensam plats att lagra plugin och anpassade mallar.<br>Skapa en katalog i Dolibarrs rot (t.ex. custom).<br>
InfDirExample=<br> Sedan förklara den i filen conf.php <br> $ Dolibarr_main_url_root_alt = 'http: // myserver / anpassad " <br> $ Dolibarr_main_document_root_alt = '/ sökväg / till / Dolibarr / htdocs / anpassad " <br> * Dessa linjer kommen med "#", för att kommentera bort bara ta bort tecknet.
-YouCanSubmitFile=For this step, you can send package using this tool: Select module file
+YouCanSubmitFile=För detta steg kan du skicka paket med det här verktyget: Välj modulfil
CurrentVersion=Dolibarr nuvarande version
CallUpdatePage=Gå till sidan som uppdaterar databasen struktur och data: %s.
LastStableVersion=Senaste stabila version
@@ -389,7 +389,7 @@ ExtrafieldSeparator=Avskiljare
ExtrafieldCheckBox=Kryssruta
ExtrafieldRadio=Radioknapp
ExtrafieldCheckBoxFromList= Kryssruta från tabell
-ExtrafieldLink=Link to an object
+ExtrafieldLink=Länk till ett objekt
ExtrafieldParamHelpselect=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ... <br><br> För att få en lista beroende på en annan: <br> 1, value1 | parent_list_code: parent_key <br> 2, värde2 | parent_list_code: parent_key
ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde <br><br> till exempel: <br> 1, value1 <br> 2, värde2 <br> 3, value3 <br> ...
@@ -397,7 +397,7 @@ ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell <br> Syntax:
ExtrafieldParamHelpchkbxlst=Parameterlista från en tabell<br>Syntax : table_name:label_field:id_field::filter<br>Exempel: c_typent:libelle:id::filter<br><br>filter kan vara ett enkelt test (t.ex. active=1) för att visa enbart aktiva värden <br> Använd extra.fieldcode=... (där fältkod är extrafält) syntax för att filtrera på extrafält.<br><br>För att få listan beroende en annan:<br>c_typent:libelle:id:parent_list_code|parent_column:filter
LibraryToBuildPDF=Katalog som används för att skapa PDF
WarningUsingFPDF=Varning: Din <b>conf.php</b> innehåller direktiv <b>dolibarr_pdf_force_fpdf = 1.</b> Detta innebär att du använder fpdf bibliotek för att generera PDF-filer. Detta bibliotek är gammalt och inte stöder en mängd funktioner (Unicode, bild öppenhet, kyrilliska, arabiska och asiatiska språk, ...), så att du kan uppleva fel under PDF generation. <br> För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner <a href="http://www.tcpdf.org/" target="_blank">TCPDF bibliotek</a> , sedan kommentera eller ta bort linjen <b>$ dolibarr_pdf_force_fpdf = 1,</b> och lägg istället <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=Vissa länder tillämpar 2 eller 3 skatt på varje faktura rad. Om så är fallet, välj typ för andra och tredje skatte- och dess hastighet. Möjlig typ är: <br> 1: lokal skatt tillämpas på produkter och tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 2: lokal skatt tillämpas på produkter och tjänster, inklusive moms (localtax beräknas på belopp + huvud skatt) <br> 3: lokal skatt tillämpas på produkter utan moms (localtax beräknas på belopp utan skatt) <br> 4: lokal skatt tillämpas på produkter inklusive moms (localtax beräknas på belopp + huvud moms) <br> 5: lokal skatt tillämpas på tjänster utan moms (localtax beräknas på belopp utan skatt) <br> 6: lokal skatt tillämpas på tjänster, inklusive moms (localtax beräknas på belopp + moms)
SMS=SMS
LinkToTestClickToDial=Skriv in ett telefonnummer att ringa upp för att visa en länk för att prova ClickToDial url för användare <strong>%s</strong>
RefreshPhoneLink=Uppdatera länk
@@ -491,42 +491,42 @@ Module400Name=Projekt / Möjligheter / Leads
Module400Desc=Förvaltning av projekt, möjligheter eller leads. Du kan sedan tilldela varje element (faktura, beställning, förslag, ingripande, ...) till ett projekt och få ett övergripande vy från projekt vyn.
Module410Name=WebCalendar
Module410Desc=WebCalendar integration
-Module500Name=Special expenses
-Module500Desc=Management of special expenses (taxes, social or fiscal taxes, dividends)
+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
-Module520Name=Loan
-Module520Desc=Management of loans
+Module520Name=Lån
+Module520Desc=Förvaltning av lån
Module600Name=Anmälningar
Module600Desc=Skicka e-postmeddelanden på vissa Dolibarr affärshändelser till kontakter tredjeparts (inställnings definieras på varje tredjeparts)
Module700Name=Donationer
Module700Desc=Donation ledning
-Module770Name=Expense reports
-Module770Desc=Management and claim expense reports (transportation, meal, ...)
-Module1120Name=Supplier commercial proposal
-Module1120Desc=Request supplier commercial proposal and prices
+Module770Name=Räkningar
+Module770Desc=Förvaltnings- och anspråk räkningar (transport, måltid, ...)
+Module1120Name=Leverantör kommersiell förslag
+Module1120Desc=Begär leverantör kommersiella förslag och priser
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Bokföring
Module1400Desc=Bokföring och redovisning (dubbel part)
-Module1520Name=Document Generation
-Module1520Desc=Mass mail document generation
+Module1520Name=Dokument Generation
+Module1520Desc=Mass post dokumentgenerering
Module1780Name=Taggar/Kategorier
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Desc=Skapa taggar / kategori (produkter, kunder, leverantörer, kontakter eller medlemmar)
Module2000Name=FCKeditor
Module2000Desc=WYSIWYG Editor
Module2200Name=Dynamiska priser
Module2200Desc=Aktivera användningen av matematiska uttryck för priser
Module2300Name=Cron
-Module2300Desc=Scheduled job management
+Module2300Desc=Planerad jobbhantering
Module2400Name=Agenda
Module2400Desc=Åtgärder / uppgifter och dagordning förvaltning
Module2500Name=Electronic Content Management
Module2500Desc=Spara och dela dokument
-Module2600Name=API services (Web services SOAP)
-Module2600Desc=Enable the Dolibarr SOAP server providing API services
-Module2610Name=API services (Web services REST)
-Module2610Desc=Enable the Dolibarr REST server providing API services
+Module2600Name=API-tjänster (webbtjänster SOAP)
+Module2600Desc=Aktivera Dolibarr SOAP server tillhandahåller API-tjänster
+Module2610Name=API-tjänster (webbtjänster REST)
+Module2610Desc=Aktivera Dolibarr REST servern tillhandahåller API-tjänster
Module2650Name=WebServices (klient)
Module2650Desc=Aktivera Dolibarr webbtjänster klient (Kan användas för att driva data / ansökningar till externa servrar. Leverantörs order stöds bara för stunden)
Module2700Name=Gravatar
@@ -542,8 +542,8 @@ Module6000Name=Workflow
Module6000Desc=Workflow management
Module20000Name=Lämna Framställningar förvaltning
Module20000Desc=Deklarera och följ de anställda lämnar förfrågningar
-Module39000Name=Product lot
-Module39000Desc=Lot or serial number, eat-by and sell-by date management on products
+Module39000Name=Produkt mycket
+Module39000Desc=Varu eller serienummer, äter av och bäst före-datum ledningen på produkter
Module50000Name=Paybox
Module50000Desc=Modul för att erbjuda en online-betalning sidan genom kreditkort med Paybox
Module50100Name=Point of sales
@@ -554,8 +554,8 @@ Module50400Name=Redovisning (avancerad)
Module50400Desc=Bokföring och redovisning (dubbla parter)
Module54000Name=PrintIPP
Module54000Desc=Direktutskrift (utan att öppna dokumenten) använder Cups IPP-gränssnitt (skrivare måste vara synlig från servern, och CUPS måste vara installerad på servern).
-Module55000Name=Öppen Poll
-Module55000Desc=Modul för att göra online omröstningar (som Doodle, öar Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Marginaler
Module59000Desc=Modul för att hantera marginaler
Module60000Name=Provision
@@ -579,7 +579,7 @@ Permission32=Skapa / modifiera produkter
Permission34=Ta bort produkter
Permission36=Se / hantera dold produkter
Permission38=EXPORTVARA
-Permission41=Read projects and tasks (shared project and projects i'm contact for). Can also enter time consumed on assigned tasks (timesheet)
+Permission41=Läs projekt och uppgifter (gemensamma projekt och projekt jag är kontaktperson för). Kan också ange tid konsumeras på tilldelade uppgifter (tidrapport)
Permission42=Skapa / modifiera projekt (gemensamma projekt och projekt som jag är kontaktperson för)
Permission44=Ta bort projekt (gemensamma projekt och projekt som jag är kontaktperson för)
Permission61=Läs insatser
@@ -600,10 +600,10 @@ Permission86=Skicka kunder order
Permission87=Stäng kunder order
Permission88=Avbryt kunder order
Permission89=Ta bort kunder order
-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=Läs sociala eller skattemässiga skatter och moms
+Permission92=Skapa / ändra sociala eller skattemässiga skatter och moms
+Permission93=Radera sociala eller skattemässiga skatter och moms
+Permission94=Exportera social eller skatte skatter
Permission95=Läs rapporter
Permission101=Läs sendings
Permission102=Skapa / ändra sendings
@@ -621,9 +621,9 @@ Permission121=Läs tredje part kopplad till användaren
Permission122=Skapa / ändra tredje part kopplad till användaren
Permission125=Radera tredje part kopplad till användaren
Permission126=Export tredje part
-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=Läsa alla projekt och uppgifter (även privata projekt jag är inte kontakta för)
+Permission142=Skapa / ändra alla projekt och uppgifter (även privata projekt jag är inte kontakta för)
+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
@@ -645,7 +645,7 @@ Permission181=Läs leverantör order
Permission182=Skapa / ändra leverantör order
Permission183=Validate leverantör order
Permission184=Godkänn leverantör order
-Permission185=Order or cancel supplier orders
+Permission185=Beställ eller avbryta leverantörs order
Permission186=Ta emot leverantör order
Permission187=Stäng leverantör order
Permission188=Avbryt leverantör order
@@ -717,11 +717,11 @@ Permission510=Läs Löner
Permission512=Skapa / ändra löner
Permission514=Radera löner
Permission517=Export löner
-Permission520=Read Loans
-Permission522=Create/modify loans
-Permission524=Delete loans
-Permission525=Access loan calculator
-Permission527=Export loans
+Permission520=Läs Lån
+Permission522=Skapa / ändra lån
+Permission524=Radera lån
+Permission525=Tillgång lån kalkylator
+Permission527=Exportlånet
Permission531=Läs tjänster
Permission532=Skapa / modifiera tjänster
Permission534=Ta bort tjänster
@@ -730,13 +730,13 @@ Permission538=Exportera tjänster
Permission701=Läs donationer
Permission702=Skapa / ändra donationer
Permission703=Ta bort donationer
-Permission771=Read expense reports (own and his subordinates)
-Permission772=Create/modify expense reports
-Permission773=Delete expense reports
-Permission774=Read all expense reports (even for user not subordinates)
-Permission775=Approve expense reports
-Permission776=Pay expense reports
-Permission779=Export expense reports
+Permission771=Läs reseräkningar (eget och hans underlydande)
+Permission772=Skapa / ändra utgiftsrapporter
+Permission773=Radera räkningar
+Permission774=Läs alla utgiftsrapporter (även för användare som inte underordnade)
+Permission775=Godkänn räkningar
+Permission776=Betala räkningar
+Permission779=Export räkningar
Permission1001=Läs lager
Permission1002=Skapa / ändra lager
Permission1003=Radera lager
@@ -754,7 +754,7 @@ Permission1185=Godkänn leverantör order
Permission1186=Beställ leverantör order
Permission1187=Bekräfta mottagandet av leverantör order
Permission1188=Radera leverantör order
-Permission1190=Approve (second approval) supplier orders
+Permission1190=Godkänn (andra godkännande) leverantörs order
Permission1201=Få resultat av en export
Permission1202=Skapa / ändra en export
Permission1231=Läs leverantörsfakturor
@@ -767,10 +767,10 @@ 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
Permission1421=Export kundorder och attribut
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
+Permission23001=Läs Planerad jobb
+Permission23002=Skapa / uppdatera Schemalagt jobb
+Permission23003=Radera schemalagt jobb
+Permission23004=Utför schemalagt jobb
Permission2401=Läs åtgärder (händelser eller uppgifter) kopplade till sitt konto
Permission2402=Skapa / ändra åtgärder (händelser eller uppgifter) kopplade till sitt konto
Permission2403=Radera åtgärder (händelser eller uppgifter) kopplade till sitt konto
@@ -801,7 +801,7 @@ DictionaryCountry=Länder
DictionaryCurrency=Valutor
DictionaryCivility=Civility titel
DictionaryActions=Typ av dagordningen händelser
-DictionarySocialContributions=Social or fiscal taxes types
+DictionarySocialContributions=Sociala och skattemässiga skatter typer
DictionaryVAT=Moms Priser och Sales Tax Rates
DictionaryRevenueStamp=Mängd skattestämpel
DictionaryPaymentConditions=Betalningsvillkor
@@ -818,10 +818,10 @@ DictionarySource=Ursprung av affärsförslag / beställning
DictionaryAccountancyplan=Kontoplan
DictionaryAccountancysystem=Modeller för kontoplan
DictionaryEMailTemplates=E-postmeddelanden mallar
-DictionaryUnits=Units
-DictionaryProspectStatus=Prospection status
-DictionaryHolidayTypes=Type of leaves
-DictionaryOpportunityStatus=Opportunity status for project/lead
+DictionaryUnits=Enheter
+DictionaryProspectStatus=Prospektering Status
+DictionaryHolidayTypes=Typ av blad
+DictionaryOpportunityStatus=Möjlighet status för projektet / bly
SetupSaved=Setup sparas
BackToModuleList=Tillbaka till moduler lista
BackToDictionaryList=Tillbaka till ordlistan
@@ -857,12 +857,12 @@ LocalTax2IsUsedDescES= RE räntesats som standard när du skapar framtidsutsikte
LocalTax2IsNotUsedDescES= Som standard föreslås IRPF är 0. Slut på regeln.
LocalTax2IsUsedExampleES= I Spanien, frilansare och oberoende yrkesutövare som tillhandahåller tjänster och företag som har valt skattesystemet i moduler.
LocalTax2IsNotUsedExampleES= I Spanien de bussines inte omfattas av skattesystemet i moduler.
-CalcLocaltax=Reports on local taxes
-CalcLocaltax1=Sales - Purchases
+CalcLocaltax=Rapporter om lokala skatter
+CalcLocaltax1=Försäljning - Inköp
CalcLocaltax1Desc=Lokala skatter rapporter beräknas med skillnaden mellan localtaxes försäljning och localtaxes inköp
-CalcLocaltax2=Purchases
+CalcLocaltax2=Inköp
CalcLocaltax2Desc=Lokala skatter rapporter är summan av localtaxes inköp
-CalcLocaltax3=Sales
+CalcLocaltax3=Försäljning
CalcLocaltax3Desc=Lokala skatter rapporter är summan av localtaxes försäljning
LabelUsedByDefault=Etikett som används som standard om ingen översättning kan hittas för kod
LabelOnDocuments=Etikett på dokument
@@ -941,14 +941,14 @@ CompanyZip=Zip
CompanyTown=Staden
CompanyCountry=Land
CompanyCurrency=Viktigaste valuta
-CompanyObject=Object of the company
+CompanyObject=Föremålet för bolagets verksamhet
Logo=Logo
DoNotShow=Visa inte
DoNotSuggestPaymentMode=Pekar inte
NoActiveBankAccountDefined=Inga aktiva bankkonto definierade
OwnerOfBankAccount=Ägare till %s bankkonto
BankModuleNotActive=Bankkonton modulen inte aktiverad
-ShowBugTrackLink=Show link "<strong>%s</strong>"
+ShowBugTrackLink=Visa länken <strong>"%s"</strong>
ShowWorkBoard=Visa "arbetsbänk" på hemsidan
Alerts=Varningar
Delays=Förseningar
@@ -1015,7 +1015,7 @@ MAIN_MAX_DECIMALS_UNIT=Max decimaler för priserna per enhet
MAIN_MAX_DECIMALS_TOT=Max decimaler för total priser
MAIN_MAX_DECIMALS_SHOWN=Max decimaler för priser som visas på skärmen (Lägg <b>...</b> efter detta nummer om du vill se <b>...</b> när numret är avkortas vid visas på skärmen)
MAIN_DISABLE_PDF_COMPRESSION=Använd PDF-komprimering för genererade PDF-filer.
-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)
+MAIN_ROUNDING_RULE_TOT=Steg avrundningsintervall (för länder där avrundning görs på något annat än basen 10. Till exempel satte 0,05 om avrundning sker med 0,05 steg)
UnitPriceOfProduct=Net priset per enhet för en produkt
TotalPriceAfterRounding=Total kostnad (netto / behållare / inkl moms) efter avrundning
ParameterActiveForNextInputOnly=Parameter effektiv för nästa inmatning
@@ -1023,14 +1023,14 @@ NoEventOrNoAuditSetup=Ingen säkerhet händelsen har registrerats ännu. Detta k
NoEventFoundWithCriteria=Ingen säkerhet händelse har konstaterats för sådan sökning sökkriterier.
SeeLocalSendMailSetup=Se din lokala sendmail setup
BackupDesc=För att göra en fullständig säkerhetskopia av Dolibarr måste du:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (<b>%s</b>) into a dump file. For this, you can use following assistant.
+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=Spara innehållet i din databas <b>(%s)</b> i en dumpfilen. För detta kan du använda följande assistent.
BackupDescX=Arkiverade katalogen bör förvaras på ett säkert ställe.
BackupDescY=Den genererade dumpfilen bör förvaras på ett säkert ställe.
BackupPHPWarning=Backup kan inte guaranted med denna metod. Föredrar tidigare ett
RestoreDesc=Om du vill återställa en Dolibarr säkerhetskopia måste du:
-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.
+RestoreDesc2=Återställa arkivfil (zip-fil till exempel) av dokumentkatalog för att extrahera träd filer i dokumentkatalog av en ny Dolibarr anläggning eller i den nuvarande dokument directoy <b>(%s).</b>
+RestoreDesc3=Återställa data från en backup dumpfilen, i databasen av den nya Dolibarr installationen eller i databasen av den nuvarande anläggningen <b>(%s).</b> Varning, när återställningen är klar, måste du använda en användarnamn / lösenord, som fanns när säkerhetskopian gjordes, för att ansluta igen. Om du vill återställa en backup databas i detta aktuella installationen, kan du följa den här assistent.
RestoreMySQL=MySQL import
ForcedToByAModule= Denna regel tvingas <b>%s</b> av en aktiverad modul
PreviousDumpFiles=Tillgänglig databas backup dumpfiler
@@ -1057,8 +1057,8 @@ MAIN_PROXY_PASS=Lösenord för att använda proxyservern
DefineHereComplementaryAttributes=Här definierar du alla atributes inte redan finns tillgänglig som standard, och att du vill bli stöd för %s.
ExtraFields=Komplementära egenskaper
ExtraFieldsLines=Kompletterande attribut (rader)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsSupplierOrdersLines=Kompletterande attribut (orderrader)
+ExtraFieldsSupplierInvoicesLines=Kompletterande attribut (faktura linjer)
ExtraFieldsThirdParties=Kompletterande attribut (tredjeparts)
ExtraFieldsContacts=Kompletterande attribut (kontaktperson / adress)
ExtraFieldsMember=Kompletterande attribut (medlem)
@@ -1083,7 +1083,7 @@ TotalNumberOfActivatedModules=Totalt antal aktiverade <b>funktionsmoduler:% s</b
YouMustEnableOneModule=Minst 1 modul måste aktiveras
ClassNotFoundIntoPathWarning=Klass %s inte funnen i PHP-sökvägen
YesInSummer=Ja, under sommaren
-OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are open to external users (whatever are permission of such users):
+OnlyFollowingModulesAreOpenedToExternalUsers=Observera, endast följande moduler är öppna för externa användare (vad är tillstånd från sådana användare):
SuhosinSessionEncrypt=Session lagring krypteras av Suhosin
ConditionIsCurrently=Condition är för närvarande% s
YouUseBestDriver=Du använder drivrutinen %s som är bäst drivrutin tillgänglig för tillfället.
@@ -1121,7 +1121,7 @@ ModuleCompanyCodeAquarium=Avkastningen en bokföring kod byggd med %s följt av
ModuleCompanyCodePanicum=Avkastningen en tom bokföring kod.
ModuleCompanyCodeDigitaria=Bokföring kod beror på tredje part kod. Koden består av tecknet "C" i den första positionen och därefter det första fem bokstäver av tredje part koden.
UseNotifications=Använd anmälningar
-NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:<br>* per third parties contacts (customers or suppliers), one contact at time.<br>* or by setting global target email addresses in module setup page.
+NotificationsDesc=E-post meddelanden funktionen kan du tyst skicka automatiska mail, för vissa Dolibarr händelser. Mål av anmälningarna kan definieras: <br> * Per tredje parter kontakter (kunder eller leverantörer), en kontakt i taget. <br> * Eller genom att sätta globala mål e-postadresser i modul inställningssidan.
ModelModules=Dokument mallar
DocumentModelOdt=Generera dokument från OpenDocuments mallar (.odt eller .ods filer för Openoffice, KOffice, Textedit, ...)
WatermarkOnDraft=Vattenstämpel utkast
@@ -1187,12 +1187,12 @@ FreeLegalTextOnProposal=Fri text på affärsförslag
WatermarkOnDraftProposal=Vattenstämpel på utkast till affärsförslag (ingen om tom)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Be om bankkonto destination förslag
##### AskPriceSupplier #####
-AskPriceSupplierSetup=Price requests suppliers module setup
-AskPriceSupplierNumberingModules=Price requests suppliers numbering models
-AskPriceSupplierPDFModules=Price requests suppliers documents models
-FreeLegalTextOnAskPriceSupplier=Free text on price requests suppliers
-WatermarkOnDraftAskPriceSupplier=Watermark on draft price requests suppliers (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Ask for bank account destination of price request
+AskPriceSupplierSetup=Pris begär leverantörer modul konfiguration
+AskPriceSupplierNumberingModules=Pris förfrågningar leverantörer numrerings modeller
+AskPriceSupplierPDFModules=Pris begär leverantörer dokument modeller
+FreeLegalTextOnAskPriceSupplier=Fritext på förfrågningar pris leverantörer
+WatermarkOnDraftAskPriceSupplier=Vattenstämpel om förslaget pris begär leverantörer (ingen om tom)
+BANK_ASK_PAYMENT_BANK_DURING_ASKPRICESUPPLIER=Fråga efter bankkonto destination pris begäran
##### Orders #####
OrdersSetup=Beställ ledning setup
OrdersNumberingModules=Beställningar numrering moduler
@@ -1342,8 +1342,8 @@ LDAPFieldCountry=Land
LDAPFieldCountryExample=Exempel: c
LDAPFieldDescription=Beskrivning
LDAPFieldDescriptionExample=Exempel: beskrivning
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example : publicnote
+LDAPFieldNotePublic=Offentlig anmärkning
+LDAPFieldNotePublicExample=Exempel: publicnote
LDAPFieldGroupMembers= Gruppmedlemmar
LDAPFieldGroupMembersExample= Exempel: uniqueMember
LDAPFieldBirthdate=Födelsedag
@@ -1390,14 +1390,14 @@ NumberOfProductShowInSelect=Max antal produkter i combos välj listor (0 = ingen
ConfirmDeleteProductLineAbility=Bekräftelse vid borttagning produktserier i former
ModifyProductDescAbility=Anpassning av produktbeskrivning i former
ViewProductDescInFormAbility=Visualisering av produktbeskrivning i formulären (i övrigt enligt 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
+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
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).
UseEcoTaxeAbility=Stöd Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Standard streckkod som ska användas för produkter
SetDefaultBarcodeTypeThirdParties=Standard streckkod som ska användas för tredje part
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Modul för produkt kodgenerering och kontroll (produkt eller tjänst)
ProductOtherConf= Produkt / tjänst konfiguration
##### Syslog #####
@@ -1428,9 +1428,9 @@ BarcodeDescUPC=Barcode av typ UPC
BarcodeDescISBN=Barcode av typ ISBN
BarcodeDescC39=Streckkod av typen C39
BarcodeDescC128=Barcode av typ C128
-BarcodeDescDATAMATRIX=Barcode of type Datamatrix
-BarcodeDescQRCODE=Barcode of type QR code
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types). Must be compatible with "genbarcode".<br>For example: /usr/local/bin/genbarcode
+BarcodeDescDATAMATRIX=Barcode av typen Datamatrix
+BarcodeDescQRCODE=Barcode typ QR-kod
+GenbarcodeLocation=Bar kodgenerering kommandoradsverktyg (som används av intern motor för vissa streckkodstyper). Måste vara kompatibel med "genbarcode". <br> Till exempel: / usr / local / bin / genbarcode
BarcodeInternalEngine=Intern motor
BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer
##### Prelevements #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fast e målet
SendingsSetup=Sända modul setup
SendingsReceiptModel=Att skicka kvitto modell
SendingsNumberingModules=Sänts numrering moduler
-SendingsAbility=Stöd fraktsedlar för kundleveranser.
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=I de flesta fall är sendings kvitton användas både som ark för kundleveranser (förteckning över produkter för att skicka) och ark som är recevied och undertecknas av kunden. Så produktleveranser intäkter är en dubbel funktion och är sällan aktiveras.
FreeLegalTextOnShippings=Fritext på fraktsedlar
##### Deliveries #####
@@ -1512,7 +1512,7 @@ ConfirmDeleteMenu=Är du säker på att du vill ta bort posten <b>%s</b> menyn?
DeleteLine=Radera rad
ConfirmDeleteLine=Är du säker på att du vill ta bort denna linje?
##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=Skatter, sociala eller skattemässiga skatter och dividender modul installations
OptionVatMode=Mervärdesskatt
OptionVATDefault=Kontantmetoden
OptionVATDebitOption=Periodiseringsprincipen
@@ -1548,10 +1548,10 @@ CashDeskThirdPartyForSell=Standard generiska tredje part att använda för Sells
CashDeskBankAccountForSell=Konto som ska användas för att ta emot kontant betalning
CashDeskBankAccountForCheque= Konto som ska användas för att ta emot betalningar med check
CashDeskBankAccountForCB= Konto som ska användas för att ta emot kontant betalning med kreditkort
-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).
+CashDeskDoNotDecreaseStock=Inaktivera lager minskar när en försäljning sker från Point of Sale (om "nej", stock minskning görs för varje säljer görs från POS, vad är alternativet inställt i modul Stock).
CashDeskIdWareHouse=Tvinga och begränsa lager att använda för aktie minskning
StockDecreaseForPointOfSaleDisabled=Stock minskning från Point of Sale inaktiv
-StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with lot management
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock minskning av POS är inte kompatibelt med mycket hantering
CashDeskYouDidNotDisableStockDecease=Du har inte inaktivera lager minskning när du gör en sälja från Point of Sale. Så ett lager krävs.
##### Bookmark #####
BookmarkSetup=Bokmärk modul setup
@@ -1563,14 +1563,14 @@ WebServicesDesc=Genom att aktivera denna modul Dolibarr bli en webbtjänst serve
WSDLCanBeDownloadedHere=WSDL-deskriptor fil som serviceses kan ladda ner här
EndPointIs=SOAP klienter måste skicka in sina ansökningar till Dolibarr endpoint finns på URL
##### API ####
-ApiSetup=API module setup
-ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
-KeyForApiAccess=Key to use API (parameter "api_key")
-ApiProductionMode=Enable production mode
-ApiEndPointIs=You can access to the API at url
-ApiExporerIs=You can explore the API at url
-OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed
-ApiKey=Key for API
+ApiSetup=API-modul konfiguration
+ApiDesc=Genom att aktivera denna modul Dolibarr bli en REST-server för att tillhandahålla diverse webbtjänster.
+KeyForApiAccess=Key att använda API (parameter "api_key")
+ApiProductionMode=Aktivera produktionsläge
+ApiEndPointIs=Du kan få tillgång till API på URL
+ApiExporerIs=Du kan utforska API på url
+OnlyActiveElementsAreExposed=Endast element från aktiverade moduler utsätts
+ApiKey=Key för API
##### Bank #####
BankSetupModule=Bank modul setup
FreeLegalTextOnChequeReceipts=Fri text om kontrollera kvitton
@@ -1586,7 +1586,7 @@ SuppliersSetup=Leverantör modul setup
SuppliersCommandModel=Fullständig mall av leverantör för (logo. ..)
SuppliersInvoiceModel=Komplett mall leverantörsfaktura (logo. ..)
SuppliersInvoiceNumberingModel=Leverantörsfakturor numrerings modeller
-IfSetToYesDontForgetPermission=If set to yes, don't forget to provide permissions to groups or users allowed for the second approval
+IfSetToYesDontForgetPermission=Om satt till ja, glöm inte att ge behörighet till grupper eller användare som tillåts för den andra godkännande
##### GeoIPMaxmind #####
GeoIPMaxmindSetup=GeoIP Maxmind modul setup
PathToGeoIPMaxmindCountryDataFile=Sökväg till fil innehåller MaxMind ip till land översättning. <br> Exempel: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat
@@ -1600,7 +1600,7 @@ ProjectsSetup=Projekt modul setup
ProjectsModelModule=S rapport dokument modell
TasksNumberingModules=Uppgifter nummermodulen
TaskModelModule=Uppgifter rapporter dokumentmodell
-UseSearchToSelectProject=Use autocompletion fields to choose project (instead of using a list box)
+UseSearchToSelectProject=Använd automatisk komplettering fälten för att välja projekt (istället för att använda en listruta)
##### ECM (GED) #####
ECMSetup = GED Setup
ECMAutoTree = Automatisk träd mapp och dokument
@@ -1614,7 +1614,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?
-Opened=Open
+Opened=Öppen
Closed=Stängt
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)
@@ -1628,47 +1628,47 @@ SortOrder=Sorteringsordning
Format=Format
TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ
IncludePath=Inkludera sökväg (definerad i variabel %s)
-ExpenseReportsSetup=Setup of module Expense Reports
-TemplatePDFExpenseReports=Document templates to generate expense report document
-NoModueToManageStockDecrease=No module able to manage automatic stock decrease has been activated. Stock decrease will be done on manual input only.
-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".
-ListOfNotificationsPerContact=List of notifications per contact*
-ListOfFixedNotifications=List of fixed notifications
-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:
-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</strong> enabled to value <strong>$dolibarr_main_url_root_alt="/custom"</strong><br>- <strong>$dolibarr_main_document_root_alt</strong> enabled to value <strong>"%s/custom"</strong>
-HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
-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
-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
-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 shipment, 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
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+ExpenseReportsSetup=Inställning av modulräkningar
+TemplatePDFExpenseReports=Dokumentmallar för att skapa reseräkning dokument
+NoModueToManageStockDecrease=Ingen modul kunna hantera automatiska aktie minskning har aktiverats. Stock minskning kommer att ske på bara manuell inmatning.
+NoModueToManageStockIncrease=Ingen modul kunna hantera automatiska lagerökningen har aktiverats. Stock ökning kommer att ske på bara manuell inmatning.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan hitta alternativ för e-postmeddelanden genom att aktivera och konfigurera modulen "Anmälan".
+ListOfNotificationsPerContact=Lista över anmälningar per kontakt *
+ListOfFixedNotifications=Lista över fasta anmälningar
+GoOntoContactCardToAddMore=Gå på fliken "Meddelanden" av en tredjeparts kontakt för att lägga till eller ta bort meddelanden för kontakter / adresser
+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:
+SomethingMakeInstallFromWebNotPossible2=Av denna anledning, för att processen uppgradering, som beskrivs här är endast manuell steg en privilegierad användare kan göra.
+InstallModuleFromWebHasBeenDisabledByFile=Installation av extern modul från ansökan har inaktiverats av administratören. Du måste be honom att ta bort <strong>filen% s</strong> för att tillåta denna funktion.
+ConfFileMuseContainCustom=Installera en extern modul från ansökan spara modul filer till <strong>katalogen% s.</strong> Att ha den här katalogen behandlas av Dolibarr, måste du ställa in din <strong>conf / conf.php</strong> att ha alternativ <br> - <strong>$ Dolibarr_main_url_root_alt</strong> aktiverat för att <strong>värde dolibarr_main_url_root_alt = "/ custom"</strong> <br> - <strong>$ Dolibarr_main_document_root_alt</strong> aktiverat för att värdet <strong>"% s / anpassade"</strong>
+HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
+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
+BackgroundColor=Bakgrundsfärg
+TopMenuBackgroundColor=Bakgrundsfärg för Huvudmeny
+LeftMenuBackgroundColor=Bakgrundsfärg för vänstermenyn
+BackgroundTableTitleColor=Bakgrundsfärg för tabell titelraden
+BackgroundTableLineOddColor=Bakgrundsfärg för udda bords linjer
+BackgroundTableLineEvenColor=Bakgrundsfärg för ännu bords linjer
+MinimumNoticePeriod=Minsta varseltid (Din ledighet begäran måste göras innan denna försening)
+NbAddedAutomatically=Antal dagar som läggs till räknare av användare (automatiskt) varje månad
+EnterAnyCode=Detta fält innehåller en hänvisning till identifiera linje. Ange något värde i ditt val, men utan specialtecken.
+UnicodeCurrency=Ange här mellan hängslen, lista över bytenummer som representerar valutasymbolen. För exemple: för $ anger [36] - för brazil real R $ [82,36] - för €, ange [8364]
+PositionIntoComboList=Position of line i kombinationslistor
+SellTaxRate=Försäljning skattesats
+RecuperableOnly=Ja moms "Non Perçue återvinningsbart" avsedd för någon stat i Frankrike. Håll värde till "Nej" i alla andra fall.
+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=När du skapar en möjlighet, kommer du har definierat en uppskattad mängd projekt / bly. Enligt status möjligheter, kan detta belopp multiplicated av denna kurs att utvärdera totala beloppet alla dina möjligheter kan generera. Värdet är procent (mellan 0 och 100).
+TemplateForElement=Denna mall rekord är tillägnad vilket element
+TypeOfTemplate=Typ av mall
+TemplateIsVisibleByOwnerOnly=Mall syns av ägaren endast
+MailToSendProposal=Om du vill skicka kunden förslag
+MailToSendOrder=Om du vill skicka kundorder
+MailToSendInvoice=Om du vill skicka kundfaktura
+MailToSendShipment=Om du vill skicka försändelsen
+MailToSendIntervention=Om du vill skicka ingripande
+MailToSendSupplierRequestForQuotation=Om du vill skicka Offertförfrågan till leverantör
+MailToSendSupplierOrder=Om du vill skicka leverantör ordning
+MailToSendSupplierInvoice=Om du vill skicka leverantörsfaktura
+MailToThirdparty=Om du vill skicka e-post från tredjeparts sida
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index 861bc0841f9..3e89ca69526 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Händelser för alla användare av grupp
ActionAssignedTo=Händelse delad
AllMyActions= Alla mina handlingar och uppgifter
AllActions= Alla åtgärder / uppgifter
-ViewList=Visa lista
ViewCal=Visa kalender
ViewDay=Dagsvy
ViewWeek=Veckovy
diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index 350e80a0cb9..d515458bd3e 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Utforma kommersiella förslag
SearchPropal=Sök en kommersiell förslag
CommercialDashboard=Kommersiell sammanfattning
+NoLimit=No limit
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index b30c9002626..50c796b8bc8 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Tredje part kontakt/adress
StatusContactValidated=Status för kontakt/adress
Company=Företag
CompanyName=Företagets namn
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Företag
CountryIsInEEC=Landet är inom Europeiska ekonomiska gemenskapen
ThirdPartyName=Tredje parts namn
@@ -68,6 +69,7 @@ Country=Land
CountryCode=Landskod
CountryId=Land-id
Phone=Telefon
+PhoneShort=Phone
Skype=Skype
Call=Ring upp
Chat=Chat
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 677aec9573f..f51e4a66aac 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Vänligen fyll i värde för krysslista
ErrorNoValueForRadioType=Vänligen fyll i värde för radiolista
ErrorBadFormatValueList=Listans värd kan inte ha mer än ett komma: <u>%s</u>, men behöver åtminstone en: Llave, valores
ErrorFieldCanNotContainSpecialCharacters=Fält <b>%s</b> inte innehåller specialtecken.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Fältet <b>%s</b> får inte innehåller specialtecken eller versaler.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Ingen bokföring modul aktiverad
ErrorExportDuplicateProfil=Detta profilnamn finns redan för denna export.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matchning inte är fullständig.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 9b0650cd93b..614f2f4c260 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Franska (Kanada)
Language_fr_CH=Franska (Schweiz)
Language_fr_FR=Franska
Language_fr_NC=Franska (Nya Kaledonien)
+Language_fy_NL=Frisian
Language_he_IL=Hebreiska
Language_hr_HR=Kroatiska
Language_hu_HU=Ungerska
@@ -70,6 +71,7 @@ Language_sv_SV=Svenska
Language_sv_SE=Svenskt
Language_sq_AL=Albanska
Language_sk_SK=Slovakiska
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thailändska
Language_uk_UA=Ukrainska
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 9fb906da69b..6624a5bf002 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Måndag
Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/margins.lang b/htdocs/langs/sv_SE/margins.lang
index 26476d9c327..0fb5622928a 100644
--- a/htdocs/langs/sv_SE/margins.lang
+++ b/htdocs/langs/sv_SE/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Som produkt
UseDiscountAsService=Som tjänst
UseDiscountOnTotal=På delsumma
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definierar om en global rabatt behandlas som en produkt, en tjänst, eller bara på delsumman för beräkning marginal.
-MARGIN_TYPE=Typ av marginal
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Bruttomarginal
MargeNette=Nettomarginal
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Bruttomarginal: Säljpris - Inköpspris<br/>Nettomarginal: Säljpris - Kostnadspris
+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
CostPrice=Kostnadspris
BuyingCost=Kostnadspris
UnitCharges=Enhetsladdningar
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index 157db6caa44..a19c95b93c6 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unikt pris för produkt eller tjänst
PricingRule=Regler för kundpriser
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
-PriceByCustomerLog=Pris per kundlogg
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
PriceExpressionEditor=Pris uttryck redigerare
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index ea99e09780c..32e2f0deb43 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Uppgift %s skapad
TaskModifiedInDolibarr=Uppgift %s modifierade
TaskDeletedInDolibarr=Uppgift %s raderad
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Projektledare
TypeContact_project_external_PROJECTLEADER=Projektledare
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index ac940cbc42d..a7f40b61d45 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Transporter
AllSendings=All Shipments
Shipment=Sändning
Shipments=Transporter
-ShowSending=Visa skickade
+ShowSending=Show Shipments
Receivings=Kvitto
SendingsArea=Transporter område
ListOfSendings=Lista över transporter
@@ -26,8 +26,8 @@ QtyToShip=Antal till-fartyg
QtyReceived=Antal mottagna
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Andra sändningar för denna beställning
-DateSending=Datum skicka ordning
-DateSendingShort=Datum skicka ordning
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Transporter för denna beställning
SendingsAndReceivingForSameOrder=Transporter och receivings för denna order
SendingsToValidate=Transporter för att validera
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index bd39347859f..986097678b9 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Regel för lagerminskning
RuleForStockManagementIncrease=Regel för lagerökning
DeStockOnBill=Minska befintligt lager vid validering av kundfakturor / kreditnotor
DeStockOnValidateOrder=Minska befintligt lager vid validering av kundorder
-DeStockOnShipment=Minska befintligt lager vid validering av skeppning
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Öka befintligt lager vid validering av leverantörsfakturor / kreditnotor
ReStockOnValidateOrder=Öka befintligt lager vid godkänd leverantörsorder
ReStockOnDispatchOrder=Öka befintligt lager vid manuell sändning till lager, efter mottagande av leverantörsorder
@@ -134,7 +134,7 @@ IsInPackage=Ingår i förpackning
ShowWarehouse=Visa lagret
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 7c3fbf3826f..f4ce2dc75e8 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/sw_SW/accountancy.lang b/htdocs/langs/sw_SW/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/sw_SW/accountancy.lang
+++ b/htdocs/langs/sw_SW/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/sw_SW/agenda.lang b/htdocs/langs/sw_SW/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/sw_SW/agenda.lang
+++ b/htdocs/langs/sw_SW/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/sw_SW/commercial.lang b/htdocs/langs/sw_SW/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/sw_SW/commercial.lang
+++ b/htdocs/langs/sw_SW/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sw_SW/languages.lang b/htdocs/langs/sw_SW/languages.lang
index 774abdd2f50..19c8c7a3950 100644
--- a/htdocs/langs/sw_SW/languages.lang
+++ b/htdocs/langs/sw_SW/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Kifaransa (Canada)
Language_fr_CH=Kifaransa (Switzerland)
Language_fr_FR=Kifaransa
Language_fr_NC=Kifaransa (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Kiebrania
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakiska
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Kiukreni
diff --git a/htdocs/langs/sw_SW/main.lang b/htdocs/langs/sw_SW/main.lang
index 12d9337641d..0802b693ffd 100644
--- a/htdocs/langs/sw_SW/main.lang
+++ b/htdocs/langs/sw_SW/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/sw_SW/margins.lang b/htdocs/langs/sw_SW/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/sw_SW/margins.lang
+++ b/htdocs/langs/sw_SW/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/sw_SW/sendings.lang b/htdocs/langs/sw_SW/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/sw_SW/sendings.lang
+++ b/htdocs/langs/sw_SW/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/sw_SW/stocks.lang b/htdocs/langs/sw_SW/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/sw_SW/stocks.lang
+++ b/htdocs/langs/sw_SW/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/sw_SW/trips.lang b/htdocs/langs/sw_SW/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/sw_SW/trips.lang
+++ b/htdocs/langs/sw_SW/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
index 8a77feacba3..5be669f351e 100644
--- a/htdocs/langs/th_TH/accountancy.lang
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=บัญชีการบัญชีใหม่
Update=ปรับปรุง
List=รายการ
Create=สร้าง
+CreateMvts=Create movement
UpdateAccount=การเปลี่ยนแปลงของบัญชีบัญชี
UpdateMvts=การปรับเปลี่ยนของการเคลื่อนไหว
WriteBookKeeping=บันทึกในบัญชีแยกประเภททั่วไป
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=เริ่มต้นการเรี
AccountLength=ความยาวของบัญชีที่แสดงในบัญชี Dolibarr
AccountLengthDesc=ฟังก์ชั่นที่ช่วยให้การแสร้งความยาวของบัญชีบัญชีโดยการเปลี่ยนพื้นที่โดยตัวเลขที่ศูนย์ ฟังก์ชั่นนี้เพียงสัมผัสหน้าจอก็ไม่ได้ปรับเปลี่ยนบัญชีบัญชีจดทะเบียนใน Dolibarr เพื่อการส่งออก, ฟังก์ชั่นนี้มีความจำเป็นต้องใช้งานร่วมกับซอฟต์แวร์
+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=ความยาวของบัญชีของบุคคลที่สาม
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index e69aa8c39f9..a5d504f1e42 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=บัญชี (ขั้นสูง)
Module50400Desc=การจัดการการบัญชี (ฝ่ายคู่)
Module54000Name=PrintIPP
Module54000Desc=พิมพ์โดยตรง (โดยไม่ต้องเปิดเอกสาร) โดยใช้อินเตอร์เฟซถ้วยไอพีพี (เครื่องพิมพ์จะต้องมองเห็นจากเซิร์ฟเวอร์และ CUPS จะต้อง installe บนเซิร์ฟเวอร์)
-Module55000Name=โพล
-Module55000Desc=โมดูลที่จะทำให้การเลือกตั้งออนไลน์ (เช่น Doodle, กระดุม, Rdvz, ... )
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=อัตรากำไรขั้นต้น
Module59000Desc=โมดูลการจัดการอัตรากำไรขั้นต้น
Module60000Name=คณะกรรมการ
@@ -821,7 +821,7 @@ DictionaryEMailTemplates=แม่แบบอีเมล
DictionaryUnits=หน่วย
DictionaryProspectStatus=สถานะ prospection
DictionaryHolidayTypes=ประเภทของใบ
-DictionaryOpportunityStatus=Opportunity status for project/lead
+DictionaryOpportunityStatus=สถานะการเปิดโอกาสให้โครงการ / นำ
SetupSaved=การตั้งค่าที่บันทึกไว้
BackToModuleList=กลับไปยังรายการโมดูล
BackToDictionaryList=กลับไปยังรายการพจนานุกรม
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=เหตุการณ์การรักษาคว
NoEventFoundWithCriteria=เหตุการณ์การรักษาความปลอดภัยที่ไม่ได้พบเกณฑ์การค้นหาดังกล่าว
SeeLocalSendMailSetup=ดูการตั้งค่าของคุณ sendmail ท้องถิ่น
BackupDesc=เพื่อให้การสำรองข้อมูลที่สมบูรณ์ของ Dolibarr คุณต้อง:
-BackupDesc2=บันทึกเนื้อหาของไดเรกทอรีเอกสาร <b>(% s)</b> ที่มีไฟล์ที่อัปโหลดและสร้างทั้งหมด (คุณสามารถทำเช่นซิป)
+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=บันทึกเนื้อหาของฐานข้อมูลของคุณ <b>(% s)</b> ลงในแฟ้มการถ่ายโอนข้อมูล สำหรับนี้คุณสามารถใช้ผู้ช่วยต่อไปนี้
BackupDescX=ไดเรกทอรีเก็บควรเก็บไว้ในสถานที่ที่ปลอดภัย
BackupDescY=สร้างแฟ้มการถ่ายโอนควรเก็บไว้ในสถานที่ที่ปลอดภัย
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=ใช้แบบฟอร์มการค้นห
UseEcoTaxeAbility=สนับสนุน Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=ประเภทบาร์โค้ดเริ่มต้นที่จะใช้สำหรับผลิตภัณฑ์
SetDefaultBarcodeTypeThirdParties=ประเภทบาร์โค้ดเริ่มต้นที่จะใช้สำหรับบุคคลที่สาม
-UseUnits=หน่วยสนับสนุน
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Module สำหรับรุ่นรหัสสินค้าและการตรวจสอบ (สินค้าหรือบริการ)
ProductOtherConf= สินค้า / การกำหนดค่าบริการ
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=เป้าหมายคงที่อีเมล
SendingsSetup=ส่งติดตั้งโมดูล
SendingsReceiptModel=รูปแบบการส่งใบเสร็จรับเงิน
SendingsNumberingModules=sendings โมดูลจำนวน
-SendingsAbility=การสนับสนุนการจัดส่งแผ่นสำหรับการส่งมอบลูกค้า
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=ในกรณีส่วนใหญ่ตอบรับใบเสร็จรับเงินที่มีการใช้ทั้งสองเป็นแผ่นสำหรับการส่งมอบลูกค้า (รายชื่อของผลิตภัณฑ์ที่จะส่ง) และแผ่นที่ recevied และลงนามโดยลูกค้า ดังนั้นใบเสร็จรับเงินการส่งมอบผลิตภัณฑ์ที่มีคุณลักษณะที่ซ้ำกันและมีการเปิดใช้งานไม่ค่อย
FreeLegalTextOnShippings=ข้อความฟรีในการจัดส่ง
##### Deliveries #####
@@ -1651,24 +1651,24 @@ LeftMenuBackgroundColor=สีพื้นหลังสำหรับเม
BackgroundTableTitleColor=สีพื้นหลังสำหรับสายชื่อตาราง
BackgroundTableLineOddColor=สีพื้นหลังสำหรับสายตารางแปลก
BackgroundTableLineEvenColor=สีพื้นหลังสำหรับแม้แต่เส้นตาราง
-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
-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 shipment, 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
-MailToSendProposal=To send customer proposal
-MailToSendOrder=To send customer order
-MailToSendInvoice=To send customer invoice
-MailToSendShipment=To send shipment
-MailToSendIntervention=To send intervention
-MailToSendSupplierRequestForQuotation=To send quotation request to supplier
-MailToSendSupplierOrder=To send supplier order
-MailToSendSupplierInvoice=To send supplier invoice
-MailToThirdparty=To send email from thirdparty page
+MinimumNoticePeriod=ระยะเวลาการแจ้งให้ทราบล่วงหน้าขั้นต่ำ (ตามคำขอลาของคุณจะต้องทำก่อนการหน่วงเวลานี้)
+NbAddedAutomatically=จำนวนวันที่เพิ่มเข้าไปในเคาน์เตอร์ของผู้ใช้ (โดยอัตโนมัติ) ในแต่ละเดือน
+EnterAnyCode=ฟิลด์นี้มีการอ้างอิงในการระบุสาย ป้อนค่าที่คุณเลือกได้ แต่ไม่มีตัวอักษรพิเศษ
+UnicodeCurrency=ป้อนที่นี่ระหว่างวงเล็บรายการจำนวนไบต์ที่เป็นตัวแทนของสัญลักษณ์สกุลเงิน สำหรับ exemple: ราคา $ ป้อน [36] - ราคา $ บราซิลจริง R [82,36] - สำหรับ€ป้อน [8364]
+PositionIntoComboList=ตำแหน่งของเส้นเป็นรายการคำสั่งผสม
+SellTaxRate=อัตราภาษีการขาย
+RecuperableOnly=ใช่ภาษีมูลค่าเพิ่ม "ไม่PerçueRécupérable" ทุ่มเทของรัฐในฝรั่งเศสบาง เก็บค่าที่จะ "ไม่" ในกรณีอื่น ๆ
+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=เมื่อคุณสร้างโอกาสที่คุณจะกำหนดจำนวนเงินประมาณของโครงการ / นำ ตามสถานะของโอกาสที่เงินจำนวนนี้อาจจะ multiplicated โดยอัตรานี้ในการประเมินปริมาณทั่วโลกโอกาสของคุณอาจสร้าง ค่าร้อยละ (ระหว่าง 0 และ 100)
+TemplateForElement=บันทึกแม่แบบนี้มีความมุ่งมั่นที่องค์ประกอบ
+TypeOfTemplate=ประเภทของแม่แบบ
+TemplateIsVisibleByOwnerOnly=แม่แบบสามารถมองเห็นได้โดยเจ้าของเท่านั้น
+MailToSendProposal=ที่จะส่งข้อเสนอของลูกค้า
+MailToSendOrder=ในการส่งคำสั่งของลูกค้า
+MailToSendInvoice=ในการส่งใบแจ้งหนี้ลูกค้า
+MailToSendShipment=ในการส่งการจัดส่ง
+MailToSendIntervention=ในการส่งการแทรกแซง
+MailToSendSupplierRequestForQuotation=ในการส่งคำขอใบเสนอราคาในการจัดจำหน่าย
+MailToSendSupplierOrder=ในการส่งคำสั่งผู้จัดจำหน่าย
+MailToSendSupplierInvoice=ในการส่งใบแจ้งหนี้จัดจำหน่าย
+MailToThirdparty=ในการส่งอีเมล์จากหน้า thirdparty
diff --git a/htdocs/langs/th_TH/agenda.lang b/htdocs/langs/th_TH/agenda.lang
index 370cbd0f926..16b8ebe8a7c 100644
--- a/htdocs/langs/th_TH/agenda.lang
+++ b/htdocs/langs/th_TH/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=กิจกรรมสำหรับผู้ใช้
ActionAssignedTo=เหตุการณ์ได้รับมอบหมายให้
AllMyActions= เหตุการณ์ทั้งหมดของฉัน / งาน
AllActions= เหตุการณ์ทั้งหมด / งาน
-ViewList=มุมมองรายการ
ViewCal=มุมมองรายเดือน
ViewDay=มุมมองรายวัน
ViewWeek=มุมมองสัปดาห์
@@ -97,9 +96,9 @@ ActionType=ประเภทเหตุการณ์
DateActionBegin=วันที่เริ่มต้นเหตุการณ์
CloneAction=เหตุการณ์โคลน
ConfirmCloneEvent=<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
+RepeatEvent=เหตุการณ์ซ้ำ
+EveryWeek=ทุกสัปดาห์
+EveryMonth=ทุกเดือน
+DayOfMonth=วันของเดือน
+DayOfWeek=วันของสัปดาห์
+DateStartPlusOne=เริ่มต้นวันที่ 1 ชั่วโมง
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 762fb9abe86..aff3312d507 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -165,8 +165,8 @@ DeleteARib=ลบบันทึกบ้าน
ConfirmDeleteRib=คุณแน่ใจหรือว่าต้องการลบระเบียนบ้านนี้หรือไม่?
StartDate=วันที่เริ่มต้น
EndDate=วันที่สิ้นสุด
-RejectCheck=Check rejection
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected ?
-RejectCheckDate=Check rejection date
-CheckRejected=Check rejected
-CheckRejectedAndInvoicesReopened=Check rejected and invoices reopened
+RejectCheck=ตรวจสอบการปฏิเสธ
+ConfirmRejectCheck=คุณแน่ใจหรือว่าต้องการทำเครื่องหมายเครื่องหมายนี้เป็นปฏิเสธ?
+RejectCheckDate=ตรวจสอบวันปฏิเสธ
+CheckRejected=ตรวจสอบการปฏิเสธ
+CheckRejectedAndInvoicesReopened=ตรวจสอบการปฏิเสธและใบแจ้งหนี้เปิด
diff --git a/htdocs/langs/th_TH/categories.lang b/htdocs/langs/th_TH/categories.lang
index 7226d277057..a0cea40541b 100644
--- a/htdocs/langs/th_TH/categories.lang
+++ b/htdocs/langs/th_TH/categories.lang
@@ -108,4 +108,4 @@ CategorieRecursiv=การเชื่อมโยงที่มีแท็
CategorieRecursivHelp=หากเปิดใช้งานผลิตภัณฑ์นี้ยังจะเชื่อมโยงกับประเภทหลักเมื่อมีการเพิ่มเข้าไปในหมวดหมู่
AddProductServiceIntoCategory=เพิ่มสินค้า / บริการดังต่อไปนี้
ShowCategory=แสดงแท็ก / หมวดหมู่
-ByDefaultInList=By default in list
+ByDefaultInList=โดยค่าเริ่มต้นในรายการ
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index 227ed908264..445a6c39b79 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=สถานะ Prospect
DraftPropals=ข้อเสนอในเชิงพาณิชย์ร่าง
SearchPropal=ค้นหาข้อเสนอในเชิงพาณิชย์
CommercialDashboard=สรุปพาณิชย์
+NoLimit=No limit
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index 5023c005c60..e2cb2639964 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=ติดต่อบุคคลที่สาม / ที
StatusContactValidated=สถานะของการติดต่อ / ที่อยู่
Company=บริษัท
CompanyName=ชื่อ บริษัท
-AliasNames=ชื่อนามแฝง (เชิงพาณิชย์, เครื่องหมายการค้า, ... )
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=บริษัท
CountryIsInEEC=ประเทศที่อยู่ภายในประชาคมเศรษฐกิจยุโรป
ThirdPartyName=ชื่อของบุคคลที่สาม
@@ -68,6 +69,7 @@ Country=ประเทศ
CountryCode=รหัสประเทศ
CountryId=รหัสประเทศ
Phone=โทรศัพท์
+PhoneShort=Phone
Skype=Skype
Call=โทรศัพท์
Chat=พูดคุย
diff --git a/htdocs/langs/th_TH/compta.lang b/htdocs/langs/th_TH/compta.lang
index c47f66050e6..daa2846fd10 100644
--- a/htdocs/langs/th_TH/compta.lang
+++ b/htdocs/langs/th_TH/compta.lang
@@ -199,16 +199,16 @@ TurnoverPerProductInCommitmentAccountingNotRelevant=<b>รายงานผล
CalculationMode=โหมดการคำนวณ
AccountancyJournal=วารสารการบัญชีรหัส
ACCOUNTING_VAT_SOLD_ACCOUNT=รหัสบัญชีเริ่มต้นสำหรับการจัดเก็บภาษีภาษีมูลค่าเพิ่ม
-ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for recovered VAT
-ACCOUNTING_VAT_PAY_ACCOUNT=Default accountancy code for paying VAT
+ACCOUNTING_VAT_BUY_ACCOUNT=รหัสบัญชีเริ่มต้นสำหรับการกู้คืนภาษีมูลค่าเพิ่ม
+ACCOUNTING_VAT_PAY_ACCOUNT=รหัสบัญชีเริ่มต้นสำหรับการจ่ายเงินภาษีมูลค่าเพิ่ม
ACCOUNTING_ACCOUNT_CUSTOMER=รหัสบัญชีโดยเริ่มต้นสำหรับ thirdparties ลูกค้า
ACCOUNTING_ACCOUNT_SUPPLIER=รหัสบัญชีโดยเริ่มต้นสำหรับ thirdparties ผู้จัดจำหน่าย
CloneTax=โคลนสังคม / ภาษีการคลัง
ConfirmCloneTax=ยืนยันโคลนของสังคม / ชำระภาษีการคลัง
CloneTaxForNextMonth=โคลนมันสำหรับเดือนถัดไป
-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
+SimpleReport=รายงานอย่างง่าย
+AddExtraReport=รายงานพิเศษ
+OtherCountriesCustomersReport=ลูกค้าต่างประเทศรายงาน
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=ขึ้นอยู่กับตัวอักษรสองตัวแรกของหมายเลข VAT แตกต่างจากรหัสประเทศ บริษัท ของคุณเอง
+SameCountryCustomersWithVAT=ลูกค้าแห่งชาติรายงาน
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=ขึ้นอยู่กับตัวอักษรสองตัวแรกของหมายเลข VAT เป็นเช่นเดียวกับรหัสประเทศ บริษัท ของคุณเอง
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 184c6526cbc..da749023eb6 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=กรุณากรอกค่าสำห
ErrorNoValueForRadioType=กรุณากรอกค่าสำหรับรายการวิทยุ
ErrorBadFormatValueList=<u>มูลค่ารายการไม่สามารถมีมากกว่าหนึ่งมา:% s</u> แต่ต้องไม่น้อยกว่าหนึ่ง Llave, valores
ErrorFieldCanNotContainSpecialCharacters=<b>s สนาม%</b> ไม่ต้องมีอักขระพิเศษ
-ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>s สนาม%</b> ไม่ต้องมีอักขระพิเศษหรืออักขระตัวพิมพ์ใหญ่
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=ไม่มีการเปิดใช้งานโมดูลบัญชี
ErrorExportDuplicateProfil=ชื่อโปรไฟล์นี้มีอยู่แล้วสำหรับการตั้งค่าการส่งออกนี้
ErrorLDAPSetupNotComplete=การจับคู่ Dolibarr-LDAP ไม่สมบูรณ์
@@ -100,7 +100,7 @@ ErrorProdIdAlreadyExist=% s ได้รับมอบหมายให้ส
ErrorFailedToSendPassword=ล้มเหลวในการส่งรหัสผ่าน
ErrorFailedToLoadRSSFile=ล้มเหลวที่จะได้รับฟีด RSS พยายามที่จะเพิ่ม MAIN_SIMPLEXMLLOAD_DEBUG คงถ้าข้อความผิดพลาดที่ไม่ได้ให้ข้อมูลที่เพียงพอ
ErrorPasswordDiffers=แตกต่างรหัสผ่านกรุณาพิมพ์พวกเขาอีกครั้ง
-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.
+ErrorForbidden=ปฏิเสธการเข้าใช้ <br> คุณพยายามที่จะเข้าถึงพื้นที่หน้าหรือคุณสมบัติของโมดูลพิการหรือไม่มีอยู่ในเซสชั่นหรือรับรองความถูกต้องที่ไม่ได้รับอนุญาตให้ผู้ใช้ของคุณ
ErrorForbidden2=การอนุญาตให้เข้าสู่ระบบนี้สามารถกำหนดได้โดยผู้ดูแลระบบ Dolibarr ของคุณจากเมนู% s ->% s
ErrorForbidden3=ดูเหมือนว่า Dolibarr ไม่ได้ใช้ผ่านเซสชั่นการตรวจสอบสิทธิ์ ลองดูที่เอกสารการติดตั้ง Dolibarr จะทราบวิธีการจัดการ authentications (htaccess, mod_auth หรืออื่น ๆ ... )
ErrorNoImagickReadimage=ระดับ Imagick ไม่พบใน PHP นี้ ไม่มีตัวอย่างสามารถใช้ได้ ผู้ดูแลระบบสามารถปิดการใช้งานแท็บนี้จากการตั้งค่าเมนู - จอแสดงผล
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=ไม่มีตัวแปรทั่วโล
ErrorFieldMustBeANumeric=<b>s สนาม%</b> จะต้องเป็นค่าตัวเลข
ErrorFieldMustBeAnInteger=<b>s สนาม%</b> ต้องเป็นจำนวนเต็ม
ErrorMandatoryParametersNotProvided=พารามิเตอร์บังคับ (s) ไม่ได้ให้
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=พารามิเตอร์การตั้งค่าบังคับไม่ได้กำหนดไว้ยัง
diff --git a/htdocs/langs/th_TH/exports.lang b/htdocs/langs/th_TH/exports.lang
index dcf68bbe92e..3d578297114 100644
--- a/htdocs/langs/th_TH/exports.lang
+++ b/htdocs/langs/th_TH/exports.lang
@@ -132,4 +132,4 @@ SelectFilterFields=หากคุณต้องการที่จะกร
FilterableFields=Champs Filtrables
FilteredFields=สาขากรอง
FilteredFieldsValues=ราคากรอง
-FormatControlRule=Format control rule
+FormatControlRule=รูปแบบการปกครองควบคุม
diff --git a/htdocs/langs/th_TH/languages.lang b/htdocs/langs/th_TH/languages.lang
index b61446dc3a0..107acf38b44 100644
--- a/htdocs/langs/th_TH/languages.lang
+++ b/htdocs/langs/th_TH/languages.lang
@@ -23,7 +23,7 @@ Language_en_US=ภาษาอังกฤษ (สหรัฐอเมริก
Language_en_ZA=ภาษาอังกฤษ (แอฟริกาใต้)
Language_es_ES=สเปน
Language_es_AR=สเปน (อาร์เจนตินา)
-Language_es_BO=Spanish (Bolivia)
+Language_es_BO=สเปน (โบลิเวีย)
Language_es_CL=สเปน (ชิลี)
Language_es_CO=สเปน (โคลอมเบีย)
Language_es_DO=ภาษาสเปน
@@ -41,6 +41,7 @@ Language_fr_CA=ฝรั่งเศส (แคนาดา)
Language_fr_CH=ฝรั่งเศส (วิตเซอร์แลนด์)
Language_fr_FR=ฝรั่งเศส
Language_fr_NC=ฝรั่งเศส (ใหม่แคลิโดเนีย)
+Language_fy_NL=Frisian
Language_he_IL=ชาวอิสราเอล
Language_hr_HR=โครเอเชีย
Language_hu_HU=ฮังการี
@@ -70,6 +71,7 @@ Language_sv_SV=สวีเดน
Language_sv_SE=สวีเดน
Language_sq_AL=แอลเบเนีย
Language_sk_SK=สโลวาเกีย
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=ไทย
Language_uk_UA=ยูเครน
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index bf94be312e3..a03f60fac2a 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -710,6 +710,8 @@ Denied=ปฏิเสธ
ListOfTemplates=รายชื่อของแม่แบบ
Genderman=คน
Genderwoman=หญิง
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=วันจันทร์
Tuesday=วันอังคาร
diff --git a/htdocs/langs/th_TH/margins.lang b/htdocs/langs/th_TH/margins.lang
index 65ae3af6533..1bb79f31095 100644
--- a/htdocs/langs/th_TH/margins.lang
+++ b/htdocs/langs/th_TH/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=เป็นผลิตภัณฑ์
UseDiscountAsService=เป็นบริการ
UseDiscountOnTotal=เกี่ยวกับผลรวมย่อย
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=กำหนดถ้าลดราคาทั่วโลกจะถือว่าเป็นสินค้าบริการหรือเพียง แต่ในผลรวมย่อยสำหรับการคำนวณอัตรากำไรขั้นต้น
-MARGIN_TYPE=ประเภทมาร์จิ้น
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=ขอบดิบ
MargeNette=อัตรากำไรสุทธิ
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=ขอบดิบ: ราคาขาย - ราคาซื้อ <br/> อัตรากำไรสุทธิ: ราคาขาย - ราคาต้นทุน
+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
CostPrice=ราคาทุน
BuyingCost=ราคาทุน
UnitCharges=ค่าใช้จ่ายต่อหน่วย
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 5b247bee191..88853cddd43 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -206,11 +206,11 @@ gram=กรัม
g=ก.
meter=เมตร
m=ม.
-linear เมตร = เมตรเชิงเส้น
+linearmeter=linear meter
lm=LM
-square เมตร = ตารางเมตร
+squaremeter=square meter
m2=ตารางเมตร
-cubic เมตร = ลูกบาศก์เมตร
+cubicmeter=cubic meter
m3=ลูกบาศก์เมตร
liter=ลิตร
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=ราคาที่ไม่ซ้ำกันต่อสิ
PricingRule=กฎสำหรับราคาของลูกค้า
AddCustomerPrice=เพิ่มราคาโดยลูกค้า
ForceUpdateChildPriceSoc=ตั้งราคาเดียวกันกับ บริษัท ย่อยของลูกค้า
-PriceByCustomerLog=ราคาโดยการเข้าสู่ระบบของลูกค้า
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=ราคาขั้นต่ำไม่สามารถจะลดลงแล้ว% s
MinimumRecommendedPrice=ราคาแนะนำขั้นต่ำ:% s
PriceExpressionEditor=บรรณาธิการแสดงออกราคา
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index ead83fdf4ba..42c4d14d4be 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -26,8 +26,8 @@ ConfirmDeleteATask=คุณแน่ใจหรือว่าต้องก
OfficerProject=เจ้าหน้าที่โครงการ
LastProjects=โครงการ% s ล่าสุด
AllProjects=ทุกโครงการ
-OpenedProjects=Opened projects
-OpportunitiesStatusForOpenedProjects=Opportunities status for opened projects
+OpenedProjects=เปิดโครงการ
+OpportunitiesStatusForOpenedProjects=สถานะโอกาสสำหรับโครงการที่เปิด
ProjectsList=รายการของโครงการ
ShowProject=แสดงโครงการ
SetProject=โครงการตั้ง
@@ -80,8 +80,8 @@ ListDonationsAssociatedProject=รายชื่อของการบริ
ListActionsAssociatedProject=รายการของเหตุการณ์ที่เกี่ยวข้องกับโครงการ
ListTaskTimeUserProject=รายชื่อของเวลาที่ใช้ในงานของโครงการ
TaskTimeUserProject=เวลาที่ใช้ในงานของโครงการ
-ActivityOnProjectToday=Activity on project today
-ActivityOnProjectYesterday=Activity on project yesterday
+ActivityOnProjectToday=กิจกรรมในโครงการในวันนี้
+ActivityOnProjectYesterday=กิจกรรมในโครงการเมื่อวานนี้
ActivityOnProjectThisWeek=กิจกรรมในโครงการสัปดาห์นี้
ActivityOnProjectThisMonth=กิจกรรมในโครงการในเดือนนี้
ActivityOnProjectThisYear=กิจกรรมในโครงการในปีนี้
@@ -97,7 +97,7 @@ ReOpenAProject=เปิดโครงการ
ConfirmReOpenAProject=คุณแน่ใจหรือว่าต้องการที่จะเปิดโครงการนี้หรือไม่
ProjectContact=รายชื่อโครงการ
ActionsOnProject=เหตุการณ์ที่เกิดขึ้นในโครงการ
-OpenedProjects=Opened projects
+OpenedProjects=เปิดโครงการ
YouAreNotContactOfProject=คุณยังไม่ได้ติดต่อส่วนตัวของโครงการนี้
DeleteATimeSpent=ลบเวลาที่ใช้
ConfirmDeleteATimeSpent=คุณแน่ใจหรือว่าต้องการลบในครั้งนี้ใช้เวลา?
@@ -126,8 +126,10 @@ ProjectCreatedInDolibarr=โครงการสร้าง% s
TaskCreatedInDolibarr=งาน% s สร้าง
TaskModifiedInDolibarr=งาน% s การแก้ไข
TaskDeletedInDolibarr=งาน% s ลบ
-OpportunityStatus=Opportunity status
-OpportunityAmount=Opportunity amount
+OpportunityStatus=สถานะโอกาส
+OpportunityStatusShort=Opp. status
+OpportunityAmount=จำนวนเงินที่มีโอกาส
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=หัวหน้าโครงการ
TypeContact_project_external_PROJECTLEADER=หัวหน้าโครงการ
@@ -147,7 +149,7 @@ PlannedWorkloadShort=จำนวนงาน
WorkloadOccupation=ภาระงานนัด
ProjectReferers=หมายวัตถุ
SearchAProject=ค้นหาโครงการ
-SearchATask=Search a task
+SearchATask=ค้นหางาน
ProjectMustBeValidatedFirst=โครงการจะต้องผ่านการตรวจสอบครั้งแรก
ProjectDraft=ร่างโครงการ
FirstAddRessourceToAllocateTime=เชื่อมโยงทรัพยากรที่จัดสรรเวลา
@@ -162,10 +164,21 @@ ResourceNotAssignedToTask=ไม่ได้กำหนดให้กับง
AssignTaskToMe=มอบหมายงานให้ฉัน
AssignTask=กำหนด
ProjectOverview=ภาพรวม
-ManageTasks=Use projects to follow tasks and time
-ManageOpportunitiesStatus=Use projects to follow leads/opportinuties
-ProjectNbProjectByMonth=Nb of created projects by month
-ProjectsStatistics=Statistics on projects/leads
-TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
-OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+ManageTasks=ใช้โครงการที่จะปฏิบัติตามงานและเวลา
+ManageOpportunitiesStatus=ใช้โครงการที่จะนำไปสู่การปฏิบัติตาม / opportinuties
+ProjectNbProjectByMonth=nb ของโครงการที่สร้างขึ้นโดย
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
+ProjectsStatistics=สถิติในโครงการ / โอกาสในการขาย
+TaskAssignedToEnterTime=งานที่ได้รับมอบหมาย เข้าครั้งในงานนี้จะเป็นไปได้
+OpenedProjectsByThirdparties=โครงการเปิดโดย thirdparties
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 63d8ec4cd6d..1e696713126 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -5,7 +5,7 @@ Sendings=การจัดส่ง
AllSendings=ทั้งหมดจัดส่ง
Shipment=การส่งสินค้า
Shipments=การจัดส่ง
-ShowSending=แสดงการส่ง
+ShowSending=Show Shipments
Receivings=รายรับ
SendingsArea=พื้นที่การจัดส่ง
ListOfSendings=รายชื่อของการจัดส่ง
@@ -26,8 +26,8 @@ QtyToShip=จำนวนที่จะจัดส่ง
QtyReceived=จำนวนที่ได้รับ
KeepToShip=ยังคงอยู่ในการจัดส่ง
OtherSendingsForSameOrder=การจัดส่งอื่น ๆ สำหรับการสั่งซื้อนี้
-DateSending=วันที่ส่งคำสั่งซื้อ
-DateSendingShort=วันที่ส่งคำสั่งซื้อ
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=การจัดส่งสำหรับการสั่งซื้อนี้
SendingsAndReceivingForSameOrder=การจัดส่งและ Receivings สำหรับการสั่งซื้อนี้
SendingsToValidate=ในการตรวจสอบการจัดส่ง
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 7ac5a613a68..6fa99d595db 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=กฎการลดบริหารสต็
RuleForStockManagementIncrease=กฎสำหรับการเพิ่มขึ้นบริหารสต็อก
DeStockOnBill=ลดหุ้นที่แท้จริงในใบแจ้งหนี้ลูกค้า / บันทึกการตรวจสอบเครดิต
DeStockOnValidateOrder=ลดหุ้นที่แท้จริงในการตรวจสอบการสั่งซื้อของลูกค้า
-DeStockOnShipment=ลดหุ้นที่แท้จริงในการตรวจสอบการจัดส่ง
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=เพิ่มหุ้นที่แท้จริงในใบแจ้งหนี้ซัพพลายเออร์ / บันทึกการตรวจสอบเครดิต
ReStockOnValidateOrder=เพิ่มหุ้นที่แท้จริงในการอนุมัติคำสั่งซัพพลายเออร์
ReStockOnDispatchOrder=เพิ่มหุ้นที่แท้จริงในคู่มือการฝึกอบรมออกเป็นโกดังหลังจากที่สั่งซื้อผู้จัดจำหน่ายที่ได้รับ
@@ -134,7 +134,7 @@ IsInPackage=เป็นแพคเกจที่มีอยู่
ShowWarehouse=แสดงคลังสินค้า
MovementCorrectStock=แก้ไขหุ้นสำหรับผลิตภัณฑ์% s
MovementTransferStock=การโอนหุ้นของผลิตภัณฑ์% s เข้าไปในโกดังอีก
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=คลังสินค้าที่มาจะต้องกำหนดที่นี่เมื่อ "มากผลิตภัณฑ์" ที่อยู่ในโมดูล มันจะถูกใช้เพื่อแสดงรายการชจัดสรร / อนุกรมสามารถใช้ได้สำหรับสินค้าที่จำเป็นต้องใช้จำนวนมาก / ข้อมูลแบบอนุกรมสำหรับการเคลื่อนไหว หากคุณต้องการที่จะส่งสินค้าจากคลังสินค้าที่แตกต่างกันเพียงแค่ทำให้การจัดส่งเข้ามาในหลายขั้นตอน
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Inv. / Mov รหัส
NoPendingReceptionOnSupplierOrder=ไม่มีการรับสัญญาณอยู่ระหว่างการพิจารณากำหนดจะเปิดเพื่อจัดจำหน่าย
ThisSerialAlreadyExistWithDifferentDate=จำนวนมากนี้ / หมายเลขประจำเครื่อง <strong>(% s)</strong> อยู่แล้ว แต่ด้วยความแตกต่างกันหรือ eatby วัน sellby <strong>(ที่พบ% s แต่คุณป้อน% s)</strong>
diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
index af8c6dde7f9..06552d7688d 100644
--- a/htdocs/langs/th_TH/trips.lang
+++ b/htdocs/langs/th_TH/trips.lang
@@ -9,7 +9,7 @@ TripCard=บัตรรายงานค่าใช้จ่าย
AddTrip=สร้างรายงานค่าใช้จ่าย
ListOfTrips=รายชื่อของรายงานค่าใช้จ่าย
ListOfFees=รายการค่าใช้จ่าย
-ShowTrip=Show expense report
+ShowTrip=แสดงรายงานค่าใช้จ่าย
NewTrip=รายงานค่าใช้จ่ายใหม่
CompanyVisited=บริษัท / มูลนิธิเข้าเยี่ยมชม
Kilometers=กิโลเมตร
@@ -101,3 +101,4 @@ SaveTrip=ตรวจสอบรายงานค่าใช้จ่าย
ConfirmSaveTrip=คุณแน่ใจหรือว่าต้องการตรวจสอบรายงานค่าใช้จ่ายนี้หรือไม่?
NoTripsToExportCSV=ไม่มีรายงานค่าใช้จ่ายในการส่งออกในช่วงเวลานี้
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index ea96949d2dd..4fe08dc2cbc 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Yeni muhasebe hesabı
Update=Güncelle
List=Liste
Create=Oluştur
+CreateMvts=Create movement
UpdateAccount=Bir muhasebe hesabının değiştirilmesi
UpdateMvts=Bir hareketin değiştirilmesi
WriteBookKeeping=Büyük defter hesap kayıtları
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Analiz sayfalarında "Analiz edilmişlerin
AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu
AccountLengthDesc=Boşlukların sıfır figürü ile değiştirilmesiyle muhasebe hesap uzunluğunun uydurulmasını sağlayan işlevdir. Bu işlev yalnızca görüntüyü değiştirir, Dolibarr'da kayıtlı muhasebe hesaplarını değiştirmez. Dışaaktarma için bu fonksiyonun belirli yazılımla uyumlu olması gerekir.
+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=Genel hesapların uzunluğu
ACCOUNTING_LENGTH_AACCOUNT=Üçüncü parti hesaplarının uzunluğu
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 45e5abb6059..c391873f254 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Muhasebe (gelişmiş)
Module50400Desc=Muhasebe yönetimi (çift taraf)
Module54000Name=IPP Yazdır
Module54000Desc=Cups IPP aryüzü kullanılarak doğrudan yazdırma (belgeler açılmadan) (Yazıcı sunucudan görülmeli ve sunucuda CUPS kurulu olmalı)
-Module55000Name=Anket aç
-Module55000Desc=Çevrimiçi anketler yapmak için modül (Doodle, Studs, Rdvz gibi)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Oranlar
Module59000Desc=Oran yönetimi modülü
Module60000Name=Komisyonlar
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Hiçbir güvenlik etkinliği henüz kaydedilmedi. Eğer
NoEventFoundWithCriteria=Bu arama kriteri için herhangi bir güvenlik etkinliği bulunamadı.
SeeLocalSendMailSetup=Yerel postagönder kurulumunuza bakın
BackupDesc=Tam bir Dolibarr yedeklemesi için şunları yapmalısınız:
-BackupDesc2=Tüm gönderilen ve oluşturulan dosyaları (örneğin bir zip dosyası yapabilirsiniz) içeren belge dizininin (<b>%s</b>) içeriğini kaydedin.
+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=Veritabanınızın içeriğini (<b>%s</b>) bir döküm dosyasına kaydedin. Bunun için, aşağıdaki yardımcıyı kullanabilirsiniz.
BackupDescX=Arşivlenmiş dizin güvenli bir yerde korunmalıdır.
BackupDescY=Üretilen bilgi döküm dosyası güvenli bir yerde korunmalıdır.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Bir ürün seçmek için arama formu kullanın (liste k
UseEcoTaxeAbility=Eko-Vergi Desteği (WEEE)
SetDefaultBarcodeTypeProducts=Ürünler için kullanılacak varsayılan barkod türü
SetDefaultBarcodeTypeThirdParties=Üçüncü partiler için kullanılacak varsayılan barkod tipi
-UseUnits=Birimleri destekler
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Ürün kodu oluşturma ve denetimi modülü (ürün ya da hizmet)
ProductOtherConf= Ürün / Hizmet yapılandırma
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Sabit eposta hedefi
SendingsSetup=Gönderme modülü kurulumu
SendingsReceiptModel=Makbuz gönderme modeli
SendingsNumberingModules=Gönderi numaralandırma modülü
-SendingsAbility=Müşteri teslimatları için belge gönderme desteği
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Çoğu durumda, gönderilen fişler hem müşteri teslimatları (gönderilecek ürün listesi) hem de müşteri tarafından alınan ve imzalanan belgeler olarak kullanılır. Yani, ürün teslimat makbuzları çift kopya özelliğindedir ve nadiren etkinleştirilir.
FreeLegalTextOnShippings=Sevkiyatlarda serbest metin
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Burada ayraçlar arasına para birimi simgesini belirten bayt sa
PositionIntoComboList=Satırın kombo listesindeki konumu
SellTaxRate=Satış vergisi oranı
RecuperableOnly=Bazı Fransa eyaletlerinde geçerli olan "Non Perçue Récupérable" KDV için Evet, bütün diğer durumlar için "Hayır" girin.
-UrlTrackingDesc=Eğer taşıma sağlayıcı ya da taşımacı size sevkiyatınız durumunu denetlemek için bir web sayfası ya da sitesi önerirse, bunu burada girebilirsiniz. {TRACKID} anahtarını URL parametrelerinde kullanarak kullanıcı tarafından sevkiyat kartına girilen izleme numarası değeriyle değiştirebilirsiniz.
+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=Bir fırsat oluşturduğunuzda, tahmini bir proje/aday tutarı gireceksiniz. Fırsatın durumuna göre, oluşturulacak bütün fırsatların genel tutarını hesaplamak için bu tutar bu oran ile çarpılabilir. Değer yüzde cinsindedir (0 ile 100 arasında)
TemplateForElement=Bu şablon kaydının ayrıldığı öğe
TypeOfTemplate=Şablon türü
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index d7d8a399ea3..24f2ca4bb43 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Grupun tüm üyelerine ait etkinlikler
ActionAssignedTo=Etkinlik için görevlendirilen
AllMyActions= Tüm etkinliklerim/görevlerim
AllActions= Tüm etkinlikler/görevler
-ViewList=Liste görünümü
ViewCal=Ay görünümü
ViewDay=Gün görünümü
ViewWeek=Hafta görünümü
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 11d7368c400..9c4f11881e8 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Aday durumu
DraftPropals=Taslak teklifler
SearchPropal=Teklif ara
CommercialDashboard=Ticaret özeti
+NoLimit=No limit
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 368d6ebc244..9b03af6d52e 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Üçüncü parti kişisi/adresi
StatusContactValidated=Kişi/adres durumu
Company=Firma
CompanyName=Firma adı
-AliasNames=Rumuz adları (ticari, marka, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Firmalar
CountryIsInEEC=Ülke, Avrupa Ekonomik Topluluğu içindedir
ThirdPartyName=Üçüncü parti adı
@@ -68,6 +69,7 @@ Country=Ülkesi
CountryCode=Ülke kodu
CountryId=Ülke kimliği
Phone=Telefonu
+PhoneShort=Phone
Skype=Skype
Call=Ara
Chat=Sohbet
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index 3346be87947..d390d176bf2 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Lütfen onay kutusu listesi için değer girin
ErrorNoValueForRadioType=Lütfen onay düğmesi için değer girin
ErrorBadFormatValueList=Listedeki değeri birden fazla virgül içeremez: <u>%s</u>, ama en az bir tane olması gerekir: anahtar, değer
ErrorFieldCanNotContainSpecialCharacters=<b>%s</b> alanı özel karakterler içermemelidir.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=b>%s</b> alanı ne özel karakterler ne de büyük harfler içermemelidir.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Etkinleştirilmiş muhasebe modülü yok
ErrorExportDuplicateProfil=Bu profil adı bu dışaaktarma seti için zaten var.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP eşleşmesi tamamlanmamış.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=Seçilmiş genel değişken yok
ErrorFieldMustBeANumeric=<b>%s</b> alanı sayısal bir değer olmalıdır
ErrorFieldMustBeAnInteger=<b>%s</b> alanı tamsayı olmalıdır
ErrorMandatoryParametersNotProvided=Zorunlu parametre(ler) girilmemiş
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index 671bae8c42b..c93fc8b523a 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Fransızca (Kanada)
Language_fr_CH=Fransızca (İsviçre)
Language_fr_FR=Fransızca
Language_fr_NC=Fransızca (Yeni Kaledonya)
+Language_fy_NL=Frisian
Language_he_IL=İbranice
Language_hr_HR=Hırvatça
Language_hu_HU=Macarca
@@ -70,6 +71,7 @@ Language_sv_SV=İsveçce
Language_sv_SE=İsveçce
Language_sq_AL=Arnavutça
Language_sk_SK=Slovakça
+Language_sr_RS=Serbian
Language_sw_SW=Kisvahilice
Language_th_TH=Taice
Language_uk_UA=Ukraynaca
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 48eb44f216b..c1c93df417e 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -710,6 +710,8 @@ Denied=Reddedildi
ListOfTemplates=Şablon listesi
Genderman=Adam
Genderwoman=Kadın
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Pazartesi
Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/margins.lang b/htdocs/langs/tr_TR/margins.lang
index 721d6f34ba9..8c651809e03 100644
--- a/htdocs/langs/tr_TR/margins.lang
+++ b/htdocs/langs/tr_TR/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Ürün olarak
UseDiscountAsService=Hizmet olarak
UseDiscountOnTotal=Ara toplamla
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Genel bir indirimin, oran hesaplaması için bir ürün, hizmet ya da yalnızca ara toplam olarak mı değerlendirildiğini tanımlayın.
-MARGIN_TYPE=Oran türü
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Ham oran
MargeNette=Net oran
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Ham oran : Satış fiyatı - Alış fiyatı<br/>Net oran : Satış fiyatı - Maliyet fiyatı
+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
CostPrice=Maliyet fiyatı
BuyingCost=Maliyet fiyatı
UnitCharges=Birim masrafları
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index b86c794dd5d..8c31948f1c1 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=metre
m=m
-linear metre=lineer metre
+linearmeter=linear meter
lm=lm
-square metre=metre kare
+squaremeter=square meter
m2=m²
-cubic metre=metre küp
+cubicmeter=cubic meter
m3=m³
liter=litre
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Ürün/Servis için birim fiyat
PricingRule=Müşteri fiyatları kuralları
AddCustomerPrice=Müşteriye göre fiyat ekle
ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
-PriceByCustomerLog=Müşteri fiyat günlüğü
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s
MinimumRecommendedPrice=Önerilen enaz fiyat: %s
PriceExpressionEditor=Fiyat ifadesi düzenleyici
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 43da9ce4dc5..71c5e719ab6 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=%s görev oluşturuldu
TaskModifiedInDolibarr=%s görev değiştirildi
TaskDeletedInDolibarr=%s görev silindi
OpportunityStatus=Fırsat durumu
+OpportunityStatusShort=Opp. status
OpportunityAmount=Fırsat tutarı
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Proje önderi
TypeContact_project_external_PROJECTLEADER=Proje önderi
@@ -165,7 +167,18 @@ ProjectOverview=Genel bakış
ManageTasks=Görev ve süre izlemek için projeleri kullan
ManageOpportunitiesStatus=Adayları/fırsatları izlemek için projeleri kullan
ProjectNbProjectByMonth=Aylık oluşturulan proje sayısı
+ProjectOppAmountOfProjectsByMonth=Amount of opportunities by month
+ProjectWeightedOppAmountOfProjectsByMonth=Weighted amount of opportunities by month
+ProjectOpenedProjectByOppStatus=Opened project/lead by opportunity status
ProjectsStatistics=Projeler/adaylar için istatistikler
TaskAssignedToEnterTime=Atanan görevler. Bu göreve süre girmek mümkün olmalı.
OpenedProjectsByThirdparties=Üçüncü partiye göre açık projeler
-OpportunityPonderatedAmount=Düşünülebilir tutardaki fırsatlar
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index a394748b645..c5535986074 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Sevkiyatlar
AllSendings=Tüm sevkiyatlar
Shipment=Sevkiyat
Shipments=Sevkiyatlar
-ShowSending=Gönderimi göster
+ShowSending=Show Shipments
Receivings=Kabuller
SendingsArea=Sevkiyat alanı
ListOfSendings=Sevkiyat listesi
@@ -26,8 +26,8 @@ QtyToShip=Sevk edilecek mikt.
QtyReceived=Alınan mikt.
KeepToShip=Gönderilmek için kalır
OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar
-DateSending=Sipariş gönderme tarihi
-DateSendingShort=Sipariş gönderme tarihi
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Bu sipariş için sevkiyatlar
SendingsAndReceivingForSameOrder=Bu sipariş için sevkiyatlar ve alımlar
SendingsToValidate=Doğrulanacak sevkiyatlar
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 3e2f63963b7..1f7c1fdb9ab 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Stok azaltma yönetimi kuralı
RuleForStockManagementIncrease=Stok arttırma yönetimi kuralı
DeStockOnBill=Müşteri faturalarının/iade faturalarının doğrulanması üzerine gerçek stokları azalt
DeStockOnValidateOrder=Müşteri siparişlerinin doğrulanması üzerine gerçek stokları azalt
-DeStockOnShipment=Sevkiyat doğrulaması üzerine gerçek stokları azalt
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Müşteri faturalarının/iade faturalarının doğrulanması üzerine gerçek stokları arttır
ReStockOnValidateOrder=Tedarikçi siparişlerinin onanması üzerine gerçek stokları arttır
ReStockOnDispatchOrder=Tedarikçi siparişi aldıktan sonra, elle yapılan sevk üzerine gerçek stokları artırın
@@ -134,7 +134,7 @@ IsInPackage=Pakette içerilir
ShowWarehouse=Depo göster
MovementCorrectStock=Stok düzeltme yapılacak ürün %s
MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn="Ürün partisi" modülü açık ise kaynak depo burada tanımlanmalıdır. Hareket için parti/seri gerektiren ürün için hangi partinin/serinin uygun olduğunun listelenmesi için kullanılacaktır. Farklı depolardan ürün göndermek isterseniz bir kaç adımda sevkiyat yapın.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
InventoryCodeShort=Inv./Mov. kodu
NoPendingReceptionOnSupplierOrder=Açık tedarikçi siparişlerinde bekleyen kabul yok
ThisSerialAlreadyExistWithDifferentDate=Bu parti/seri numarası (<strong>%s</strong>) zaten var fakat farklı tüketme ya da satma tarihli bulundu (<strong>%s</strong> ama sizin girdiğiniz bu <strong>%s</strong>).
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index d516fa868a1..9ec61265533 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Gider raporunu doğrula
ConfirmSaveTrip=Bu gider raporunu doğrulamak istediğinizden emin misiniz?
NoTripsToExportCSV=Bu dönem için dışaaktarılacak gider raporu yok.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index 9e798b3b234..8879af38fca 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index d12303c9c6a..dc8da8b14bd 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index 8f7479fb910..0e1f1c8aeb2 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Французька (Канада)
Language_fr_CH=Французька (Швейцарія)
Language_fr_FR=Французький
Language_fr_NC=Французька (Нова Каледонія)
+Language_fy_NL=Frisian
Language_he_IL=Іврит
Language_hr_HR=Хорватська
Language_hu_HU=Угорська
@@ -70,6 +71,7 @@ Language_sv_SV=Шведська
Language_sv_SE=Шведська
Language_sq_AL=Албанська
Language_sk_SK=Словаччини
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Тайська
Language_uk_UA=Український
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index b1403b29bca..5f1e7374d39 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 0b8035086c9..17d85f39994 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=No security event has been recorded yet. This can be norma
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:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Default barcode type to use for products
SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Sending module setup
SendingsReceiptModel=Sending receipt model
SendingsNumberingModules=Sendings numbering modules
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
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
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 93ea33678e5..08fd8c9b806 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= All my events/tasks
AllActions= All events/tasks
-ViewList=List view
ViewCal=Month view
ViewDay=Day view
ViewWeek=Week view
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index 7acdc7bd7e6..29315241a0c 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
SearchPropal=Search a commercial proposal
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 42a9a884c76..764ca969350 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Third party contact/address
StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Companies
CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
@@ -68,6 +69,7 @@ Country=Country
CountryCode=Country code
CountryId=Country id
Phone=Phone
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 3fc477121f0..2cdc521612a 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field <b>%s</b> must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case 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
ErrorExportDuplicateProfil=This profile name already exists for this export set.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP matching is not complete.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index f1da5549014..3d9bf981568 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=French (Canada)
Language_fr_CH=French (Switzerland)
Language_fr_FR=French
Language_fr_NC=French (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Hebrew
Language_hr_HR=Croatian
Language_hu_HU=Hungarian
@@ -70,6 +71,7 @@ Language_sv_SV=Swedish
Language_sv_SE=Swedish
Language_sq_AL=Albanian
Language_sk_SK=Slovakian
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thai
Language_uk_UA=Ukrainian
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index a74212167ff..c68e269114e 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/margins.lang b/htdocs/langs/uz_UZ/margins.lang
index 748b3c71f30..7db5ea4892e 100644
--- a/htdocs/langs/uz_UZ/margins.lang
+++ b/htdocs/langs/uz_UZ/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 55b1d016827..9dcaf5bc684 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index f4b9129117d..0e20e994706 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Project leader
TypeContact_project_external_PROJECTLEADER=Project leader
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 1dc182c6fdc..4d4aca48cd9 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Shipments
AllSendings=All Shipments
Shipment=Shipment
Shipments=Shipments
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Shipments area
ListOfSendings=List of shipments
@@ -26,8 +26,8 @@ QtyToShip=Qty to ship
QtyReceived=Qty received
KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
-DateSending=Date sending order
-DateSendingShort=Date sending order
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Shipments for this order
SendingsAndReceivingForSameOrder=Shipments and receivings for this order
SendingsToValidate=Shipments to validate
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 7aeef1c9641..1056cefe332 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Rule for stock management decrease
RuleForStockManagementIncrease=Rule for stock management increase
DeStockOnBill=Decrease real stocks on customers invoices/credit notes validation
DeStockOnValidateOrder=Decrease real stocks on customers orders validation
-DeStockOnShipment=Decrease real stocks on shipment validation
+DeStockOnShipment=Decrease real stocks on shipping validation
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
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index 6944fd52714..4aa616c3b6e 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 02b9d6320a3..cec6f2ecc39 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=Tài khoản kế toán mới
Update=Cập nhật
List=Danh sách
Create=Tạo
+CreateMvts=Create movement
UpdateAccount=Sự biến đổi của một tài khoản kế toán
UpdateMvts=Sửa đổi của một thay đổi
WriteBookKeeping=Tài khoản ghi trong sổ kế toán tổng
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Chiều dài của kế toán tài khoản thể hiện trong Dolibarr
AccountLengthDesc=Chức năng cho phép để giả vờ chiều dài của tài khoản kế toán bằng cách thay thế không gian bởi các con số không. Chức năng này chỉ chạm vào màn hình, nó không sửa đổi các tài khoản kế toán đăng ký tại Dolibarr. Đối với xuất khẩu, chức năng này là cần thiết để tương thích với phần mềm nhất định.
+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
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index ea76a4a96b2..e64c07c4eda 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Kế toán (nâng cao)
Module50400Desc=Quản trị kế toán (đôi bên)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=Lợi nhuận
Module59000Desc=Module quản lý lợi nhuận
Module60000Name=Hoa hồng
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=Chưa có sự kiện bảo mật được ghi nhận. Đ
NoEventFoundWithCriteria=Không có sự kiện bảo mật đã được tìm thấy cho các tiêu chí tìm kiếm như vậy.
SeeLocalSendMailSetup=Xem thiết lập sendmail địa phương của bạn
BackupDesc=Để thực hiện một sao lưu đầy đủ của Dolibarr, bạn phải:
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=Thư mục lưu trữ nên được lưu trữ ở một nơi an toàn.
BackupDescY=Tạo ra các tập tin dump nên được lưu trữ ở một nơi an toàn.
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Sử dụng một form tìm kiếm để chọn một s
UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
SetDefaultBarcodeTypeProducts=Loại mã vạch mặc định để sử dụng cho các sản phẩm
SetDefaultBarcodeTypeThirdParties=Loại mã vạch mặc định để sử dụng cho các bên thứ ba
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= Module để sinh ra mã sản phẩm và kiểm tra (sản phẩm hoặc dịch vụ)
ProductOtherConf= Cấu hình Sản phẩm / Dịch vụ
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=Cài đặt module Gửi
SendingsReceiptModel=Mô hình biên nhận Gửi
SendingsNumberingModules=Module đánh số Gửi
-SendingsAbility=Phiếu vận chuyển cho đơn giao hàng khách hàng
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=Trong hầu hết các trường hợp, biên nhận gửi đi được sử dụng như phiếu giao hàng khách hàng (danh sách các sản phẩm để gửi) và phiếu này được nhận và ký tên bởi khách hàng. Vì vậy, phiếu vận chuyển sản phẩm là đặc tính trùng lắp và hiếm khi được kích hoạt.
FreeLegalTextOnShippings=Free text trên phiếu vận chuyển
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/vi_VN/agenda.lang b/htdocs/langs/vi_VN/agenda.lang
index bd06fb0076b..7e3b5a95815 100644
--- a/htdocs/langs/vi_VN/agenda.lang
+++ b/htdocs/langs/vi_VN/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Sự kiện cho tất cả người dùng của nhóm
ActionAssignedTo=Event assigned to
AllMyActions= Tất cả các sự kiện của tôi / nhiệm vụ
AllActions= Tất cả các sự kiện / nhiệm vụ
-ViewList=Danh sách xem
ViewCal=Xem tháng
ViewDay=Ngày xem
ViewWeek=Xem theo tuần
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index d905b474831..4ce193a354d 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -5,92 +5,93 @@ CommercialCard=Thẻ thương mại
CustomerArea=Khu vực khách hàng
Customer=Khách hàng
Customers=Khách hàng
-Prospect=Triển vọng
-Prospects=Triển vọng
-DeleteAction=Xóa một sự kiện / tác vụ
-NewAction=Sự kiện mới / tác vụ
-AddAction=Tạo sự kiện / tác vụ
-AddAnAction=Tạo một sự kiện / tác vụ
+Prospect=KH tiềm năng
+Prospects=KH tiềm năng
+DeleteAction=Xóa một sự kiện/tác vụ
+NewAction=Sự kiện mới/tác vụ
+AddAction=Tạo sự kiện/tác vụ
+AddAnAction=Tạo một sự kiện/tác vụ
AddActionRendezVous=Tạo một sự kiện Rendez-vous
Rendez-Vous=Rendezvous
-ConfirmDeleteAction=Bạn có chắc chắn muốn xóa sự kiện này / tác vụ?
+ConfirmDeleteAction=Bạn có chắc muốn xóa sự kiện/tác vụ này ?
CardAction=Thẻ sự kiện
PercentDone=Tỷ lệ hoàn thành
ActionOnCompany=Tác vụ về công ty
-ActionOnContact=Tác vụ về liên hệ
+ActionOnContact=Tác vụ về liên lạc
TaskRDV=Các cuộc họp
TaskRDVWith=Gặp gỡ với %s
ShowTask=Hiện tác vụ
ShowAction=Hiện sự kiện
-ActionsReport=Sự kiện báo cáo
-ThirdPartiesOfSaleRepresentative=Thirdparties với đại diện bán hàng
+ActionsReport=Báo cáo sự kiện
+ThirdPartiesOfSaleRepresentative=Bên thứ ba với đại điện bán hàng
SalesRepresentative=Đại diện bán hàng
SalesRepresentatives=Đại diện bán hàng
SalesRepresentativeFollowUp=Đại diện bán hàng (theo dõi)
SalesRepresentativeSignature=Đại diện bán hàng (chữ ký)
CommercialInterlocutor=Đối thoại thương mại
ErrorWrongCode=Sai mã
-NoSalesRepresentativeAffected=Không có đại diện bán hàng đặc biệt được chỉ định
+NoSalesRepresentativeAffected=Không có đại diện bán hàng cụ thể được chỉ định
ShowCustomer=Hiện khách hàng
-ShowProspect=Hiện khách hàng tiềm năng
-ListOfProspects=Danh sách khách hàng tiềm năng
+ShowProspect=Hiện KH tiềm năng
+ListOfProspects=Danh sách KH tiềm năng
ListOfCustomers=Danh sách khách hàng
-LastDoneTasks=Hoàn thành tác vụ cuối %s
-LastRecordedTasks=Tác vụ ghi lại cuối cùng
-LastActionsToDo=Hoạt động lâu đời nhất cuối %s không hoàn thành
-DoneAndToDoActionsFor=Sự kiện hoàn thành và Để làm cho %s
-DoneAndToDoActions=Để hoàn thành và làm sự kiện
+LastDoneTasks=%s tác vụ đã hoàn thành cuối
+LastRecordedTasks=Tác vụ đã ghi cuối
+LastActionsToDo=%s hoạt động cuối chưa hoàn thành
+DoneAndToDoActionsFor=Sự kiện cần làm và đã hoàn thành cho %s
+DoneAndToDoActions=Sự kiện cần làm và đã hoàn thành
DoneActions=Sự kiện hoàn thành
-DoneActionsFor=Sự kiện hoàn thành %s
-ToDoActions=Sự kiện không đầy đủ
-ToDoActionsFor=Sự kiện không đầy đủ cho %s
-SendPropalRef=Nộp đề xuất thương mại %s
-SendOrderRef=Đệ trình đơn hàng %s
+DoneActionsFor=Sự kiện hoàn thành cho %s
+ToDoActions=Sự kiện không hoàn thành
+ToDoActionsFor=Sự kiện không hoàn thành cho %s
+SendPropalRef=Nộp đơn hàng đề xuất %s
+SendOrderRef=Nộp đơn hàng %s
StatusNotApplicable=Không áp dụng
-StatusActionToDo=Để làm
+StatusActionToDo=Cần làm
StatusActionDone=Hoàn thành
-MyActionsAsked=Tôi đã ghi lại sự kiện
+MyActionsAsked=Sự kiện tôi đã ghi nhận
MyActionsToDo=Sự kiện tôi phải làm
MyActionsDone=Sự kiện được gán cho tôi
-StatusActionInProcess=Trong quá trình
-TasksHistoryForThisContact=Sự kiện cho liên hệ này
-LastProspectDoNotContact=Không liên hệ
-LastProspectNeverContacted=Không bao giờ liên lạc
-LastProspectToContact=Để liên hệ
-LastProspectContactInProcess=Liên hệ trong quá trình
-LastProspectContactDone=Liên hệ với thực hiện
-DateActionPlanned=Ngày lên kế hoạch cho sự kiện
+StatusActionInProcess=Đang xử lý
+TasksHistoryForThisContact=Sự kiện cho liên lạc này
+LastProspectDoNotContact=Không liên lạc
+LastProspectNeverContacted=Chưa từng liên lạc
+LastProspectToContact=Để liên lạc
+LastProspectContactInProcess=Đang liên lạc
+LastProspectContactDone=Đã liên lạc
+DateActionPlanned=Ngày sự kiện dự kiến
DateActionDone=Ngày thực hiện sự kiện
-ActionAskedBy=Tổ chức sự kiện báo cáo của
-ActionAffectedTo=Event assigned to
-ActionDoneBy=Sự kiện được thực hiện bởi
-ActionUserAsk=Báo cáo của
-ErrorStatusCantBeZeroIfStarted=Nếu trường <b>'ngày thực hiện</b> "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' <b>Trạng thái</b> 'không thể là 0 %%.
-ActionAC_TEL=Cuộc gọi
+ActionAskedBy=Sự kiện được báo cáo bởi
+ActionAffectedTo=Sự kiện được giao cho
+ActionDoneBy=Sự kiện được hoàn tất bởi
+ActionUserAsk=Được báo cáo bởi
+ErrorStatusCantBeZeroIfStarted=If field '<b>Date done</b>' is filled, action is started (or finished), so field '<b>Status</b>' can't be 0%%.
+ActionAC_TEL=Gọi điện thoại
ActionAC_FAX=Gửi fax
-ActionAC_PROP=Gửi đề nghị qua đường bưu điện
+ActionAC_PROP=Gửi đơn hàng đề xuất qua thư
ActionAC_EMAIL=Gởi thư
-ActionAC_RDV=Các cuộc họp
-ActionAC_INT=Can thiệp trên trang web
-ActionAC_FAC=Gửi hóa đơn của khách hàng qua đường bưu điện
-ActionAC_REL=Gửi hóa đơn của khách hàng qua đường bưu điện (nhắc nhở)
+ActionAC_RDV=Cuộc họp
+ActionAC_INT=Intervention on site
+ActionAC_FAC=Gửi hóa đơn khách hàng bằng thư
+ActionAC_REL=Gửi hóa đơn khách hàng bằng thư (nhắc nhở)
ActionAC_CLO=Đóng
ActionAC_EMAILING=Gửi email hàng loạt
-ActionAC_COM=Gửi đơn đặt hàng qua bưu điện
-ActionAC_SHIP=Gửi vận chuyển qua đường bưu điện
-ActionAC_SUP_ORD=Gửi đơn đặt hàng nhà cung cấp qua đường bưu điện
-ActionAC_SUP_INV=Gửi tin nhà cung cấp hóa đơn qua đường bưu điện
+ActionAC_COM=Gửi đơn hàng khách hàng bằng thư
+ActionAC_SHIP=Gửi đơn hàng vận chuyển bằng thư
+ActionAC_SUP_ORD=Gửi đơn hàng nhà cung cấp bằng thư
+ActionAC_SUP_INV=Gửi hóa đơn nhà cung cấp bằng thư
ActionAC_OTH=Khác
ActionAC_OTH_AUTO=Khác (sự kiện tự động chèn vào)
ActionAC_MANUAL=Sự kiện chèn bằng tay
ActionAC_AUTO=Sự kiện tự động chèn
-Stats=Thống kê doanh số bán hàng
-CAOrder=Khối lượng bán hàng (đơn đặt hàng xác nhận)
+Stats=Thống kê bán hàng
+CAOrder=Khối lượng bán hàng (đơn hàng đã xác nhận)
FromTo=từ %s đến %s
-MargeOrder=Tỷ suất lợi nhuận (đơn đặt hàng xác nhận)
-RecapAnnee=Tóm tắt các năm
+MargeOrder=Lợi nhuận (đơn hàng đã xác nhận)
+RecapAnnee=Tóm tắt của năm
NoData=Không có dữ liệu
-StatusProsp=Tình trạng khách hàng tiềm năng
-DraftPropals=Dự thảo đề xuất thương mại
-SearchPropal=Tìm kiếm một đề nghị thương mại
+StatusProsp=Trạng thái KH tiềm năng
+DraftPropals=Dự thảo đơn hàng đề xuất
+SearchPropal=Tìm kiếm đơn hàng đề xuất
CommercialDashboard=Tóm tắt thương mại
+NoLimit=No limit
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 88f4c0438fb..5721979ef09 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=Liên lạc/địa chỉ bên thứ ba
StatusContactValidated=Trạng thái liên lạc/địa chỉ
Company=Công ty
CompanyName=Tên công ty
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=Các công ty
CountryIsInEEC=Quốc gia thuộc Cộng đồng Kinh tế châu Âu
ThirdPartyName=Tên của bên thứ ba
@@ -68,6 +69,7 @@ Country=Quốc gia
CountryCode=Mã quốc gia
CountryId=ID quốc gia
Phone=Điện thoại
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 9ea500a26ef..8000721e788 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Xin vui lòng điền giá trị so với danh sách
ErrorNoValueForRadioType=Xin vui lòng điền giá trị so với danh sách phát thanh
ErrorBadFormatValueList=Giá trị danh sách không thể có nhiều hơn một <u>đến:% s,</u> nhưng cần ít nhất một: Llave, Valores
ErrorFieldCanNotContainSpecialCharacters=<b>Dòng% s</b> không được chứa các ký tự đặc biệt.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=<b>Dòng% s</b> không được chứa các ký tự đặc biệt, cũng không phải ký tự trường hợp trên.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contain special characters, nor upper case characters and cannot contain only numbers.
ErrorNoAccountancyModuleLoaded=Không có mô-đun kế toán kích hoạt
ErrorExportDuplicateProfil=Tên hồ sơ này đã tồn tại cho bộ xuất khẩu này.
ErrorLDAPSetupNotComplete=Dolibarr-LDAP phù hợp là không đầy đủ.
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Thiết lập các thông số bắt buộc chưa được xác định
diff --git a/htdocs/langs/vi_VN/languages.lang b/htdocs/langs/vi_VN/languages.lang
index 1061cd75202..da3449015ca 100644
--- a/htdocs/langs/vi_VN/languages.lang
+++ b/htdocs/langs/vi_VN/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=Pháp (Canada)
Language_fr_CH=Pháp (Thụy Sĩ)
Language_fr_FR=Pháp
Language_fr_NC=Pháp (New Caledonia)
+Language_fy_NL=Frisian
Language_he_IL=Do Thái
Language_hr_HR=Croatia
Language_hu_HU=Hungary
@@ -70,6 +71,7 @@ Language_sv_SV=Thụy Điển
Language_sv_SE=Thụy Điển
Language_sq_AL=Albania
Language_sk_SK=Slovakia
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=Thái Lan
Language_uk_UA=Ukraina
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index a2201b68835..b59001c48ef 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# 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 b48ab7198be..ba3782a1cdb 100644
--- a/htdocs/langs/vi_VN/margins.lang
+++ b/htdocs/langs/vi_VN/margins.lang
@@ -30,10 +30,13 @@ UseDiscountAsProduct=Là một sản phẩm
UseDiscountAsService=Là một dịch vụ
UseDiscountOnTotal=Trên tổng số phụ
MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Xác định nếu giảm giá toàn cầu được coi là một sản phẩm, một dịch vụ, hoặc chỉ trên tổng số phụ để tính tỷ suất biên lợi nhuận.
-MARGIN_TYPE=Loại biên
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Biên liệu
MargeNette=Tỷ suất biên lợi nhuận
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Biên liệu: Giá bán - giá mua <br/> Tỷ suất biên lợi nhuận: Giá bán - Giá vốn
+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
CostPrice=Giá thành
BuyingCost=Giá thành
UnitCharges=Chi phí đơn vị
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index da779d78e92..718c56a0676 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Giá duy nhất cho mỗi sản phẩm/dịch vụ
PricingRule=Quy tắc cho giá khách hàng
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Đặt giá giống nhau trên nhóm khách hàng phụ thuộc
-PriceByCustomerLog=Sổ ghi giá theo khách hàng
+PriceByCustomerLog=Log of previous customer prices
MinimumPriceLimit=Minimum price can't be lower then %s
MinimumRecommendedPrice=Giá tối thiểu đề nghị là: %s
PriceExpressionEditor=Soạn thảo biểu giá
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index a13e7d774a9..2e710ede517 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Tác vụ %s được tạo
TaskModifiedInDolibarr=Tác vụ %s đã chỉnh sửa
TaskDeletedInDolibarr=Tác vụ %s đã xóa
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=Lãnh đạo dự án
TypeContact_project_external_PROJECTLEADER=Lãnh đạo dự án
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 6728e0a8df3..929fb097f80 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -5,7 +5,7 @@ Sendings=Lô hàng
AllSendings=All Shipments
Shipment=Lô hàng
Shipments=Lô hàng
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=Diện tích lô hàng
ListOfSendings=Danh sách các lô hàng
@@ -26,8 +26,8 @@ QtyToShip=Số lượng xuất xưởng
QtyReceived=Số lượng nhận được
KeepToShip=Giữ tàu
OtherSendingsForSameOrder=Lô hàng khác về đơn hàng này
-DateSending=Ngày gửi đơn đặt hàng
-DateSendingShort=Ngày gửi đơn đặt hàng
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=Các lô hàng về đơn hàng này
SendingsAndReceivingForSameOrder=Lô hàng và Receivings về đơn hàng này
SendingsToValidate=Lô hàng để xác nhận
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 67488654b3d..9e68258d625 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=Quy tắc cho quản lý kho giảm
RuleForStockManagementIncrease=Quy tắc cho tăng quản lý kho
DeStockOnBill=Giảm kho thực tế trên hoá đơn khách hàng / tín dụng ghi xác nhận
DeStockOnValidateOrder=Giảm tồn kho thực trên khách hàng xác nhận đơn đặt hàng
-DeStockOnShipment=Giảm tồn kho thực trên xác nhận lô hàng
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=Tăng tồn kho thực tế các nhà cung cấp hoá đơn tín dụng / ghi xác nhận
ReStockOnValidateOrder=Tăng tồn kho thực sự tán thành đơn đặt hàng các nhà cung cấp
ReStockOnDispatchOrder=Tăng tồn kho thực trên dẫn điều phối vào kho, sau khi tiếp nhận đơn đặt hàng nhà cung cấp
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index 963aa1af252..a24b291f3b0 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index 3a8b31c50f0..59576b4339a 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=”新建“会计账户
Update=更新
List=名单
Create=创建
+CreateMvts=Create movement
UpdateAccount=修改”会计帐户“
UpdateMvts=对一个”活动“进行修改
WriteBookKeeping=在”总账“中的”账户记录“
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=会计长度账户显示在的Dolibarr
AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。
+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
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index c759c998e12..a49bed6cb2e 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=财会(高级)
Module50400Desc=会计管理(双方)
Module54000Name=IPP打印
Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installe on server).
-Module55000Name=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+Module55000Name=Poll, Survey or Vote
+Module55000Desc=Module to make online polls, surveys or votes (like Doodle, Studs, Rdvz, ...)
Module59000Name=利润空间
Module59000Desc=利润空间管理模块
Module60000Name=佣金
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=尚无安全事件被记录。这属正常，默认“设
NoEventFoundWithCriteria=未发现符合搜索条件的安全事件。
SeeLocalSendMailSetup=参见您的本机 sendmail 设置
BackupDesc=为了生成一个完整的 Dolibarr 备份，您必须：
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=存档的文档目录应存储在一个安全的地方。
BackupDescY=生成的转储文件应存放在安全的地方。
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=支持生态附加税 (WEEE)
SetDefaultBarcodeTypeProducts=默认的条码类型
SetDefaultBarcodeTypeThirdParties=第三方用默认条码类型
-UseUnits=Support units
+UseUnits=Define a unit of measure for Quantity during order, proposal or invoice lines edition
ProductCodeChecker= 产品/服务编号的生成与检查模块
ProductOtherConf= 产品/服务 配置
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=发货单模块设置
SendingsReceiptModel=发货单据模板
SendingsNumberingModules=发货单编号模块
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=通常发货单同时被用来作为发货清单和收货回执，由客户接收并签字。所以产品收货回执/交付回执是此功能的重复，很少使用。
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/zh_CN/agenda.lang b/htdocs/langs/zh_CN/agenda.lang
index d1275a451d4..d919e0b5993 100644
--- a/htdocs/langs/zh_CN/agenda.lang
+++ b/htdocs/langs/zh_CN/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= 我所有的事件/任务
AllActions= 所有/任务行动
-ViewList=查看列表
ViewCal=查看日历
ViewDay=日视图
ViewWeek=周视图
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 6a88865a84e..9a6641b5472 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=展望状态
DraftPropals=起草商业建议
SearchPropal=搜索一个商业建议
CommercialDashboard=商业摘要
+NoLimit=No limit
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 18fde7c7030..3203fbdf63f 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=第三方联系人
StatusContactValidated=联系人/地址 状态
Company=公司
CompanyName=公司名称
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=公司
CountryIsInEEC=国家是欧共体内
ThirdPartyName=第三方的名称
@@ -68,6 +69,7 @@ Country=国家
CountryCode=国家代码
CountryId=国家编号
Phone=电话
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 1e9ac636f7b..3b5da716027 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=请填写复选框列表值
ErrorNoValueForRadioType=请填写电台列表的值
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=菲尔德<b>%s</b>必须不包含特殊字符。
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+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.
ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=强制设置参数尚未定义
diff --git a/htdocs/langs/zh_CN/languages.lang b/htdocs/langs/zh_CN/languages.lang
index 92fa3cfe78f..d414653f9e9 100644
--- a/htdocs/langs/zh_CN/languages.lang
+++ b/htdocs/langs/zh_CN/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=法语（加拿大）
Language_fr_CH=法语（瑞士）
Language_fr_FR=法国的
Language_fr_NC=法语（新喀里多尼亚）
+Language_fy_NL=Frisian
Language_he_IL=希伯来语
Language_hr_HR=克罗地亚
Language_hu_HU=匈牙利
@@ -70,6 +71,7 @@ Language_sv_SV=瑞典
Language_sv_SE=瑞典
Language_sq_AL=Albanian
Language_sk_SK=斯洛伐克
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=泰国
Language_uk_UA=乌克兰
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 78e99d4599b..bf9846d2294 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=星期一
Tuesday=星期二
diff --git a/htdocs/langs/zh_CN/margins.lang b/htdocs/langs/zh_CN/margins.lang
index ed5581c71ad..82c45a06754 100644
--- a/htdocs/langs/zh_CN/margins.lang
+++ b/htdocs/langs/zh_CN/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 878e87ac441..3767950d044 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 0abff61f724..c3a59075041 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=项目负责人
TypeContact_project_external_PROJECTLEADER=项目负责人
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index 35a5cdf0f01..6a60e1e2e9e 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -5,7 +5,7 @@ Sendings=出货
AllSendings=All Shipments
Shipment=装船
Shipments=出货
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=出货面积
ListOfSendings=名单sendings
@@ -26,8 +26,8 @@ QtyToShip=出货数量
QtyReceived=收到的数量
KeepToShip=Remain to ship
OtherSendingsForSameOrder=这个命令的其他货物
-DateSending=为了发送日期
-DateSendingShort=为了发送日期
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=为此订单出货
SendingsAndReceivingForSameOrder=出货量为这种秩序和receivings
SendingsToValidate=发送验证
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index cbb0fae57d9..fb586bea382 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=为减少库存管理规则
RuleForStockManagementIncrease=增加的库存管理规则
DeStockOnBill=减少对客户的实际库存发票/信用票据验证（警告在此版本，它只有在仓库数1，股票被修改）
DeStockOnValidateOrder=减少对客户的订单确认（警告在此版本中，真正的股票，它只有在仓库数1，股票被修改）
-DeStockOnShipment=减少对实际装运验证股票（推荐）
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=增加对供应商发票的实际库存/信用票据验证（警告在此版本中，它只有在仓库数1，股票被修改）
ReStockOnValidateOrder=对供应商的订单增加赞许（警告在此版本中，真正的股票，它只有在仓库数1，股票被修改）
ReStockOnDispatchOrder=增加人工调度到仓库供应商接到订单后，实时股票
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index ca5e195cb25..8fee637b7fb 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 40e2b65db42..0437a8f1cb9 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -48,6 +48,7 @@ NewAccount=New accounting account
Update=Update
List=List
Create=Create
+CreateMvts=Create movement
UpdateAccount=Modification of an accounting account
UpdateMvts=Modification of a movement
WriteBookKeeping=Record accounts in general ledger
@@ -83,6 +84,8 @@ ACCOUNTING_LIST_SORT_VENTILATION_DONE=Begin the sorting of the breakdown pages "
AccountLength=Length of the accounting accounts shown in Dolibarr
AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+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
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 93c6bd6ca9e..8b36b47106e 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -554,8 +554,8 @@ Module50400Name=Accounting (advanced)
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=Open Poll
-Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
+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
@@ -1023,7 +1023,7 @@ NoEventOrNoAuditSetup=沒有安全事件已被記錄呢。這可以是正常的
NoEventFoundWithCriteria=沒有安全事件已發現這種搜尋標準。
SeeLocalSendMailSetup=看到您當地的sendmail的設置
BackupDesc=為了使一個完整的Dolibarr備份，您必須：
-BackupDesc2=Save content of documents directory (<b>%s</b>) that contains all uploaded and generated files (you can make a zip for example).
+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=存檔的目錄應該被存儲在一個安全的地方。
BackupDescY=生成的轉儲文件應存放在安全的地方。
@@ -1397,7 +1397,7 @@ UseSearchToSelectProduct=Use a search form to choose a product (rather than a dr
UseEcoTaxeAbility=支持生態附加稅（WEEE）的
SetDefaultBarcodeTypeProducts=預設的條碼類型
SetDefaultBarcodeTypeThirdParties=預設的條碼類型給客戶/供應商模組使用
-UseUnits=Support units
+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
##### Syslog #####
@@ -1454,7 +1454,7 @@ FixedEmailTarget=Fixed email target
SendingsSetup=設定出貨單模組
SendingsReceiptModel=出貨單據範本
SendingsNumberingModules=設定出貨單編號模組
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Support shipping sheets for customer deliveries
NoNeedForDeliveryReceipts=在大多數情況下，出貨單據可提供客戶記錄及查詢交貨單資訊(產品出貨清單)及收貨單資訊，客戶可同時註記簽收狀態。所以產品交貨單據是一個重複的功能，很少被開啟。
FreeLegalTextOnShippings=Free text on shipments
##### Deliveries #####
@@ -1658,7 +1658,7 @@ UnicodeCurrency=Enter here between braces, list of byte number that represent th
PositionIntoComboList=Position of line into combo lists
SellTaxRate=Sale tax rate
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 shipment, 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.
+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
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index 2994c24271c..c52537c1731 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -32,7 +32,6 @@ ActionsForUsersGroup=Events for all users of group
ActionAssignedTo=Event assigned to
AllMyActions= 我所有的行動/任務
AllActions= 所有/任務行動
-ViewList=查看列表
ViewCal=查看日歷
ViewDay=日視圖
ViewWeek=周視圖
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index bf96053a8ec..c6536272168 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -94,3 +94,4 @@ StatusProsp=潛在狀態
DraftPropals=起草商業建議
SearchPropal=搜尋一個商業建議
CommercialDashboard=Commercial summary
+NoLimit=No limit
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 92693795652..fda2251b7d3 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -30,7 +30,8 @@ ThirdPartyContact=客戶/供應商聯絡人
StatusContactValidated=聯絡人狀態
Company=公司
CompanyName=公司名稱
-AliasNames=Alias names (commercial, trademark, ...)
+AliasNames=Alias name (commercial, trademark, ...)
+AliasNameShort=Alias name
Companies=公司
CountryIsInEEC=國家是歐共體內
ThirdPartyName=客戶/供應商名稱
@@ -68,6 +69,7 @@ Country=國家
CountryCode=國家代碼
CountryId=國家編號
Phone=電話
+PhoneShort=Phone
Skype=Skype
Call=Call
Chat=Chat
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 5477d0bf7dc..587664fb3f1 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -65,7 +65,7 @@ ErrorNoValueForCheckBoxType=Please fill value for checkbox list
ErrorNoValueForRadioType=Please fill value for radio list
ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=菲爾德<b>%s</b>必須不包含特殊字符。
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field <b>%s</b> must not contains special characters, nor upper case characters.
+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.
ErrorLDAPSetupNotComplete=Dolibarr - LDAP的匹配是不完整的。
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
ErrorFieldMustBeAnInteger=Field <b>%s</b> must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorOppStatusRequiredIfAmount=Vous avez renseigné un montant estimé de l'opportunité. Dans ce cas, il faut aussi renseigner le statut d'opportunité
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 8d5c20f8b96..84e12f06230 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -41,6 +41,7 @@ Language_fr_CA=法語（加拿大）
Language_fr_CH=法語（瑞士）
Language_fr_FR=法國的
Language_fr_NC=法国 (新喀里多尼亚)
+Language_fy_NL=Frisian
Language_he_IL=希伯来语
Language_hr_HR=克罗地亚
Language_hu_HU=匈牙利
@@ -70,6 +71,7 @@ Language_sv_SV=瑞典
Language_sv_SE=瑞典
Language_sq_AL=Albanian
Language_sk_SK=斯洛伐克
+Language_sr_RS=Serbian
Language_sw_SW=Kiswahili
Language_th_TH=泰国
Language_uk_UA=乌克兰
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index ffac379b6bd..a1fcb379283 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -710,6 +710,8 @@ Denied=Denied
ListOfTemplates=List of templates
Genderman=Man
Genderwoman=Woman
+ViewList=List view
+Mandatory=Mandatory
# Week day
Monday=星期一
Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/margins.lang b/htdocs/langs/zh_TW/margins.lang
index 180d2d80e0c..df6d4d93150 100644
--- a/htdocs/langs/zh_TW/margins.lang
+++ b/htdocs/langs/zh_TW/margins.lang
@@ -30,10 +30,13 @@ 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=Margin type
+MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
MargeBrute=Raw margin
MargeNette=Net margin
+MargeType1=Margin on Best supplier price
+MargeType2=Margin on Weighted Average Price (WAP)
MARGIN_TYPE_DETAILS=Raw margin : Selling price - Buying price<br/>Net margin : Selling price - 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
CostPrice=Cost price
BuyingCost=Cost price
UnitCharges=Unit charges
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index dd689b0f87a..b866a4a2cf2 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -206,11 +206,11 @@ gram=gram
g=g
meter=meter
m=m
-linear meter=linear meter
+linearmeter=linear meter
lm=lm
-square meter=square meter
+squaremeter=square meter
m2=m²
-cubic meter=cubic meter
+cubicmeter=cubic meter
m3=m³
liter=liter
l=L
@@ -264,7 +264,7 @@ PriceCatalogue=Unique price per product/service
PricingRule=Rules for customer prices
AddCustomerPrice=Add price by customer
ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
-PriceByCustomerLog=Price by customer log
+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
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 3cb8d72af35..d0415593f37 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -127,7 +127,9 @@ TaskCreatedInDolibarr=Task %s created
TaskModifiedInDolibarr=Task %s modified
TaskDeletedInDolibarr=Task %s deleted
OpportunityStatus=Opportunity status
+OpportunityStatusShort=Opp. status
OpportunityAmount=Opportunity amount
+OpportunityAmountShort=Opp. amount
##### Types de contacts #####
TypeContact_project_internal_PROJECTLEADER=項目負責人
TypeContact_project_external_PROJECTLEADER=項目負責人
@@ -165,7 +167,18 @@ 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=Opened project/lead by opportunity status
ProjectsStatistics=Statistics on projects/leads
TaskAssignedToEnterTime=Task assigned. Entering time on this task should be possible.
OpenedProjectsByThirdparties=Opened projects by thirdparties
-OpportunityPonderatedAmount=Opportunities ponderated amount
+OpportunityTotalAmount=Opportunities total amount
+OpportunityPonderatedAmount=Opportunities weighted amount
+OppStatusPROSP=Prospection
+OppStatusQUAL=Qualification
+OppStatusPROPO=Proposal
+OppStatusNEGO=Negociation
+OppStatusPENDING=Pending
+OppStatusWIN=Won
+OppStatusLOST=Lost
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 4186de38c3f..d5635a4c642 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -5,7 +5,7 @@ Sendings=出貨
AllSendings=All Shipments
Shipment=出貨
Shipments=出貨
-ShowSending=Show Sending
+ShowSending=Show Shipments
Receivings=Receipts
SendingsArea=出貨
ListOfSendings=出貨清單列表
@@ -26,8 +26,8 @@ QtyToShip=出貨數量
QtyReceived=收到的數量
KeepToShip=Remain to ship
OtherSendingsForSameOrder=此訂單的其他出貨清單
-DateSending=出貨日期
-DateSendingShort=出貨日期
+DateSending=Shipping date
+DateSendingShort=Shipping date
SendingsForSameOrder=此訂單的出貨清單
SendingsAndReceivingForSameOrder=此訂單的出貨清單及收貨清單
SendingsToValidate=發送驗證
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index c257a2dfa9f..426c772d93c 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -57,7 +57,7 @@ RuleForStockManagementDecrease=<b>啟用或關閉庫存減少的管理規則</b>
RuleForStockManagementIncrease=<b>啟用或關閉庫存增加的管理規則</b>
DeStockOnBill=在供應商發票(invoice)或票據(Credit notes)驗證後，減少實際庫存量
DeStockOnValidateOrder=在客戶訂單驗證後，減少實際庫存量
-DeStockOnShipment=在出貨單驗證後，減少實際庫存量(建議採用此方法)
+DeStockOnShipment=Decrease real stocks on shipping validation
ReStockOnBill=在供應商發票(invoice)或票據(Credit notes)驗證後，增加實際庫存量
ReStockOnValidateOrder=在供應商訂單批准後，增加實際庫存量
ReStockOnDispatchOrder=在手動轉讓庫存量或供應商訂單收到後，增加實際庫存量
@@ -134,7 +134,7 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
-WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when "Product lot" module is on. It will be used to list which lot/serial are available for products requiring lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
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>).
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index 8597220991f..b263a0d4bc2 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -101,3 +101,4 @@ SaveTrip=Validate expense report
ConfirmSaveTrip=Are you sure you want to validate this expense report ?
NoTripsToExportCSV=No expense report to export for this period.
+ExpenseReportPayment=Expense report payment
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index a55687db823..922679bcb86 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -131,7 +131,6 @@ function print_paybox_redirect($PRICE,$CURRENCY,$EMAIL,$urlok,$urlko,$TAG)
$IBS_MODE=1; // Mode formulaire
$IBS_PORTEUR=$EMAIL;
$IBS_RETOUR="montant:M;ref:R;auto:A;trans:T"; // Format des parametres du get de validation en reponse (url a definir sous paybox)
- //$IBS_TXT="<div class="center"><b>".$langsiso->trans("YouWillBeRedirectedOnPayBox")."</b><br><i>".$langsiso->trans("PleaseBePatient")."...</i><br></div>";
$IBS_TXT=' '; // Use a space
$IBS_BOUTPI=$langs->trans("Wait");
//$IBS_BOUTPI='';
--
GitLab