% s b>, dar trebuie să aibă cel puțin una: cheie, valoare
ErrorFieldCanNotContainSpecialCharacters=Câmp %s trebuie să nu conţine caractere speciale.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Câmpul %s nu trebuie să conțină caractere speciale, nici litere mari.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Marja netă : Preţ vânzare - Cost de preţ
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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=Сохраняет содержимой папки с документами (%s), которая содержит все загруженные и сгенерированные файлы (вы можете использовать сжатие Zip)
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Сохраняет содержание вашей базы данных (%s) в файл. Для этого используйте следующей мастер.
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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Поле %s не содержит специальных символов.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s), ktorý obsahuje všetky nahraté a vytvorené súbory (môžete napríklad vytvoriť ZIP súbor ).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Uložiť obsah databázy (%s) 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: %s, ale potrebujete aspoň jeden: Llave, Valores
ErrorFieldCanNotContainSpecialCharacters=Terénne %s nesmie obsahuje špeciálne znaky.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Čistá marža: Predajná cena - obstarávacej ceny,
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s), ki vsebuje vse naložene in generirane datoteke (lahko na primer naredite zip datoteko).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Shranite vsebino vaše baze podatkov (%s) 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 'Date done' izpolnjeno, je aktivnost začeta (ali končana), zato polje 'Status' 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Polje %s ne sme vsebovati posebnih znakov.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Neto marža : prodajna cena - stroškovna cena
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) že obstaja, vendar z drugim datumom vstopa ali izstopa (najden je %s, vi pa ste vnesli %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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
+Accounting=Računovodstvo
+Globalparameters=Globalni parametri
+Chartofaccounts=Tabela računa
+Fiscalyear=Fiskalne godine
+Menuaccount=Računovodstveni nalozi
+Menuthirdpartyaccount=Ostali računi
+MenuTools=Alati
-ConfigAccountingExpert=Configuration of the module accounting expert
-Journaux=Journals
-JournalFinancial=Financial journals
-Exports=Exports
+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
+Selectmodelcsv=Izaberite model izvoza
+Modelcsv_normal=Klasičan izvoz
+Modelcsv_CEGID=Izvoz ka CEGID ekspertu
+BackToChartofaccounts=Vrati tabelu računa
+Back=Vrati
-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
+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=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
+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=Breakdown accounting
-AccountingVentilationSupplier=Breakdown accounting supplier
-AccountingVentilationCustomer=Breakdown accounting customer
-Line=Line
+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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 ?
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 ?
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 %s
ConfirmClassifyPaidBill=Da li ste sigurni da želite da izmenite račun %s u status "plaćeno"?
ConfirmCancelBill=Da li ste sigurni da želite da otkažete račun %s?
ConfirmCancelBillQuestion=Zašto želite da klasifikujete ovaj račun kao "napušten"?
-ConfirmClassifyPaidPartially=Are you sure you want to change invoice %s 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 %s 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 (%s %s) is a discount granted because payment was made before term. I regularise the VAT with a credit note.
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Remaining unpaid (%s %s) is a discount granted because payment was made before term. I accept to lose the VAT on this discount.
ConfirmClassifyPaidPartiallyReasonDiscountVat=Remaining unpaid (%s %s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 conf.php file, replace the line
$dolibarr_main_db_pass="...";
by
$dolibarr_main_db_pass="crypted:%s";
-InstrucToClearPass=To have password decoded (clear) into the conf.php file, replace the line
$dolibarr_main_db_pass="crypted:...";
by
$dolibarr_main_db_pass="%s";
+InstrucToEncodePass=Att ha lösenord kodad i conf.php filen, ersätt raden
$ Dolibarr_main_db_pass = "...";
av
$ Dolibarr_main_db_pass = "krypterad:%s";
+InstrucToClearPass=Att ha lösenord avkodas (klar) i conf.php filen, ersätt raden
$ Dolibarr_main_db_pass = "krypterat: ...";
av
$ Dolibarr_main_db_pass = "%s";
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: %s
+DownloadPackageFromWebSite=Hämta paket (till exempel från officiella hemsida%s).
+UnpackPackageInDolibarrRoot=Packa paketfil i Dolibarr serverkatalog tillägnad externa moduler:%s
SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten.
NotExistsDirect=Den alternativa rotkatalogen är inte definierad.
InfDirAlt=Sedab version 3 är det möjligt att definiera en alternativ rotkatalog. Detta medger en gemensam plats att lagra plugin och anpassade mallar.
Skapa en katalog i Dolibarrs rot (t.ex. custom).
InfDirExample=
Sedan förklara den i filen conf.php
$ Dolibarr_main_url_root_alt = 'http: // myserver / anpassad "
$ Dolibarr_main_document_root_alt = '/ sökväg / till / Dolibarr / htdocs / anpassad "
* 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
till exempel:
1, value1
2, värde2
3, value3
...
För att få en lista beroende på en annan:
1, value1 | parent_list_code: parent_key
2, värde2 | parent_list_code: parent_key
ExtrafieldParamHelpcheckbox=Parametrar listan måste vara som nyckel, värde
till exempel:
1, value1
2, värde2
3, value3
...
ExtrafieldParamHelpradio=Parametrar listan måste vara som nyckel, värde
till exempel:
1, value1
2, värde2
3, value3
...
@@ -397,7 +397,7 @@ ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell
Syntax:
ExtrafieldParamHelpchkbxlst=Parameterlista från en tabell
Syntax : table_name:label_field:id_field::filter
Exempel: c_typent:libelle:id::filter
filter kan vara ett enkelt test (t.ex. active=1) för att visa enbart aktiva värden
Använd extra.fieldcode=... (där fältkod är extrafält) syntax för att filtrera på extrafält.
För att få listan beroende en annan:
c_typent:libelle:id:parent_list_code|parent_column:filter
LibraryToBuildPDF=Katalog som används för att skapa PDF
WarningUsingFPDF=Varning: Din conf.php innehåller direktiv dolibarr_pdf_force_fpdf = 1. 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.
För att lösa detta och ha ett fullt stöd för PDF-generering, ladda ner TCPDF bibliotek , sedan kommentera eller ta bort linjen $ dolibarr_pdf_force_fpdf = 1, och lägg istället $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'
-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:
1 : local tax apply on products and services without vat (localtax is calculated on amount without tax)
2 : local tax apply on products and services including vat (localtax is calculated on amount + main tax)
3 : local tax apply on products without vat (localtax is calculated on amount without tax)
4 : local tax apply on products including vat (localtax is calculated on amount + main vat)
5 : local tax apply on services without vat (localtax is calculated on amount without tax)
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:
1: lokal skatt tillämpas på produkter och tjänster utan moms (localtax beräknas på belopp utan skatt)
2: lokal skatt tillämpas på produkter och tjänster, inklusive moms (localtax beräknas på belopp + huvud skatt)
3: lokal skatt tillämpas på produkter utan moms (localtax beräknas på belopp utan skatt)
4: lokal skatt tillämpas på produkter inklusive moms (localtax beräknas på belopp + huvud moms)
5: lokal skatt tillämpas på tjänster utan moms (localtax beräknas på belopp utan skatt)
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 %s
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 "%s"
+ShowBugTrackLink=Visa länken "%s"
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 ... efter detta nummer om du vill se ... 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 (%s) that contains all uploaded and generated files (you can make a zip for example).
-BackupDesc3=Save content of your database (%s) into a dump file. For this, you can use following assistant.
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
+BackupDesc3=Spara innehållet i din databas (%s) 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 (%s).
-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 (%s). 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 (%s).
+RestoreDesc3=Återställa data från en backup dumpfilen, i databasen av den nya Dolibarr installationen eller i databasen av den nuvarande anläggningen (%s). 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 %s 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 funktionsmoduler:% s* per third parties contacts (customers or suppliers), one contact at time.
* 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:
* Per tredje parter kontakter (kunder eller leverantörer), en kontakt i taget.
* 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".
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".
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 %s 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.
Exempel:
/usr/local/share/GeoIP/GeoIP.dat
/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 %s to allow this feature.
-ConfFileMuseContainCustom=Installing an external module from application save the module files into directory %s. To have this directory processed by Dolibarr, you must setup your conf/conf.php to have option
- $dolibarr_main_url_root_alt enabled to value $dolibarr_main_url_root_alt="/custom"
- $dolibarr_main_document_root_alt enabled to value "%s/custom"
-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 filen% s för att tillåta denna funktion.
+ConfFileMuseContainCustom=Installera en extern modul från ansökan spara modul filer till katalogen% s. Att ha den här katalogen behandlas av Dolibarr, måste du ställa in din conf / conf.php att ha alternativ
- $ Dolibarr_main_url_root_alt aktiverat för att värde dolibarr_main_url_root_alt = "/ custom"
- $ Dolibarr_main_document_root_alt aktiverat för att värdet "% s / anpassade"
+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: %s, men behöver åtminstone en: Llave, valores
ErrorFieldCanNotContainSpecialCharacters=Fält %s inte innehåller specialtecken.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Fältet %s får inte innehåller specialtecken eller versaler.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Nettomarginal: Säljpris - Kostnadspris
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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=บันทึกเนื้อหาของไดเรกทอรีเอกสาร (% s) ที่มีไฟล์ที่อัปโหลดและสร้างทั้งหมด (คุณสามารถทำเช่นซิป)
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=บันทึกเนื้อหาของฐานข้อมูลของคุณ (% s) ลงในแฟ้มการถ่ายโอนข้อมูล สำหรับนี้คุณสามารถใช้ผู้ช่วยต่อไปนี้
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=คุณแน่ใจหรือว่าต้องการโคลนเหตุการณ์% s?
-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=รายงานผล
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=มูลค่ารายการไม่สามารถมีมากกว่าหนึ่งมา:% s แต่ต้องไม่น้อยกว่าหนึ่ง Llave, valores
ErrorFieldCanNotContainSpecialCharacters=s สนาม% ไม่ต้องมีอักขระพิเศษ
-ErrorFieldCanNotContainSpecialNorUpperCharacters=s สนาม% ไม่ต้องมีอักขระพิเศษหรืออักขระตัวพิมพ์ใหญ่
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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.
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=ปฏิเสธการเข้าใช้
คุณพยายามที่จะเข้าถึงพื้นที่หน้าหรือคุณสมบัติของโมดูลพิการหรือไม่มีอยู่ในเซสชั่นหรือรับรองความถูกต้องที่ไม่ได้รับอนุญาตให้ผู้ใช้ของคุณ
ErrorForbidden2=การอนุญาตให้เข้าสู่ระบบนี้สามารถกำหนดได้โดยผู้ดูแลระบบ Dolibarr ของคุณจากเมนู% s ->% s
ErrorForbidden3=ดูเหมือนว่า Dolibarr ไม่ได้ใช้ผ่านเซสชั่นการตรวจสอบสิทธิ์ ลองดูที่เอกสารการติดตั้ง Dolibarr จะทราบวิธีการจัดการ authentications (htaccess, mod_auth หรืออื่น ๆ ... )
ErrorNoImagickReadimage=ระดับ Imagick ไม่พบใน PHP นี้ ไม่มีตัวอย่างสามารถใช้ได้ ผู้ดูแลระบบสามารถปิดการใช้งานแท็บนี้จากการตั้งค่าเมนู - จอแสดงผล
@@ -171,6 +171,7 @@ ErrorGlobalVariableUpdater5=ไม่มีตัวแปรทั่วโล
ErrorFieldMustBeANumeric=s สนาม% จะต้องเป็นค่าตัวเลข
ErrorFieldMustBeAnInteger=s สนาม% ต้องเป็นจำนวนเต็ม
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=ขอบดิบ: ราคาขาย - ราคาซื้อ
อัตรากำไรสุทธิ: ราคาขาย - ราคาต้นทุน
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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=จำนวนมากนี้ / หมายเลขประจำเครื่อง (% s) อยู่แล้ว แต่ด้วยความแตกต่างกันหรือ eatby วัน sellby (ที่พบ% s แต่คุณป้อน% s)
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 (%s) içeriğini kaydedin.
+BackupDesc2=Save content of documents directory (%s) 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 (%s) 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: %s, ama en az bir tane olması gerekir: anahtar, değer
ErrorFieldCanNotContainSpecialCharacters=%s alanı özel karakterler içermemelidir.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=b>%s alanı ne özel karakterler ne de büyük harfler içermemelidir.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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=%s alanı sayısal bir değer olmalıdır
ErrorFieldMustBeAnInteger=%s 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ı
Net oran : Satış fiyatı - Maliyet fiyatı
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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ı (%s) zaten var fakat farklı tüketme ya da satma tarihli bulundu (%s ama sizin girdiğiniz bu %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=Field %s must not contains special characters.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 'ngày thực hiện "được làm đầy, hành động được bắt đầu (hoặc hoàn thành), do đó lĩnh vực' Trạng thái '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 'Date done' is filled, action is started (or finished), so field 'Status' 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 đến:% s, nhưng cần ít nhất một: Llave, Valores
ErrorFieldCanNotContainSpecialCharacters=Dòng% s không được chứa các ký tự đặc biệt.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Dòng% s 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 %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
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
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=菲尔德%s必须不包含特殊字符。
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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 (%s) that contains all uploaded and generated files (you can make a zip for example).
+BackupDesc2=Save content of documents directory (%s) that contains all uploaded and generated files (So it includes all dump files generated at step 1).
BackupDesc3=Save content of your database (%s) 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 : %s, but need at least one: llave,valores
ErrorFieldCanNotContainSpecialCharacters=菲爾德%s必須不包含特殊字符。
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s must not contains special characters, nor upper case characters.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Field %s 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 %s must be a numeric value
ErrorFieldMustBeAnInteger=Field %s 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
Net margin : Selling price - Cost price
+MarginTypeDesc=Margin on best buying price : Selling price - Best supplier price defined on product card
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=啟用或關閉庫存減少的管理規則
RuleForStockManagementIncrease=啟用或關閉庫存增加的管理規則
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 (%s) already exists but with different eatby or sellby date (found %s but you enter %s).
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="".$langsiso->trans("YouWillBeRedirectedOnPayBox")."
".$langsiso->trans("PleaseBePatient")."...
";
$IBS_TXT=' '; // Use a space
$IBS_BOUTPI=$langs->trans("Wait");
//$IBS_BOUTPI='';