diff --git a/dev/fixaltlanguages.sh b/dev/fixaltlanguages.sh
index d6d1946b7d1..eec9df4b88f 100755
--- a/dev/fixaltlanguages.sh
+++ b/dev/fixaltlanguages.sh
@@ -37,8 +37,12 @@ then
export aa=`echo $dirshort | nawk -F"_" '{ print $1 }'`
export bb=`echo $dirshort | nawk -F"_" '{ print $2 }'`
aaupper=`echo $dirshort | nawk -F"_" '{ print toupper($1) }'`
+ if [ $aaupper = "EN" ]
+ then
+ aaupper="US"
+ fi
bblower=`echo $dirshort | nawk -F"_" '{ print tolower($2) }'`
- if [ "$aa" != "$bblower" ]
+ if [ "$aa" != "$bblower" -a "$bblower" != "us" ]
then
reflang="htdocs/langs/"$aa"_"$aaupper
if [ -d $reflang ]
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 290a5eb67b5..2777d5fac6a 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=تجريبية
VersionDevelopment=تطويرية
VersionUnknown=غير معروفة
VersionRecommanded=موصى بها
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=رمز المرحلة
SessionSaveHandler=معالج لحفظ المراحل
SessionSavePath=مرحلة التخزين المحلية
@@ -493,10 +498,16 @@ Module600Name=الإخطارات
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=التبرعات
Module700Desc=التبرعات إدارة
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=فرس النبي
Module1200Desc=فرس النبي التكامل
Module1400Name=المحاسبة
Module1400Desc=المحاسبة الإدارية (ضعف الأحزاب)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=الفئات
Module1780Desc=الفئات إدارة المنتجات والموردين والزبائن)
Module2000Name=Fckeditor
@@ -631,7 +642,7 @@ Permission181=قراءة مورد أوامر
Permission182=إنشاء / تغيير المورد أوامر
Permission183=صحة أوامر المورد
Permission184=الموافقة على أوامر المورد
-Permission185=من أجل المورد أوامر
+Permission185=Order or cancel supplier orders
Permission186=تلقي أوامر المورد
Permission187=وثيقة أوامر المورد
Permission188=المورد إلغاء أوامر
@@ -711,6 +722,13 @@ Permission538=تصدير الخدمات
Permission701=قراءة التبرعات
Permission702=إنشاء / تعديل والهبات
Permission703=حذف التبرعات
+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
Permission1001=قراءة مخزونات
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=كلمة مرور لاستخدام الملقم الوكيل
DefineHereComplementaryAttributes=هنا تعريف جميع atributes، لا تتوفر بالفعل افتراضيا، والتي تريد أن تدعم ل%s.
ExtraFields=تكميلية سمات
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=خط من المنتجات / الخدمات ذات ا
FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=أوامر إدارة الإعداد
OrdersNumberingModules=أوامر الترقيم نمائط
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=الباركود نوع من اتحاد الوطنيين الكو
BarcodeDescISBN=الباركود من نوع ردمك
BarcodeDescC39=الباركود من نوع C39
BarcodeDescC128=الباركود من نوع C128
-GenbarcodeLocation=باركود الجيل سطر أداة تستخدمها phpbarcode المحرك لبعض أنواع باركود)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
CashDeskBankAccountForCheque= حساب لاستخدام لتلقي المدفوعات عن طريق الشيكات
CashDeskBankAccountForCB= حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=إعداد وحدة المرجعية
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 4a6dabe894e..3f25d223c75 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=المصالحة
RIB=رقم الحساب المصرفي
IBAN=عدد إيبان
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=بيك / سويفت عدد
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=أوامر دائمة
StandingOrder=من أجل الوقوف
Withdrawals=انسحابات
@@ -148,7 +152,7 @@ BackToAccount=إلى حساب
ShowAllAccounts=وتبين للجميع الحسابات
FutureTransaction=الصفقة في أجل المستقبل. أي وسيلة للتوفيق.
SelectChequeTransactionAndGenerate=حدد / تصفية الشيكات لتشمل في الاختيار استلام الودائع وانقر على "إنشاء".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/ar_SA/commercial.lang b/htdocs/langs/ar_SA/commercial.lang
index 2ddffcb0a05..9f0e152a7dc 100644
--- a/htdocs/langs/ar_SA/commercial.lang
+++ b/htdocs/langs/ar_SA/commercial.lang
@@ -9,9 +9,9 @@ Prospect=احتمال
Prospects=آفاق
DeleteAction=حذف عمل / المهمة
NewAction=عمل جديدة / المهمة
-AddAction=أضف العمل / المهمة
-AddAnAction=إضافة عمل / المهمة
-AddActionRendezVous=إضافة مهمة رانديفو
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=الموعد
ConfirmDeleteAction=هل أنت متأكد من أنك تريد حذف هذه المهمة؟
CardAction=بطاقة العمل
@@ -44,8 +44,8 @@ DoneActions=إجراءات عمله
DoneActionsFor=إجراءات لعمله ق ٪
ToDoActions=عدم اكتمال الإجراءات
ToDoActionsFor=لعدم اكتمال الإجراءات ق ٪
-SendPropalRef=اقتراح ارسال التجارية ق ٪
-SendOrderRef=من أجل إرسال المستندات ٪
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=لا ينطبق
StatusActionToDo=القيام
StatusActionDone=فعل
@@ -62,7 +62,7 @@ LastProspectContactDone=الاتصال به
DateActionPlanned=تاريخ العمل المزمع
DateActionDone=تاريخ العمل به
ActionAskedBy=طلبت العمل
-ActionAffectedTo=العمل على المتضررين
+ActionAffectedTo=Event assigned to
ActionDoneBy=العمل الذي قام به
ActionUserAsk=التي سجلتها
ErrorStatusCantBeZeroIfStarted=إذا كان المجال 'تاريخ عمله هو شغلها ، وبدأ العمل (أو انتهت) ، وذلك الميدان' الحالة 'لا يمكن أن يكون 0 ٪ ٪.
diff --git a/htdocs/langs/ar_SA/contracts.lang b/htdocs/langs/ar_SA/contracts.lang
index 133036960c0..8c181b2fba4 100644
--- a/htdocs/langs/ar_SA/contracts.lang
+++ b/htdocs/langs/ar_SA/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=انتهى
ServiceStatusClosed=مغلقة
ServicesLegend=خدمات أسطورة
Contracts=عقود
+ContractsAndLine=Contracts and line of contracts
Contract=العقد
NoContracts=أي عقود
MenuServices=الخدمات
diff --git a/htdocs/langs/ar_SA/cron.lang b/htdocs/langs/ar_SA/cron.lang
index 46751a39fdb..c3c9b446364 100644
--- a/htdocs/langs/ar_SA/cron.lang
+++ b/htdocs/langs/ar_SA/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 87a2b76ac3d..4635ed9b4be 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكو
ErrorBadThirdPartyName=سوء قيمة اسم طرف ثالث
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=سوء تركيب الزبون مدونة
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=رمز العميل المطلوبة
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=الشفرة المستخدمة بالفعل العملاء
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=يجب عدم تعطيل جافا سكريبت لج
ErrorPasswordsMustMatch=ويجب على كلا كلمات المرور المكتوبة تطابق بعضها البعض
ErrorContactEMail=وقع خطأ فني. من فضلك، اتصل بمسؤول إلى البريد الإلكتروني بعد %s EN توفير %s رمز الخطأ في رسالتك، أو حتى أفضل من خلال إضافة نسخة شاشة من هذه الصفحة.
ErrorWrongValueForField=قيمة خاطئة لعدد %s الحقل (قيمة '%s' لا يتطابق %s حكم [رجإكس])
-ErrorFieldValueNotIn=قيمة خاطئة ل%s عدد حقل ('%s "قيمة ليست قيمة المتاحة في مجال %s %s الجدول)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=قيمة خاطئة ل%s عدد حقل ('%s "قيمة ليست المرجع %s موجود)
ErrorsOnXLines=الأخطاء على خطوط مصدر %s
ErrorFileIsInfectedWithAVirus=وكان برنامج مكافحة الفيروسات غير قادرة على التحقق من صحة الملف (ملف قد يكون مصابا بواسطة فيروس)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 589343ad052..b805743f44f 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=الخطوة الأخيرة : تعريف المس
ActivateModule=تفعيل وحدة %s
ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 64e8da49c42..45649f61d53 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -141,6 +141,7 @@ Cancel=الغاء
Modify=تعديل
Edit=تحرير
Validate=صحة
+ValidateAndApprove=Validate and Approve
ToValidate=للمصادقة
Save=حفظ
SaveAs=حفظ باسم
@@ -158,6 +159,7 @@ Search=بحث
SearchOf=البحث
Valid=صحيح
Approve=الموافقة
+Disapprove=Disapprove
ReOpen=إعادة فتح
Upload=ارسال الملف
ToLink=Link
@@ -219,6 +221,7 @@ Cards=بطاقات
Card=بطاقة
Now=الآن
Date=تاريخ
+DateAndHour=Date and hour
DateStart=تاريخ البدء
DateEnd=نهاية التاريخ
DateCreation=تاريخ الإنشاء
@@ -295,6 +298,7 @@ UnitPriceHT=سعر الوحدة (صافي)
UnitPriceTTC=سعر الوحدة
PriceU=ارتفاع
PriceUHT=ارتفاع (صافي)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=ارتفاع
Amount=مبلغ
AmountInvoice=مبلغ الفاتورة
@@ -521,6 +525,7 @@ DateFromTo=ل٪ من ق ق ٪
DateFrom=من ق ٪
DateUntil=حتى ق ٪
Check=فحص
+Uncheck=Uncheck
Internal=الداخلية
External=الخارجية
Internals=الداخلية
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=يوم الاثنين
Tuesday=الثلاثاء
diff --git a/htdocs/langs/ar_SA/orders.lang b/htdocs/langs/ar_SA/orders.lang
index c3188102774..24a7db59d86 100644
--- a/htdocs/langs/ar_SA/orders.lang
+++ b/htdocs/langs/ar_SA/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=ألغى
StatusOrderDraft=مشروع (لا بد من التحقق من صحة)
StatusOrderValidated=صادق
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=تجهيز
StatusOrderToBill=على مشروع قانون
StatusOrderToBill2=على مشروع قانون
@@ -58,6 +59,7 @@ MenuOrdersToBill=أوامر لمشروع قانون
MenuOrdersToBill2=Billable orders
SearchOrder=من أجل البحث
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=سفينة المنتج
Discount=الخصم
CreateOrder=خلق أمر
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 4500fbcdd8b..8154a44c9ea 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -54,12 +54,13 @@ MaxSize=الحجم الأقصى
AttachANewFile=إرفاق ملف جديد / وثيقة
LinkedObject=ربط وجوه
Miscellaneous=متفرقات
-NbOfActiveNotifications=عدد الإخطارات
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=هذا هو الاختبار الإلكتروني. تكون مفصولة \\ nThe سطرين من قبل حرف إرجاع.
PredefinedMailTestHtml=هذا هو البريد الاختبار (الاختبار يجب أن تكون في كلمة جريئة).
وتفصل بين الخطين من قبل حرف إرجاع.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index dce6ac36fea..e79c928e86b 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 8e9925f168a..b1625a43fdf 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -8,8 +8,10 @@ SharedProject=مشاريع مشتركة
PrivateProject=اتصالات من المشروع
MyProjectsDesc=ويقتصر هذا الرأي على المشاريع التي تقوم على الاتصال (كل ما هو نوع).
ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
MyTasksDesc=ويقتصر هذا الرأي على المشروعات أو المهام التي هي الاتصال للحصول على (ما هو نوع).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
ProjectsArea=مشاريع المنطقة
@@ -29,6 +31,8 @@ NoProject=لا يعرف أو المملوكة للمشروع
NbOpenTasks=ملاحظة : من مهام فتح
NbOfProjects=ملاحظة : للمشاريع
TimeSpent=الوقت الذي تستغرقه
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=قضى وقتا
RefTask=المرجع. مهمة
LabelTask=علامة مهمة
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=قائمة الموردين الأوامر
ListSupplierInvoicesAssociatedProject=قائمة الموردين المرتبطة بالمشروع.
ListContractAssociatedProject=قائمة العقود المرتبطة بالمشروع.
ListFichinterAssociatedProject=قائمة التدخلات المرتبطة بالمشروع
-ListTripAssociatedProject=قائمة من الرحلات والنفقات المرتبطة بالمشروع
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=قائمة الإجراءات المرتبطة بالمشروع
ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ar_SA/salaries.lang b/htdocs/langs/ar_SA/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/ar_SA/salaries.lang
+++ b/htdocs/langs/ar_SA/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ar_SA/sendings.lang b/htdocs/langs/ar_SA/sendings.lang
index ef76283c5de..ba8a8febbad 100644
--- a/htdocs/langs/ar_SA/sendings.lang
+++ b/htdocs/langs/ar_SA/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=الكمية أمرت
QtyShipped=الكمية المشحونة
QtyToShip=لشحن الكمية
QtyReceived=الكمية الواردة
-KeepToShip=إبقاء لشحن
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=الإرسال الأخرى لهذا النظام
DateSending=وحتى الآن من أجل إرسال
DateSendingShort=وحتى الآن من أجل إرسال
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 9e6ab293234..965feeea1bc 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=المتوسط المرجح لسعر
PMPValueShort=الواب
EnhancedValueOfWarehouses=قيمة المستودعات
UserWarehouseAutoCreate=خلق مخزون تلقائيا عند إنشاء مستخدم
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=ارسال كمية
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index 405d15954ba..622c3c5575d 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=الموردين
-Supplier=المورد
AddSupplier=Create a supplier
SupplierRemoved=إزالة المورد
SuppliersInvoice=فاتورة الموردين
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=فواتير الموردين والمدفوعات
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=الموافقة على هذا النظام
ConfirmApproveThisOrder=هل أنت متأكد من أن يوافق على هذا الأمر؟
-DenyingThisOrder=ونفى هذا الأمر
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=هل أنت متأكد من إنكار هذا الأمر؟
ConfirmCancelThisOrder=هل أنت متأكد من أنك تريد إلغاء هذا النظام؟
AddCustomerOrder=العملاء من أجل خلق
diff --git a/htdocs/langs/ar_SA/trips.lang b/htdocs/langs/ar_SA/trips.lang
index a0e4ca8661a..fadc1044001 100644
--- a/htdocs/langs/ar_SA/trips.lang
+++ b/htdocs/langs/ar_SA/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=رحلة
-Trips=رحلات
-TripsAndExpenses=ونفقات الرحلات
-TripsAndExpensesStatistics=رحلات ونفقات إحصاءات
-TripCard=بطاقة زيارة
-AddTrip=إضافة رحلة
-ListOfTrips=قائمة الرحلات
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=قائمة الرسوم
-NewTrip=رحلة جديدة
+NewTrip=New expense report
CompanyVisited=الشركة / المؤسسة زارت
Kilometers=كم
FeesKilometersOrAmout=كم المبلغ أو
-DeleteTrip=رحلة حذف
-ConfirmDeleteTrip=هل أنت متأكد من أنك تريد حذف هذه الرحلة؟
-TF_OTHER=أخرى
-TF_LUNCH=غداء
-TF_TRIP=رحلة
-ListTripsAndExpenses=قائمة الرحلات والمصاريف
-ExpensesArea=رحلات ومنطقة النفقات
-SearchATripAndExpense=بحث عن رحلة والنفقات
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=أخرى
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=غداء
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index 6b3cc24a468..e1d603d5a23 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Експериментален
VersionDevelopment=Разработка
VersionUnknown=Неизвестен
VersionRecommanded=Препоръчва се
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID на сесията
SessionSaveHandler=Handler за да запазите сесията
SessionSavePath=Място за съхранение на сесията
@@ -294,7 +299,7 @@ DoNotUseInProduction=Не използвайте на продукшън пла
ThisIsProcessToFollow=Това е настройка на процеса:
StepNb=Стъпка %s
FindPackageFromWebSite=Намери пакет, който осигурява функция искате (например относно официалния уеб сайт %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Изтегляне на пакет %s.
UnpackPackageInDolibarrRoot=Разопаковайте пакет файл в главната директория %s Dolibarr
SetupIsReadyForUse=Install е завършен и Dolibarr е готов за използване с този нов компонент.
NotExistsDirect=Алтернатива главната директория не е дефинирано.
@@ -311,7 +316,7 @@ GenericMaskCodes3=Всички други символи на маската щ
GenericMaskCodes4a=Пример за използване на 99 %s на третата страна КОМПАНИЯТА извършва 2007-01-31:
GenericMaskCodes4b=Пример за трета страна е създаден на 2007-03-01:
GenericMaskCodes4c=Пример за продукт, създаден на 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100@1}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
+GenericMaskCodes5=ABC{yy}{mm}-{000000} ще даде ABC0701-000099
{0000+100@1}-ZZZ/{dd} / XXX ще даде 0199-ZZZ/31/XXX
GenericNumRefModelDesc=Върнете адаптивни номер според определен маска.
ServerAvailableOnIPOrPort=Сървър е достъпна на адрес %s на порт %s
ServerNotAvailableOnIPOrPort=Сървърът не е достъпен на адрес %s на порт %s
@@ -335,7 +340,7 @@ LanguageFilesCachedIntoShmopSharedMemory=Файлове. Lang заредени
ExamplesWithCurrentSetup=Примери с текущата настройка
ListOfDirectories=Списък на OpenDocument директории шаблони
ListOfDirectoriesForModelGenODT=Списък на директории, съдържащи шаблони файлове с OpenDocument формат.
Тук можете да въведете пълния път на директории.
Добави за връщане между указател ие.
За да добавите директория на GED модул, добавете тук на DOL_DATA_ROOT / ECM / yourdirectoryname.
Файлове в тези директории, трябва да завършва с. ODT.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
+NumberOfModelFilesFound=Брой на ODT файлове шаблони, намерени в тези директории
ExampleOfDirectoriesForModelGen=Примери на синтаксиса:
C: \\ mydir
/ Начало / mydir
DOL_DATA_ROOT / ECM / ecmdir
FollowingSubstitutionKeysCanBeUsed=
За да разберете как да създадете свои ODT шаблони на документи, преди да ги съхранявате в тези указатели, прочетете уики документация:
FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
@@ -369,19 +374,19 @@ NewVATRates=Нов ставка на ДДС
PriceBaseTypeToChange=Промяна на цените с база референтна стойност, определена на
MassConvert=Стартиране маса конвертирате
String=Низ
-TextLong=Long text
-Int=Integer
-Float=Float
+TextLong=Дълъг текст
+Int=Цяло число
+Float=Десетично число
DateAndTime=Дата и час
-Unique=Unique
-Boolean=Boolean (Checkbox)
+Unique=Уникално
+Boolean=Логическо (Отметка)
ExtrafieldPhone = Телефон
ExtrafieldPrice = Цена
ExtrafieldMail = Имейл
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
-ExtrafieldCheckBox=Checkbox
+ExtrafieldSelect = Избор лист
+ExtrafieldSelectList = Избор от таблица
+ExtrafieldSeparator=Разделител
+ExtrafieldCheckBox=Отметка
ExtrafieldRadio=Радио бутон
ExtrafieldCheckBoxFromList= Checkbox from table
ExtrafieldParamHelpselect=Parameters list have to be like key,value
for example :
1,value1
2,value2
3,value3
...
In order to have the list depending on another :
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
@@ -389,16 +394,16 @@ ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value
fo
ExtrafieldParamHelpradio=Parameters list have to be like key,value
for example :
1,value1
2,value2
3,value3
...
ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
+LibraryToBuildPDF=Библиотека използвана за направа на PDF
WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $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 (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
SMS=SMS
LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user %s (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+RefreshPhoneLink=Обнови връзка
+LinkToTest=Генерирана е връзка за потребител %s (натиснете телефонния номер за тест)
+KeepEmptyToUseDefault=Оставете празно за стойност по подразбиране
+DefaultLink=Връзка по подразбиране
+ValueOverwrittenByUserSetup=Внимание, тази стойност може да бъде презаписана от потребителски настройки (всеки потребител може да зададе собствен натисни-набери адрес)
ExternalModule=Външен модул - инсталиран в директория %s
BarcodeInitForThirdparties=Mass barcode init for thirdparties
BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
@@ -443,8 +448,8 @@ Module52Name=Запаси
Module52Desc=Управление на склад (продукти)
Module53Name=Услуги
Module53Desc=Управление на услуги
-Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or reccuring subscriptions)
+Module54Name=Договори/Абонаменти
+Module54Desc=Управление на договори (услуги или абонаменти)
Module55Name=Баркодове
Module55Desc=Управление на баркод
Module56Name=Телефония
@@ -481,7 +486,7 @@ Module320Name=RSS емисия
Module320Desc=Добавяне на RSS емисия в страниците на Dolibarr
Module330Name=Отметки
Module330Desc=Управление на отметки
-Module400Name=Projects/Opportunities/Leads
+Module400Name=Проекти/Възможности
Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
Module410Name=Webcalendar
Module410Desc=Webcalendar интеграция
@@ -493,10 +498,16 @@ Module600Name=Известия
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Дарения
Module700Desc=Управление на дарения
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Богомолка
Module1200Desc=Mantis интеграция
Module1400Name=Счетоводство
Module1400Desc=Управление на счетоводство (двойни страни)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Категории
Module1780Desc=Управление на категории (продукти, доставчици и клиенти)
Module2000Name=WYSIWYG редактор
@@ -631,7 +642,7 @@ Permission181=Доставчика поръчки
Permission182=Създаване / промяна на доставчика поръчки
Permission183=Проверка на доставчика поръчки
Permission184=Одобряване на доставчика поръчки
-Permission185=Поръчка доставчика поръчки
+Permission185=Order or cancel supplier orders
Permission186=Получаване на доставчика поръчки
Permission187=Близки поръчки доставчици
Permission188=Отказ доставчика поръчки
@@ -711,6 +722,13 @@ Permission538=Износ услуги
Permission701=Прочети дарения
Permission702=Създаване / промяна на дарения
Permission703=Изтриване на дарения
+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
Permission1001=Прочети запаси
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Парола, за да използвате прокси сър
DefineHereComplementaryAttributes=Определете тук всички atributes, не е налична по подразбиране, и че искате да се поддържа за %s.
ExtraFields=Допълнителни атрибути
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Линия на продукт / услуга с ну
FreeLegalTextOnProposal=Свободен текст на търговски предложения
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Настройки за управление на поръчки
OrdersNumberingModules=Поръчки номериране модули
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Баркод от тип UPC
BarcodeDescISBN=Баркод от тип ISBN
BarcodeDescC39=Баркод от типа С39
BarcodeDescC128=Баркод от тип C128
-GenbarcodeLocation=Бар код поколение инструмент за командния ред (използва се от двигател с вътрешно за някои видове баркод)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Акаунт по подразбиране да се използва за получаване на парични плащания
CashDeskBankAccountForCheque= Акаунт по подразбиране да се използва за получаване на плащания с чек
CashDeskBankAccountForCB= Акаунт по подразбиране да се използва за получаване на парични плащания с кредитни карти
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark настройка модул
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/bg_BG/banks.lang b/htdocs/langs/bg_BG/banks.lang
index ffd304d841c..e609966ddf7 100644
--- a/htdocs/langs/bg_BG/banks.lang
+++ b/htdocs/langs/bg_BG/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Помирение
RIB=Номер на банкова сметка
IBAN=IBAN номер
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT номер
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Постоянни поръчки
StandingOrder=Постоянна поръчка
Withdrawals=Тегления
@@ -148,7 +152,7 @@ BackToAccount=Обратно към сметка
ShowAllAccounts=Покажи за всички сметки
FutureTransaction=Транзакция в FUTUR. Няма начин за помирение.
SelectChequeTransactionAndGenerate=Изберете / филтрирате проверки, за да се включи в проверка за получаването на депозит и кликнете върху "Създаване".
-InputReceiptNumber=Изберете банково извлечение, свързани с процедурата по съгласуване. Използвайте подреждане числова стойност (като YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=В крайна сметка, да посочите категорията, в която да се класифицират записи
ToConciliate=За помирение?
ThenCheckLinesAndConciliate=След това проверете линии в отчета на банката и кликнете
diff --git a/htdocs/langs/bg_BG/boxes.lang b/htdocs/langs/bg_BG/boxes.lang
index 8695bdf4edd..77d4e23521f 100644
--- a/htdocs/langs/bg_BG/boxes.lang
+++ b/htdocs/langs/bg_BG/boxes.lang
@@ -12,13 +12,14 @@ BoxLastProspects=Последно променени prospects
BoxLastCustomers=Последно променени клиенти
BoxLastSuppliers=Последно променени доставчици
BoxLastCustomerOrders=Последни поръчки на клиентите
+BoxLastValidatedCustomerOrders=Последни проверени клиентски поръчки
BoxLastBooks=Последни книги
BoxLastActions=Последни действия
BoxLastContracts=Последните договори
BoxLastContacts=Последните контакти/адреси
BoxLastMembers=Последните членове
BoxFicheInter=Последните намеси
-BoxCurrentAccounts=Opened accounts balance
+BoxCurrentAccounts=Открити сметки баланс
BoxSalesTurnover=Оборот от продажби
BoxTotalUnpaidCustomerBills=Общо неплатени фактури на клиента
BoxTotalUnpaidSuppliersBills=Общо неплатени фактури на доставчика
@@ -27,26 +28,29 @@ BoxTitleNbOfCustomers=Брой клиенти
BoxTitleLastRssInfos=Последните %s новини от %s
BoxTitleLastProducts=Последните %s променени продукти/услуги
BoxTitleProductsAlertStock=Предупреждение за наличност на продукти
-BoxTitleLastCustomerOrders=Последните %s променени поръчки от клиенти
+BoxTitleLastCustomerOrders=Последни %s поръчки на клиенти
+BoxTitleLastModifiedCustomerOrders=Последни %s променени клиентски поръчки
BoxTitleLastSuppliers=Последните %s записани доставчици
BoxTitleLastCustomers=Последните %s записани клиенти
BoxTitleLastModifiedSuppliers=Последните %s променени доставчици
BoxTitleLastModifiedCustomers=Последните %s променени клиенти
-BoxTitleLastCustomersOrProspects=Последните %s променени клиенти или prospects
-BoxTitleLastPropals=Последните %s записани предложения
+BoxTitleLastCustomersOrProspects=Последни %s клиенти или потенциални
+BoxTitleLastPropals=Последни %s предложения
+BoxTitleLastModifiedPropals=Последни %s променени предложения
BoxTitleLastCustomerBills=Последните %s фактури на клиента
+BoxTitleLastModifiedCustomerBills=Последни %s променени клиентски фактури
BoxTitleLastSupplierBills=Последните %s фактури на доставчика
-BoxTitleLastProspects=Последните %s записани prospects
+BoxTitleLastModifiedSupplierBills=Последни %s променени фактури от доставчик
BoxTitleLastModifiedProspects=Последните %s променени prospects
BoxTitleLastProductsInContract=Последните %s продукти / услуги в договора
-BoxTitleLastModifiedMembers=Последните %s променени членове
+BoxTitleLastModifiedMembers=Последни %s членове
BoxTitleLastFicheInter=Последните %s променени intervention
-BoxTitleOldestUnpaidCustomerBills=Старите %s неплатени фактури на клиента
-BoxTitleOldestUnpaidSupplierBills=Старите %s неплатени фактури на доставчика
-BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleOldestUnpaidCustomerBills=Най-стари %s неплатени клиентски фактури
+BoxTitleOldestUnpaidSupplierBills=Най-стари %s неплатени фактури доставчик
+BoxTitleCurrentAccounts=Открити сметки баланси
BoxTitleSalesTurnover=Оборот от продажби
-BoxTitleTotalUnpaidCustomerBills=Неплатени фактури на клиента
-BoxTitleTotalUnpaidSuppliersBills=Неплатени фактури на доставчика
+BoxTitleTotalUnpaidCustomerBills=Неплатени клиентски фактури
+BoxTitleTotalUnpaidSuppliersBills=Неплатени доставни фактури
BoxTitleLastModifiedContacts=Последните %s променени контакти/адреси
BoxMyLastBookmarks=Последните ми %s отметки
BoxOldestExpiredServices=Най-старите действащи изтекли услуги
@@ -74,18 +78,19 @@ NoRecordedProducts=Няма регистрирани продукти / услу
NoRecordedProspects=Няма регистрирани перспективи
NoContractedProducts=Няма договорени продукти / услуги
NoRecordedContracts=Няма регистрирани договори
-NoRecordedInterventions=No recorded interventions
+NoRecordedInterventions=Няма записани намеси
BoxLatestSupplierOrders=Последни поръчки доставчика
-BoxTitleLatestSupplierOrders=%s новите поръчки доставчика
+BoxTitleLatestSupplierOrders=Последни %s поръчки за доставка
+BoxTitleLatestModifiedSupplierOrders=Последни %s променени поръчки от доставчик
NoSupplierOrder=Не са познати доставчик за
-BoxCustomersInvoicesPerMonth=Customer invoices per month
-BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-BoxCustomersOrdersPerMonth=Customer orders per month
-BoxSuppliersOrdersPerMonth=Supplier orders per month
-BoxProposalsPerMonth=Proposals per month
+BoxCustomersInvoicesPerMonth=Клиентски фактури за месец
+BoxSuppliersInvoicesPerMonth=Доставчик фактури за месец
+BoxCustomersOrdersPerMonth=Клиентски заявки за месец
+BoxSuppliersOrdersPerMonth=Доставчик поръчки за месец
+BoxProposalsPerMonth=Предложения за месец
NoTooLowStockProducts=Няма продукт в наличност под минималната
-BoxProductDistribution=Products/Services distribution
-BoxProductDistributionFor=Distribution of %s for %s
+BoxProductDistribution=Продукти/Услуги разпределение
+BoxProductDistributionFor=Разпределение на %s за %s
ForCustomersInvoices=Клиента фактури
-ForCustomersOrders=Customers orders
+ForCustomersOrders=Клиентски поръчки
ForProposals=Предложения
diff --git a/htdocs/langs/bg_BG/cashdesk.lang b/htdocs/langs/bg_BG/cashdesk.lang
index 4328519b645..81c14e6e6ff 100644
--- a/htdocs/langs/bg_BG/cashdesk.lang
+++ b/htdocs/langs/bg_BG/cashdesk.lang
@@ -12,7 +12,7 @@ CashDeskProducts=Продукти
CashDeskStock=Наличност
CashDeskOn=на
CashDeskThirdParty=Трета страна
-CashdeskDashboard=Point of sale access
+CashdeskDashboard=Достъп до точка на продажбите
ShoppingCart=Количка за пазаруване
NewSell=Нов продажба
BackOffice=Обратно офис
@@ -36,5 +36,5 @@ BankToPay=Банкова сметка
ShowCompany=Покажи фирмата
ShowStock=Покажи склад
DeleteArticle=Кликнете, за да се премахне тази статия
-FilterRefOrLabelOrBC=Search (Ref/Label)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Търсене (Номер/Заглавие)
+UserNeedPermissionToEditStockToUsePos=Запитвате за намаляване на стоки при създаване на фактура, така че потребителя използващ ТП трябва да е с привилегии да редактира стоки.
diff --git a/htdocs/langs/bg_BG/categories.lang b/htdocs/langs/bg_BG/categories.lang
index a6142468ddf..9e969cad703 100644
--- a/htdocs/langs/bg_BG/categories.lang
+++ b/htdocs/langs/bg_BG/categories.lang
@@ -50,7 +50,7 @@ SupplierIsInCategories=Третото лице е в следните катег
CompanyIsInCustomersCategories=Това трето лице е в следните категории клиенти/prospects
CompanyIsInSuppliersCategories=Това трето лице е в следните категории доставчици
MemberIsInCategories=Този член е в следните категории членове
-ContactIsInCategories=This contact owns to following contacts categories
+ContactIsInCategories=Този контакт принадлежи на следните категории контакти
ProductHasNoCategory=Този продукт/услуга не е в никакви категории
SupplierHasNoCategory=Този доставчик не е в никакви категории
CompanyHasNoCategory=Тази фирма не е в никакви категории
@@ -66,7 +66,7 @@ ReturnInCompany=Обратно към картата на клиента/prospe
ContentsVisibleByAll=Съдържанието ще се вижда от всички
ContentsVisibleByAllShort=Съдържанието е видимо от всички
ContentsNotVisibleByAllShort=Съдържанието не е видимо от всички
-CategoriesTree=Categories tree
+CategoriesTree=Категории дърво
DeleteCategory=Изтриване на категория
ConfirmDeleteCategory=Сигурни ли сте, че желаете да изтриете тази категория?
RemoveFromCategory=Премахване на връзката с категория
@@ -96,17 +96,17 @@ CatSupList=Списък на доставчика категории
CatCusList=Списък на потребителите / перспективата категории
CatProdList=Списък на продуктите категории
CatMemberList=Списък на членовете категории
-CatContactList=List of contact categories and contact
-CatSupLinks=Links between suppliers and categories
-CatCusLinks=Links between customers/prospects and categories
-CatProdLinks=Links between products/services and categories
-CatMemberLinks=Links between members and categories
+CatContactList=Лист на контактни категории и контакти
+CatSupLinks=Връзки между доставчици и категории
+CatCusLinks=Връзки между потребител/перспектива и категории
+CatProdLinks=Връзки между продукти/услуги и категории
+CatMemberLinks=Връзки между членове и категории
DeleteFromCat=Премахване от категорията
-DeletePicture=Picture delete
-ConfirmDeletePicture=Confirm picture deletion?
-ExtraFieldsCategories=Complementary attributes
-CategoriesSetup=Categories setup
-CategorieRecursiv=Link with parent category automatically
-CategorieRecursivHelp=If activated, product will also linked to parent category when adding into a subcategory
+DeletePicture=Изтрий снимка
+ConfirmDeletePicture=Потвърди изтриване на снимка?
+ExtraFieldsCategories=Допълнителни атрибути
+CategoriesSetup=Категории настройка
+CategorieRecursiv=Автоматично свързване с родителска категория
+CategorieRecursivHelp=Ако е активирано, продукта ще бъде свързан също и с родителската категория при добавяне в под-категория
AddProductServiceIntoCategory=Add the following product/service
ShowCategory=Show category
diff --git a/htdocs/langs/bg_BG/commercial.lang b/htdocs/langs/bg_BG/commercial.lang
index dfcb852b7d6..b194f60814c 100644
--- a/htdocs/langs/bg_BG/commercial.lang
+++ b/htdocs/langs/bg_BG/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Перспектива
Prospects=Перспективи
DeleteAction=Изтриване на събитие / задача
NewAction=Ново събитие/задача
-AddAction=Добавяне на събитие/задача
-AddAnAction=Добавяне на събитие/задача
-AddActionRendezVous=Добави събитие - среща
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Среща
ConfirmDeleteAction=Сигурни ли сте, че желаете да изтриете това събитие/задача?
CardAction=Карта на/за събитие
@@ -44,8 +44,8 @@ DoneActions=Завършени събития
DoneActionsFor=Завършени събития за %s
ToDoActions=Непълни събития
ToDoActionsFor=Непълни събития за %s
-SendPropalRef=Изпратете търговски %s предложение
-SendOrderRef=Изпрати ред %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Не е приложимо
StatusActionToDo=За да направите
StatusActionDone=Пълен
@@ -62,7 +62,7 @@ LastProspectContactDone=Свържи се направи
DateActionPlanned=Дата на събитието, планирано за
DateActionDone=Дата на събитието направи
ActionAskedBy=Събитие докладвани от
-ActionAffectedTo=Събитие засегнати в
+ActionAffectedTo=Event assigned to
ActionDoneBy=Събитие, извършена от
ActionUserAsk=Съобщените от
ErrorStatusCantBeZeroIfStarted=Ако се попълва поле "Дата", действието се стартира (или завършен), така че "Статус" Полето не може да бъде 0%.
diff --git a/htdocs/langs/bg_BG/contracts.lang b/htdocs/langs/bg_BG/contracts.lang
index 1aa00c03e0e..dc09a470545 100644
--- a/htdocs/langs/bg_BG/contracts.lang
+++ b/htdocs/langs/bg_BG/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Изтекла
ServiceStatusClosed=Затворен
ServicesLegend=Услуги легенда
Contracts=Договори
+ContractsAndLine=Contracts and line of contracts
Contract=Договор
NoContracts=Не договори
MenuServices=Услуги
diff --git a/htdocs/langs/bg_BG/cron.lang b/htdocs/langs/bg_BG/cron.lang
index 47c14375e46..9bd0fcaa449 100644
--- a/htdocs/langs/bg_BG/cron.lang
+++ b/htdocs/langs/bg_BG/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Терминална команда
CronMenu=Крон (софтуер за изпънение на автоматични задачи)
CronCannotLoadClass=Неможе да се зареди класа %s или обекта %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 0db0a31c373..6231717fdd5 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Източника и целите на банк
ErrorBadThirdPartyName=Неправилна стойност за името на трета страна
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad синтаксис за код на клиента
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Клиентите изисква код
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Клиентът код вече се използва
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript не трябва да бъдат хор
ErrorPasswordsMustMatch=Двете машинописни пароли трябва да съвпадат помежду си
ErrorContactEMail=Техническа грешка. Моля, свържете се с администратора след имейл %s EN предоставят на %s код на грешка в съобщението си, или още по-добре чрез добавяне на екран копие на тази страница.
ErrorWrongValueForField=Грешна стойност за номер на полето %s ("%s" стойността не съответства на регулярни изрази върховенството %s)
-ErrorFieldValueNotIn=Грешна стойност за %s номер на полето (стойност "%s" не е стойност в полеви %s трапезни %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Грешна стойност за номер на полето %s ("%s стойност не е %s съществуващия код)
ErrorsOnXLines=Грешки на %s изходни линии
ErrorFileIsInfectedWithAVirus=Антивирусна програма не е в състояние да валидира файла (файл може да бъде заразен с вирус)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Задължителни параметри на настройката все още не са определени
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index 51f011d6708..8f31aacacc0 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Последна стъпка: Определет
ActivateModule=Активиране на модул %s
ShowEditTechnicalParameters=Натиснете тук за да покажете/редактирате параметрите за напреднали (експертен режим)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 57cc10d1008..579a2d355a3 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -141,6 +141,7 @@ Cancel=Отказ
Modify=Промяна
Edit=Редактиране
Validate=Потвърждение
+ValidateAndApprove=Validate and Approve
ToValidate=За потвърждение
Save=Запис
SaveAs=Запис като
@@ -158,6 +159,7 @@ Search=Търсене
SearchOf=Търсене
Valid=Потвърден
Approve=Одобряване
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Изпращане на файл
ToLink=Връзка
@@ -219,6 +221,7 @@ Cards=Карти
Card=Карта
Now=Сега
Date=Дата
+DateAndHour=Date and hour
DateStart=Начална дата
DateEnd=Крайна дата
DateCreation=Дата на създаване
@@ -295,6 +298,7 @@ UnitPriceHT=Единична цена (нето)
UnitPriceTTC=Единична цена
PriceU=U.P.
PriceUHT=U.P. (нето)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Размер
AmountInvoice=Фактурирана стойност
@@ -521,6 +525,7 @@ DateFromTo=От %s до %s
DateFrom=От %s
DateUntil=До %s
Check=Проверка
+Uncheck=Uncheck
Internal=Вътрешен
External=Външен
Internals=Вътрешен
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Изберете елемент и натиснете Презареждане
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Понеделник
Tuesday=Вторник
diff --git a/htdocs/langs/bg_BG/orders.lang b/htdocs/langs/bg_BG/orders.lang
index 0446c663f6c..b68ed897256 100644
--- a/htdocs/langs/bg_BG/orders.lang
+++ b/htdocs/langs/bg_BG/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Отменен
StatusOrderDraft=Проект (трябва да бъдат валидирани)
StatusOrderValidated=Утвърден
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Обработен
StatusOrderToBill=Доставени
StatusOrderToBill2=На Бил
@@ -58,6 +59,7 @@ MenuOrdersToBill=Доставени поръчки
MenuOrdersToBill2=Billable orders
SearchOrder=Търсене за
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Кораб продукт
Discount=Отстъпка
CreateOrder=Създаване на поръчка
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index 0e650cb6d81..4e636a028f0 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -54,12 +54,13 @@ MaxSize=Максимален размер
AttachANewFile=Прикачване на нов файл/документ
LinkedObject=Свързан обект
Miscellaneous=Разни
-NbOfActiveNotifications=Брой на уведомленията
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Това е тестов имейл.\nДвата реда са разделени с нов ред.\n\n__SIGNATURE__
PredefinedMailTestHtml=Това е тестов имейл (думата тестов трябва да бъде с удебелен шрифт).
Двата реда са разделени с нов ред.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/bg_BG/productbatch.lang b/htdocs/langs/bg_BG/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/bg_BG/productbatch.lang
+++ b/htdocs/langs/bg_BG/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 63a9c3ea81a..b742caded2a 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index c384cf449f2..76dc1909c2d 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Всички
PrivateProject=Контакти на проекта
MyProjectsDesc=Тази гледна точка е ограничена до проекти, които са за контакт (какъвто и да е тип).
ProjectsPublicDesc=Този възглед представя всички проекти, по които могат да се четат.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Този възглед представя всички проекти (потребителски разрешения ви даде разрешение да видите всичко).
MyTasksDesc=Тази гледна точка е ограничена до проекти или задачи, които са контакт (какъвто и да е тип).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Този възглед представя всички проекти и задачи, които може да чете.
TasksDesc=Този възглед представя всички проекти и задачи (потребителски разрешения ви даде разрешение да видите всичко).
ProjectsArea=Проекти област
@@ -29,6 +31,8 @@ NoProject=Нито един проект няма определени или с
NbOpenTasks=Nb отворени задачи
NbOfProjects=Nb на проекти
TimeSpent=Времето, прекарано
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Времето, прекарано
RefTask=Реф. задача
LabelTask=Label задача
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Списък на поръчките на д
ListSupplierInvoicesAssociatedProject=Списък на фактурите на доставчика, свързана с проекта
ListContractAssociatedProject=Списък на договори, свързани с проекта
ListFichinterAssociatedProject=Списък на интервенциите, свързани с проекта
-ListTripAssociatedProject=Списък на пътувания и разходи, свързани с проекта
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Списък на събития, свързани с проекта
ActivityOnProjectThisWeek=Дейности в проекта тази седмица
ActivityOnProjectThisMonth=Дейност по проект, този месец
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Свържете със средство за да определите времето
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/bg_BG/salaries.lang b/htdocs/langs/bg_BG/salaries.lang
index 64fcb3c80f5..b5b74bc1035 100644
--- a/htdocs/langs/bg_BG/salaries.lang
+++ b/htdocs/langs/bg_BG/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Заплата
Salaries=Заплати
Employee=Служител
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/bg_BG/sendings.lang b/htdocs/langs/bg_BG/sendings.lang
index 67c5fe8d52d..5b7e942d65e 100644
--- a/htdocs/langs/bg_BG/sendings.lang
+++ b/htdocs/langs/bg_BG/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Количество нареди
QtyShipped=Количество изпратени
QtyToShip=Количество за кораба
QtyReceived=Количество получи
-KeepToShip=Придържайте се към кораб
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Други пратки за изпълнение на поръчката
DateSending=Дата на изпращане ред
DateSendingShort=Дата на изпращане ред
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index 2c23d4ca0d2..2188c85aae5 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Средна цена
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Създаване на склада автоматично при създаването на потребителя
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Брой изпратени
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=За този склад
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Попълване
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/bg_BG/suppliers.lang b/htdocs/langs/bg_BG/suppliers.lang
index 1dcc4088caf..b98cea1ccfe 100644
--- a/htdocs/langs/bg_BG/suppliers.lang
+++ b/htdocs/langs/bg_BG/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Доставчици
-Supplier=Снабдител
AddSupplier=Create a supplier
SupplierRemoved=Изтрити доставчик
SuppliersInvoice=Фактура
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Фактури и наредби
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Одобряване на поръчката
ConfirmApproveThisOrder=Сигурен ли сте, че искате да одобри %s Поръчката?
-DenyingThisOrder=Да откаже поръчката
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Сигурен ли сте, че искате да откаже доставчик %s за?
ConfirmCancelThisOrder=Сигурен ли сте, че искате да отмените доставчика на %s за?
AddCustomerOrder=Създаване на заявка на клиента
diff --git a/htdocs/langs/bg_BG/trips.lang b/htdocs/langs/bg_BG/trips.lang
index cde887226a8..4e70dd8d132 100644
--- a/htdocs/langs/bg_BG/trips.lang
+++ b/htdocs/langs/bg_BG/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Екскурзия
-Trips=Екскурзии
-TripsAndExpenses=Екскурзии и разноски
-TripsAndExpensesStatistics=Екскурзии и разходи статистика
-TripCard=Екскурзия карта
-AddTrip=Добави пътуване
-ListOfTrips=Списък на пътуванията
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Списък на такси
-NewTrip=Нов пътуване
+NewTrip=New expense report
CompanyVisited=Фирмата/организацията е посетена
Kilometers=Км
FeesKilometersOrAmout=Сума или км
-DeleteTrip=Изтриване на пътуване
-ConfirmDeleteTrip=Сигурен ли сте, че искате да изтриете това пътуване?
-TF_OTHER=Друг
-TF_LUNCH=Обяд
-TF_TRIP=Екскурзия
-ListTripsAndExpenses=Списък на пътувания и разходи
-ExpensesArea=Екскурзии и разходи площ
-SearchATripAndExpense=Търсене на пътуване и разходи
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Друг
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Обяд
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index 9045eeb2c2e..d882817a90b 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperimentalno
VersionDevelopment=Razvoj
VersionUnknown=Nepoznato
VersionRecommanded=Preporučeno
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID sesije
SessionSaveHandler=Rukovatelj snimanje sesija
SessionSavePath=Lokalizacija snimanja sesije
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Dopunski atributi
ExtraFieldsLines=Dopunski atributi (tekstovi)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Dopunski atributi (treća stranka)
ExtraFieldsContacts=Dopunski atributi (kontakt/adresa)
ExtraFieldsMember=Dopunski atributi (član)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Vodeni žig na nacrte komercijalnih prijedloga (ništa, ako je prazno)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Menadžer za automatsko određivanje barkod brojeva
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/bs_BA/banks.lang b/htdocs/langs/bs_BA/banks.lang
index 9082a5092d2..cc94be9e783 100644
--- a/htdocs/langs/bs_BA/banks.lang
+++ b/htdocs/langs/bs_BA/banks.lang
@@ -33,7 +33,11 @@ AllTime=Od početka
Reconciliation=Izmirenje
RIB=Broj bankovnog računa
IBAN=IBAN broj
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT broj
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Trajni nalozi
StandingOrder=Trajni nalog
Withdrawals=Podizanja
@@ -148,7 +152,7 @@ BackToAccount=Nazad na račun
ShowAllAccounts=Pokaži za sve račune
FutureTransaction=Transakcije u budućnosti. Nema šanse da se izmiri.
SelectChequeTransactionAndGenerate=Izaberite/filtrirajte čekove za uključivanje u priznanicu za depozit i kliknite na "Kreiraj".
-InputReceiptNumber=Odaberite izvod banke u vezi s izmirenjima. Koristite numeričke vrijednosti (kao što je, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Na kraju, navesti kategoriju u koju će se svrstati zapisi
ToConciliate=Izmiriti?
ThenCheckLinesAndConciliate=Zatim, provjerite tekst prisutan u izvodu banke i kliknite
diff --git a/htdocs/langs/bs_BA/commercial.lang b/htdocs/langs/bs_BA/commercial.lang
index 242758543f0..62bbf25f7a1 100644
--- a/htdocs/langs/bs_BA/commercial.lang
+++ b/htdocs/langs/bs_BA/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/bs_BA/contracts.lang b/htdocs/langs/bs_BA/contracts.lang
index 4952376c86c..99ee4c3bfb7 100644
--- a/htdocs/langs/bs_BA/contracts.lang
+++ b/htdocs/langs/bs_BA/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Istekao
ServiceStatusClosed=Zatvoren
ServicesLegend=Legenda usluga
Contracts=Ugovori
+ContractsAndLine=Contracts and line of contracts
Contract=Ugovor
NoContracts=Nema ugovora
MenuServices=Usluge
diff --git a/htdocs/langs/bs_BA/cron.lang b/htdocs/langs/bs_BA/cron.lang
index 6a16b5fb366..db866d27f75 100644
--- a/htdocs/langs/bs_BA/cron.lang
+++ b/htdocs/langs/bs_BA/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell komanda
CronMenu=Cron
CronCannotLoadClass=Ne može se otvoriti klada %s ili objekat %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/bs_BA/main.lang b/htdocs/langs/bs_BA/main.lang
index 540e45e2946..8ccf22d049a 100644
--- a/htdocs/langs/bs_BA/main.lang
+++ b/htdocs/langs/bs_BA/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/bs_BA/orders.lang b/htdocs/langs/bs_BA/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/bs_BA/orders.lang
+++ b/htdocs/langs/bs_BA/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/bs_BA/productbatch.lang b/htdocs/langs/bs_BA/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/bs_BA/productbatch.lang
+++ b/htdocs/langs/bs_BA/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 6aa77416467..b0ee1036827 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index a6b5764ef40..7f9d2c4415e 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Zajednički projekti
PrivateProject=Kontakti za projekte
MyProjectsDesc=Ovaj pregled je limitiran na projekte u kojima ste stavljeni kao kontakt (bilo koji tip).
ProjectsPublicDesc=Ovaj pregled predstavlja sve projekte koje možete čitati.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Ovaj pregled predstavlja sve projekte (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
MyTasksDesc=Ovaj pregled predstavlja sve projekte ili zadatke za koje ste kontakt (bilo koji tip).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Ovaj pregled predstavlja sve projekte ili zadatke koje možete čitati.
TasksDesc=Ovaj pregled predstavlja sve projekte i zadatke (postavke vaših korisničkih dozvola vam omogućavaju da vidite sve).
ProjectsArea=Područje za projekte
@@ -29,6 +31,8 @@ NoProject=Nema definisanog ili vlastitog projekta
NbOpenTasks=Broj otvorenih zadataka
NbOfProjects=Broj projekata
TimeSpent=Vrijeme provedeno
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Vrijeme provedeno
RefTask=Ref. zadatka
LabelTask=Oznaka zadatka
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista narudžbi dobavljača u vezi s projekt
ListSupplierInvoicesAssociatedProject=Lista faktura dobavljača u vezi s projektom
ListContractAssociatedProject=Lista ugovora u vezi s projektom
ListFichinterAssociatedProject=Lista intervencija u vezi s projektom
-ListTripAssociatedProject=Lista putovanja i troškove u vezi s projektom
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Lista događaja u vezi s projektom
ActivityOnProjectThisWeek=Aktivnost na projektu ove sedmice
ActivityOnProjectThisMonth=Aktivnost na projektu ovog mjeseca
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/bs_BA/salaries.lang b/htdocs/langs/bs_BA/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/bs_BA/salaries.lang
+++ b/htdocs/langs/bs_BA/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/bs_BA/sendings.lang b/htdocs/langs/bs_BA/sendings.lang
index b8deefe7ae6..0324d02b664 100644
--- a/htdocs/langs/bs_BA/sendings.lang
+++ b/htdocs/langs/bs_BA/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Naručena količina
QtyShipped=Poslana količina
QtyToShip=Količina za slanje
QtyReceived=Primljena količina
-KeepToShip=Zadržati za slanje
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Druge pošiljke za ovu narudžbu
DateSending=Datum slanja narudžbe
DateSendingShort=Datum slanja narudžbe
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index 40a7deebee2..14059aefcc0 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Ponderirana/vagana aritmetička sredina - PAS
PMPValueShort=PAS
EnhancedValueOfWarehouses=Skladišna vrijednost
UserWarehouseAutoCreate=Kreiraj skladište automatski prilikom kreiranja korisnika
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Otpremljena količina
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladište %s će biti korišteno za smanjenje
WarehouseForStockIncrease=Skladište %s će biti korišteno za povećanje zalihe
ForThisWarehouse=Za ovo skladište
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=Ovo je lista svih otvorenih narudžbi dobavljača
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Nadopune
NbOfProductBeforePeriod=Količina proizvoda %s u zalihi prije odabranog perioda (%s)
NbOfProductAfterPeriod=Količina proizvoda %s u zalihi poslije odabranog perioda (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/bs_BA/suppliers.lang b/htdocs/langs/bs_BA/suppliers.lang
index ecab4e95a06..2a329c91d10 100644
--- a/htdocs/langs/bs_BA/suppliers.lang
+++ b/htdocs/langs/bs_BA/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Dobavljači
-Supplier=Dobavljač
AddSupplier=Create a supplier
SupplierRemoved=Dobavljač uklonjen
SuppliersInvoice=Faktura dobavljača
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Fakture i plačanja dobavljača
ExportDataset_fournisseur_3=Narudžbe za dobavljača i tekst narudžbe
ApproveThisOrder=Odobri ovu narudžbu
ConfirmApproveThisOrder=Jeste li sigurni da želite da odobriti narudžbu %s ?
-DenyingThisOrder=Odbijanje ove narudžbe
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Jeste li sigurni da želite odbiti narudžbu %s ?
ConfirmCancelThisOrder=Jeste li sigurni da želite poništiti narudžbu %s ?
AddCustomerOrder=Kreiraj narudžbu za kupca
diff --git a/htdocs/langs/bs_BA/trips.lang b/htdocs/langs/bs_BA/trips.lang
index 3129380dd57..282500cf778 100644
--- a/htdocs/langs/bs_BA/trips.lang
+++ b/htdocs/langs/bs_BA/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Putovanje
-Trips=Putovanja
-TripsAndExpenses=Putovanja i troškovi
-TripsAndExpensesStatistics=Statistika putovanja i troškova
-TripCard=Kartica putovanja
-AddTrip=Dodaj putovanje
-ListOfTrips=Lista putovanja
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Lista naknada
-NewTrip=Novo putovanje
+NewTrip=New expense report
CompanyVisited=Posjeta kompaniji/fondaciji
Kilometers=Kilometri
FeesKilometersOrAmout=Iznos ili kilometri
-DeleteTrip=Obriši putovanje
-ConfirmDeleteTrip=Jeste li sigurni da želite obrisati ovo putovanje?
-TF_OTHER=Ostalo
-TF_LUNCH=Ručak
-TF_TRIP=Putovanje
-ListTripsAndExpenses=Lista putovanja i troškova
-ExpensesArea=Područje za putovanja i troškove
-SearchATripAndExpense=Traži putovanja i troškove
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Ostalo
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Ručak
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 6f9c00f04a3..239694fc251 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Desenvolupament
VersionUnknown=Desconeguda
VersionRecommanded=Recomanada
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sesió ID
SessionSaveHandler=Modalitat de salvaguardat de sessions
SessionSavePath=Localització salvaguardat de sessions
@@ -493,10 +498,16 @@ Module600Name=Notificacions
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donacions
Module700Desc=Gestió de donacions
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis
Module1400Name=Comptabilitat experta
Module1400Desc=Gestió experta de la comptabilitat (doble partida)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Gestió de categories (productes, proveïdors i clients)
Module2000Name=Editor WYSIWYG
@@ -631,7 +642,7 @@ Permission181=Consultar comandes a proveïdors
Permission182=Crear/modificar comandes a proveïdors
Permission183=Validar comandes a proveïdors
Permission184=Aprovar comandes a proveïdors
-Permission185=Enviar comandes a proveïdors
+Permission185=Order or cancel supplier orders
Permission186=Rebre comandes de proveïdors
Permission187=Tancar comandes a proveïdors
Permission188=Anul·lar comandes a proveïdors
@@ -711,6 +722,13 @@ Permission538=Exportar serveis
Permission701=Consultar donacions
Permission702=Crear/modificar donacions
Permission703=Eliminar donacions
+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
Permission1001=Consultar stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Contrasenya del servidor proxy
DefineHereComplementaryAttributes=Definiu aquí la llista d'atributs addicionals, no disponibles a estàndard, i que vol gestionar per %s.
ExtraFields=Atributs addicionals
ExtraFieldsLines=atributs complementaris (línies)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Atributs adicionals (tercers)
ExtraFieldsContacts=Atributs adicionals (contactes/adreçes)
ExtraFieldsMember=Atributs complementaris (membres)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una línia de producte/servei que té una quantitat nu
FreeLegalTextOnProposal=Text lliure en pressupostos
WatermarkOnDraftProposal=Marca d'aigua en pressupostos esborrany (en cas d'estar buit)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Configuració del mòdul comandes
OrdersNumberingModules=Mòduls de numeració de les comandes
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Codis de barra tipus UPC
BarcodeDescISBN=Codis de barra tipus ISBN
BarcodeDescC39=Codis de barra tipus C39
BarcodeDescC128=Codis de barra tipus C128
-GenbarcodeLocation=Eina generació codi de barra en línia de comanda (utilitzat pel motor phpbar per a determinats tipus de codis barra)
+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
BarcodeInternalEngine=Motor intern
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Compte per defecte a utilitzar per als cobraments en efectiu (caixa)
CashDeskBankAccountForCheque= Compte per defecte a utilitzar per als cobraments amb xecs
CashDeskBankAccountForCB= Compte per defecte a utilitzar per als cobraments amb targeta de crèdit
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Configuració del mòdul Bookmark
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index 16057026a04..c329a4a3eb4 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Conciliació
RIB=Compte bancari
IBAN=Identificador IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Identificador BIC/SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Domiciliacions
StandingOrder=Domiciliació
Withdrawals=Reintegraments
@@ -148,7 +152,7 @@ BackToAccount=Tornar al compte
ShowAllAccounts=Mostra per a tots els comptes
FutureTransaction=Transacció futura. No és possible conciliar.
SelectChequeTransactionAndGenerate=Seleccioneu/filtreu els xecs a incloure a la remesa i feu clic a "Crear".
-InputReceiptNumber=Indiqui l'extracte bancari relacionat amb la conciliació. Utilitzeu un valor numèric ordenable (per exemple, AAAAMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventualment, indiqui una categoria en la qual classificar els registres
ToConciliate=A conciliar?
ThenCheckLinesAndConciliate=A continuació, comproveu les línies presents en l'extracte bancari i feu clic
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 6ffbd0077e7..92ceb20f492 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Client potencial
Prospects=Clients potencials
DeleteAction=Eliminar un esdeveniment
NewAction=Nou esdeveniment
-AddAction=Crear esdeveniment
-AddAnAction=Crear un esdeveniment
-AddActionRendezVous=Crear una cita
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Cita
ConfirmDeleteAction=Esteu segur de voler eliminar aquest esdeveniment?
CardAction=Fitxa esdeveniment
@@ -44,8 +44,8 @@ DoneActions=Llista d'esdeveniments realitzats
DoneActionsFor=Llista d'esdeveniments realitzats per %s
ToDoActions=Llista d'esdevenimentss incomplets
ToDoActionsFor=Llista d'esdeveniments incomplets %s
-SendPropalRef=Enviament del pressupost %s
-SendOrderRef=Enviament de la comanda %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=No aplicable
StatusActionToDo=A realitzar
StatusActionDone=Realitzat
@@ -62,7 +62,7 @@ LastProspectContactDone=Clients potencials contactats
DateActionPlanned=Data planificació
DateActionDone=Data realització
ActionAskedBy=Acció registrada per
-ActionAffectedTo=Acció assignada a
+ActionAffectedTo=Event assigned to
ActionDoneBy=Acció realitzada per
ActionUserAsk=Registrada per
ErrorStatusCantBeZeroIfStarted=Si el camp 'Data de realització' conté dades l'acció està en curs, per la qual cosa el camp 'Estat' no pot ser 0%%.
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index be202d8b593..8859f44f388 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirat
ServiceStatusClosed=Tancat
ServicesLegend=Llegenda per als serveis
Contracts=Contractes
+ContractsAndLine=Contracts and line of contracts
Contract=Contracte
NoContracts=Sense contractes
MenuServices=Serveis
diff --git a/htdocs/langs/ca_ES/cron.lang b/htdocs/langs/ca_ES/cron.lang
index 87e0a50c732..eb350eaaaa9 100644
--- a/htdocs/langs/ca_ES/cron.lang
+++ b/htdocs/langs/ca_ES/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Comando Shell
CronMenu=Cron
CronCannotLoadClass=impossible carregar la classe %s de l'objecte %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 05e776b9cc9..927b9a3af1e 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferen
ErrorBadThirdPartyName=Nom de tercer incorrecte
ErrorProdIdIsMandatory=El %s es obligatori
ErrorBadCustomerCodeSyntax=La sintaxi del codi client és incorrecta
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Codi client obligatori
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Codi de client ja utilitzat
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ha d'estar activat per a que aquesta opc
ErrorPasswordsMustMatch=Les 2 contrasenyes indicades s'han de correspondre
ErrorContactEMail=S'ha produït un error tècnic. Contacti amb l'administrador al e-mail %s, indicant el codi d'error %s en el seu missatge, o pot també adjuntar una còpia de pantalla d'aquesta pàgina.
ErrorWrongValueForField=Valor incorrecte per al camp número %s (el valor '%s' no compleix amb la regla %s)
-ErrorFieldValueNotIn=Valor incorrecte per al camp nombre %s (el valor '%s' no es un valor en el camp %s de la taula %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Valor incorrecte per al camp nombre %s (el valor '%s' no és una referència existent en %s)
ErrorsOnXLines=Errors a %s línies font
ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és probable que estigui infectat per un virus)!
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Els paràmetres obligatoris de configuració no estan encara definits
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 125805b6194..4b0bf7265e7 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Últim pas: Indiqueu aquí el compte i la contrase
ActivateModule=Activació del mòdul %s
ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 6ea2c963f3f..80bf6b6e547 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -141,6 +141,7 @@ Cancel=Anul·lar
Modify=Modificar
Edit=Editar
Validate=Validar
+ValidateAndApprove=Validate and Approve
ToValidate=A validar
Save=Gravar
SaveAs=Gravar com
@@ -158,6 +159,7 @@ Search=Cercar
SearchOf=Cerca de
Valid=Validar
Approve=Aprovar
+Disapprove=Disapprove
ReOpen=Reobrir
Upload=Enviar arxiu
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Fitxes
Card=Fitxa
Now=Ara
Date=Data
+DateAndHour=Date and hour
DateStart=Data inici
DateEnd=Data fi
DateCreation=Data de creació
@@ -295,6 +298,7 @@ UnitPriceHT=Preu base
UnitPriceTTC=Preu unitari total
PriceU=P.U.
PriceUHT=P.U.
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=P.U. Total
Amount=Import
AmountInvoice=Import factura
@@ -521,6 +525,7 @@ DateFromTo=De %s a %s
DateFrom=A partir de %s
DateUntil=Fins %s
Check=Verificar
+Uncheck=Uncheck
Internal=Intern
External=Extern
Internals=Interns
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Dilluns
Tuesday=Dimarts
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index 7cfa908d372..2749007c0ce 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Anul-lada
StatusOrderDraft=Esborrany (a validar)
StatusOrderValidated=Validada
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processada
StatusOrderToBill=Emès
StatusOrderToBill2=A facturar
@@ -58,6 +59,7 @@ MenuOrdersToBill=Comandes a facturar
MenuOrdersToBill2=Billable orders
SearchOrder=Cercar una comanda
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Enviar producte
Discount=Descompte
CreateOrder=Crear comanda
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index ae25227403d..316704111fa 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -54,12 +54,13 @@ MaxSize=Tamany màxim
AttachANewFile=Adjuntar nou arxiu/document
LinkedObject=Objecte adjuntat
Miscellaneous=Diversos
-NbOfActiveNotifications=Número notificacions
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Això és un correu de prova.\nLes 2 línies estan separades per un retorn de carro a la línia.
PredefinedMailTestHtml=Això és un e-mail de prova (la paraula prova ha d'estar en negreta).
Les 2 línies estan separades per un retorn de carro en la línia
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index a99396d34ba..5c3a7e7b2d1 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index dbdb9564f25..694c1c3a732 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Projecte compartit
PrivateProject=Contactes del projecte
MyProjectsDesc=Aquesta vista projecte es limita als projectes en què vostè és un contacte afectat (qualsevol tipus).
ProjectsPublicDesc=Aquesta vista mostra tots els projectes en els que vostè té dret a tenir visibilitat.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Aquesta vista mostra tots els projectes (les seves autoritzacions li ofereixen una visió completa).
MyTasksDesc=Aquesta vista es limita als projectes i tasques en què vostè és un contacte afectat en almenys una tasca (qualsevol tipus).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
TasksDesc=Aquesta vista mostra tots els projectes i tasques (les sevas autoritzacions li ofereixen una visió completa).
ProjectsArea=Àrea projectes
@@ -29,6 +31,8 @@ NoProject=Cap projecte definit
NbOpenTasks=Nº Tasques obertes
NbOfProjects=Nº de projectes
TimeSpent=Temps dedicat
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Temps dedicats
RefTask=Ref. tasca
LabelTask=Etiqueta tasca
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Llistat de comandes a proveïdors associades
ListSupplierInvoicesAssociatedProject=Llistat de factures de proveïdor associades al projecte
ListContractAssociatedProject=Llistatde contractes associats al projecte
ListFichinterAssociatedProject=Llistat d'intervencions associades al projecte
-ListTripAssociatedProject=Llistat notes d'honoraris associades al projecte
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Llista d'esdeveniments associats al projecte
ActivityOnProjectThisWeek=Activitat en el projecte aquesta setmana
ActivityOnProjectThisMonth=Activitat en el projecte aquest mes
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index edca71a1829..6c4a42fa77f 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -1,8 +1,13 @@
# Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+Salary=Sou
+Salaries=Sous
+Employee=Empleat
+NewSalaryPayment=Nou pagament de sous
+SalaryPayment=Pagament de sous
+SalariesPayments=Pagaments de sous
+ShowSalaryPayment=Veure pagament de sous
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index 81357c77fa4..21562f914cc 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qt. demanada
QtyShipped=Qt. enviada
QtyToShip=Qt. a enviar
QtyReceived=Qt. rebuda
-KeepToShip=Quede per enviar
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Altres enviaments d'aquesta comanda
DateSending=Data d'expedició
DateSendingShort=Data d'expedició
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 0c918bae6d8..4b3f823d589 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Valor (PMP)
PMPValueShort=PMP
EnhancedValueOfWarehouses=Valor d'estocs
UserWarehouseAutoCreate=Crea automàticament existències/magatzem propi de l'usuari en la creació de l'usuari
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantitat desglossada
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index df79e34d4e4..d0b6422c8e8 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Proveïdors
-Supplier=Proveïdor
AddSupplier=Create a supplier
SupplierRemoved=Proveïdor eliminat
SuppliersInvoice=Factura proveïdor
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Factures proveïdors i pagaments
ExportDataset_fournisseur_3=Comandes de proveïdors i línies de comanda
ApproveThisOrder=Aprovar aquesta comanda
ConfirmApproveThisOrder=Esteu segur de voler aprovar la comanda a proveïdor %s?
-DenyingThisOrder=Denegar aquesta comanda
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Esteu segur de voler denegar la comanda a proveïdor %s?
ConfirmCancelThisOrder=Esteu segur de voler cancel·lar la comanda a proveïdor %s?
AddCustomerOrder=Crear comanda de client
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 74f7e7cdb55..7999889e678 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Desplaçament
-Trips=Desplaçaments
-TripsAndExpenses=Honoraris
-TripsAndExpensesStatistics=Estadístiques honoraris
-TripCard=Fitxa honorari
-AddTrip=Crear honorari
-ListOfTrips=Llistat de honorari
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Llistat notes de honoraris
-NewTrip=Nou honorari
+NewTrip=New expense report
CompanyVisited=Empresa/institució visitada
Kilometers=Quilòmetres
FeesKilometersOrAmout=Import o quilòmetres
-DeleteTrip=Eliminar honorari
-ConfirmDeleteTrip=Esteu segur de voler eliminar aquest honorari?
-TF_OTHER=Altre
-TF_LUNCH=Dieta
-TF_TRIP=Viatge
-ListTripsAndExpenses=Llistat notes de honoraris
-ExpensesArea=Àrea Notes d'honoraris
-SearchATripAndExpense=Cercar un honorari
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Altre
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Dieta
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index cb3fb8c8ca3..e857b9ee394 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimentální
VersionDevelopment=Vývoj
VersionUnknown=Neznámý
VersionRecommanded=Doporučené
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID relace
SessionSaveHandler=Manipulátor uložených relací
SessionSavePath=Místo uložení relace
@@ -493,10 +498,16 @@ Module600Name=Upozornění
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Dary
Module700Desc=Darování řízení
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integrace
Module1400Name=Účetnictví
Module1400Desc=Vedení účetnictví (dvojité strany)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorie
Module1780Desc=Category management (produkty, dodavatelé a odběratelé)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Přečtěte si dodavatelských objednávek
Permission182=Vytvořit / upravit dodavatelské objednávky
Permission183=Ověřit dodavatelských objednávek
Permission184=Schválit dodavatelských objednávek
-Permission185=Objednávky Objednat dodavatel
+Permission185=Order or cancel supplier orders
Permission186=Příjem objednávek s dodavately
Permission187=Zavřít dodavatelské objednávky
Permission188=Zrušit dodavatelských objednávek
@@ -711,6 +722,13 @@ Permission538=Export služeb
Permission701=Přečtěte si dary
Permission702=Vytvořit / upravit dary
Permission703=Odstranit dary
+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
Permission1001=Přečtěte si zásoby
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Heslo používat proxy server
DefineHereComplementaryAttributes=Definujte zde všechny atributy, které ještě nejsou k dispozici ve výchozím nastavení, a že chcete být podporovány %s.
ExtraFields=Doplňkové atributy
ExtraFieldsLines=Doplňkové atributy (linky)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Doplňkové atributy (thirdparty)
ExtraFieldsContacts=Doplňkové atributy (kontakt / adresa)
ExtraFieldsMember=Doplňkové atributy (člen)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Řada výrobků / služeb s nulové hodnoty je považo
FreeLegalTextOnProposal=Volný text o obchodních návrhů
WatermarkOnDraftProposal=Vodoznak na předloh návrhů komerčních (none-li prázdný)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Objednat řízení nastavení
OrdersNumberingModules=Objednávky číslování modelů
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Čárových kódů typu UPC
BarcodeDescISBN=Čárový kód typu ISBN
BarcodeDescC39=Čárový kód typu C39
BarcodeDescC128=Čárový kód typu C128
-GenbarcodeLocation=Bar generování kódu nástroj pro příkazovou řádku (používaný motorem s vnitřním u některých typů čárových kódů)
+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
BarcodeInternalEngine=Vnitřní motor
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Výchozí účet použít pro příjem plateb v hotovosti
CashDeskBankAccountForCheque= Výchozí účet použít pro příjem plateb šekem
CashDeskBankAccountForCB= Výchozí účet použít pro příjem plateb prostřednictvím kreditní karty
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Záložka Nastavení modulu
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/cs_CZ/banks.lang b/htdocs/langs/cs_CZ/banks.lang
index 8c43ba341c4..67ff3cf6011 100644
--- a/htdocs/langs/cs_CZ/banks.lang
+++ b/htdocs/langs/cs_CZ/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Smíření
RIB=Číslo bankovního účtu
IBAN=IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT číslo
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Trvalé příkazy
StandingOrder=Trvalý příkaz
Withdrawals=Výběry
@@ -148,7 +152,7 @@ BackToAccount=Zpět na účtu
ShowAllAccounts=Zobrazit pro všechny účty
FutureTransaction=Transakce v Futur. Žádný způsob, jak se smířit.
SelectChequeTransactionAndGenerate=Výběr / filtr, aby kontroly zahrnovaly do obdržení šeku vkladů a klikněte na "Vytvořit".
-InputReceiptNumber=Vyberte si výpis z účtu související s dohodovacím řízení. Použijte Sortable číselnou hodnotu (například RRRRMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Nakonec určit kategorii, ve které chcete klasifikovat záznamy
ToConciliate=Smířit?
ThenCheckLinesAndConciliate=Poté zkontrolujte, zda řádky, které jsou ve výpisu z účtu a klepněte na tlačítko
diff --git a/htdocs/langs/cs_CZ/commercial.lang b/htdocs/langs/cs_CZ/commercial.lang
index ab71b01387d..7886122e124 100644
--- a/htdocs/langs/cs_CZ/commercial.lang
+++ b/htdocs/langs/cs_CZ/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Vyhlídka
Prospects=Vyhlídky
DeleteAction=Odstranit událost / úkol
NewAction=Nová událost / úkol
-AddAction=Přidat událost / úkol
-AddAnAction=Přidat událost / úkol
-AddActionRendezVous=Přidat Rendez-vous události
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Schůzka
ConfirmDeleteAction=Jste si jisti, že chcete smazat tuto událost / úkol?
CardAction=Událost karty
@@ -44,8 +44,8 @@ DoneActions=Dokončené akce
DoneActionsFor=Dokončené akce pro %s
ToDoActions=Neúplné události
ToDoActionsFor=Neúplné akce pro %s
-SendPropalRef=Poslat komerční návrhu %s
-SendOrderRef=Pošli objednávku %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Nevztahuje se
StatusActionToDo=Chcete-li
StatusActionDone=Dokončit
@@ -62,7 +62,7 @@ LastProspectContactDone=Spojit se provádí
DateActionPlanned=Datum Akce plánované na
DateActionDone=Datum Akce provedeno
ActionAskedBy=Akce hlášeny
-ActionAffectedTo=Událost přiřazena
+ActionAffectedTo=Event assigned to
ActionDoneBy=Událost provádí
ActionUserAsk=Zpracoval
ErrorStatusCantBeZeroIfStarted=Pokud pole 'Datum udělat "je naplněn, je akce zahájena (nebo dokončený), tak pole" Stav "nemůže být 0%%.
diff --git a/htdocs/langs/cs_CZ/contracts.lang b/htdocs/langs/cs_CZ/contracts.lang
index 792ed511937..40188328aae 100644
--- a/htdocs/langs/cs_CZ/contracts.lang
+++ b/htdocs/langs/cs_CZ/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Vypršela
ServiceStatusClosed=Zavřeno
ServicesLegend=Služby legenda
Contracts=Smlouvy
+ContractsAndLine=Contracts and line of contracts
Contract=Smlouva
NoContracts=Žádné smlouvy
MenuServices=Služby
diff --git a/htdocs/langs/cs_CZ/cron.lang b/htdocs/langs/cs_CZ/cron.lang
index 05ed1384123..83947327da5 100644
--- a/htdocs/langs/cs_CZ/cron.lang
+++ b/htdocs/langs/cs_CZ/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell příkaz
CronMenu=Cron
CronCannotLoadClass=Nelze načíst třídu nebo objekt %s %s
UseMenuModuleToolsToAddCronJobs=Jděte do menu "Home - Moduly nářadí - Seznam úloh" vidět a upravovat naplánované úlohy.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 6a09500f020..d2570c905ce 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Zdrojové a cílové bankovní účty musí být
ErrorBadThirdPartyName=Nesprávná hodnota pro třetí strany jménem
ErrorProdIdIsMandatory=%s je povinné
ErrorBadCustomerCodeSyntax=Bad syntaxe pro zákazníka kódu
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Zákazník požadoval kód
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Zákaznický kód již používán
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript musí být vypnuta, že tato funkce prac
ErrorPasswordsMustMatch=Oba napsaný hesla se musí shodovat se navzájem
ErrorContactEMail=Technické chybě. Prosím, obraťte se na správce, aby e-mailovou %s en poskytovat %s kód chyby ve zprávě, nebo ještě lépe přidáním obrazovky kopii této stránky.
ErrorWrongValueForField=Chybná hodnota %s číslo pole (hodnota "%s 'neodpovídá regex pravidel %s)
-ErrorFieldValueNotIn=Chybná hodnota %s číslo pole (hodnota "%s 'není dostupná hodnota do pole %s stolních %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Chybná hodnota %s číslo pole (hodnota "%s" není %s stávající ref)
ErrorsOnXLines=Chyby na %s zdrojovém záznamu (s)
ErrorFileIsInfectedWithAVirus=Antivirový program nebyl schopen ověřit soubor (soubor může být napaden virem)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Povinné parametry jsou dosud stanoveny
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 4855a8f234c..7967e44f0b2 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Poslední krok: Definujte zde přihlašovací jmé
ActivateModule=Aktivace modulu %s
ShowEditTechnicalParameters=Klikněte zde pro zobrazení / editaci pokročilých parametrů (pro experty)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index b3c285cdbae..17e4c56569f 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -141,6 +141,7 @@ Cancel=Zrušit
Modify=Upravit
Edit=Upravit
Validate=Potvrdit
+ValidateAndApprove=Validate and Approve
ToValidate=Chcete-li ověřit
Save=Uložit
SaveAs=Uložit jako
@@ -158,6 +159,7 @@ Search=Vyhledávání
SearchOf=Vyhledávání
Valid=Platný
Approve=Schvalovat
+Disapprove=Disapprove
ReOpen=Znovu otevřít
Upload=Odeslat soubor
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Karty
Card=Karta
Now=Nyní
Date=Datum
+DateAndHour=Date and hour
DateStart=Datum začátku
DateEnd=Datum ukončení
DateCreation=Datum vytvoření
@@ -295,6 +298,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
UnitPriceTTC=Jednotková cena
PriceU=UP
PriceUHT=UP (bez DPH)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Množství
AmountInvoice=Fakturovaná částka
@@ -521,6 +525,7 @@ DateFromTo=Od %s na %s
DateFrom=Od %s
DateUntil=Do %s
Check=Kontrola
+Uncheck=Uncheck
Internal=Vnitřní
External=Externí
Internals=Vnitřní
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Pondělí
Tuesday=Úterý
diff --git a/htdocs/langs/cs_CZ/orders.lang b/htdocs/langs/cs_CZ/orders.lang
index 67d948e78b3..6aa596baa1b 100644
--- a/htdocs/langs/cs_CZ/orders.lang
+++ b/htdocs/langs/cs_CZ/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Zrušený
StatusOrderDraft=Návrh (musí být ověřena)
StatusOrderValidated=Ověřené
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Zpracované
StatusOrderToBill=Dodává se
StatusOrderToBill2=K účtu
@@ -58,6 +59,7 @@ MenuOrdersToBill=Objednávky dodáno
MenuOrdersToBill2=Billable orders
SearchOrder=Hledat účelem
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Loď produkt
Discount=Sleva
CreateOrder=Vytvořit objednávku
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index d2b3363bde1..f0e4b814a04 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximální rozměr
AttachANewFile=Připojte nový soubor / dokument
LinkedObject=Propojený objekt
Miscellaneous=Smíšený
-NbOfActiveNotifications=Počet oznámení
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Toto je test e-mailem. \\ NPokud dva řádky jsou odděleny znakem konce řádku. \n\n __ SIGNATURE__
PredefinedMailTestHtml=Toto je test-mail (slovo test musí být tučně).
Dva řádky jsou odděleny znakem konce řádku.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/cs_CZ/productbatch.lang b/htdocs/langs/cs_CZ/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/cs_CZ/productbatch.lang
+++ b/htdocs/langs/cs_CZ/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index aa3dbd4fda9..7fc24c7a1a3 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index b98531acef5..3e8b7a046b0 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Všichni
PrivateProject=Kontakty na projektu
MyProjectsDesc=Tento pohled je omezen na projekty u kterých jste uveden jako kontakt (jakéhokoliv typu)
ProjectsPublicDesc=Tento pohled zobrazuje všechny projekty které máte oprávnění číst.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Tento pohled zobrazuje všechny projekty (vaše uživatelské oprávnění vám umožňuje vidět vše).
MyTasksDesc=Tento pohled je omezen na projekty či úkoly u kterých jste uveden jako kontakt (jakéhokoliv typu)
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Tento pohled zobrazuje všechny projekty a úkoly které máte oprávnění číst.
TasksDesc=Tento pohled zobrazuje všechny projekty a úkoly (vaše uživatelské oprávnění vám umožňuje vidět vše).
ProjectsArea=Projekty
@@ -29,6 +31,8 @@ NoProject=Žádný projekt nedefinován či vlastněn
NbOpenTasks=Počet otevřených úloh
NbOfProjects=Počet projektů
TimeSpent=Strávený čas
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Strávený čas
RefTask=Číslo. úkolu
LabelTask=Název úkolu
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Seznam dodavatelských objednávek souvisej
ListSupplierInvoicesAssociatedProject=Seznam dodavatelských faktur související s projektem
ListContractAssociatedProject=Seznam zakázek souvisejících s projektem
ListFichinterAssociatedProject=Seznam zákroků spojených s projektem
-ListTripAssociatedProject=Seznam cest a nákladů spojených s projektem
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Seznam událostí spojených s projektem
ActivityOnProjectThisWeek=Týdenní projektová aktivita
ActivityOnProjectThisMonth=Měsíční projektová aktivita
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/cs_CZ/salaries.lang b/htdocs/langs/cs_CZ/salaries.lang
index edca71a1829..f9dbdb94b20 100644
--- a/htdocs/langs/cs_CZ/salaries.lang
+++ b/htdocs/langs/cs_CZ/salaries.lang
@@ -1,8 +1,13 @@
# Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+Salary=Mzda
+Salaries=Mzdy
+Employee=Zaměstnanec
+NewSalaryPayment=Nová platba mzdy
+SalaryPayment=Platba mzdy
+SalariesPayments=Platby mezd
+ShowSalaryPayment=Ukázat platbu mzdy
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/cs_CZ/sendings.lang b/htdocs/langs/cs_CZ/sendings.lang
index 73b172c200e..f794bceaa84 100644
--- a/htdocs/langs/cs_CZ/sendings.lang
+++ b/htdocs/langs/cs_CZ/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Množství objednat
QtyShipped=Množství odesláno
QtyToShip=Množství na loď
QtyReceived=Množství přijaté
-KeepToShip=Mějte na loď
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Další zásilky pro tuto objednávku
DateSending=Datum odeslání, aby
DateSendingShort=Datum odeslání, aby
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index 57d76a0cdf7..451126fb054 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Vážená průměrná cena
PMPValueShort=WAP
EnhancedValueOfWarehouses=Sklady hodnota
UserWarehouseAutoCreate=Vytvořte sklad automaticky při vytváření uživatele
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Množství odesláno
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladová %s budou použity pro snížení skla
WarehouseForStockIncrease=Skladová %s budou použity pro zvýšení stavu zásob
ForThisWarehouse=Z tohoto skladu
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=Toto je seznam všech otevřených dodavatelských objednávek
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Splátky
NbOfProductBeforePeriod=Množství produktů %s na skladě, než zvolené období (<%s)
NbOfProductAfterPeriod=Množství produktů %s na skladě po zvolené období (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/cs_CZ/suppliers.lang b/htdocs/langs/cs_CZ/suppliers.lang
index 57bd9b70754..99a629ba847 100644
--- a/htdocs/langs/cs_CZ/suppliers.lang
+++ b/htdocs/langs/cs_CZ/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Dodavatelé
-Supplier=Dodavatel
AddSupplier=Create a supplier
SupplierRemoved=Dodavatel odstraní
SuppliersInvoice=Dodavatelé faktura
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Dodavatel faktury a platby
ExportDataset_fournisseur_3=Dodavatel objednávky a objednávka linky
ApproveThisOrder=Schválit tuto objednávku
ConfirmApproveThisOrder=Jste si jisti, že chcete schválit pořadí %s?
-DenyingThisOrder=Popírat tuto objednávku
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Jste si jisti, že chcete popírat objednávky %s?
ConfirmCancelThisOrder=Jste si jisti, že chcete zrušit tuto objednávku %s?
AddCustomerOrder=Vytvoření objednávky zákazníka
diff --git a/htdocs/langs/cs_CZ/trips.lang b/htdocs/langs/cs_CZ/trips.lang
index 9de98944f52..faeac138096 100644
--- a/htdocs/langs/cs_CZ/trips.lang
+++ b/htdocs/langs/cs_CZ/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Výlet
-Trips=Výlety
-TripsAndExpenses=Výlety a výdaje
-TripsAndExpensesStatistics=Výlety a výdaje statistiky
-TripCard=Výlet karty
-AddTrip=Přidat výlet
-ListOfTrips=Seznam cest
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Sazebník poplatků
-NewTrip=Nová cesta
+NewTrip=New expense report
CompanyVisited=Firma / nadace navštívil
Kilometers=Kilometry
FeesKilometersOrAmout=Množství nebo kilometrů
-DeleteTrip=Odstranit výlet
-ConfirmDeleteTrip=Jste si jisti, že chcete smazat tuto cestu?
-TF_OTHER=Ostatní
-TF_LUNCH=Oběd
-TF_TRIP=Výlet
-ListTripsAndExpenses=Seznam cest a nákladů
-ExpensesArea=Výlety a náklady oblast
-SearchATripAndExpense=Hledat na výlet a náklady
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Ostatní
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Oběd
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 93e6a224b77..8cbc1e17779 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperimentel
VersionDevelopment=Udvikling
VersionUnknown=Ukendt
VersionRecommanded=Anbefalet
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler for at gemme sessioner
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Adviséringer
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donationer
Module700Desc=Gaver 'ledelse
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Regnskabsmæssig ekspert
Module1400Desc=Regnskabsmæssig forvaltning for eksperter (dobbelt parterne)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorier
Module1780Desc=Kategorier 'forvaltning (produkter, leverandører og kunder)
Module2000Name=FCKeditor
@@ -631,7 +642,7 @@ Permission181=Læs leverandør ordrer
Permission182=Opret / ændre leverandør ordrer
Permission183=Valider leverandør ordrer
Permission184=Godkend leverandør ordrer
-Permission185=Bestil leverandør ordrer
+Permission185=Order or cancel supplier orders
Permission186=Modtag leverandør ordrer
Permission187=Luk leverandør ordrer
Permission188=Annuller leverandør ordrer
@@ -711,6 +722,13 @@ Permission538=Eksport af tjenesteydelser
Permission701=Læs donationer
Permission702=Opret / ændre donationer
Permission703=Slet 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
Permission1001=Læs bestande
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Adgangskode for at bruge proxyserveren
DefineHereComplementaryAttributes=Definer her alle atributes, der ikke allerede findes som standard, og at du ønsker at blive understøttet for %s.
ExtraFields=Supplerende egenskaber
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=En linje af produkt / service med et nul beløb anses
FreeLegalTextOnProposal=Fri tekst på kommercielle forslag
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Ordrer «forvaltning setup
OrdersNumberingModules=Ordrer nummerressourcer moduler
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode typeidentifikationsmærker UPC
BarcodeDescISBN=Barcode typeidentifikationsmærker ISBN
BarcodeDescC39=Barcode af type C39
BarcodeDescC128=Barcode af type C128
-GenbarcodeLocation=Stregkode generation kommando linje værktøj (der benyttes af phpbarcode motor for nogle stregkode typer)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Cash konto til brug for sælger
CashDeskBankAccountForCheque= Konto til at bruge til at modtage betalinger med check
CashDeskBankAccountForCB= Konto til at bruge til at modtage kontant betaling ved kreditkort
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bogmærkemodulet setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 11dfcb6ab7c..d66fa525a7b 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Forsoning
RIB=Bankkontonummer
IBAN=IBAN-nummer
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT-nummer
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Stående ordrer
StandingOrder=Stående ordre
Withdrawals=Tilbagekøb
@@ -148,7 +152,7 @@ BackToAccount=Tilbage til regnskab
ShowAllAccounts=Vis for alle konti
FutureTransaction=Transaktion i futur. Ingen måde at forene.
SelectChequeTransactionAndGenerate=Vælg / filter, at kontrollen skal omfatte ind checken depositum modtaget og klikke på "Opret".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/da_DK/commercial.lang b/htdocs/langs/da_DK/commercial.lang
index 97c040cbf8b..8a226198cad 100644
--- a/htdocs/langs/da_DK/commercial.lang
+++ b/htdocs/langs/da_DK/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Perspektiver
DeleteAction=Slet en foranstaltning / opgave
NewAction=Ny action / opgave
-AddAction=Tilføj action / opgave
-AddAnAction=Tilføj en foranstaltning / opgave
-AddActionRendezVous=Tilføj en Rendezvous opgave
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Er du sikker på du vil slette denne opgave?
CardAction=Action-kortet
@@ -44,8 +44,8 @@ DoneActions=Udfærdiget aktioner
DoneActionsFor=Gøres tiltag for %s
ToDoActions=Ufuldstændig aktioner
ToDoActionsFor=Ufuldstændig aktioner for %s
-SendPropalRef=Send kommercielle forslag %s
-SendOrderRef=Send for %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Ikke relevant
StatusActionToDo=At gøre
StatusActionDone=Gjort
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt gjort
DateActionPlanned=Dato aktion er planlagt til
DateActionDone=Dato indsats gøres
ActionAskedBy=Aktion spurgt af
-ActionAffectedTo=Aktion påvirkes i
+ActionAffectedTo=Event assigned to
ActionDoneBy=Aktion gøres ved
ActionUserAsk=Registreres af
ErrorStatusCantBeZeroIfStarted=Hvis feltet 'Dato gjort «er fyldt handling er startet (eller afsluttet), så felt' Status' kan ikke være 0%%.
diff --git a/htdocs/langs/da_DK/contracts.lang b/htdocs/langs/da_DK/contracts.lang
index 73a7e126d9e..7c4327088bc 100644
--- a/htdocs/langs/da_DK/contracts.lang
+++ b/htdocs/langs/da_DK/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Udløbet
ServiceStatusClosed=Lukket
ServicesLegend=Services legend
Contracts=Kontrakter
+ContractsAndLine=Contracts and line of contracts
Contract=Kontrakt
NoContracts=Nr. kontrakter
MenuServices=Services
diff --git a/htdocs/langs/da_DK/cron.lang b/htdocs/langs/da_DK/cron.lang
index cb5e21f817a..8ea7f4353fa 100644
--- a/htdocs/langs/da_DK/cron.lang
+++ b/htdocs/langs/da_DK/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 9ad36372483..f69f42d1a6f 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kilde og mål bankkonti skal være anderledes.
ErrorBadThirdPartyName=Bad værdi for tredjeparts navn
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntaks for kunde-kode
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Kunden kode kræves
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Kunden koden allerede anvendes
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript skal ikke være deaktiveret for at have
ErrorPasswordsMustMatch=Begge har skrevet passwords skal matche hinanden
ErrorContactEMail=En teknisk fejl opstod. Kontakt venligst administrator til at følge e-mail %s da give fejlkoder %s i din besked, eller endnu bedre ved at tilføje en skærm kopi af denne side.
ErrorWrongValueForField=Forkert værdi for felt nummer %s (værdi '%s' passer ikke regex regel %s)
-ErrorFieldValueNotIn=Forkert værdi for feltnummer %s (value "%s" er ikke en værdi, der i felt %s af tabel %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Forkert værdi for feltnummer %s (værdien '%s' er ikke en %s eksisterende ref)
ErrorsOnXLines=Fejl på %s kildelinjer
ErrorFileIsInfectedWithAVirus=Det antivirusprogram var ikke i stand til at validere filen (filen kan være inficeret med en virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 443877735a9..d265352dc80 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Sidste trin: Definer her login og adgangskode, du
ActivateModule=Aktiver modul %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 6ce6c3fe051..91070a4d2ce 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -141,6 +141,7 @@ Cancel=Annuller
Modify=Modify
Edit=Redigér
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=At validere
Save=Gemme
SaveAs=Gem som
@@ -158,6 +159,7 @@ Search=Søgning
SearchOf=Søg
Valid=Gyldig
Approve=Godkend
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send fil
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Postkort
Card=Kort
Now=Nu
Date=Dato
+DateAndHour=Date and hour
DateStart=Dato start
DateEnd=Dato udgangen
DateCreation=Lavet dato
@@ -295,6 +298,7 @@ UnitPriceHT=Enhedspris (netto)
UnitPriceTTC=Enhedspris
PriceU=UP
PriceUHT=UP (netto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Mængde
AmountInvoice=Fakturabeløbet
@@ -521,6 +525,7 @@ DateFromTo=Fra %s til %s
DateFrom=Fra %s
DateUntil=Indtil %s
Check=Kontrollere
+Uncheck=Uncheck
Internal=Intern
External=Eksterne
Internals=Intern
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Mandag
Tuesday=Tirsdag
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index e85107b54f0..c5cb6c9dc56 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Annulleret
StatusOrderDraft=Udkast (skal valideres)
StatusOrderValidated=Valideret
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Forarbejdede
StatusOrderToBill=Til lovforslag
StatusOrderToBill2=Til lovforslag
@@ -58,6 +59,7 @@ MenuOrdersToBill=Ordrer til lovforslag
MenuOrdersToBill2=Billable orders
SearchOrder=Search for
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Skib produkt
Discount=Discount
CreateOrder=Opret Order
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 3195ac89360..ec7a5a1fc9f 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maksimumstørrelse
AttachANewFile=Vedhæfte en ny fil / dokument
LinkedObject=Forbundet objekt
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Antal anmeldelser
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Dette er en test mail. \\ NDen to linjer er adskilt af et linjeskift.
PredefinedMailTestHtml=Dette er en test mail (ordet test skal være i fed).
De to linjer er adskilt af et linjeskift.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/da_DK/productbatch.lang b/htdocs/langs/da_DK/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/da_DK/productbatch.lang
+++ b/htdocs/langs/da_DK/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index ecd03ef5957..e66913ef4fc 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index 88c5210f23c..a72024e975f 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Fælles projekt
PrivateProject=Kontakter af projektet
MyProjectsDesc=Dette synspunkt er begrænset til projekter, du er en kontaktperson for (hvad der er den type).
ProjectsPublicDesc=Dette synspunkt præsenterer alle projekter du får lov til at læse.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Dette synspunkt præsenterer alle projekter (din brugertilladelser give dig tilladelse til at se alt).
MyTasksDesc=Dette synspunkt er begrænset til projekter eller opgaver, du er en kontaktperson for (hvad der er den type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Dette synspunkt præsenterer alle projekter og opgaver, som du får lov til at læse.
TasksDesc=Dette synspunkt præsenterer alle projekter og opgaver (din brugertilladelser give dig tilladelse til at se alt).
ProjectsArea=Projekter område
@@ -29,6 +31,8 @@ NoProject=Nr. projektet defineret
NbOpenTasks=Nb af åbnet opgaver
NbOfProjects=Nb af projekter
TimeSpent=Tid brugt
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tid brugt
RefTask=Ref. opgave
LabelTask=Label opgave
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste over leverandører ordrer forbundet me
ListSupplierInvoicesAssociatedProject=Liste over leverandører fakturaer forbundet med projektet
ListContractAssociatedProject=Liste over kontrakter i forbindelse med projektet
ListFichinterAssociatedProject=Liste over interventioner i forbindelse med projektet
-ListTripAssociatedProject=Liste over rejser og udgifter forbundet med projektet
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Liste over aktioner i forbindelse med projektet
ActivityOnProjectThisWeek=Aktivitet på projektet i denne uge
ActivityOnProjectThisMonth=Aktivitet på projektet i denne måned
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/da_DK/salaries.lang b/htdocs/langs/da_DK/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/da_DK/salaries.lang
+++ b/htdocs/langs/da_DK/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/da_DK/sendings.lang b/htdocs/langs/da_DK/sendings.lang
index a52622bda7c..0b1d722f494 100644
--- a/htdocs/langs/da_DK/sendings.lang
+++ b/htdocs/langs/da_DK/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty bestilt
QtyShipped=Qty afsendt
QtyToShip=Qty til skibet
QtyReceived=Antal modtagne
-KeepToShip=Hold til skib
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Andre sendings for denne ordre
DateSending=Dato for afsendelse orden
DateSendingShort=Dato for afsendelse orden
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index acb10492f90..19b708156b7 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Værdi
PMPValueShort=WAP
EnhancedValueOfWarehouses=Lager værdi
UserWarehouseAutoCreate=Opret en bestand automatisk, når du opretter en bruger
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Afsendte mængde
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index 2d7dbf35ee6..aae6a4917a0 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Leverandører
-Supplier=Leverandør
AddSupplier=Create a supplier
SupplierRemoved=Leverandør fjernet
SuppliersInvoice=Leverandører faktura
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leverandør fakturaer og betalinger
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Godkende denne ordre
ConfirmApproveThisOrder=Er du sikker på at du vil godkende denne ordre?
-DenyingThisOrder=Benægte denne ordre
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Er du sikker på at du vil benægte denne ordre?
ConfirmCancelThisOrder=Er du sikker på du vil annullere denne ordre?
AddCustomerOrder=Opret kunde for
diff --git a/htdocs/langs/da_DK/trips.lang b/htdocs/langs/da_DK/trips.lang
index e4f3690f70d..561a88dfc8a 100644
--- a/htdocs/langs/da_DK/trips.lang
+++ b/htdocs/langs/da_DK/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Tur
-Trips=Trips
-TripsAndExpenses=Udflugter og udgifter
-TripsAndExpensesStatistics=Udflugter og udgifter statistik
-TripCard=Trip kortet
-AddTrip=Tilføj tur
-ListOfTrips=Liste over ture
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Liste over gebyrer
-NewTrip=Ny tur
+NewTrip=New expense report
CompanyVisited=Company / fundament besøgte
Kilometers=Kilometer
FeesKilometersOrAmout=Beløb eller kilometer
-DeleteTrip=Slet tur
-ConfirmDeleteTrip=Er du sikker på du vil slette denne tur?
-TF_OTHER=Anden
-TF_LUNCH=Frokost
-TF_TRIP=Tur
-ListTripsAndExpenses=Liste over ture og omkostninger
-ExpensesArea=Udflugter og udgifter området
-SearchATripAndExpense=Søg en tur og regning
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Anden
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Frokost
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang
index e0268220e08..76a87c87644 100644
--- a/htdocs/langs/de_AT/agenda.lang
+++ b/htdocs/langs/de_AT/agenda.lang
@@ -2,4 +2,3 @@
ViewList=Liste anzeigen
ViewCal=Kalender anzeigen
OrderValidatedInDolibarr=Bestellung freigegeben
-InterventionValidatedInDolibarr=Eingriff %s freigegeben
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index be59b18d3a5..ebda6905a62 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/MM/yy
FormatDateShortJQueryInput=dd/MM/yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
@@ -25,7 +26,6 @@ ErrorFailedToSendMail=Fehler beim Senden des Mails (Absender=%s, Empfänger=%s)
ErrorAttachedFilesDisabled=Die Dateianhangsfunktion ist auf diesem Server deaktiviert
ErrorInternalErrorDetected=Interner Fehler entdeckt
ErrorDuplicateField=Dieser Wert muß einzigartig sein
-ErrorOnlyPngJpgSupported=Bitte wählen Sie eine Datei im .jpg- oder .png-Dateiformat.
LevelOfFeature=Funktions-Level
PreviousConnexion=Vorherige Verbindung
RequestLastAccessInError=Anfrage des letzten Datenbankzugriffs mit Fehler
@@ -63,7 +63,6 @@ Receive=Erhalte
ThisLimitIsDefinedInSetup=Gesetzte System-Limits (Menü Home-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
UnHidePassword=Passwort-Zeichen anzeigen
ListOfFiles=Dateiliste
-FreeZone=Freier Text
CloneMainAttributes=Duplikat mit den Haupteigenschaften
AttributeCode=Attribut-Code
OptionalFieldsSetup=Optionale Felder einrichten
diff --git a/htdocs/langs/de_AT/projects.lang b/htdocs/langs/de_AT/projects.lang
index 8b665ac1dd6..a480ec09913 100644
--- a/htdocs/langs/de_AT/projects.lang
+++ b/htdocs/langs/de_AT/projects.lang
@@ -11,7 +11,6 @@ NoProject=Kein Projekt definiert
RefTask=Aufgaben Nr.
MyActivities=Meine Tätigkeiten
ListFichinterAssociatedProject=Liste der mit diesem Projekt verknüpften Eingriffe
-ListTripAssociatedProject=Liste der mit diesem Projekt verknüpften Reise- und Fahrtspesen
CloseAProject=Schließe Projekt
ReOpenAProject=Öffne Projekt
DoNotShowMyTasksOnly=Zeige auch die Aufgaben Anderer
diff --git a/htdocs/langs/de_AT/withdrawals.lang b/htdocs/langs/de_AT/withdrawals.lang
index c5ae4da1f5f..93ca575035d 100644
--- a/htdocs/langs/de_AT/withdrawals.lang
+++ b/htdocs/langs/de_AT/withdrawals.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - withdrawals
LastWithdrawalReceipt=%s neuste Abbuchungsbelege
-InvoiceRefused=Ablehnung in Rechnung stellen
WithdrawalRefused=Abbuchungen abgelehnt
+InvoiceRefused=Ablehnung in Rechnung stellen
StatusWaiting=Wartestellung
StatusMotif2=Abbuchung angefochten
StatusMotif4=Ablehnung durch Kontoinhaber
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 26cd766b83e..70564679d5f 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -1,11 +1 @@
# Dolibarr language file - Source file is en_US - companies
-JuridicalStatus600=Einzelfirma
-JuridicalStatus601=Einfache Gesellschaft
-JuridicalStatus602=Kollektivgesellschaft
-JuridicalStatus603=Kommanditgesellschaft
-JuridicalStatus604=Aktiengesellschaft (AG)
-JuridicalStatus605=Kommanditaktiengesellschaft
-JuridicalStatus606=Gesellschaft mit beschränkter Haftung (GmbH)
-JuridicalStatus607=Genossenschaft
-JuridicalStatus608=Verein
-JuridicalStatus609=Stiftung
\ No newline at end of file
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index adbf494c99e..6a5173b676f 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/MM/yy
FormatDateShortJQueryInput=dd/MM/yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
@@ -17,4 +18,4 @@ FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
\ No newline at end of file
+FormatDateHourText=%d %B %Y %H:%M
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 68f2ac30cb8..45611a61a57 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimentell
VersionDevelopment=Entwicklung
VersionUnknown=Unbekannt
VersionRecommanded=Empfohlene
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sitzungs ID
SessionSaveHandler=Handler für Sitzungsspeicherung
SessionSavePath=Pfad für Sitzungsdatenspeicherung
@@ -493,10 +498,16 @@ Module600Name=Benachrichtigungen
Module600Desc=Senden Sie Benachrichtigungen zu einigen Dolibarr-Events per E-Mail an Partner (wird pro Partner definiert)
Module700Name=Spenden
Module700Desc=Spendenverwaltung
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis-Integation
Module1400Name=Buchhaltung
Module1400Desc=Buchhaltung für Experten (doppelte Buchhaltung)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorien
Module1780Desc=Kategorienverwaltung (Produkte, Lieferanten und Kunden)
Module2000Name=FCKeditor
@@ -631,7 +642,7 @@ Permission181=Lieferantenbestellungen einsehen
Permission182=Lieferantenbestellungen erstellen/bearbeiten
Permission183=Lieferantenbestellungen freigeben
Permission184=Lieferantenbestellungen bestätigen
-Permission185=Lieferantenbestellungen übermitteln
+Permission185=Order or cancel supplier orders
Permission186=Lieferantenbestellungen empfangen
Permission187=Lieferantenbestellungen schließen
Permission188=Lieferantenbestellungen verwerfen
@@ -711,6 +722,13 @@ Permission538=Leistungen exportieren
Permission701=Spenden einsehen
Permission702=Spenden erstellen/bearbeiten
Permission703=Spenden löschen
+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
Permission1001=Warenbestände einsehen
Permission1002=Warenlager erstellen/ändern
Permission1003=Warenlager löschen
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Kennwort ein, um den Proxy-Server verwenden
DefineHereComplementaryAttributes=Definieren Sie hier allen Attributen, nicht bereits standardmäßig vorhanden, und dass Sie für %s unterstützt werden.
ExtraFields=Ergänzende Attribute
ExtraFieldsLines=Ergänzende Attribute (Zeilen)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Ergänzende Attribute (Partner)
ExtraFieldsContacts=Ergänzende Attribute (Kontakt)
ExtraFieldsMember=Ergänzende Attribute (Mitglied)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Produkt-/Servicezeilen mit Nullmenge zulässig
FreeLegalTextOnProposal=Freier Rechtstext für Angebote
WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwürfen (keins, falls leer)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Bestellverwaltungseinstellungen
OrdersNumberingModules=Bestellnumerierungs-Module
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode vom Typ UPC
BarcodeDescISBN=Barcode vom Typ ISBN
BarcodeDescC39=Barcode vom Typ C39
BarcodeDescC128=Barcode vom Typ C128
-GenbarcodeLocation=Kommandozeilen-Tool zur Barcode-Generierung (von phpbarcode-Engine verwendet)
+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
BarcodeInternalEngine=interne Engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe
CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
CashDeskBankAccountForCheque= Finanzkonto für Scheckeinlösungen
CashDeskBankAccountForCB= Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
StockDecreaseForPointOfSaleDisabled=Verringerung des Lagerbastandes durch Point of Sale deaktivert
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Lesezeichenmoduleinstellungen
@@ -1569,3 +1597,7 @@ SortOrder=Sortierreihenfolge
Format=Format
TypePaymentDesc=0:Kunden-Zahlungs-Typ, 1:Lieferanten-Zahlungs-Typ, 2:Sowohl Kunden- als auch Lieferanten-Zahlungs-Typ
IncludePath=Include path (defined into variable %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.
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 262f9f52281..b70c2cecc29 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -33,7 +33,11 @@ AllTime=Vom start
Reconciliation=Zahlungsabgleich
RIB=Kontonummer
IBAN=IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT Code
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Daueraufträge
StandingOrder=Dauerauftrag
Withdrawals=Entnahmen
@@ -148,7 +152,7 @@ BackToAccount=Zurück zum Konto
ShowAllAccounts=Alle Finanzkonten
FutureTransaction=Zukünftige Transaktionen.
SelectChequeTransactionAndGenerate=Schecks auswählen/filtern um Sie in den Einzahlungsbeleg zu integrieren und auf "Erstellen" klicken.
-InputReceiptNumber=Wählen Sie den zugehörigen Buchungssatz zum Konsolidieren. Verwenden Sie einen numerischen Ausdruck (z.B. YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Wenn möglich Kategorie angeben, worin die Daten eingeordnet werden
ToConciliate=Konsolidieren?
ThenCheckLinesAndConciliate=Dann die Zeilen im Bankauszug prüfen und Klicken
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index 955f35f8118..5805c602b95 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -9,8 +9,8 @@ Prospect=Lead
Prospects=Leads
DeleteAction=Maßnahme / Aufgabe löschen
NewAction=Neue Maßnahme / Aufgabe
-AddAction=Maßnahme / Aufgabe hinzufügen
-AddAnAction=Hinzufügen einer Maßnahme / Aufgabe
+AddAction=Maßnahme/Aufgabe erstellen
+AddAnAction=Maßnahme/Aufgabe erstellen
AddActionRendezVous=Treffen anlegen
Rendez-Vous=Treffen
ConfirmDeleteAction=Möchten Sie diese Aufgabe wirklich löschen?
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontaktaufnahme erledigt
DateActionPlanned=Geplantes Erledigungsdatum
DateActionDone=Echtes Erledigungsdatum
ActionAskedBy=Maßnahme erbeten von
-ActionAffectedTo=Maßnahme gehört
+ActionAffectedTo=Event assigned to
ActionDoneBy=Maßnahme erledigt von
ActionUserAsk=Aufgenommen durch
ErrorStatusCantBeZeroIfStarted=Ist das Feld 'Echtes Erledigungsdatum' ausgefüllt, so wurde die Aktion bereits gestartet (oder beendet) und der 'Status' kann nicht 0%% sein.
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 0027d817391..9cb31dac046 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Abgelaufen
ServiceStatusClosed=Geschlossen
ServicesLegend=Services Legende
Contracts=Verträge
+ContractsAndLine=Contracts and line of contracts
Contract=Vertrag
NoContracts=Keine Verträge
MenuServices=Services
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 2f20a1b93ad..77060539e1b 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell-Befehl
CronMenu=Cron
CronCannotLoadClass=Kann Klasse %s oder Object %s nicht laden
UseMenuModuleToolsToAddCronJobs=Rufe Menu "Home - Modules tools - Job Liste" auf um geplante Aufgaben zu sehen und zu verändern.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 09a01fc63e9..a78fe0da64a 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Quell- und Zielbankkonto müssen unterschiedlich
ErrorBadThirdPartyName=Der für den Partner eingegebene Name ist ungültig.
ErrorProdIdIsMandatory=Die %s ist zwingend notwendig
ErrorBadCustomerCodeSyntax=Die eingegebene Kundennummer ist unzulässig.
-ErrorBadBarCodeSyntax=Falsche Syntax für Barcode
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Kunden Nr. erforderlich
ErrorBarCodeRequired=Barcode erforderlich
ErrorCustomerCodeAlreadyUsed=Diese Kunden-Nr. ist bereits vergeben.
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Diese Funktion erfordert aktiviertes JavaScript. Ak
ErrorPasswordsMustMatch=Die eingegebenen Passwörter müssen identisch sein.
ErrorContactEMail=Ein technischer Fehler ist aufgetreten. Bitte kontaktieren Sie Ihren Administrator unter der folgenden E-Mail-Adresse %s und fügen Sie den Fehlercode %s in Ihrer Nachricht ein, oder (noch besser) fügen Sie einen Screenshot dieser Seite als Anhang bei.
ErrorWrongValueForField=Falscher Wert für Feld Nr. %s (Wert '%s' passt nicht zur Regex-Regel %s)
-ErrorFieldValueNotIn=Nicht korrekter Wert für das Feld-Nummer %s (Wert: '%s' ist kein verfügbarer Wert im Feld %s der Tabelle %s
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Falscher Wert für Feldnummer %s (für den Wert '%s' besteht keine %s Referenz)
ErrorsOnXLines=Fehler in %s Quellzeilen
ErrorFileIsInfectedWithAVirus=Der Virenschutz konnte diese Datei nicht freigeben (eventuell ist diese mit einem Virus infiziert)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Interner Fehler '%s'
ErrorPriceExpressionUnknown=Unbekannter Fehler '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index b1f421536af..323979fb31f 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Letzter Schritt: Legen Sie Ihr Logo und das Passwo
ActivateModule=Aktivieren von Modul %s
ShowEditTechnicalParameters=Hier klicken um erweiterte Funktionen zu zeigen/bearbeiten (Expertenmodus)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index c8256ebde92..3f51e500253 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -141,6 +141,7 @@ Cancel=Abbrechen
Modify=Ändern
Edit=Bearbeiten
Validate=Freigeben
+ValidateAndApprove=Validate and Approve
ToValidate=Freizugeben
Save=Speichern
SaveAs=Speichern unter
@@ -158,6 +159,7 @@ Search=Suchen
SearchOf=Suche nach
Valid=Gültig
Approve=Genehmigen
+Disapprove=Disapprove
ReOpen=Wiedereröffnen
Upload=Datei laden
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Karten
Card=Karte
Now=Jetzt
Date=Datum
+DateAndHour=Date and hour
DateStart=Beginndatum
DateEnd=Enddatum
DateCreation=Erstellungsdatum
@@ -295,6 +298,7 @@ UnitPriceHT=Stückpreis (netto)
UnitPriceTTC=Stückpreis (brutto)
PriceU=VP
PriceUHT=VP (netto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=VP (brutto)
Amount=Betrag
AmountInvoice=Rechnungsbetrag
@@ -521,6 +525,7 @@ DateFromTo=Von %s bis %s
DateFrom=Von %s
DateUntil=Bis %s
Check=Prüfen
+Uncheck=Uncheck
Internal=Intern
External=Extern
Internals=Interne
@@ -688,6 +693,7 @@ PublicUrl=Öffentliche URL
AddBox=Box zufügen
SelectElementAndClickRefresh=Wählen Sie ein Element und clicken Sie Aktualisieren
PrintFile=Drucke Datei %s
+ShowTransaction=Show transaction
# Week day
Monday=Montag
Tuesday=Dienstag
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 18c9300a562..afddbf7e1b7 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Storniert
StatusOrderDraft=Entwurf (freizugeben)
StatusOrderValidated=Freigegeben
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Bearbeitet
StatusOrderToBill=Zu verrechnen
StatusOrderToBill2=Zu verrechnen
@@ -58,6 +59,7 @@ MenuOrdersToBill=Bestellverrechnung
MenuOrdersToBill2=Billable orders
SearchOrder=Suche Bestellung
SearchACustomerOrder=Kundenauftrag suchen
+SearchASupplierOrder=Search a supplier order
ShipProduct=Produkt versenden
Discount=Rabatt
CreateOrder=Erzeuge Bestellung
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 99ba2d2cf4c..4b2f4a52bea 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximalgröße
AttachANewFile=Neue Datei/Dokument anhängen
LinkedObject=Verknüpftes Objekt
Miscellaneous=Verschiedenes
-NbOfActiveNotifications=Anzahl aktiver Benachrichtigungen
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Dies ist ein Test-Mail.\n Die beiden Zeilen sind durch eine Zeilenschaltung getrennt.
PredefinedMailTestHtml=Dies ist ein (HTML)-Test Mail (das Wort Test muss in Fettschrift erscheinen).
Die beiden Zeilen sollteb durch eine Zeilenschaltung getrennt sein.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Bedauerlicherweise scheint die Rechnung __FACREF__ bislang unbeglichen. Als Erinnerung übersenden wir Ihnen diese nochmals im Anhang.\n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang unser Angebot __PROPREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ \n\n Bitte entnehmen Sie dem Anhang die Bestellung __ORDERREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ \n\n Anbei erhalten Sie die Rechnung __ FACREF__ \n\n__PERSONALIZED__Mit freundlichen Grüßen\n\n__SIGNATURE__
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 3e196897569..4ec2f570e7c 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Charge/Seriennr
l_eatby=Verzehren-bis-Datum
l_sellby=Verkaufen-bis-Datum
DetailBatchNumber=Chargen-/Seriennummern-Details
-DetailBatchFormat=Charge/Seriennr: %s - E: %s - S: %s (Menge: %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Charge: %s
printEatby=Verzehren bis: %s
printSellby=Verkaufen bis: %s
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 91044e017bb..8816eff2614 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Nummer
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index b11cd6db0c4..fbbc111f0f7 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Jeder
PrivateProject=Kontakte zum Projekt
MyProjectsDesc=Hier können Sie nur die Projekte einsehen, bei welchen Sie als Kontakt hinzugefügt sind.
ProjectsPublicDesc=Ihnen werden alle Projekte angezeigt bei welchen Sie über Leserechte verfügen.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
MyTasksDesc=Diese Ansicht ist für Sie beschränkt auf Projekte oder Aufgaben bei welchen Sie als Ansprechpartner eingetragen sind.
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
TasksDesc=Diese Ansicht zeigt alle Projekte und Aufgaben (Ihre Benutzerberechtigungen berechtigt Sie alles zu sehen).
ProjectsArea=Projektübersicht
@@ -29,6 +31,8 @@ NoProject=Kein Projekt definiert oder keine Rechte
NbOpenTasks=Anzahl der offenen Aufgaben
NbOfProjects=Anzahl der Projekte
TimeSpent=Zeitaufwand
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Zeitaufwände
RefTask=Aufgaben-Nr.
LabelTask=Aufgabenbezeichnung
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste der mit diesem Projekt verbundenen Lie
ListSupplierInvoicesAssociatedProject=Liste der mit diesem Projekt verbundenen Lieferantenrechnungen
ListContractAssociatedProject=Liste der mit diesem Projekt verbundenen Verträge
ListFichinterAssociatedProject=Liste der mit diesem Projekt verknüpften Services
-ListTripAssociatedProject=Liste der mit diesem Projekt verknüpften Reisekosten
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Liste der mit diesem Projekt verknüpften Maßnahmen
ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche
ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats
@@ -133,3 +137,6 @@ SearchAProject=Suchen Sie ein Projekt
ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
ProjectDraft=Projekt-Entwürfe
FirstAddRessourceToAllocateTime=Eine Ressource zuordnen, um Zeit festzulegen
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index b1477807c4e..5e72aae4e86 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Lohnzahlungen
ShowSalaryPayment=Zeige Lohnzahlung
THM=Durchschnittlicher Stundenpreis
TJM=Durchschnittlicher Tagespreis
+CurrentSalary=Current salary
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index cfb2af7ca1a..93da292748d 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Bestellmenge
QtyShipped=Liefermenge
QtyToShip=Versandmenge
QtyReceived=Erhaltene Menge
-KeepToShip=Für Versand behalten
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Weitere Sendungen zu dieser Bestellung
DateSending=Datum des Versands
DateSendingShort=Versanddatum
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 69b59baded0..d560920f048 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Gewichteter Warenwert
PMPValueShort=DSWP
EnhancedValueOfWarehouses=Lagerwert
UserWarehouseAutoCreate=Beim Anlegen eines Benutzers automatisch neues Warenlager erstellen
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Menge
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Das Lager %s wird für Entnahme verwendet
WarehouseForStockIncrease=Das Lager %s wird für Wareneingang verwendet
ForThisWarehouse=Für dieses Lager
ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen.
-ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Nachschub
NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index 4dcff3f39f8..58f83d6a3d5 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Lieferanten
-Supplier=Lieferant
AddSupplier=Lieferant anlegen
SupplierRemoved=Lieferant entfernt
SuppliersInvoice=Lieferantenrechnung
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Lieferantenrechnungen und Zahlungen
ExportDataset_fournisseur_3=Lieferantenbestellungen und Auftragszeilen
ApproveThisOrder=Bestellung bestätigen
ConfirmApproveThisOrder=Möchten Sie diese Bestellung wirklich bestätigen %s ?
-DenyingThisOrder=Bestellung ablehnen
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Möchten Sie diese Bestellung wirklich ablehnen %s ?
ConfirmCancelThisOrder=Möchten Sie diese Bestellung wirklich verwerfen %s ?
AddCustomerOrder=Erzeuge Kundenbestellung
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index a4dabc3ce01..2ea6735cd00 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Reise
-Trips=Reisen
-TripsAndExpenses=Reise- und Fahrtspesen
-TripsAndExpensesStatistics=Reise- und Spesenstatistiken
-TripCard=Reise-Karte
-AddTrip=Reise hinzufügen
-ListOfTrips=Liste der Reisen
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Liste der Spesen
-NewTrip=Neue Reise
+NewTrip=New expense report
CompanyVisited=Besuchter Partner
Kilometers=Kilometerstand
FeesKilometersOrAmout=Kilometergeld oder Spesenbetrag
-DeleteTrip=Reise löschen
-ConfirmDeleteTrip=Möchten Sie diese Reise wirklich löschen?
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
+ClassifyRefunded=Als 'rückerstattet' markieren
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
TF_OTHER=Andere
+TF_TRANSPORTATION=Transportation
TF_LUNCH=Essen
-TF_TRIP=Reise
-ListTripsAndExpenses=Liste der Reisen und Spesen
-ExpensesArea=Spesenübersicht
-SearchATripAndExpense=Suchen nach einer Reise oder Aufwänden
-ClassifyRefunded=Classify 'Refunded'
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index f706cfa457c..d8f7036b628 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Πειραματική
VersionDevelopment=Υπό ανάπτυξη
VersionUnknown=Άγνωστη
VersionRecommanded=Προτεινόμενη
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID Συνόδου
SessionSaveHandler=Φορέας χειρισμού αποθήκευσης συνεδριών
SessionSavePath=Αποθήκευση τοπικής προσαρμογής συνεδρίας
@@ -128,8 +133,8 @@ PHPServerOffsetWithGreenwich=PHP server offset width Greenwich (seconds)
ClientOffsetWithGreenwich=Client/Browser offset width Greenwich (seconds)
DaylingSavingTime=Η θερινή ώρα (χρήστη)
CurrentHour=PHP server hour
-CompanyTZ=Time Zone company (main company)
-CompanyHour=Hour company (main company)
+CompanyTZ=Ζώνη ώρας εταιρείας (κύρια εταιρεία)
+CompanyHour=Ώρα εταιρείας (κύρια εταιρεία)
CurrentSessionTimeOut=Χρονικό όριο περιόδου λειτουργίας τρέχουσας συνοδού
YouCanEditPHPTZ=Για να ορίσετε μια διαφορετική ζώνη ώρας της PHP (δεν απαιτείται), μπορείτε να δοκιμάσετε να προσθέσετε ένα αρχείο .htacces με μια γραμμή σαν αυτό "TZ setenv Europe / Paris"
OSEnv=Περιβάλλον OS
@@ -201,186 +206,186 @@ No=Όχι
AutoDetectLang=Αυτόματη Ανίχνευση (γλώσσα φυλλομετρητή)
FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο demo
Rights=Δικαιώματα
-BoxesDesc=Boxes are screen area that show a piece of information on some pages. You can choose between showing the box or not by selecting target page and clicking 'Activate', or by clicking the dustbin to disable it.
-OnlyActiveElementsAreShown=Only elements from enabled modules are shown.
-ModulesDesc=Dolibarr modules define which functionality is enabled in software. Some modules require permissions you must grant to users, after enabling module. Click on button on/off in column "Status" to enable a module/feature.
-ModulesInterfaceDesc=The Dolibarr modules interface allows you to add features depending on external software, systems or services.
-ModulesSpecialDesc=Special modules are very specific or seldom used modules.
-ModulesJobDesc=Business modules provide simple predefined setup of Dolibarr for a particular business.
-ModulesMarketPlaceDesc=You can find more modules to download on external web sites on the Internet...
+BoxesDesc=Τα κουτιά είναι κομμάτια της επιφάνειας εργασίας που δείχνουν πληροφορίες σε κάποιες σελίδες. Μπορείτε να επιλέξετε ανάμεσα στην εμφάνιση του κουτιού ή όχι, απλά επιλέγοντας την σελίδα στόχο και κάνοντας κλικ στο 'Ενεργοποίηση', ή κάνοντας κλικ στο εικονίδιο κάδου για να το απενεργοποιήσετε.
+OnlyActiveElementsAreShown=Μόνο στοιχεία από ενεργοποιημένα modules προβάλλονται.
+ModulesDesc=Τα modules του Dolibarr ελέγχουν ποιες λειτουργίες είναι ενεργοποιημένες στο λογισμικό. Κάποια modules απαιτούν δικαιώματα που πρέπει να παρέχετε στους χρήστες, μετά την ενεργοποίηση του module. Κάντε κλικ στο κουμπί on/off στην στήλη "Κατάσταση" για να ενεργοποίησετε ένα module ή μια λειτουργία.
+ModulesInterfaceDesc=Η διεπαφή των modules του Dolibarr σας επιτρέπει να προσθέσετε λειτουργίες που στηρίζονται σε εξωτερικό λογισμικό, συστήματα ή υπηρεσίες.
+ModulesSpecialDesc=Τα ειδικά modules είναι για πολύ συγκεκριμένες ή σπάνιες χρήσεις.
+ModulesJobDesc=Τα Business modules παρέχουν απλές προρυθμισμένες εγκαταστάσεις του Dolibarr για συγκεκριμένους τύπους επιχειρήσεων.
+ModulesMarketPlaceDesc=Μπορείτε να βρείτε περισσότερα modules για να κατεβάσετε σε εξωτερικά web sites στο Internet...
ModulesMarketPlaces=Περισσότερα Αρθρώματα...
-DoliStoreDesc=DoliStore, the official market place for Dolibarr ERP/CRM external modules
+DoliStoreDesc=Το DoliStore, είναι η επίσημη περιοχή για να βρείτε εξωτερικά modules για το Dolibarr ERP/CRM
DoliPartnersDesc=Λίστα με ορισμένες εταιρείες που μπορούν να προσφέρουν έρευνα/ανάπτυξη κατά παραγγελία modules ή χαρακτηριστικά (Σημείωση: κάθε εταιρεία Open Source που γνωρίζει γλώσσα PHP μπορεί να σας δώσει συγκεκριμένη ανάπτυξη)
-WebSiteDesc=Web site providers you can search to find more modules...
-URL=Ιστοσελίδα
+WebSiteDesc=Ιστοσελίδες στις οποίες μπορείτε να βρείτε περισσότερα modules...
+URL=Σύνδεσμος
BoxesAvailable=Διαθέσιμα Πλαίσια
BoxesActivated=Ενεργά Πλαίσια
-ActivateOn=Activate on
-ActiveOn=Activated on
+ActivateOn=Ενεργοποιήστε στις
+ActiveOn=Ενεργοποιήθηκε στις
SourceFile=Πηγαίο αρχείο
-AutomaticIfJavascriptDisabled=Automatic if Javascript is disabled
-AvailableOnlyIfJavascriptNotDisabled=Available only if JavaScript is not disabled
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
+AutomaticIfJavascriptDisabled=Αυτόματα αν είναι απενεργοποιημένο το Javascript
+AvailableOnlyIfJavascriptNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο
Required=Υποχρεωτικό
UsedOnlyWithTypeOption=Χρησιμοποιείται μόνο από κάποια επιλογή της ατζέντας
Security=Ασφάλεια
Passwords=Συνθηματικά
-DoNotStoreClearPassword=Do no store clear passwords in database but store only encrypted value (Activated recommended)
-MainDbPasswordFileConfEncrypted=Database password encrypted in conf.php (Activated recommended)
-InstrucToEncodePass=To have password encoded into the 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"
-ProtectAndEncryptPdfFiles=Protection of generated pdf files (Activated NOT recommended, breaks mass pdf generation)
-ProtectAndEncryptPdfFilesDesc=Protection of a PDF document keeps it available to read and print with any PDF browser. However, editing and copying is not possible anymore. Note that using this feature make building of a global cumulated pdf not working (like unpaid invoices).
+DoNotStoreClearPassword=Μην αποθηκεύετε αποκρυπτογραφημένους κωδικούς στην βάση δεδομένων, αλλά να αποθηκεύετε μόνο η κρυπτογραφημένη τιμή (προτείνεται να είναι ενεργό)
+MainDbPasswordFileConfEncrypted=Ο κωδικός της βάσης δεδομένων να είναι κρυπτογραφημένος στο conf.php (προτείνεται να είναι ενεργό)
+InstrucToEncodePass=Για να κρυπτογραφήσετε τον κωδικό στο αρχείο conf.php, αντικαταστήστε την γραμμή
$dolibarr_main_db_pass="..."
με το
$dolibarr_main_db_pass="crypted:%s"
+InstrucToClearPass=Για να αφήσετε τον κωδικό χωρίς κρυπτογράφηση στο αρχείο conf.php , αντικαταστήστε τη γραμμή
$dolibarr_main_db_pass="crypted:..."
με το
$dolibarr_main_db_pass="%s"
+ProtectAndEncryptPdfFiles=Προστασία παραγόμενων αρχείων pdf (Η ενεργοποίηση ΔΕΝ προτείνεται, χαλάει την μαζική δημιουργία pdf)
+ProtectAndEncryptPdfFilesDesc=Η ασφάλεια ενός αρχείου PDF επιτρέπει τα προγράμματα ανάγνωσης PDF να το ανοίξουν και να το εκτυπώσουν. Παρ' ΄όλα αυτά, η τροποποίηση και η αντιγραφή δεν θα είναι πλέον δυνατά. Σημειώστε πως αν χρησιμοποιήσετε αυτή την λειτουργία δεν θα μπορούν να δουλέψουν ομαδικά pdf (όπως απλήρωτα τιμολόγια).
Feature=Δυνατότητα
DolibarrLicense=Άδεια χρήσης
DolibarrProjectLeader=Αρχηγός Έργου
-Developpers=Developers/contributors
-OtherDeveloppers=Other developers/contributors
-OfficialWebSite=Dolibarr international official web site
-OfficialWebSiteFr=French official web site
-OfficialWiki=Dolibarr documentation on Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
+Developpers=Προγραμματιστές/συνεργάτες
+OtherDeveloppers=Άλλοι προγραμματιστές/συνεργάτες
+OfficialWebSite=Επίσημη ιστοσελίδα Dolibarr international
+OfficialWebSiteFr=Επίσημη Γαλλική ιστοσελίδα
+OfficialWiki=Τεκμηρίωση Dolibarr στο Wiki
+OfficialDemo=Δοκιμαστική έκδοση Dolibarr
+OfficialMarketPlace=Επίσημη ιστοσελίδα για εξωτερικά modules/πρόσθετα
OfficialWebHostingService=Υπηρεσίες που αναφέρονται για web hosting (Cloud hosting)
ReferencedPreferredPartners=Preferred Partners
OtherResources=Άλλοι πόροι
-ForDocumentationSeeWiki=For user or developer documentation (Doc, FAQs...),
take a look at the Dolibarr Wiki:
%s
-ForAnswersSeeForum=For any other questions/help, you can use the Dolibarr forum:
%s
-HelpCenterDesc1=This area can help you to get a Help support service on Dolibarr.
-HelpCenterDesc2=Some part of this service are available in english only.
-CurrentTopMenuHandler=Current top menu handler
-CurrentLeftMenuHandler=Current left menu handler
-CurrentMenuHandler=Current menu handler
-CurrentSmartphoneMenuHandler=Current smartphone menu handler
+ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή (Doc, FAQs...),
ρίξτε μια ματιά στο Dolibarr Wiki:
%s
+ForAnswersSeeForum=Για οποιαδήποτε άλλη ερώτηση/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:
%s
+HelpCenterDesc1=Αυτή η περιοχή μπορεί να σας βοηθήσει να αποκτήσετε υπηρεσίες βοήθειας στο Dolibarr.
+HelpCenterDesc2=Κάποια κομμάτια αυτής της υπηρεσίας είναι διαθέσιμα μόνο στα αγγλικά.
+CurrentTopMenuHandler=Τωρινός διαμορφωτής πάνω μενού
+CurrentLeftMenuHandler=Τωρινός διαμορφωτής αριστερού μενού
+CurrentMenuHandler=Τωρινός διαμορφωτής μενού
+CurrentSmartphoneMenuHandler=Τωρινός διαμορφωτής μενού για κινητές συσκευές
MeasuringUnit=Μονάδα μέτρησης
Emails=E-mails
EMailsSetup=Διαχείριση E-mails
-EMailsDesc=This page allows you to overwrite your PHP parameters for e-mails sending. In most cases on Unix/Linux OS, your PHP setup is correct and these parameters are useless.
-MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (By default in php.ini: %s)
-MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s)
-MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
-MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
-MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s)
-MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνύματα που στέλνονται
-MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
+EMailsDesc=Αυτή η σελίδα σας επιτρέπει να αλλάξετε τις παραμέτρους PHP για την αποστολή email. Στις περισσότερες περιπτώσεις σε λειτουργικά συστήματα Unix/Linux, η διαμόρφωση της PHP σας είναι σωστή και αυτές οι παράμετροι είναι άχρηστες.
+MAIN_MAIL_SMTP_PORT=Θύρα SMTP/SMTPS (Προεπιλογή στο php.ini: %s)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (Προεπιλογή στο php.ini: %s)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Θύρα SMTP/SMTPS (Δεν καθορίζεταιστην PHP σε συστήματα Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Δεν καθορίζεταιστην PHP σε συστήματα Unix)
+MAIN_MAIL_EMAIL_FROM=E-mail αποστολέα για αυτόματα e-mails (Προεπιλογή στο php.ini: %s)
+MAIN_MAIL_ERRORS_TO=E-mail αποστολέα που χρησιμοποιούνται για την επιστροφή λάθος μηνυμάτων που στέλνονται
+MAIN_MAIL_AUTOCOPY_TO= Να αποστέλονται κρυφά αντίγραφα των απεσταλμένων emails στο
MAIN_MAIL_AUTOCOPY_PROPOSAL_TO= Αποστολή συστηματικά ένος κρυφού καρμπόν-αντίγραφου των προσφορών που αποστέλλονται μέσω email στο
MAIN_MAIL_AUTOCOPY_ORDER_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου των παραγγελιών που αποστέλλονται μέσω email στο
MAIN_MAIL_AUTOCOPY_INVOICE_TO= Αποστολή συστηματικά ενός κρυφού καρμπόν-αντίγραφου τιμολογίου που αποστέλλεται μέσω email στο
-MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=Απενεργοποίηση όλων των αποστολών email (για δοκιμές και δοκιμαστικές εκδόσεις)
MAIN_MAIL_SENDMODE=Μέθοδος που χρησιμοποιείτε για αποστολή EMails
-MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
-MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
-MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
-MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων σας αποστολές SMS (για λόγους δοκιμής ή demos)
-MAIN_SMS_SENDMODE=Μέθοδος να χρησιμοποιήσετε για την αποστολή SMS
-MAIN_MAIL_SMS_FROM=Προεπιλογή αριθμού τηλεφώνου αποστολέα για την αποστολή SMS
-FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
-SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum.
+MAIN_MAIL_SMTPS_ID=SMTP ID αν απαιτείται πιστοποίηση
+MAIN_MAIL_SMTPS_PW=Κωδικός SMTP αν απαιτείται πιστοποίηση
+MAIN_MAIL_EMAIL_TLS= Χρησιμοποιήστε TLS (SSL) κωδικοποίηση
+MAIN_DISABLE_ALL_SMS=Απενεργοποίηση όλων των αποστολών SMS (για λόγους δοκιμής ή demos)
+MAIN_SMS_SENDMODE=Μέθοδος που θέλετε να χρησιμοποιηθεί για την αποστολή SMS
+MAIN_MAIL_SMS_FROM=Προεπιλεγμένος αριθμός τηλεφώνου αποστολέα για την αποστολή SMS
+FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
+SubmitTranslation=Αν η μετάφραση για αυτή την γλώσσα δεν είναι ολοκληρωμένη λη βρίσκετε λάθη, μπορείτε να τα διορθώσετε με επεξεργασία των αρχείων στο φάκελο langs/%s και να στείλετε τα επεξεργασμένα αρχεία στο forum www.dolibarr.org.
ModuleSetup=Διαχείριση Αρθρώματος
ModulesSetup=Διαχείριση Αρθρωμάτων
ModuleFamilyBase=Σύστημα
ModuleFamilyCrm=Customer Relation Management (CRM)
ModuleFamilyProducts=Διαχείριση Προϊόντων
ModuleFamilyHr=Διαχείριση Ανθρώπινου Δυναμικού
-ModuleFamilyProjects=Projects/Collaborative work
-ModuleFamilyOther=Other
-ModuleFamilyTechnic=Multi-modules tools
-ModuleFamilyExperimental=Experimental modules
-ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
-ModuleFamilyECM=Electronic Content Management (ECM)
-MenuHandlers=Menu handlers
+ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες
+ModuleFamilyOther=Άλλο
+ModuleFamilyTechnic=Εργαλεία πολλαπλών αρθρωμάτων
+ModuleFamilyExperimental=Πειραματικά αρθρώματα
+ModuleFamilyFinancial=Χρηματοοικονομικά αρθρώματα (Λογιστική/Χρηματοοικονομικά)
+ModuleFamilyECM=Διαχείριση Ηλεκτρονικού Περιεχομένου (ECM)
+MenuHandlers=Διαχειριστές μενού
MenuAdmin=Επεξεργαστής μενού
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=This is setup to process:
+DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή
+ThisIsProcessToFollow=Αυτό έχει ρυθμιστεί για να κατεργαστεί:
StepNb=Βήμα %s
-FindPackageFromWebSite=Find a package that provides feature you want (for example on official web site %s).
+FindPackageFromWebSite=Βρείτε ένα πακέτο που να παρέχει την λειτουργία που επιθυμείτε (για παράδειγμα στο επίσημο %s).
DownloadPackageFromWebSite=Μεταφόρτωση πακέτου %s.
UnpackPackageInDolibarrRoot=Αποσυμπίεσε το αρχείο εκεί που βρίσκεται η εγκατάσταση του Dolibarr %s
-SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
-NotExistsDirect=The alternative root directory is not defined.
-InfDirAlt=Since version 3 it is possible to define an alternative root directory.This allows you to store, same place, plug-ins and custom templates.
Just create a directory at the root of Dolibarr (eg: custom).
-InfDirExample=
Then declare it in the file conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*These lines are commented with "#", to uncomment only remove the character.
-YouCanSubmitFile=Select module:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Go to the page that updates the database structure and datas: %s.
+SetupIsReadyForUse=Η εγκατάσταση τελείωσε και το Dolibarr είναι έτοιμο να χρησιμοποιηθεί με αυτό το νέο μέρος.
+NotExistsDirect=Ο εναλλακτικός ριζικός φάκελος δεν έχει ρυθμιστεί.
+InfDirAlt=Από την έκδοση 3 είναι δυνατός ο ορισμός ενός εναλλακτικού ριζικού φακέλου. Αυτό σας επιτρέπει να αποθηκεύσετε στο ίδιο μέρος πρόσθετες εφαρμογές και μη τυπικά templates.
Απλά δημιουργήστε ένα φάκελο στο ριζικό φάκελο του Dolibarr (π.χ.: custom).
+InfDirExample=
Κατόπιν δηλώστε το στο αρχείο conf.php
$dolibarr_main_url_root_alt='http://myserver/custom'
$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'
*Αυτές οι γραμμές είναι απενεργοποιημένες με χρήση του χαρακτήρα "#", για να της ενεργοποιήσετε απλά αφαιρέστε το χαρακτήρα.
+YouCanSubmitFile=Επιλογή αρθρώματος:
+CurrentVersion=Έκδοση Dolibarr
+CallUpdatePage=Πηγαίνετε στην σελίδα που ενημερώνει την δομή της βάσης δεδομένων και τα δεδομένα: %s.
LastStableVersion=Τελευταία σταθερή έκδοση
UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
-GenericMaskCodes=You may enter any numbering mask. In this mask, the following tags could be used:
{000000} corresponds to a number which will be incremented on each %s. Enter as many zeros as the desired length of the counter. The counter will be completed by zeros from the left in order to have as many zeros as the mask.
{000000+000} same as previous but an offset corresponding to the number to the right of the + sign is applied starting on first %s.
{000000@x} same as previous but the counter is reset to zero when month x is reached (x between 1 and 12). If this option is used and x is 2 or higher, then sequence {yy}{mm} or {yyyy}{mm} is also required.
{dd} day (01 to 31).
{mm} month (01 to 12).
{yy}, {yyyy} or {y} year over 2, 4 or 1 numbers.
+GenericMaskCodes=Μπορείτε να χρησιμοποιήσετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτή τη μάσκα μπορούν να χρησιμοποιηθούν τις παρακάτω ετικέτες:
Το {000000} αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε όσα μηδεν επιθυμείτε ως το επιθυμητό μέγεθος για τον μετρητή. Ο μετρητής θα συμπληρωθεί με μηδενικά από τα αριστερά για να έχει όσα μηδενικά υπάρχουν στην μάσκα.
Η μάσκα {000000+000} είναι η ίδια όπως προηγουμένως αλλά ένα αντιστάθμισμα που αντιστοιχεί στον αριθμό στα δεξιά του + θα προστεθεί αρχίζοντας από το πρώτο %s.
Η μάσκα {000000@x} είναι η ίδια όπως προηγουμένως αλλά ο μετρητής επανέρχεται στο μηδέν όταν έρθει ο μήνας x (το x είναι μεταξύ του 1 και του 12). Αν αυτή η επιλογή χρησιμοποιηθεί και το x είναι 2 ή μεγαλύτερο, τότε η ακολουθία {yy}{mm} ή {yyyy}{mm} είναι επίσης απαιραίτητη.
Η μάσκα {dd} ημέρα (01 έως 31).
{mm} μήνας (01 έως 12).
{yy}, {yyyy} ή {y} έτος με χρήση 2, 4 ή 1 αριθμού.
GenericMaskCodes2={cccc} ο κωδικός πελάτη σε n χαρακτήρες
{cccc000} ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από ένα μετρητή αφιερωμένο για τον πελάτη. Αυτός ο μετρητής ειναι αφιερωμένος στον πελάτη μηδενίζεται ταυτόχρονα από την γενικό μετρητή.
{tttt} Ο κωδικός των Πελ./Προμ. σε n χαρακτήρες (βλέπε λεξικό-thirdparty types).
-GenericMaskCodes3=All other characters in the mask will remain intact.
Spaces are not allowed.
+GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.
Κενά διαστήματα δεν επιτρέπονται.
GenericMaskCodes4a=Example on the 99th %s of the third party TheCompany done 2007-01-31:
-GenericMaskCodes4b=Example on third party created on 2007-03-01:
-GenericMaskCodes4c=Example on product created on 2007-03-01:
-GenericMaskCodes5=ABC{yy}{mm}-{000000} will give ABC0701-000099
{0000+100}-ZZZ/{dd}/XXX will give 0199-ZZZ/31/XXX
-GenericNumRefModelDesc=Return a customizable number according to a defined mask.
-ServerAvailableOnIPOrPort=Server is available at address %s on port %s
-ServerNotAvailableOnIPOrPort=Server is not available at address %s on port %s
+GenericMaskCodes4b=Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:
+GenericMaskCodes4c=Το παράδειγμα προϊόντος δημιουργήθηκε στις 2007-03-01:
+GenericMaskCodes5=Η μάσκα ABC{yy}{mm}-{000000} θα δώσει ABC0701-000099
Η μάσκα{0000+100}-ZZZ/{dd}/XXX θα δώσει 0199-ZZZ/31/XXX
+GenericNumRefModelDesc=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα.
+ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμο στην διεύθυνση %s στην θύρα %s
+ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση %s στην θύρα %s
DoTestServerAvailability=Έλεγχος διασύνδεσης server
DoTestSend=Δοκιμή Αποστολής
DoTestSendHTML=Δοκιμή αποστολής HTML
ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ για να μηδενίσετε το μετρητή για κάθε έτος, εάν η ακολουθία {yy} ή {yyyy} δεν είναι μάσκα.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Error, can't use option @ if sequence {yy}{mm} or {yyyy}{mm} is not in mask.
-UMask=UMask parameter for new files on Unix/Linux/BSD/Mac file system.
-UMaskExplanation=This parameter allow you to define permissions set by default on files created by Dolibarr on server (during upload for example).
It must be the octal value (for example, 0666 means read and write for everyone).
This parameter is useless on a Windows server.
-SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
-UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
-DisableLinkToHelpCenter=Hide link "Need help or support" on login page
-DisableLinkToHelp=Hide link "%s Online help" on left menu
-AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα.
+UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac.
+UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).
Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 σημαίνει εγγραφή και ανάγνωση για όλους).
Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
+SeeWikiForAllTeam=Ρίξτε μια ματία στην σελίδα wiki για μια πλήρη λίστα όλων των actors και της οργάνωσής τους
+UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης)
+DisableLinkToHelpCenter=Αποκρύψτε τον σύνδεσμο "Αναζητήστε βοήθεια ή υποστήριξη" στην σελίδα σύνδεσης
+DisableLinkToHelp=Αποκρύψτε το σύνδεσμο "%s Online βοήθεια" στο αριστερό μενού
+AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου. Αν η γραμμή σας σας δεν χωράει στην σελίδα των εγγράφων επειδή είναι πολύ μεγάλη, θα πρέπει να προσθέσετε μόνοι σας χαρακτήρες αλλαγής γραμμής (carriage return) στην περιοχή κειμένου.
ModuleDisabled=Απενεργοποιημένο Άρθρωμα
-ModuleDisabledSoNoEvent=Module disabled so event never created
-ConfirmPurge=Are you sure you want to execute this purge ?
This will delete definitely all your data files with no way to restore them (ECM files, attached files...).
+ModuleDisabledSoNoEvent=Το άρθρωμα είναι απενεργοποιημένο και έτσι δεν έχει δημιουργηθεί τέτοιο γεγονός
+ConfirmPurge=Είστε σίγουροι πως θέλετε να εκτελέσετε αυτή τη διαγραφή;
Αυτό θα διαγράψει όλα σας τα δεδομένα με καμία δυνατότητα ανάκτησης (αρχεία ECM, συνημμένα αρχεία...).
MinLength=Ελάχιστο μήκος
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-ExamplesWithCurrentSetup=Examples with current running setup
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.
Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.
Files in those directories must end with .odt.
-NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
-ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=
To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
+LanguageFilesCachedIntoShmopSharedMemory=Τα αρχεία τύπου .lang έχουν φορτωθεί στην κοινόχρηστη μνήμη
+ExamplesWithCurrentSetup=Παραδείγματα με την τωρινή διαμόρφωση
+ListOfDirectories=Λίστα φακέλων προτύπων OpenDocument
+ListOfDirectoriesForModelGenODT=Λίστα φακέλων που περιέχουν αρχεία προτύπων τύπου OpenDocument.
Τοποθετείστε εδώ ολόκληρη την διαδρομή των φακέλων.
Εισάγετε ένα χαρακτήρα αλλαγής γραμμής ανάμεσα σε κάθε φάκελο.
Για να προσθέσετε ένα φάκελο του αρθρώματος GED, προσθέστε εδώ DOL_DATA_ROOT/ecm/yourdirectoryname.
Τα αρχεία σε αυτούς τους φακέλους πρέπει να έχουν την επέκταση .odt.
+NumberOfModelFilesFound=Αριθμός αρχείων προτύπων ODT/ODS που βρέθηκαν σε αυτούς τους φακέλους
+ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης:
c:\\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=
Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
FirstnameNamePosition=Θέση ονόματος/επιθέτου
-DescWeather=The following pictures will be shown on dashboard when number of late actions reach the following values:
+DescWeather=Οι παρακάτω εικόνες θα εμφανιστούν στο ταμπλό όταν ο αριθμός των τελευταίων ενεργειών φτάσει τις παρακάτω τιμές:
KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
-TestSubmitForm=Είσοδος μορφή δοκιμή
-ThisForceAlsoTheme=Χρησιμοποιώντας αυτό το μενού διευθυντής θα χρησιμοποιήσει επίσης το δικό της θέμα ό, τι είναι επιλογή του χρήστη. Επίσης, αυτό το μενού διευθυντής εξειδικεύεται για τα smartphones δεν λειτουργεί σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας.
-ThemeDir=Δέρματα κατάλογο
-ConnectionTimeout=Connexion timeout
-ResponseTimeout=Response timeout
+TestSubmitForm=Φόρμα δοκιμής εισαγωγής δεδομένων
+ThisForceAlsoTheme=Αυτός ο τροποποιητής μενού χρησιμοποιεί το δικό του θέμα όποιο θέμα και να έχει επιλέξει ο χρήστης. Επίσης, αυτό το πρόγραμμα διαχείρισης μενου που ειδικεύετεαι στις κινητές συσκευές δεν δουλεύει σε όλα τα smartphone. Χρησιμοποιήσετε κάποιον άλλο διαχειριστή μενού αν αντιμετωπίζετε προβλήματα στο δικό σας.
+ThemeDir=Φάκελος skins
+ConnectionTimeout=Λήξη σύνδεσης
+ResponseTimeout=Λήξη χρόνου αναμονής απάντησης
SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ να __PHONETO__
ModuleMustBeEnabledFirst=%s Ενότητα πρέπει να είναι ενεργοποιημένα πρώτη φορά πριν τη χρήση αυτής της δυνατότητας.
SecurityToken=Security Token
-NoSmsEngine=Δεν διευθυντής αποστολέα SMS διαθέσιμα. Αποστολέα SMS διευθυντής δεν έχουν εγκατασταθεί με τη διανομή προεπιλογή (διότι εξαρτάται από εξωτερικούς προμηθευτές), αλλά μπορείτε να βρείτε κάποια σχετικά http://www.dolistore.com
+NoSmsEngine=Δεν υπάρχει πρόγραμμα αποστολής SMS διαθέσιμο. Τα προγράμματα αποστολής SMS δεν εγκαθίστανται με την διανομή από προεπιλογή (επειδή εξαρτόνται από εξωτερικούς προμηθευτές) αλλά μπορείτε να βρείτε κάποια διαθέσιμα προγράμματα στο %s
PDF=PDF
-PDFDesc=Μπορείτε να ρυθμίσετε κάθε συνολική επιλογές που σχετίζονται με τη δημιουργία PDF
-PDFAddressForging=Κανόνες για να δημιουργήσουν θέσεις διεύθυνση
-HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ επί δημιουργούνται μορφή PDF
-HideDescOnPDF=Hide products description on generated PDF
-HideRefOnPDF=Hide products ref. on generated PDF
-HideDetailsOnPDF=Hide products lines details on generated PDF
-Library=Library
-UrlGenerationParameters=Παράμετροι για την εξασφάλιση διευθύνσεις URL
+PDFDesc=Μπορείτε να ρυθμίσετε κάθε κεντρική επιλογή που σχετίζεται με τη δημιουργία PDF
+PDFAddressForging=Κανόνες για να δημιουργηθούν διευθύνσεις
+HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με τον ΦΠΑ στα δημιουργηθέντα PDF
+HideDescOnPDF=Απόκρυψη περιγραφών προϊόντων στα δημιουργηθέντα PDF
+HideRefOnPDF=Απόκρυψη αναφοράς προϊόντος στα δημιουργηθέντα PDF
+HideDetailsOnPDF=Απόκρυψη λεπτομεριών προϊόντων στα δημιουργηθέντα PDF
+Library=Βιβλιοθήκη
+UrlGenerationParameters=Παράμετροι για δημιουργία ασφαλών URL
SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο
-GetSecuredUrl=Πάρτε υπολογίζεται URL
-ButtonHideUnauthorized=Hide buttons for unauthorized actions instead of showing disabled buttons
-OldVATRates=Old VAT rate
-NewVATRates=New VAT rate
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
-MassConvert=Launch mass convert
+GetSecuredUrl=Πάρτε υπολογιζόμενο URL
+ButtonHideUnauthorized=Απόκρυψη κουμπιών για μη επιτρεπτές ενέργειες αντί να φαίνονται απενεργοποιημένα κουμπιά
+OldVATRates=Παλιός συντελεστής ΦΠΑ
+NewVATRates=Νέος συντελεστής ΦΠΑ
+PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τιμή αναφοράς όπως ρυθμίστηκε στο
+MassConvert=Έναρξη μαζικής μεταβολής
String=String
TextLong=Long text
Int=Integer
Float=Float
-DateAndTime=Date and hour
-Unique=Unique
+DateAndTime=Ημερομηνία και ώρα
+Unique=Μοναδικό
Boolean=Boolean (Checkbox)
-ExtrafieldPhone = Phone
-ExtrafieldPrice = Price
+ExtrafieldPhone = Τηλέφωνο
+ExtrafieldPrice = Τιμή
ExtrafieldMail = Email
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator
+ExtrafieldSelect = Επιλογή από λίστα
+ExtrafieldSelectList = Επιλογή από πίνακα
+ExtrafieldSeparator=Διαχωριστικό
ExtrafieldCheckBox=Checkbox
ExtrafieldRadio=Radio button
ExtrafieldCheckBoxFromList= Πλαίσιο ελέγχου από τον πίνακα
@@ -389,16 +394,16 @@ ExtrafieldParamHelpcheckbox=Η λίστα παραμέτρων θα πρέπει
ExtrafieldParamHelpradio=Η λίστα παραμέτρων θα πρέπει να είναι σαν το κλειδί,value
για παράδειγμα :
1,value1
2,value2
3,value3
...
ExtrafieldParamHelpsellist=Λίστα Παραμέτρων που προέρχεται από έναν πίνακα
σύνταξη : table_name:label_field:id_field::filter
παράδειγμα: c_typent:libelle:id::filter
φίλτρο μπορεί να είναι μια απλή δοκιμή (eg active=1) για να εμφανίσετε μόνο μία ενεργό τιμή
αν θέλετε να φιλτράρετε extrafields χρησιμοποιήστε τη σύνταξη extra.fieldcode=... (όπου κωδικός πεδίου είναι ο κωδικός του extrafield)
Προκειμένου να έχει τον κατάλογο ανάλογα με ένα άλλο :
c_typent:libelle:id:parent_list_code|parent_column:filter
ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
-LibraryToBuildPDF=Library used to build PDF
-WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pdf_force_fpdf=1. This means you use the FPDF library to generate PDF files. This library is old and does not support a lot of features (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), so you may experience errors during PDF generation.
To solve this and have a full support of PDF generation, please download TCPDF library, then comment or remove the line $dolibarr_pdf_force_fpdf=1, and add instead $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 (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
+LibraryToBuildPDF=Βιβλιοθήκη για την δημιουργία PDF
+WarningUsingFPDF=Προειδοποίηση: Το αρχείο conf.php περιλαμβάνει την επιλογή dolibarr_pdf_force_fpdf=1. Αυτό σημαίνει πως χρησιμοποιείτε η βιβλιοθήκη FPDF για να δημιουργούνται τα αρχεία PDF. Αυτή η βιβλιοθήκη είναι παλιά και δεν υποστηρίζει πολλές λειτουργίες (Unicode, image transparency, cyrillic, arab and asiatic languages, ...), οπότε μπορεί να παρουσιαστούν λάθη κατά την δημιουργία των PDF.
Για να λυθεί αυτό και να μπορέσετε να έχετε πλήρη υποστήριξη δημιουργίας αρχείων PDF, παρακαλώ κατεβάστε την βιβλιοθήκη TCPDF, και μετά απενεργοποιήστε ή διαγράψτε την γραμμή $dolibarr_pdf_force_fpdf=1, και εισάγετε αντί αυτής την $dolibarr_lib_TCPDF_PATH='path_to_TCPDF_dir'
+LocalTaxDesc=Σε κάποιες χώρες επιβάλλονται 2 ή 3 φόροι σε κάθε γραμμή τιμολογίου. Αν ισχύει αυτό στην περίπτωσή σας, επιλέξτε τύπο για τον δεύτερο και τον τρίτο φόρο όπως επίσης και το ποσοστό του. Πιθανοί τύποι είναι:
1 : local tax apply on products and services without vat (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
-RefreshPhoneLink=Refresh link
-LinkToTest=Clickable link generated for user %s (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη %s
+RefreshPhoneLink=Ανανέωση συνδέσμου
+LinkToTest=Σημιουργήθηκε σύνδεσμος για τον χρήστη %s (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
+KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή
+DefaultLink=Προεπιλεγμένος σύνδεσμος
+ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
ExternalModule=Εξωτερικό module - Εγκατεστημένο στον φάκελο %s
BarcodeInitForThirdparties=Όγκος barcode init για Πέλ./Πρόμ.
BarcodeInitForProductsOrServices=Όγκος barcode init ή επαναφορά για προϊόντα ή υπηρεσίες
@@ -414,77 +419,77 @@ NoRecordWithoutBarcodeDefined=Δεν υπάρχει εγγραφή χωρίς ο
Module0Name=Χρήστες & Ομάδες
Module0Desc=Διαχείριση χρηστών και ομάδων
Module1Name=Στοιχεία
-Module1Desc=Companies and contact management (customers, prospects...)
-Module2Name=Commercial
-Module2Desc=Commercial management
-Module10Name=Accounting
-Module10Desc=Simple accounting reports (journals, turnover) based onto database content. No dispatching.
+Module1Desc=Διαχείριση εταιρειών και επαφών (πελάτες, πιθανοί πελάτες...)
+Module2Name=Εμπορικό
+Module2Desc=Εμπορική διαχείριση
+Module10Name=Λογιστική
+Module10Desc=Απλές αναφορές λογιστικής (journals, turnover) βασισμένα στα περιοχόμενα της βάσης δεδομένων. Χωρίς αποστολές.
Module20Name=Προτάσεις
-Module20Desc=Commercial proposal management
-Module22Name=Mass E-mailings
-Module22Desc=Mass E-mailing management
-Module23Name= Energy
-Module23Desc= Monitoring the consumption of energies
+Module20Desc=Διαχείριση εμπορικών προτάσεων
+Module22Name=Μαζική αποστολή e-mail
+Module22Desc=Διαχείριση μαζικής αποστολής e-mail
+Module23Name= Ενέργεια
+Module23Desc= Παρακολούθηση κατανάλωσης ενέργειας
Module25Name=Παραγγελίες πελάτη
-Module25Desc=Customer order management
+Module25Desc=Διαχείριση παραγγελιών πελατών
Module30Name=Τιμολόγια
Module30Desc=Τιμολόγιο και πιστωτικό τιμολόγιο διαχείρισης για τους πελάτες. Τιμολόγιο διαχείρισης για τους προμηθευτές
Module40Name=Προμηθευτές
-Module40Desc=Supplier management and buying (orders and invoices)
+Module40Desc=Διαχείριση προμηθευτών και παραστατικά αγοράς (παραγγελίες και τιμολόγια)
Module42Name=Logs
Module42Desc=Logging facilities (file, syslog, ...)
-Module49Name=Επεξεργαστές
-Module49Desc=Editor management
+Module49Name=Επεξεργαστές κειμένου
+Module49Desc=Διαχείριση επεξεργαστών κειμένου
Module50Name=Προϊόντα
-Module50Desc=Product management
-Module51Name=Mass mailings
-Module51Desc=Mass paper mailing management
-Module52Name=Αποθήκες
-Module52Desc=Stock's management of products
+Module50Desc=Διαχείριση προϊόντων
+Module51Name=Μαζικές αποστολές επιστολών
+Module51Desc=Διαχείριση μαζικών αποστολών επιστολών
+Module52Name=Αποθέματα
+Module52Desc=Διαχείριση αποθεμάτων (προϊόντων)
Module53Name=Υπηρεσίες
-Module53Desc=Service management
+Module53Desc=Διαχείριση υπηρεσιών
Module54Name=Συμβάσεις/Συνδρομές
Module54Desc=Διαχείριση συμβολαίων (υπηρεσιών ή ανανεώσιμων συνδρομών)
Module55Name=Barcodes
-Module55Desc=Barcode management
+Module55Desc=Διαχείριση barcode
Module56Name=Τηλεφωνία
Module56Desc=Telephony integration
-Module57Name=Standing orders
+Module57Name=Πάγιες εντολές
Module57Desc=Πάγιες εντολές και διαχείριση απόσυρσης. Επίσης, περιλαμβάνει την παραγωγή του αρχείου SEPA για τις ευρωπαϊκές χώρες.
Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module58Desc=Ενοποίηση ενός συστήματος ClickToDial (Asterisk, ...)
Module59Name=Bookmark4u
-Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
+Module59Desc=Προσθήκη λειτουργίας για την δημιουργία λογαριασμού Bookmark4u από ένα λογαριασμό Dolibarr
Module70Name=Interventions
Module70Desc=Intervention management
-Module75Name=Expense and trip notes
-Module75Desc=Expense and trip notes management
-Module80Name=Shipments
-Module80Desc=Shipments and delivery order management
-Module85Name=Banks and cash
-Module85Desc=Management of bank or cash accounts
-Module100Name=External site
-Module100Desc=This module include an external web site or page into Dolibarr menus and view it into a Dolibarr frame
+Module75Name=Σημειώσεις εξόδων και ταξιδιών
+Module75Desc=Διαχείριση σημειώσεων εξόδων και ταξιδιών
+Module80Name=Αποστολές
+Module80Desc=Διαχείριση αποστολών και εντολών παράδοσης
+Module85Name=Τράπεζες και μετρητά
+Module85Desc=Διαχείριση τραπεζικών και λογαριασμών μετρητών
+Module100Name=Εξωτερική ιστοσελίδα
+Module100Desc=Αυτό το άρθρωμα περιέχει μία εξωτερική ιστοσελίδα ή site μέσα από το μενού του Dolibarr για να προβληθεί μέσω ενός παραθύρου Dolibarr
Module105Name=Mailman και SIP
Module105Desc=Mailman ή SPIP διεπαφή για ενότητα μέλος
Module200Name=LDAP
-Module200Desc=LDAP directory synchronisation
+Module200Desc=Συγχρονισμός LDAP directory
Module210Name=PostNuke
-Module210Desc=PostNuke integration
-Module240Name=Data exports
-Module240Desc=Tool to export Dolibarr datas (with assistants)
-Module250Name=Data imports
-Module250Desc=Tool to import datas in Dolibarr (with assistants)
+Module210Desc=Διεπαφή PostNuke
+Module240Name=Εξαγωγές δεδομένων
+Module240Desc=Εργαλείο για την εξαγωγή δεδομέων του Dolibarr (με βοηθούς)
+Module250Name=Εισαγωγές δεδομένων
+Module250Desc=Εργαλείο για την εισαγωγή δεδομένω στο Dolibarr (με βοηθούς)
Module310Name=Μέλη
-Module310Desc=Foundation members management
+Module310Desc=Διαχείριση μελών οργανισμού
Module320Name=RSS Feed
-Module320Desc=Add RSS feed inside Dolibarr screen pages
+Module320Desc=Εισαγωγή RSS feed εντός των σελίδων του Dolibarr
Module330Name=Σελιδοδείκτες
-Module330Desc=Bookmark management
+Module330Desc=Διαχείριση σελιδοδεικτών
Module400Name=Έργα/Ευκαιρίες/Leads
Module400Desc=Διαχείριση έργων, ευκαιρίες ή leads. Στη συνέχεια μπορείτε να ορίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, προσφορά, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
+Module410Name=Ημερολόγιο ιστού
+Module410Desc=Διεπαφή ημερολογίου ιστού
Module500Name=Ειδικά έξοδα (φόροι, εισφορές κοινωνικής ασφάλισης, μερίσματα)
Module500Desc=Διαχείριση των ειδικών δαπανών, όπως οι φόροι, κοινωνικές εισφορές, μερίσματα και μισθούς
Module510Name=Μισθοί
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου σχετικά με ορισμένες Dolibarr επαγγελματικές συναντήσεις σε Πελ./Προμ. (η ρύθμιση ορίζεται από κάθε Πελ./Προμ.)
Module700Name=Δωρεές
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Κατηγορίες
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Δημιουργία / τροποποίηση δωρεές
Permission703=Διαγραφή δωρεές
+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
Permission1001=Διαβάστε τα αποθέματα
Permission1002=Δημιουργία/τροποποίηση αποθηκών
Permission1003=Διαγραφή αποθηκών
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Κωδικός πρόσβασης για να χρησιμοπο
DefineHereComplementaryAttributes=Ορίστε εδώ όλα τα χαρακτηριστικά, δεν είναι ήδη διαθέσιμη από προεπιλογή, και ότι θέλετε να υποστηριχθούν για %s.
ExtraFields=Συμπληρωματικά χαρακτηριστικά
ExtraFieldsLines=Συμπληρωματικά χαρακτηριστικά (σειρές)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Διαχειριστής για την αυτόματη αρίθμηση του barcode
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Προεπιλογή γενικός Πελ./Προμ.
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Απενεργοποίηση μείωση των αποθεμάτων όταν η πώληση γίνεται από Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Αναγκαστικός περιορισμός αποθήκης για μείωση των αποθεμάτων
StockDecreaseForPointOfSaleDisabled=Μείωση αποθέματος από Point Of Sale απενεργοποιημένο
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=Δεν έχετε απενεργοποιήσει μείωση των αποθεμάτων κατά την πραγματοποίηση μιας πώλησης από το σημείο πώλησης "POS". Μια αποθήκη είναι απαραίτητη.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Σειρά ταξινόμησης
Format=Μορφή
TypePaymentDesc=0:Τύπος πληρωμής πελάτη, 1:Τύπος πληρωμής προμηθευτή, 2:Τύπος πληρωμής τόσο για τους πελάτες όσο και για τους προμηθευτές
IncludePath=Include path (defined into variable %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.
diff --git a/htdocs/langs/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index c6960fe94cd..7c143b155f1 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -33,7 +33,11 @@ AllTime=Από την αρχή
Reconciliation=Πραγματοποίηση Συναλλαγών
RIB=Αριθμός Τραπ. Λογαριασμού
IBAN=IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Αριθμός BIC/SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Πάγιες εντολές
StandingOrder=Πάγια εντολή
Withdrawals=Αναλήψεις
@@ -148,7 +152,7 @@ BackToAccount=Επιστροφή στον λογαριασμό
ShowAllAccounts=Εμφάνιση Όλων των Λογαριασμών
FutureTransaction=Συναλλαγή στο μέλλον. Δεν υπάρχει τρόπος συμβιβασμού.
SelectChequeTransactionAndGenerate=Επιλέξτε/φίλτρο ελέγχου για να συμπεριληφθεί στην απόδειξη κατάθεσης και κάντε κλικ στο "Δημιουργία".
-InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή (όπως, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
ToConciliate=Να συμβιβάσει;
ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 605097a3a19..114c0169055 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Η επικοινωνία έγινε
DateActionPlanned=Ημερ. προγραμματισμού
DateActionDone=Ημερ. ολοκλήρωσης
ActionAskedBy=Η ενέργεια ζητήθηκε από
-ActionAffectedTo=Εκδήλωση που ανήκει
+ActionAffectedTo=Event assigned to
ActionDoneBy=Η ενέργεια έγινε από τον/την
ActionUserAsk=Καταγράφηκε από τον/την
ErrorStatusCantBeZeroIfStarted=Εάν το πεδίο 'Date done' είναι γεμάτο, η ενέργεια έχει αρχίσει (ή έχει τελειώσει), οπότε το πεδίο 'Status' δεν μπορεί να είναι 0%%.
diff --git a/htdocs/langs/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index ff824ce3a85..c8e4c7b1cb5 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Έληξε
ServiceStatusClosed=Τερματισμένη
ServicesLegend=Services legend
Contracts=Συμβόλαια
+ContractsAndLine=Contracts and line of contracts
Contract=Συμβόλαιο
NoContracts=Κανένα Συμβόλαιο
MenuServices=Υπηρεσίες
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 756f6c9ea35..9f94c994725 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Εντολή Shell
CronMenu=Μενού
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Πηγαίνετε στο μενού "Home - Modules εργαλεία - Λίστα εργασιών" για να δείτε και να επεξεργαστείτε τις προγραμματισμένες εργασίες.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index eaacea01c42..1361707a862 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Πηγή και τους στόχους των τ
ErrorBadThirdPartyName=Bad αξία για τους υπηκόους τρίτων όνομα κόμματος
ErrorProdIdIsMandatory=Το %s είναι υποχρεωτικό
ErrorBadCustomerCodeSyntax=Λάθος σύνταξη για τον κωδικό πελάτη
-ErrorBadBarCodeSyntax=Κακή σύνταξη για bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Κωδικός πελάτη απαιτείτε
ErrorBarCodeRequired=Απαιτείται Bar code
ErrorCustomerCodeAlreadyUsed=Ο κωδικός πελάτη που έχει ήδη χρησιμοποιηθεί
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Η Javascript πρέπει να είναι άτομ
ErrorPasswordsMustMatch=Και οι δύο πληκτρολογήσει τους κωδικούς πρόσβασης πρέπει να ταιριάζουν μεταξύ τους
ErrorContactEMail=Ένα τεχνικό σφάλμα. Παρακαλούμε, επικοινωνήστε με τον διαχειριστή για μετά %s email en παρέχουν την %s κωδικό σφάλματος στο μήνυμά σας, ή ακόμα καλύτερα με την προσθήκη ενός αντιγράφου της οθόνης αυτής της σελίδας.
ErrorWrongValueForField=Λάθος τιμή για %s αριθμό τομέα («%s» τιμή δεν ταιριάζει regex %s κανόνα)
-ErrorFieldValueNotIn=Λάθος τιμή για %s αριθμό τομέα («%s» τιμή δεν είναι μια τιμή διαθέσιμη σε %s τομέα της %s πίνακα)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Λάθος τιμή για τον αριθμό %s τομέα («%s» τιμή δεν είναι %s υφιστάμενων ref)
ErrorsOnXLines=Λάθη σε %s γραμμές πηγή
ErrorFileIsInfectedWithAVirus=Το πρόγραμμα προστασίας από ιούς δεν ήταν σε θέση να επικυρώσει το αρχείο (αρχείο μπορεί να μολυνθεί από έναν ιό)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Εσωτερικό σφάλμα '%s'
ErrorPriceExpressionUnknown=Άγνωστο σφάλμα '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index d2cc1ae3cd8..939e7a72d52 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Τελευταίο βήμα: Καθορίστε ε
ActivateModule=Ενεργοποίηση %s ενότητα
ShowEditTechnicalParameters=Κάντε κλικ εδώ για να δείτε/επεξεργαστείτε προηγμένες παραμέτρους (κατάσταση έμπειρου χρήστη)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 187c9becc66..50211a1e084 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -141,6 +141,7 @@ Cancel=Άκυρο
Modify=Τροποποίηση
Edit=Επεξεργασία
Validate=Επικύρωση
+ValidateAndApprove=Validate and Approve
ToValidate=Προς Επικύρωση
Save=Αποθήκευση
SaveAs=Αποθήκευση Ως
@@ -158,6 +159,7 @@ Search=Αναζήτηση
SearchOf=Αναζήτηση
Valid=Έγκυρο
Approve=Έγκριση
+Disapprove=Disapprove
ReOpen=Εκ νέου άνοιγμα
Upload=Αποστολή Αρχείου
ToLink=Σύνδεσμος
@@ -219,6 +221,7 @@ Cards=Καρτέλες
Card=Καρτέλα
Now=Τώρα
Date=Ημερομηνία
+DateAndHour=Date and hour
DateStart=Ημερομηνία Έναρξης
DateEnd=Ημερομηνία Τέλους
DateCreation=Ημερομηνία Δημιουργίας
@@ -295,6 +298,7 @@ UnitPriceHT=Τιμή Μονάδος (χ. Φ.Π.Α)
UnitPriceTTC=Τιμή Μονάδος
PriceU=Τιμή μον.
PriceUHT=Τιμή μον.
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=Τιμή μον.
Amount=Ποσό
AmountInvoice=Ποσό Τιμολογίου
@@ -521,6 +525,7 @@ DateFromTo=Από %s μέχρι %s
DateFrom=Από %s
DateUntil=Μέχρι %s
Check=Έλεγχος
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Δημόσια URL
AddBox=Προσθήκη πεδίου
SelectElementAndClickRefresh=Επιλέξτε ένα στοιχείο και κάντε κλικ στο κουμπί Ανανέωση
PrintFile=Εκτύπωση του αρχείου %s
+ShowTransaction=Show transaction
# Week day
Monday=Δευτέρα
Tuesday=Τρίτη
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index 4987091d539..e6cedcee375 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Ακυρωμένη
StatusOrderDraft=Προσχέδιο (χρειάζεται επικύρωση)
StatusOrderValidated=Επικυρωμένη
StatusOrderOnProcess=Παραγγέλθηκε - Αναμονή παραλαβής
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Ολοκληρωμένη
StatusOrderToBill=Προς πληρωμή
StatusOrderToBill2=Προς τιμολόγηση
@@ -58,6 +59,7 @@ MenuOrdersToBill=Παραγγελίες προς χρέωση
MenuOrdersToBill2=Χρεώσιμες παραγγελίες
SearchOrder=Εύρεση παραγγελίας
SearchACustomerOrder=Αναζητήστε μία παραγγελία πελάτη
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Έκπτωση
CreateOrder=Δημιουργία παραγγελίας
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index e15f9952453..449d5bc6fac 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -54,12 +54,13 @@ MaxSize=Μέγιστο μέγεθος
AttachANewFile=Επισύναψη νέου αρχείου/εγγράφου
LinkedObject=Συνδεδεμένα αντικείμενα
Miscellaneous=Διάφορα
-NbOfActiveNotifications=Πλήθος ειδοποιήσεων
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Δοκιμαστικο mail.\nΟι δύο γραμμές είναι χωρισμένες με carriage return.
PredefinedMailTestHtml=Αυτό είναι ένα μήνυμα δοκιμής (η δοκιμή λέξη πρέπει να είναι με έντονα γράμματα).
Οι δύο γραμμές που χωρίζονται με ένα χαρακτήρα επαναφοράς.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nΘα ήθελα να σας προειδοποιήσω ότι το τιμολόγιο __FACREF__ φαίνεται να μην έχει πληρωθεί. Στο συνημμένο βρίσκεται το τιμολόγιο που φαίνεται να μην έχει πληρωθεί.\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την προσφορά __PROPREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε τη παραγγελία __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε την παραγγελία μας __ORDERREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nΕδώ θα βρείτε το τιμολόγιο __FACREF__\n\n__PERSONALIZED__Με εκτίμηση\n\n__SIGNATURE__
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index afe3a362d63..cc6e312db0e 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Παρτίδα/Σειριακός αριθμός
l_eatby=Φάτε ημερομηνία λήξης
l_sellby=Ημερομηνία πώλησης
DetailBatchNumber=Παρτίδα/Λεπτομέρειες σειριακού
-DetailBatchFormat=Παρτίδα/Κωδικός: %s - E:%s - s:%s (Ποσότητα: %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Παρτίδα: %s
printEatby=Eat-by: %s
printSellby=Πώληση ανά: %s
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 25229b931ae..eebb6c5060b 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Στο προϊόν/υπηρεσία και στις
PriceExpressionEditorHelp4=Μόνο σε τιμές προϊόντων/υπηρεσιών: #supplier_min_price#
Μόνο τιμές Προμηθευτών: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Λειτουργία Τιμής
PriceNumeric=Αριθμός
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index c4ce60ce368..3e20c208dc9 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Όλοι
PrivateProject=Αντιπρόσωποι του έργου
MyProjectsDesc=Η άποψη αυτή περιορίζονται σε έργα που είναι σε μια επαφή για την (όποια είναι ο τύπος).
ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
MyTasksDesc=Η άποψη αυτή περιορίζονται σε έργα ή εργασίες που έχουν μια επαφή για την (όποια είναι ο τύπος).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
ProjectsArea=Περιοχή Έργων
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Αριθμός ανοιχτών εργασιών
NbOfProjects=Αριθμός έργων
TimeSpent=Χρόνος που δαπανήθηκε
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Ο χρόνος που δαπανάται
RefTask=Αναφ. εργασίας
LabelTask=Ετικέτα εργασίας
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Κατάλογος των ενταλμάτω
ListSupplierInvoicesAssociatedProject=Κατάλογος των τιμολογίων του προμηθευτή που συνδέονται με το έργο
ListContractAssociatedProject=Κατάλογος των συμβάσεων που συνδέονται με το έργο
ListFichinterAssociatedProject=Κατάλογος των παρεμβάσεων που σχετίζονται με το έργο
-ListTripAssociatedProject=Κατάλογος των ταξιδιών και των δαπανών που συνδέονται με το έργο
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Κατάλογος των εκδηλώσεων που σχετίζονται με το έργο
ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα
ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό το μήνα
@@ -133,3 +137,6 @@ SearchAProject=Αναζήτηση ένα έργο
ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
ProjectDraft=Πρόχειρα έργα
FirstAddRessourceToAllocateTime=Συσχετίστε έναν πόρο για την κατανομή του χρόνου
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index 7001bfb2fe0..58f0b819a6e 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -1,8 +1,13 @@
# Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Κωδικός Λογιστικής για τις πληρωμές των μισθών
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Κωδικός Λογιστικής για οικονομική επιβάρυνση
+Salary=Mισθός
+Salaries=Μισθοί
Employee=Υπάλληλος
NewSalaryPayment=Νέα μισθοδοσία
SalaryPayment=Μισθός
SalariesPayments=Πληρωμές μισθών
ShowSalaryPayment=Εμφάνιση μισθοδοσίας
+THM=Η μέση ωριαία τιμή
+TJM=Η μέση ημερήσια τιμή
+CurrentSalary=Current salary
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index d2774a6577f..8a0733e2515 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Ποσότητα παραγγελιών
QtyShipped=Ποσότητα που αποστέλλεται
QtyToShip=Ποσότητα προς αποστολή
QtyReceived=Ποσότητα παραλαβής
-KeepToShip=Κρατήστε την αποστολή
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό
DateSending=Ημερομηνία αποστολή της παραγγελίας
DateSendingShort=Ημερομηνία αποστολή της παραγγελίας
@@ -64,10 +64,10 @@ ShipmentLine=Σειρά αποστολής
CarrierList=Κατάλογος των μεταφορέων
SendingRunning=Προϊόν από εντολή παραγγελιών σε πελάτες
SuppliersReceiptRunning=Προϊόν από εντολή παραγγελιών σε προμηθευτές
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+ProductQtyInCustomersOrdersRunning=Ποσότητα προϊόντων σε ανοιχτές παραγγελίες πελατών
+ProductQtyInSuppliersOrdersRunning=Ποσότητα προϊόντων σε ανοιχτές παραγγελίες προμηθευτών
+ProductQtyInShipmentAlreadySent=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του πελάτη που έχουν ήδη αποσταλεί
+ProductQtyInSuppliersShipmentAlreadyRecevied=Ποσότητα προϊόντων από ανοιγμένες παραγγελίες του προμηθευτή που έχουν ήδη ληφθεί
# Sending methods
SendingMethodCATCH=Πιάσε τον πελάτη
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 26a0e5802bc..438a99de606 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Μέση σταθμική τιμή
PMPValueShort=WAP
EnhancedValueOfWarehouses=Αποθήκες αξία
UserWarehouseAutoCreate=Δημιουργήστε μια αποθήκη αυτόματα κατά τη δημιουργία ενός χρήστη
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Ποσότητα αποστέλλονται
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Η αποθήκη %s να να χρησιμοπ
WarehouseForStockIncrease=Η αποθήκη %s θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων
ForThisWarehouse=Για αυτή την αποθήκη
ReplenishmentStatusDesc=Αυτή είναι η λίστα όλων των προϊόντων με απόθεμα κάτω από το επιθυμητό απόθεμα (ή χαμηλότερες από την αξία συναγερμού, εφόσον κουτάκι "ειδοποίηση μόνο" είναι επιλεγμένο), και προτείνουμε να δημιουργήσετε παραγγελίες σε προμηθευτές για να αναπληρώσει τη διαφορά.
-ReplenishmentOrdersDesc=Αυτή είναι η λίστα όλων των ανοικτών παραγγελιών σε προμηθευτές
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Αναπληρώσεις
NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
NbOfProductAfterPeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 8a37a970d19..34b5a692b6f 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Προμηθευτές
-Supplier=Προμηθευτής
AddSupplier=Δημιουργία προμηθευτή
SupplierRemoved=Ο προμηθευτής αφαιρέθηκε
SuppliersInvoice=Τιμολόγιο προμηθευτή
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμ
ExportDataset_fournisseur_3=Παραγγελίες σε προμηθευτές και σειρά γραμμών
ApproveThisOrder=Έγκριση της παραγγελίας
ConfirmApproveThisOrder=Είστε σίγουροι ότι θέλετε να εγκρίνετε την παραγγελία %s ;
-DenyingThisOrder=Άρνηση της παραγγελίας
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Είστε σίγουροι ότι θέλετε να αρνηθείτε την παραγγελία %s ;
ConfirmCancelThisOrder=Είστε σίγουροι ότι θέλετε να ακυρώσετε την παραγγελία %s ;
AddCustomerOrder=Δημιουργία παραγγελίας πελάτη
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index 4de061f4c84..fff849b2bf4 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Ταξίδι
-Trips=Ταξίδια
-TripsAndExpenses=Ταξίδια και έξοδα
-TripsAndExpensesStatistics=Στατιστικά ταξιδιών και εξόδων
-TripCard=Καρτέλα ταξιδιού
-AddTrip=Δημιουργία ταξιδιού
-ListOfTrips=Λίστα ταξιδιών
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Λίστα φόρων
-NewTrip=Νέο ταξίδι
+NewTrip=New expense report
CompanyVisited=Έγινε επίσκεψη σε εταιρία/οργανισμό
Kilometers=Χιλιόμετρα
FeesKilometersOrAmout=Σύνολο χλμ
-DeleteTrip=Διαγραφή ταξιδιού
-ConfirmDeleteTrip=Είστε σίγουροι ότι θέλετε να διαγράψετε το ταξίδι;
-TF_OTHER=Άλλο
-TF_LUNCH=Γεύμα
-TF_TRIP=Ταξίδι
-ListTripsAndExpenses=Λίστα ταξιδιών και εξόδων
-ExpensesArea=Ταξίδια και έξοδα περιοχή
-SearchATripAndExpense=Αναζήτηση ένα ταξίδι και τα έξοδα
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Ταξινομήστε «επιστραφεί»
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Άλλο
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Γεύμα
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/en_AU/bills.lang b/htdocs/langs/en_AU/bills.lang
index 737f979cf47..8d5dc2add1a 100644
--- a/htdocs/langs/en_AU/bills.lang
+++ b/htdocs/langs/en_AU/bills.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - en_AU - bills
-BankCode=Bank code or BSB
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - bills
+BankCode=Bank code or BSB
diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
index 93ff6ae4990..42069924aee 100644
--- a/htdocs/langs/en_AU/companies.lang
+++ b/htdocs/langs/en_AU/companies.lang
@@ -1,9 +1,6 @@
-# Dolibarr language file - en_AU - companies
-# This file contains only line that must differs from en_US
+# Dolibarr language file - Source file is en_US - companies
VATIsUsed=GST is used
VATIsNotUsed=GST is not used
VATIntra=GST number
VATIntraShort=GST number
VATIntraVeryShort=GST
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
\ No newline at end of file
diff --git a/htdocs/langs/en_AU/compta.lang b/htdocs/langs/en_AU/compta.lang
index a49ba11a816..d655e71ddf6 100644
--- a/htdocs/langs/en_AU/compta.lang
+++ b/htdocs/langs/en_AU/compta.lang
@@ -1,5 +1,4 @@
-# Dolibarr language file - en_AU - compta
-# This file contains only line that must differs from en_US
+# Dolibarr language file - Source file is en_US - compta
AmountHTVATRealReceived=Amount excl GST collected
AmountHTVATRealPaid=Amount excl GST paid
VATToPay=GST to pay
@@ -11,5 +10,4 @@ VATCollected=GST collected
NewVATPayment=New GST payment
VATPayment=GST Payment
VATPayments=GST Payments
-TotalToPay=Total to pay
-TotalVATReceived=Total GST received
\ No newline at end of file
+TotalVATReceived=Total GST received
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index a2be380b7c2..27e0c30c352 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -1,5 +1,7 @@
-# Dolibarr language file - en_AU - main
-# This file contains only lines that must differs from en_US file
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=Space
FormatDateShort=%d/%m/%Y
@@ -9,19 +11,14 @@ FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
-UnitPrice=Unit price
UnitPriceHT=Unit price (excl GST)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUTTC=U.P.
-PriceUHTShort=P.U. HT
-PriceUTTCShort=P.U. TTC
AmountHT=Amount (excl GST)
AmountTTC=Amount (incl GST)
AmountVAT=Amount GST
@@ -37,4 +34,4 @@ IncludedVAT=Included GST
HT=excl GST
TTC=Incl GST
VAT=GST
-VATRate=GST Rate
\ No newline at end of file
+VATRate=GST Rate
diff --git a/htdocs/langs/en_AU/withdrawals.lang b/htdocs/langs/en_AU/withdrawals.lang
index 59a88bb9fe0..503597bc8ec 100644
--- a/htdocs/langs/en_AU/withdrawals.lang
+++ b/htdocs/langs/en_AU/withdrawals.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - en_AU - withdrawals
-ThirdPartyBankCode=Third party bank code or BSB
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - withdrawals
+ThirdPartyBankCode=Third party bank code or BSB
diff --git a/htdocs/langs/en_GB/admin.lang b/htdocs/langs/en_GB/admin.lang
index 28a42a2d38e..d2ceaa175f8 100644
--- a/htdocs/langs/en_GB/admin.lang
+++ b/htdocs/langs/en_GB/admin.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - en_GB - admin
+# Dolibarr language file - Source file is en_US - admin
DictionaryVAT=VAT Rates
diff --git a/htdocs/langs/en_GB/banks.lang b/htdocs/langs/en_GB/banks.lang
index 9c0e42f034e..289acc55386 100644
--- a/htdocs/langs/en_GB/banks.lang
+++ b/htdocs/langs/en_GB/banks.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_GB - main
+# Dolibarr language file - Source file is en_US - banks
ValidateCheckReceipt=Validate this cheque receipt ?
ConfirmValidateCheckReceipt=Are you sure you want to validate this cheque receipt, no change will be possible once this is done ?
DeleteCheckReceipt=Delete this cheque receipt ?
@@ -7,4 +7,4 @@ BankChecks=Bank cheques
BankChecksToReceipt=Cheques waiting for deposit
ShowCheckReceipt=Show cheque deposit receipt
NumberOfCheques=Nb of cheque
-SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
\ No newline at end of file
+SelectChequeTransactionAndGenerate=Select/filter cheques to include into the cheque deposit receipt and click on "Create".
diff --git a/htdocs/langs/en_GB/bills.lang b/htdocs/langs/en_GB/bills.lang
index 7f57d6e2fb8..025fcbe0f18 100644
--- a/htdocs/langs/en_GB/bills.lang
+++ b/htdocs/langs/en_GB/bills.lang
@@ -1,9 +1,18 @@
-# Dolibarr language file - en_GB - main
-PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+# Dolibarr language file - Source file is en_US - bills
+PaymentConditionShortRECEP=Due on Receipt
+PaymentConditionRECEP=Due on Receipt
+PaymentTypeVIR=Bank transfer
+PaymentTypeShortVIR=Bank transfer
+PaymentTypePRE=Direct debit
+PaymentTypeShortPRE=Direct debit
+PaymentTypeCHQ=Cheque
+PaymentTypeShortCHQ=Cheque
+BankCode=Sort code
ChequeNumber=Cheque N°
ChequeOrTransferNumber=Cheque/Transfer N°
ChequeMaker=Cheque transmitter
ChequeBank=Bank of Cheque
+PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to
PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to
MenuChequeDeposits=Cheques deposits
@@ -13,26 +22,3 @@ ChequesReceipts=Cheques receipts
ChequesArea=Cheques deposits area
ChequeDeposits=Cheques deposits
Cheques=Cheques
-BankCode=Sort code
-
-# PaymentConditions
-PaymentConditionShortRECEP=Due on Receipt
-PaymentConditionRECEP=Due on Receipt
-
-# PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit
-PaymentTypeShortPRE=Direct debit
-PaymentTypeLIQ=Cash
-PaymentTypeShortLIQ=Cash
-PaymentTypeCB=Credit card
-PaymentTypeShortCB=Credit card
-PaymentTypeCHQ=Cheque
-PaymentTypeShortCHQ=Cheque
-PaymentTypeTIP=TIP
-PaymentTypeShortTIP=TIP
-PaymentTypeVAD=On line payment
-PaymentTypeShortVAD=On line payment
-PaymentTypeTRA=Bill payment
-PaymentTypeShortTRA=Bill
\ No newline at end of file
diff --git a/htdocs/langs/en_GB/compta.lang b/htdocs/langs/en_GB/compta.lang
index fdc28352121..8bd70a68704 100644
--- a/htdocs/langs/en_GB/compta.lang
+++ b/htdocs/langs/en_GB/compta.lang
@@ -1,7 +1,7 @@
-# Dolibarr language file - en_GB - main
+# Dolibarr language file - Source file is en_US - compta
CheckReceipt=Cheque deposit
CheckReceiptShort=Cheque deposit
NewCheckDeposit=New cheque deposit
NoWaitingChecks=No cheques waiting for deposit.
DateChequeReceived=Cheque reception date
-NbOfCheques=Nb of cheques
\ No newline at end of file
+NbOfCheques=Nb of cheques
diff --git a/htdocs/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang
index 4f035a9aea4..982dcc4bca9 100644
--- a/htdocs/langs/en_GB/exports.lang
+++ b/htdocs/langs/en_GB/exports.lang
@@ -1,2 +1 @@
-# Dolibarr language file - en_GB - exports
-BankCode=Sort code
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - exports
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 556febcaaaf..ced56a38a13 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -1,4 +1,7 @@
-# Dolibarr language file - en_GB - main
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
@@ -8,15 +11,16 @@ FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
+AmountVAT=Amount VAT
TotalVAT=Total VAT
IncludedVAT=Included VAT
-HT=Net of tax
TTC=Inc. VAT
VAT=VAT
VATRate=VAT Rate
-AmountVAT=Amount VAT
diff --git a/htdocs/langs/en_GB/other.lang b/htdocs/langs/en_GB/other.lang
index 74c8e72f4c6..5c827f1c4ed 100644
--- a/htdocs/langs/en_GB/other.lang
+++ b/htdocs/langs/en_GB/other.lang
@@ -1,5 +1,4 @@
-# Dolibarr language file - en_US - other
-VolumeUnitm3=m3
+# Dolibarr language file - Source file is en_US - other
VolumeUnitdm3=dm3 (l)
VolumeUnitcm3=cm3 (ml)
-VolumeUnitmm3=mm3 (µl)
\ No newline at end of file
+VolumeUnitmm3=mm3 (µl)
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index 31a47e78634..4e6f0c06015 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_IN - admin
+# Dolibarr language file - Source file is en_US - admin
Module20Name=Quotations
Module20Desc=Quotation's management
Permission21=Read quotations
@@ -9,10 +9,9 @@ Permission26=Close quotations
Permission27=Delete quotations
Permission28=Export quotations
WebCalAddEventOnStatusPropal=Add calendar event on quotations status change
-##### Proposals #####
PropalSetup=Quotations module setup
ProposalsNumberingModules=Quotations numbering modules
ProposalsPDFModules=Quotations documents models
HideTreadedPropal=Hide the treated quotations in the list
FreeLegalTextOnProposal=Free text on quotations
-WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
\ No newline at end of file
+WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
diff --git a/htdocs/langs/en_IN/bills.lang b/htdocs/langs/en_IN/bills.lang
index 24e1b4e307d..e7f2dd11cfc 100644
--- a/htdocs/langs/en_IN/bills.lang
+++ b/htdocs/langs/en_IN/bills.lang
@@ -1,10 +1,11 @@
-# Dolibarr language file - en_IN - bills
+# Dolibarr language file - Source file is en_US - bills
RelatedCommercialProposals=Related quotations
+PaymentTypeShortCHQ=Cheque
ChequeNumber=Cheque N°
ChequeOrTransferNumber=Cheque/Transfer N°
ChequeMaker=Cheque transmitter
ChequeBank=Bank of Cheque
-PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
+PrettyLittleSentence=Accept the amount of payments due by cheques issued in my name as a Member of an accounting association approved by the Fiscal Administration.
PaymentByChequeOrderedTo=Cheque payment (including tax) are payable to %s send to
PaymentByChequeOrderedToShort=Cheque payment (including tax) are payable to
MenuChequeDeposits=Cheques deposits
@@ -14,4 +15,3 @@ ChequesReceipts=Cheques receipts
ChequesArea=Cheques deposits area
ChequeDeposits=Cheques deposits
Cheques=Cheques
-PaymentTypeShortCHQ=Cheque
diff --git a/htdocs/langs/en_IN/boxes.lang b/htdocs/langs/en_IN/boxes.lang
index 73827f379f9..921fc0285aa 100644
--- a/htdocs/langs/en_IN/boxes.lang
+++ b/htdocs/langs/en_IN/boxes.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_IN - boxes
+# Dolibarr language file - Source file is en_US - boxes
BoxLastProposals=Last quotations
BoxTitleLastPropals=Last %s recorded quotations
-NoRecordedProposals=No recorded quotations
\ No newline at end of file
+NoRecordedProposals=No recorded quotations
diff --git a/htdocs/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
index 2aade00195f..6c3e1637652 100644
--- a/htdocs/langs/en_IN/companies.lang
+++ b/htdocs/langs/en_IN/companies.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - en_IN - companies
-Zip=Pin Code
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - companies
+Zip=Pin Code
diff --git a/htdocs/langs/en_IN/compta.lang b/htdocs/langs/en_IN/compta.lang
index a4baaf37679..ffd8565c10c 100644
--- a/htdocs/langs/en_IN/compta.lang
+++ b/htdocs/langs/en_IN/compta.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_IN - compta
+# Dolibarr language file - Source file is en_US - compta
CheckReceipt=Cheque deposit
CheckReceiptShort=Cheque deposit
NewCheckDeposit=New cheque deposit
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 44f3c729259..7fbca74ca3d 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -1,5 +1,7 @@
-# Dolibarr language file - en_US - main
+# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
@@ -9,16 +11,17 @@ FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d, %Y
FormatDateText=%B %d, %Y
FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y, %I:%M %p
FormatDateHourText=%d %B %Y, %I:%M %p
-CommercialProposalsShort=Quotations
+AmountVAT=Amount VAT
TotalVAT=Total VAT
IncludedVAT=Included VAT
-HT=Net of tax
TTC=Inc. VAT
VAT=VAT
VATRate=VAT Rate
-AmountVAT=Amount VAT
+CommercialProposalsShort=Quotations
diff --git a/htdocs/langs/en_IN/other.lang b/htdocs/langs/en_IN/other.lang
index 9f02c19eee2..67a6767b663 100644
--- a/htdocs/langs/en_IN/other.lang
+++ b/htdocs/langs/en_IN/other.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - en_US - other
+# Dolibarr language file - Source file is en_US - other
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \n\n You will find here the quotation __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/en_IN/projects.lang b/htdocs/langs/en_IN/projects.lang
index 5c24ec1c76f..72a5a5089ce 100644
--- a/htdocs/langs/en_IN/projects.lang
+++ b/htdocs/langs/en_IN/projects.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - en_IN - projects
-ListProposalsAssociatedProject=List of the quotations associated with the project
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - projects
+ListProposalsAssociatedProject=List of the quotations associated with the project
diff --git a/htdocs/langs/en_IN/propal.lang b/htdocs/langs/en_IN/propal.lang
index 7559a0af6ee..04f74459023 100644
--- a/htdocs/langs/en_IN/propal.lang
+++ b/htdocs/langs/en_IN/propal.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_US - propal
+# Dolibarr language file - Source file is en_US - propal
Proposals=Quotations
Proposal=Quotation
ProposalShort=Quotation
@@ -40,12 +40,9 @@ OtherPropals=Other quotations
CopyPropalFrom=Create quotation by copying existing quotation
CreateEmptyPropal=Create empty quotation or from list of products/services
DefaultProposalDurationValidity=Default quotation validity duration (in days)
-UseCustomerContactAsPropalRecipientIfExist=Use customer contact address if defined instead of third party address as proposal recipient address
ClonePropal=Clone quotation
ConfirmClonePropal=Are you sure you want to clone this quotation %s ?
ProposalsAndProposalsLines=Quotation and lines
ProposalLine=Quotation line
-# Document models
DocModelAzurDescription=A complete quotation (logo...)
DocModelJauneDescription=Jaune quotation model
-DocModelRoigDescription=A complete quotation model with Spanish tax RE and IRPF
diff --git a/htdocs/langs/en_NZ/companies.lang b/htdocs/langs/en_NZ/companies.lang
index 461f74aef64..42069924aee 100644
--- a/htdocs/langs/en_NZ/companies.lang
+++ b/htdocs/langs/en_NZ/companies.lang
@@ -1,9 +1,6 @@
-# Dolibarr language file - en_NZ - companies
-# This file contains only line that must differs from en_US
+# Dolibarr language file - Source file is en_US - companies
VATIsUsed=GST is used
VATIsNotUsed=GST is not used
VATIntra=GST number
VATIntraShort=GST number
VATIntraVeryShort=GST
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
\ No newline at end of file
diff --git a/htdocs/langs/en_NZ/compta.lang b/htdocs/langs/en_NZ/compta.lang
index 238053d97a7..d655e71ddf6 100644
--- a/htdocs/langs/en_NZ/compta.lang
+++ b/htdocs/langs/en_NZ/compta.lang
@@ -1,5 +1,4 @@
-# Dolibarr language file - en_NZ - compta
-# This file contains only line that must differs from en_US
+# Dolibarr language file - Source file is en_US - compta
AmountHTVATRealReceived=Amount excl GST collected
AmountHTVATRealPaid=Amount excl GST paid
VATToPay=GST to pay
@@ -11,5 +10,4 @@ VATCollected=GST collected
NewVATPayment=New GST payment
VATPayment=GST Payment
VATPayments=GST Payments
-TotalToPay=Total to pay
-TotalVATReceived=Total GST received
\ No newline at end of file
+TotalVATReceived=Total GST received
diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang
index d07603dfbd8..93e9771e575 100644
--- a/htdocs/langs/en_NZ/main.lang
+++ b/htdocs/langs/en_NZ/main.lang
@@ -1,5 +1,7 @@
-# Dolibarr language file - en_NZ - main
-# This file contains only line that must differs from en_US file
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%d/%m/%Y
@@ -9,19 +11,14 @@ FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
-UnitPrice=Unit price
UnitPriceHT=Unit price (excl GST)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUTTC=U.P.
-PriceUHTShort=P.U. HT
-PriceUTTCShort=P.U. TTC
AmountHT=Amount (excl GST)
AmountTTC=Amount (incl GST)
AmountVAT=Amount GST
@@ -37,4 +34,4 @@ IncludedVAT=Included GST
HT=excl GST
TTC=Incl GST
VAT=GST
-VATRate=GST Rate
\ No newline at end of file
+VATRate=GST Rate
diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang
index 8712c2081e1..f8402963091 100644
--- a/htdocs/langs/en_SA/main.lang
+++ b/htdocs/langs/en_SA/main.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - en_SA - main
+# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
FONTFORPDF=DejaVuSans
FONTSIZEFORPDF=9
@@ -15,5 +15,6 @@ FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y, %I:%M %p
-FormatDateHourText=%d %B %Y, %I:%M %p
\ No newline at end of file
+FormatDateHourText=%d %B %Y, %I:%M %p
diff --git a/htdocs/langs/en_SA/propal.lang b/htdocs/langs/en_SA/propal.lang
index 6f5ff0a090c..459cdde70f6 100644
--- a/htdocs/langs/en_SA/propal.lang
+++ b/htdocs/langs/en_SA/propal.lang
@@ -1,7 +1,7 @@
-# Dolibarr language file - en_SA - propal
+# Dolibarr language file - Source file is en_US - propal
Proposals=Commercial Proposals
Proposal=Commercial Proposal
Prop=Commercial Proposals
CommercialProposal=Commercial Proposal
CommercialProposals=Commercial Proposals
-DateEndPropal=Validity Ending Date
\ No newline at end of file
+DateEndPropal=Validity Ending Date
diff --git a/htdocs/langs/en_ZA/companies.lang b/htdocs/langs/en_ZA/companies.lang
index f41855b944d..70564679d5f 100644
--- a/htdocs/langs/en_ZA/companies.lang
+++ b/htdocs/langs/en_ZA/companies.lang
@@ -1,9 +1 @@
-# Dolibarr language file - en_ZA - companies
-# This file contains only line that must differs from en_US
-VATIsUsed=VAT is used
-VATIsNotUsed=VAT is not used
-VATIntra=VAT number
-VATIntraShort=VAT number
-VATIntraVeryShort=VAT
-VATIntraSyntaxIsValid=Syntax is valid
-VATIntraValueIsValid=Value is valid
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - companies
diff --git a/htdocs/langs/en_ZA/compta.lang b/htdocs/langs/en_ZA/compta.lang
index 1767142a837..1738634c769 100644
--- a/htdocs/langs/en_ZA/compta.lang
+++ b/htdocs/langs/en_ZA/compta.lang
@@ -1,15 +1 @@
-# Dolibarr language file - en_ZA - compta
-# This file contains only line that must differs from en_US
-AmountHTVATRealReceived=Amount excl VAT collected
-AmountHTVATRealPaid=Amount excl VAT paid
-VATToPay=VAT to pay
-VATReceived=VAT received
-VATToCollect=VAT to collect
-VATSummary=VAT Summary
-VATPaid=VAT paid
-VATCollected=VAT collected
-NewVATPayment=New VAT payment
-VATPayment=VAT Payment
-VATPayments=VAT Payments
-TotalToPay=Total to pay
-TotalVATReceived=Total VAT received
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - compta
diff --git a/htdocs/langs/en_ZA/main.lang b/htdocs/langs/en_ZA/main.lang
index d1aad81392a..a696d3c77d8 100644
--- a/htdocs/langs/en_ZA/main.lang
+++ b/htdocs/langs/en_ZA/main.lang
@@ -1,5 +1,7 @@
-# Dolibarr language file - en_ZA - main
-# This file contains only line that must differs from en_US file
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
FormatDateShort=%Y/%m/%d
@@ -9,32 +11,10 @@ FormatDateShortJavaInput=yyyy/MM/yy
FormatDateShortJQuery=yy/mm/yy
FormatDateShortJQueryInput=yy/mm/dd
FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
FormatDateText=%d %B %Y
FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
FormatDateHourTextShort=%d %b %Y %H:%M
FormatDateHourText=%d %B %Y %H:%M
-UnitPrice=Unit price
-UnitPriceHT=Unit price (without VAT)
-UnitPriceTTC=Unit price
-PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUTTC=U.P.
-PriceUHTShort=P.U. excl VAT
-PriceUTTCShort=P.U. incl VAT
-AmountHT=Amount (excl VAT)
-AmountTTC=Amount (incl VAT)
-AmountVAT=Amount VAT
-PriceQtyHT=Price for this quantity excl VAT
-PriceQtyMinHT=Price quantity min. excl VAT
-PriceQtyTTC=Price for this quantity incl VAT
-PriceQtyMinTTC=Price quantity min. incl VAT
-TotalHT=Total (excl VAT)
-TotalTTC=Total (incl VAT)
-TotalTTCToYourCredit=Total (incl VAT) to your credit
-TotalVAT=Total VAT
-IncludedVAT=Included VAT
-HT=excl VAT
-TTC=Incl VAT
-VAT=VAT
-VATRate=VAT Rate
\ No newline at end of file
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index 39a4dac9a4e..8161a7a8e7c 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -4,5 +4,3 @@ Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión factu
BillsNumberingModule=Módulo de numeración de facturas y notas de crédito
CreditNoteSetup=Configuración del módulo notas de crédito
CreditNotePDFModules=Modelo de documento de notas de crédito
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
diff --git a/htdocs/langs/es_AR/bills.lang b/htdocs/langs/es_AR/bills.lang
index 8bd4d0b82d8..75496f66e43 100644
--- a/htdocs/langs/es_AR/bills.lang
+++ b/htdocs/langs/es_AR/bills.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_AR - bills
+# Dolibarr language file - Source file is en_US - bills
InvoiceAvoir=Nota de crédito
InvoiceAvoirAsk=Nota de crédito para corregir la factura
InvoiceAvoirDesc=La nota de crédito es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo).
@@ -11,12 +11,11 @@ ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) se ha re
ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:
-pago parcial ya que una partida de productos se ha devuleto.
- reclamado por no entregar productos de la factura
En todos los casos, la reclamación debe regularizarse mediante una nota de crédito
ShowInvoiceAvoir=Ver nota de crédito
AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos las notas de crédito y anticipos)
+AddCreditNote=Crear nota de crédito
ShowDiscount=Ver la nota de crédito
CreditNote=Nota de crédito
CreditNotes=Notas de crédito
DiscountFromCreditNote=Descuento resultante de la nota de crédito %s
AbsoluteDiscountUse=Este tipo de crédito no puede ser utilizado en una factura antes de su validación
-CreditNoteDepositUse=La factura debe de estar validada para poder utilizar este tipo de créditos
CreditNoteConvertedIntoDiscount=Esta nota de crédito se convirtió en %s
TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para las notas de crédito donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
-AddCreditNote=Crear nota de crédito
\ No newline at end of file
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 458044a34c1..36f5cbcff4d 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -1,5 +1,5 @@
-# Dolibarr language file - es_AR - companies
-CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles
+# Dolibarr language file - Source file is en_US - companies
VATIntra=CUIT
VATIntraShort=CUIT
-VATIntraVeryShort=CUIT
\ No newline at end of file
+VATIntraVeryShort=CUIT
+CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles
diff --git a/htdocs/langs/es_AR/stocks.lang b/htdocs/langs/es_AR/stocks.lang
index 6d24900d446..295151fbd08 100644
--- a/htdocs/langs/es_AR/stocks.lang
+++ b/htdocs/langs/es_AR/stocks.lang
@@ -1,3 +1,3 @@
-# Dolibarr language file - es_AR - stocks
+# Dolibarr language file - Source file is en_US - stocks
DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes
ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores
diff --git a/htdocs/langs/es_CL/agenda.lang b/htdocs/langs/es_CL/agenda.lang
index deefdc2275c..2418f69ed4c 100644
--- a/htdocs/langs/es_CL/agenda.lang
+++ b/htdocs/langs/es_CL/agenda.lang
@@ -1,2 +1,3 @@
+# Dolibarr language file - Source file is en_US - agenda
PropalValidatedInDolibarr=Cotización %s validada
-ProposalSentByEMail=Cotización %s enviada por e-mail
\ No newline at end of file
+ProposalSentByEMail=Cotización %s enviada por e-mail
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index 63a78444437..2199e215bd6 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -1 +1,2 @@
-RelatedCommercialProposals=Cotizaciones asociadas
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - bills
+RelatedCommercialProposals=Cotizaciones asociadas
diff --git a/htdocs/langs/es_CL/boxes.lang b/htdocs/langs/es_CL/boxes.lang
index 970c91a8fe5..8c9a36c30fd 100644
--- a/htdocs/langs/es_CL/boxes.lang
+++ b/htdocs/langs/es_CL/boxes.lang
@@ -1,5 +1,6 @@
+# Dolibarr language file - Source file is en_US - boxes
BoxLastProposals=Últimas cotizaciones
BoxTitleLastPropals=Las %s últimas cotizaciones registradas
NoRecordedProposals=Sin cotizaciones registradas
BoxProposalsPerMonth=Cotizaciones por mes
-ForProposals=Cotizaciones
\ No newline at end of file
+ForProposals=Cotizaciones
diff --git a/htdocs/langs/es_CL/commercial.lang b/htdocs/langs/es_CL/commercial.lang
index d468d7d5f19..78806e09307 100644
--- a/htdocs/langs/es_CL/commercial.lang
+++ b/htdocs/langs/es_CL/commercial.lang
@@ -1,4 +1,5 @@
+# Dolibarr language file - Source file is en_US - commercial
SendPropalRef=Envío de la cotización %s
ActionAC_PROP=Envío cotización por correo
DraftPropals=Cotizaciones borrador
-SearchPropal=Buscar una cotización
\ No newline at end of file
+SearchPropal=Buscar una cotización
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index daef89c75cf..66d1f1d9dc1 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -1,2 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
ContactForProposals=Contacto de cotizaciones
-NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización
\ No newline at end of file
+NoContactForAnyProposal=Este contacto no es contacto de ninguna cotización
diff --git a/htdocs/langs/es_CL/compta.lang b/htdocs/langs/es_CL/compta.lang
index bf18ae78c5f..efe0bb1627b 100644
--- a/htdocs/langs/es_CL/compta.lang
+++ b/htdocs/langs/es_CL/compta.lang
@@ -1 +1,2 @@
-ProposalStats=Estadísticas de cotizaciones
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - compta
+ProposalStats=Estadísticas de cotizaciones
diff --git a/htdocs/langs/es_CL/ecm.lang b/htdocs/langs/es_CL/ecm.lang
index 3e20b3e6628..693bda9e4a2 100644
--- a/htdocs/langs/es_CL/ecm.lang
+++ b/htdocs/langs/es_CL/ecm.lang
@@ -1,2 +1,3 @@
+# Dolibarr language file - Source file is en_US - ecm
DocsProposals=Documentos cotizaciones
-ECMDocsByProposals=Documentos asociados a cotizaciones
\ No newline at end of file
+ECMDocsByProposals=Documentos asociados a cotizaciones
diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
index 40d447b8653..2e02f3816ab 100644
--- a/htdocs/langs/es_CL/install.lang
+++ b/htdocs/langs/es_CL/install.lang
@@ -1 +1,2 @@
-MigrationProposal=Migración de datos de cotizaciones
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - install
+MigrationProposal=Migración de datos de cotizaciones
diff --git a/htdocs/langs/es_CL/main.lang b/htdocs/langs/es_CL/main.lang
index 90e98cca31d..dc549dfb838 100644
--- a/htdocs/langs/es_CL/main.lang
+++ b/htdocs/langs/es_CL/main.lang
@@ -1 +1,22 @@
-CommercialProposalsShort=Cotizaciones
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=,
+SeparatorThousand=.
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
+CommercialProposalsShort=Cotizaciones
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index 59fd53dd993..4e770babbba 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -1 +1,2 @@
-TurnoverOrBudget=Volumen de ventas (empresa) o Cotización (asociación o colectivo)
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - members
+TurnoverOrBudget=Volumen de ventas (empresa) o Cotización (asociación o colectivo)
diff --git a/htdocs/langs/es_CL/orders.lang b/htdocs/langs/es_CL/orders.lang
index 8810a19bcf8..d40140bd326 100644
--- a/htdocs/langs/es_CL/orders.lang
+++ b/htdocs/langs/es_CL/orders.lang
@@ -1 +1,2 @@
-OrderSource0=Cotización
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - orders
+OrderSource0=Cotización
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index f2b10a1a2d2..056e70bee9a 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -1,3 +1,4 @@
+# Dolibarr language file - Source file is en_US - other
Notify_PROPAL_VALIDATE=Validación cotización cliente
Notify_PROPAL_SENTBYMAIL=Envío cotización por e-mail
PredefinedMailContentSendProposal=Buenos días, __CONTACTCIVNAME__ \n\n Nos ponemos en contacto con usted para facilitarle la cotización __PROPREF__\n\n Ante cualquier duda, consúltenos y será atendido a la mayor brevedad posible.\n\n __PERSONALIZED__Cordialmente\n\n__SIGNATURE__
@@ -6,4 +7,3 @@ NumberOfUnitsProposals=Número de unidades en las cotizaciones en los últimos 1
EMailTextProposalValidated=La cotización %s que le concierne ha sido validado.
PropalClosedSignedInDolibarr=Cotización %s firmada en Dolibarr
PropalClosedRefusedInDolibarr=Cotización %s rechazada en Dolibarr
-PropalValidatedInDolibarr=Cotización %s validada en Dolibarr
\ No newline at end of file
diff --git a/htdocs/langs/es_CL/products.lang b/htdocs/langs/es_CL/products.lang
index cf82ea19c2b..9c1f2378871 100644
--- a/htdocs/langs/es_CL/products.lang
+++ b/htdocs/langs/es_CL/products.lang
@@ -1,3 +1,4 @@
+# Dolibarr language file - Source file is en_US - products
AddToMyProposals=Añadir a mis cotizaciones
AddToOtherProposals=Añadir a otras cotizaciones
-NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.)
\ No newline at end of file
+NoteNotVisibleOnBill=Nota (no visible en las facturas, cotizaciones, etc.)
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index a5ee33a39a4..d483e1e5659 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -1 +1,2 @@
-ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - projects
+ListProposalsAssociatedProject=Listado de cotizaciones asociadas al proyecto
diff --git a/htdocs/langs/es_CL/propal.lang b/htdocs/langs/es_CL/propal.lang
index 8242c7d90a4..3099628ae7d 100644
--- a/htdocs/langs/es_CL/propal.lang
+++ b/htdocs/langs/es_CL/propal.lang
@@ -1,3 +1,4 @@
+# Dolibarr language file - Source file is en_US - propal
Proposals=Cotizaciones
Proposal=Cotización
ProposalShort=Cotización
@@ -11,7 +12,6 @@ ProposalCard=Ficha cotización
NewProp=Nueva cotización
NewProposal=Nueva cotización
NewPropal=Nueva cotización
-DeletePop=Eliminar cotización
ValidateProp=Validar cotización
AddProp=Crear cotización
ConfirmDeleteProp=¿Está seguro de querer eliminar esta cotización?
@@ -22,7 +22,6 @@ AllPropals=Todas las cotizacioness
LastProposals=Últimas cotizaciones
SearchAProposal=Buscar una cotización
ProposalsStatistics=Estadísticas de cotizaciones
-NumberOfUnitsProposals=Número de unidades en las cotizaciones en los últimos 12 meses
NbOfProposals=Número cotizaciones
ShowPropal=Ver cotización
PropalStatusValidated=Validado (cotización abierta)
@@ -37,7 +36,6 @@ RefProposal=Ref. cotización
SendPropalByMail=Enviar cotización por e-mail
AssociatedDocuments=Documentos asociados a la cotizacion
DatePropal=Fecha cotización
-ErrorPropalNotFound=Presupuesto %s inexistente
Estimate=Cotización:
EstimateShort=Cotización
OtherPropals=Otras cotizaciones
@@ -51,12 +49,10 @@ ConfirmClonePropal=¿Está seguro de querer clonar la cotización %s?
ConfirmReOpenProp=¿Está seguro de querer reabrir la cotización %s ?
ProposalsAndProposalsLines=Cotizaciones a clientes y líneas de cotizaciones
ProposalLine=Línea de cotización
-##### Types de contacts #####
TypeContact_propal_internal_SALESREPFOLL=Comercial seguimiento cotización
TypeContact_propal_external_BILLING=Contacto cliente de facturación cotización
TypeContact_propal_external_CUSTOMER=Contacto cliente seguimiento cotización
-# Document models
DocModelAzurDescription=Modelo de cotización completa (logo...)
DocModelJauneDescription=Modelo de cotización Jaune
DefaultModelPropalToBill=Modelo por defecto al cerrar una cotización (a facturar)
-DefaultModelPropalClosed=Modelo por defecto al cerrar una cotización (no facturado)
\ No newline at end of file
+DefaultModelPropalClosed=Modelo por defecto al cerrar una cotización (no facturado)
diff --git a/htdocs/langs/es_CL/workflow.lang b/htdocs/langs/es_CL/workflow.lang
index 17b2915fc39..6f07885c897 100644
--- a/htdocs/langs/es_CL/workflow.lang
+++ b/htdocs/langs/es_CL/workflow.lang
@@ -1,3 +1,4 @@
+# Dolibarr language file - Source file is en_US - workflow
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear un pedido de cliente automáticamente a la firma de una cotización
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente a la firma de una cotización
-descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturada la cotización cuando el pedido de cliente relacionado se clasifique como pagado
\ No newline at end of file
+descWORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL=Clasificar como facturada la cotización cuando el pedido de cliente relacionado se clasifique como pagado
diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
index 149e6ab15d4..564a9951b97 100644
--- a/htdocs/langs/es_DO/companies.lang
+++ b/htdocs/langs/es_DO/companies.lang
@@ -1,4 +1,4 @@
# Dolibarr language file - Source file is en_US - companies
VATIsUsed=Sujeto a ITBIS
VATIsNotUsed=No sujeto a ITBIS
-VATIntraCheckDesc=El link %s permite consultar al servicio europeo de control de números de ITBIS intracomunitario. Se requiere acceso a internet para que el servicio funcione
\ No newline at end of file
+VATIntraCheckDesc=El link %s permite consultar al servicio europeo de control de números de ITBIS intracomunitario. Se requiere acceso a internet para que el servicio funcione
diff --git a/htdocs/langs/es_DO/compta.lang b/htdocs/langs/es_DO/compta.lang
index 4474b523ba5..9713057f7e2 100644
--- a/htdocs/langs/es_DO/compta.lang
+++ b/htdocs/langs/es_DO/compta.lang
@@ -25,4 +25,4 @@ RulesVATInProducts=- Para los bienes materiales, incluye el ITBIS de las factura
RulesVATDueServices=- Para los servicios, el informe incluye el ITBIS de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
RulesVATDueProducts=- Para los bienes materiales, incluye el ITBIS de las facturas basándose en la fecha de la factura.
ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ITBIS repercutido
-ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado
\ No newline at end of file
+ACCOUNTING_VAT_BUY_ACCOUNT=Código contable por defecto para el ITBIS soportado
diff --git a/htdocs/langs/es_DO/main.lang b/htdocs/langs/es_DO/main.lang
index 7076727abdd..21cb2cca37c 100644
--- a/htdocs/langs/es_DO/main.lang
+++ b/htdocs/langs/es_DO/main.lang
@@ -1,9 +1,5 @@
# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
-# Note for Chinese:
-# msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
-# stsongstdlight or cid0cs are for simplified Chinese
-# To read Chinese pdf with Linux: sudo apt-get install poppler-data
FONTFORPDF=helvetica
FONTSIZEFORPDF=10
SeparatorDecimal=,
@@ -14,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
@@ -29,4 +26,4 @@ IncludedVAT=ITBIS incluido
HT=Sin ITBIS
TTC=ITBIS incluido
VAT=ITBIS
-VATRate=Tasa ITBIS
\ No newline at end of file
+VATRate=Tasa ITBIS
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 78ce8878190..45dc1e4858b 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Desarrollo
VersionUnknown=Desconocida
VersionRecommanded=Recomendada
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID sesión
SessionSaveHandler=Modalidad de salvaguardado de sesiones
SessionSavePath=Localización salvaguardado de sesiones
@@ -493,10 +498,16 @@ Module600Name=Notificaciones
Module600Desc=Envío de notificaciones por e-mail en algunos eventos de negocio de Dolibarr a contactos de terceros (configurado en cada tercero)
Module700Name=Donaciones
Module700Desc=Gestión de donaciones
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Interfaz con el sistema de seguimiento de incidencias Mantis
Module1400Name=Contabilidad experta
Module1400Desc=Gestión experta de la contabilidad (doble partida)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categorías
Module1780Desc=Gestión de categorías (productos, proveedores y clientes)
Module2000Name=Editor WYSIWYG
@@ -631,7 +642,7 @@ Permission181=Consultar pedidos a proveedores
Permission182=Crear/modificar pedidos a proveedores
Permission183=Validar pedidos a proveedores
Permission184=Aprobar pedidos a proveedores
-Permission185=Enviar pedidos a proveedores
+Permission185=Order or cancel supplier orders
Permission186=Recibir pedidos de proveedores
Permission187=Cerrar pedidos a proveedores
Permission188=Anular pedidos a proveedores
@@ -711,6 +722,13 @@ Permission538=Exportar servicios
Permission701=Consultar donaciones
Permission702=Crear/modificar donaciones
Permission703=Eliminar donaciones
+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
Permission1001=Consultar stocks
Permission1002=Crear/modificar almacenes
Permission1003=Eliminar almacenes
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Contraseña del servidor proxy
DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles por defecto, y que desea gestionar para %s.
ExtraFields=Atributos adicionales
ExtraFieldsLines=Atributos adicionales (líneas)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Atributos adicionales (terceros)
ExtraFieldsContacts=Atributos adicionales (contactos/direcciones)
ExtraFieldsMember=Atributos adicionales (miembros)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una línea de producto/servicio que tiene una cantidad
FreeLegalTextOnProposal=Texto libre en presupuestos
WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
+##### 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
##### Orders #####
OrdersSetup=Configuración del módulo pedidos
OrdersNumberingModules=Módulos de numeración de los pedidos
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Códigos de barras tipo UPC
BarcodeDescISBN=Códigos de barras tipo ISBN
BarcodeDescC39=Códigos de barras tipo C39
BarcodeDescC128=Códigos de barras tipo C128
-GenbarcodeLocation=Herramienta de generación de códigos de barras en líneas de pedidos (utilizado por el motor phpbar para determinados tipos de códigos de barras)
+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
BarcodeInternalEngine=Motor interno
BarCodeNumberManager=Gestor para auto definir números de código de barras
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Tercero genérico a usar para las ventas
CashDeskBankAccountForSell=Cuenta por defecto a utilizar para los cobros en efectivo (caja)
CashDeskBankAccountForCheque= Cuenta por defecto a utilizar para los cobros con cheques
CashDeskBankAccountForCB= Cuenta por defecto a utilizar para los cobros con tarjeta de crédito
-CashDeskDoNotDecreaseStock=Desactivar decrementos de stock si una venta se realiza desde TPV
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
##### Bookmark #####
BookmarkSetup=Configuración del módulo Marcadores
@@ -1569,3 +1597,7 @@ SortOrder=Ordenación
Format=Formatear
TypePaymentDesc=0:Pago cliente,1:Pago proveedor,2:Tanto pago de cliente como de proveedor
IncludePath=Include path (definida en la variable %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.
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 647e7987293..3117ecc1f15 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -33,7 +33,11 @@ AllTime=Mostrar saldo desde el inicio
Reconciliation=Conciliación
RIB=Cuenta bancaria
IBAN=Identificador IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Identificador BIC/SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Domiciliaciones
StandingOrder=Domiciliación
Withdrawals=Reintregros
@@ -148,7 +152,7 @@ BackToAccount=Volver a la cuenta
ShowAllAccounts=Mostrar para todas las cuentas
FutureTransaction=Transacción futura. No es posible conciliar.
SelectChequeTransactionAndGenerate=Seleccione/filtre los cheques a incluir en la remesa y haga clic en "Crear".
-InputReceiptNumber=Indique el extracto bancario relacionado con la conciliación. Utilice un valor numérico ordenable (por ejemplo, AAAAMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventualmente, indique una categoría en la que clasificar los registros
ToConciliate=¿A conciliar?
ThenCheckLinesAndConciliate=A continuación, compruebe las líneas presentes en el extracto bancario y haga clic
diff --git a/htdocs/langs/es_ES/commercial.lang b/htdocs/langs/es_ES/commercial.lang
index 99219ff6c2f..51de60229c8 100644
--- a/htdocs/langs/es_ES/commercial.lang
+++ b/htdocs/langs/es_ES/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciales contactados
DateActionPlanned=Fecha planificación
DateActionDone=Fecha realización
ActionAskedBy=Acción preguntada por
-ActionAffectedTo=Evento para
+ActionAffectedTo=Event assigned to
ActionDoneBy=Acción realizada por
ActionUserAsk=Registrada por
ErrorStatusCantBeZeroIfStarted=Si el campo 'Fecha de realización' contiene datos la acción está en curso , por lo que el campo ' Estado ' no puede ser 0%.
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 76dd3e925de..654a55badde 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirado
ServiceStatusClosed=Cerrado
ServicesLegend=Leyenda para los servicios
Contracts=Contratos
+ContractsAndLine=Contracts and line of contracts
Contract=Contrato
NoContracts=Sin contratos
MenuServices=Servicios
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index d8d9065c901..d436847a411 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Comando Shell
CronMenu=Programador
CronCannotLoadClass=No se puede cargar la clase %s u objeto %s
UseMenuModuleToolsToAddCronJobs=Ir a "Inicio - Utilidades módulos - Lista de tareas Cron" para ver y editar tareas programadas.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 18ee8a8a9ee..f8506d6e27b 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes.
ErrorBadThirdPartyName=Nombre de tercero incorrecto
ErrorProdIdIsMandatory=El %s es obligatorio
ErrorBadCustomerCodeSyntax=La sintaxis del código cliente es incorrecta
-ErrorBadBarCodeSyntax=El código de barras no posee un formato válido
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Código cliente obligatorio
ErrorBarCodeRequired=Código de barras requerido
ErrorCustomerCodeAlreadyUsed=Código de cliente ya utilizado
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript no debe estar desactivado para que esta
ErrorPasswordsMustMatch=Las 2 contraseñas indicadas deben corresponderse
ErrorContactEMail=Se ha producido un error técnico. Contacte con el administrador al e-mail %s, indicando el código de error %s en su mensaje, o puede también adjuntar una copia de pantalla de esta página.
ErrorWrongValueForField=Valor incorrecto para el campo número %s (el valor '%s' no cumple con la regla %s)
-ErrorFieldValueNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es un valor en el campo %s de la tabla %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Valor incorrecto para el campo número %s (el valor '%s' no es una referencia existente en %s)
ErrorsOnXLines=Errores en %s líneas fuente
ErrorFileIsInfectedWithAVirus=¡El antivirus no ha podido validar este archivo (es probable que esté infectado por un virus)!
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Error interno '%s'
ErrorPriceExpressionUnknown=Error desconocido '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Los almacenes de origen y destino deben de ser diferentes
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, intenta hacer un movimiento de stock sin indicar lote/serie, en un producto que requiere de lote/serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Los parámetros obligatorios de configuración no están todavía definidos
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index a93ded0ce8e..9a567b19ed5 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Último paso: Indique aquí la cuenta y la contras
ActivateModule=Activación del módulo %s
ShowEditTechnicalParameters=Pulse aquí para ver/editar los parámetros técnicos (modo experto)
WarningUpgrade=Atención:\nHa pensado en hacer una copia de seguridad de la base de datos?\nEs muy recomendable: por ejemplo, debido a algunos fallos en los sistemas de bases de datos (por ejemplo MySQL versión 5.5.40), algunos datos o tablas se pueden perder durante este proceso, por lo que es muy recomendable tener una copia completa de su base de datos antes de iniciar la migración.\n\nHaga clic en OK para iniciar el proceso de migración...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 80c77d8c09e..300e17729fe 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -141,6 +141,7 @@ Cancel=Anular
Modify=Modificar
Edit=Editar
Validate=Validar
+ValidateAndApprove=Validate and Approve
ToValidate=A validar
Save=Grabar
SaveAs=Grabar como
@@ -158,6 +159,7 @@ Search=Buscar
SearchOf=Búsqueda de
Valid=Validar
Approve=Aprobar
+Disapprove=Disapprove
ReOpen=Reabrir
Upload=Enviar archivo
ToLink=Enlace
@@ -219,6 +221,7 @@ Cards=Fichas
Card=Ficha
Now=Ahora
Date=Fecha
+DateAndHour=Date and hour
DateStart=Fecha inicio
DateEnd=Fecha fin
DateCreation=Fecha de creación
@@ -295,6 +298,7 @@ UnitPriceHT=Precio base
UnitPriceTTC=Precio unitario total
PriceU=P.U.
PriceUHT=P.U.
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=P.U. Total
Amount=Importe
AmountInvoice=Importe factura
@@ -521,6 +525,7 @@ DateFromTo=De %s a %s
DateFrom=A partir de %s
DateUntil=Hasta %s
Check=Verificar
+Uncheck=Uncheck
Internal=Interno
External=Externo
Internals=Internos
@@ -688,6 +693,7 @@ PublicUrl=URL pública
AddBox=Añadir caja
SelectElementAndClickRefresh=Seleccione un elemento y haga clic en Refrescar
PrintFile=Imprimir Archivo %s
+ShowTransaction=Show transaction
# Week day
Monday=Lunes
Tuesday=Martes
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 895a5c32915..46e87bd4dc7 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Anulado
StatusOrderDraft=Borrador (a validar)
StatusOrderValidated=Validado
StatusOrderOnProcess=Pedido - En espera de recibir
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Procesado
StatusOrderToBill=Emitido
StatusOrderToBill2=A facturar
@@ -58,6 +59,7 @@ MenuOrdersToBill=Pedidos a facturar
MenuOrdersToBill2=Pedidos facturables
SearchOrder=Buscar un pedido
SearchACustomerOrder=Buscar un pedido de cliente
+SearchASupplierOrder=Search a supplier order
ShipProduct=Enviar producto
Discount=Descuento
CreateOrder=Crear pedido
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index fe430c2878c..01d97afcc34 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -54,12 +54,13 @@ MaxSize=Tamaño máximo
AttachANewFile=Adjuntar nuevo archivo/documento
LinkedObject=Objeto adjuntado
Miscellaneous=Miscelánea
-NbOfActiveNotifications=Número notificaciones
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Esto es un correo de prueba.\nLas 2 líneas están separadas por un retorno de carro a la línea.
PredefinedMailTestHtml=Esto es un e-mail de prueba(la palabra prueba debe de estar en negrita).
Las 2 líneas están separadas por un retorno de carro en la línea
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nQueremos recordarle que su factura __FACREF__ parece estar pendiente de pago. Le adjuntamos la factura en cuestión, como recordatorio.\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nLe adjuntamos el presupuesto __PROPREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nLe adjuntamos el pedido __ORDERREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nLe adjuntamos nuestro pedido __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nLe adjuntamos la factura __FACREF__\n\n__PERSONALIZED__Cordialmente\n\n__SIGNATURE__
diff --git a/htdocs/langs/es_ES/productbatch.lang b/htdocs/langs/es_ES/productbatch.lang
index 6fa46be9db5..8540dfd80c9 100644
--- a/htdocs/langs/es_ES/productbatch.lang
+++ b/htdocs/langs/es_ES/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Número Lote/Serie
l_eatby=Fecha de caducidad
l_sellby=Fecha límite de venta
DetailBatchNumber=Detalles del lote/serie
-DetailBatchFormat=Lote/Serie: %s - Caducidad: %s - Límite venta: %s (Stock: %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Lote: %s
printEatby=Caducidad: %s
printSellby=Límite venta: %s
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index e07e882a1ee..ab2875577b0 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=En productos y servicios, y precios de proveedor est
PriceExpressionEditorHelp4=Solamente en los precios de productos y servicios: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Modo precio
PriceNumeric=Número
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index b17e8892198..b5c4081e1ba 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Proyecto compartido
PrivateProject=Contactos del proyecto
MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).
ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
ProjectsArea=Área proyectos
@@ -29,6 +31,8 @@ NoProject=Ningún proyecto definido
NbOpenTasks=Nº tareas abiertas
NbOfProjects=Nº de proyectos
TimeSpent=Tiempo dedicado
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tiempos dedicados
RefTask=Ref. tarea
LabelTask=Etiqueta tarea
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Listado de pedidos a proveedores asociados a
ListSupplierInvoicesAssociatedProject=Listado de facturas de proveedor asociados al proyecto
ListContractAssociatedProject=Listado de contratos asociados al proyecto
ListFichinterAssociatedProject=Listado de intervenciones asociadas al proyecto
-ListTripAssociatedProject=Listado notas de honorarios asociadas al proyecto
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Lista de eventos asociados al proyecto
ActivityOnProjectThisWeek=Actividad en el proyecto esta semana
ActivityOnProjectThisMonth=Actividad en el proyecto este mes
@@ -133,3 +137,6 @@ SearchAProject=Buscar un proyecto
ProjectMustBeValidatedFirst=El proyecto debe validarse primero
ProjectDraft=Proyectos borrador
FirstAddRessourceToAllocateTime=Asociar un recurso para asignar tiempo consumido
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/es_ES/salaries.lang b/htdocs/langs/es_ES/salaries.lang
index c8e3707d5df..6995284079c 100644
--- a/htdocs/langs/es_ES/salaries.lang
+++ b/htdocs/langs/es_ES/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Pagos de salarios
ShowSalaryPayment=Ver pago
THM=Precio medio por hora
TJM=Precio medio por día
+CurrentSalary=Current salary
diff --git a/htdocs/langs/es_ES/sendings.lang b/htdocs/langs/es_ES/sendings.lang
index cf377a641db..c119cd363d2 100644
--- a/htdocs/langs/es_ES/sendings.lang
+++ b/htdocs/langs/es_ES/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Cant. pedida
QtyShipped=Cant. enviada
QtyToShip=Cant. a enviar
QtyReceived=Cant. recibida
-KeepToShip=Queda por enviar
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Otros envíos de este pedido
DateSending=Fecha de expedición
DateSendingShort=Fecha de expedición
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index c45945ede6e..bb9f7423361 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Valor (PMP)
PMPValueShort=PMP
EnhancedValueOfWarehouses=Valor de stocks
UserWarehouseAutoCreate=Crear automáticamente existencias/almacén propio del usuario en la creación del usuario
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Cantidad recibida
QtyDispatchedShort=Cant. recibida
QtyToDispatchShort=Cant. a enviar
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Para el decremento de stock se usará el almacén %
WarehouseForStockIncrease=Para el incremento de stock se usará el almacén %s
ForThisWarehouse=Para este almacén
ReplenishmentStatusDesc=Esta es la lista de todos los productos con un stock menor que el stock deseado (o menor que el valor de alerta si el checkbox "sólo alertas" está marcado) y que sugiere crear pedidos de proveedor para rellenar la diferencia.
-ReplenishmentOrdersDesc=Este es el listado de pedidos a proveedores en curso
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Reaprovisionamiento
NbOfProductBeforePeriod=Cantidad del producto %s en stock antes del periodo seleccionado (< %s)
NbOfProductAfterPeriod=Cantidad del producto %s en stock después del periodo seleccionado (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contenido en el paquete
ShowWarehouse=Mostrar almacén
MovementCorrectStock=Corrección de stock del producto %s
MovementTransferStock=Transferencia de stock del producto %s a otro almacén
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index a7d37289ca7..7e0f2718572 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Proveedores
-Supplier=Proveedor
AddSupplier=Crear un proveedor
SupplierRemoved=Proveedor eliminado
SuppliersInvoice=Factura proveedor
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Facturas proveedores y pagos
ExportDataset_fournisseur_3=Pedidos de proveedores y líneas de pedido
ApproveThisOrder=Aprobar este pedido
ConfirmApproveThisOrder=¿Está seguro de querer aprobar el pedido a proveedor %s?
-DenyingThisOrder=Denegar este pedido
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=¿Está seguro de querer denegar el pedido a proveedor %s?
ConfirmCancelThisOrder=¿Está seguro de querer cancelar el pedido a proveedor %s?
AddCustomerOrder=Crear pedido de cliente
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index ff2cdf724bd..b75dbfd2bad 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Desplazamiento
-Trips=Desplazamientos
-TripsAndExpenses=Honorarios
-TripsAndExpensesStatistics=Estadísticas de honorarios
-TripCard=Ficha honorario
-AddTrip=Crear honorario
-ListOfTrips=Listado de honorarios
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Listado notas de honorarios
-NewTrip=Nuevo honorario
+NewTrip=New expense report
CompanyVisited=Empresa/institución visitada
Kilometers=Kilometros
FeesKilometersOrAmout=Importe o kilómetros
-DeleteTrip=Eliminar honorario
-ConfirmDeleteTrip=¿Está seguro de querer eliminar este honorario?
-TF_OTHER=Otro
-TF_LUNCH=Dieta
-TF_TRIP=Viaje
-ListTripsAndExpenses=Listado notas de honorarios
-ExpensesArea=Área de Notas de honorarios
-SearchATripAndExpense=Buscar un honorario
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Clasificar 'Reembolsado'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Otro
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Dieta
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/es_HN/bills.lang b/htdocs/langs/es_HN/bills.lang
index f7136eb8fdf..62504667750 100644
--- a/htdocs/langs/es_HN/bills.lang
+++ b/htdocs/langs/es_HN/bills.lang
@@ -1,9 +1,7 @@
-# Dolibarr language file - es_HN - bills
+# Dolibarr language file - Source file is en_US - bills
ErrorVATIntraNotConfigured=Número de ISV intracomunitario aún no configurado
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento acordado después de la factura. Acepto perder el ISV de este descuento
AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin ISV)
IntracommunityVATNumber=Número de ISV intracomunitario
VATIsNotUsedForInvoice=* ISV no aplicable art-293B del CGI
-PDFBerniqueDescription=Modelo para las facturas con varios tipos de ISV, incluido también el número de ISV Intracomunitario
PDFCrabeDescription=Modelo de factura completo (ISV, método de pago a mostrar, logotipo...)
-PDFOursinDescription=Modelo de factura completo (ISV, métodos de pago, entregas, nombre del proyecto, referencias de presupuesto, logotipo...)
diff --git a/htdocs/langs/es_HN/companies.lang b/htdocs/langs/es_HN/companies.lang
index 3ffed8aac17..25fd5487290 100644
--- a/htdocs/langs/es_HN/companies.lang
+++ b/htdocs/langs/es_HN/companies.lang
@@ -1,6 +1,6 @@
-# Dolibarr language file - es_HN - companies
+# Dolibarr language file - Source file is en_US - companies
VATIsUsed=Sujeto a ISV
VATIsNotUsed=No sujeto a ISV
VATIntra=RTN
VATIntraShort=RTN
-VATIntraVeryShort=RTN
\ No newline at end of file
+VATIntraVeryShort=RTN
diff --git a/htdocs/langs/es_HN/compta.lang b/htdocs/langs/es_HN/compta.lang
index 396d234b2df..9fede56fc29 100644
--- a/htdocs/langs/es_HN/compta.lang
+++ b/htdocs/langs/es_HN/compta.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_HN - compta
+# Dolibarr language file - Source file is en_US - compta
VATToPay=ISV ventas
VATReceived=ISV repercutido
VATToCollect=ISV compras
@@ -9,7 +9,6 @@ PaymentVat=Pago ISV
NewVATPayment=Nuevo pago de ISV
VATPayment=Pago ISV
VATPayments=Pagos ISV
-SocialContributionsPayments=Pagos cargas sociales
ShowVatPayment=Ver pagos ISV
TotalVATReceived=Total ISV percibido
RulesResultDue=- Los importes mostrados son importes totales
- Incluye las facturas, cargas e ISV debidos, que estén pagadas o no.
- Se basa en la fecha de validación para las facturas y el ISV y en la fecha de vencimiento para las cargas.
@@ -20,6 +19,4 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del ISV repercutido y paga
VATReportByQuartersInDueDebtMode=Informe por tasa del ISV repercutido y pagado (ISV debido)
SeeVATReportInInputOutputMode=Ver el informe %sISV pagado%s para un modo de cálculo estandard
SeeVATReportInDueDebtMode=Ver el informe %sISV debido%s para un modo de cálculo con la opción sobre lo debido
-RulesVATIn=- Para los servicios, el informe incluye el ISV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura.
-RulesVATDue=- Para los servicios, el informe incluye el ISV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el ISV de las facturas basándose en la fecha de la factura.
ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el ISV (si no está definido en el diccionario "Tasas de ISV")
diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang
index 371cb541453..5c9e6ffe29a 100644
--- a/htdocs/langs/es_HN/main.lang
+++ b/htdocs/langs/es_HN/main.lang
@@ -1,11 +1,28 @@
-Dolibarr language file - es_HN - main
+# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=None
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
AmountVAT=Importe ISV
TotalVAT=Total ISV
IncludedVAT=ISV incluido
HT=Sin ISV
TTC=ISV incluido
VAT=ISV
-VATRate=Tasa ISV
\ No newline at end of file
+VATRate=Tasa ISV
diff --git a/htdocs/langs/es_HN/propal.lang b/htdocs/langs/es_HN/propal.lang
index 5b7ea08179a..a3356570a4b 100644
--- a/htdocs/langs/es_HN/propal.lang
+++ b/htdocs/langs/es_HN/propal.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - es_HN - propal
-AmountOfProposalsByMonthHT=Importe por mes (Sin ISV)
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - propal
+AmountOfProposalsByMonthHT=Importe por mes (Sin ISV)
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 39a4dac9a4e..8161a7a8e7c 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -4,5 +4,3 @@ Module30Desc=Gestión de facturas y notas de crédito a clientes. Gestión factu
BillsNumberingModule=Módulo de numeración de facturas y notas de crédito
CreditNoteSetup=Configuración del módulo notas de crédito
CreditNotePDFModules=Modelo de documento de notas de crédito
-CreditNote=Nota de crédito
-CreditNotes=Notas de crédito
diff --git a/htdocs/langs/es_MX/banks.lang b/htdocs/langs/es_MX/banks.lang
index 98313c7cbed..a5411981c4b 100644
--- a/htdocs/langs/es_MX/banks.lang
+++ b/htdocs/langs/es_MX/banks.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - es_MX - banks
-BankAccountDomiciliation=Tarjeta
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - banks
+BankAccountDomiciliation=Tarjeta
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 50dfc1f71c3..e62583d9e73 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_MX - bills
+# Dolibarr language file - Source file is en_US - bills
InvoiceAvoir=Nota de crédito
InvoiceAvoirAsk=Nota de crédito para corregir la factura
InvoiceAvoirDesc=La nota de crédito es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo).
@@ -7,19 +7,18 @@ ConfirmConvertToReduc=¿Quiere convertir esta nota de crédito en una reducción
AddBill=Crear factura o nota de crédito
EnterPaymentDueToCustomer=Realizar pago de notas de crédito al cliente
ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipo nota de crédito debe tener un importe negativo
+BillTo=Receptor
ConfirmClassifyPaidPartiallyReasonAvoir=El resto a pagar (%s %s) se ha regularizado (ya que artículo se ha devuelto, olvidado entregar, descuento no definido...) mediante una nota de crédito
ConfirmClassifyPaidPartiallyReasonOtherDesc=Esta elección será posible, por ejemplo, en los casos siguiente:
-pago parcial ya que una partida de productos se ha devuleto.
- reclamado por no entregar productos de la factura
En todos los casos, la reclamación debe regularizarse mediante una nota de crédito
ShowInvoiceAvoir=Ver nota de crédito
AlreadyPaidNoCreditNotesNoDeposits=Ya pagado (excluidos las notas de crédito y anticipos)
+AddCreditNote=Crear nota de crédito
ShowDiscount=Ver la nota de crédito
CreditNote=Nota de crédito
CreditNotes=Notas de crédito
DiscountFromCreditNote=Descuento resultante de la nota de crédito %s
AbsoluteDiscountUse=Este tipo de crédito no puede ser utilizado en una factura antes de su validación
-CreditNoteDepositUse=La factura debe de estar validada para poder utilizar este tipo de créditos
+Residence=Tarjeta
+PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias
CreditNoteConvertedIntoDiscount=Esta nota de crédito se convirtió en %s
TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para las notas de crédito donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
-AddCreditNote=Crear nota de crédito
-BillTo=Receptor
-Residence=Tarjeta
-PaymentByTransferOnThisBankAccount=Cuenta para depositos y transferencias
\ No newline at end of file
diff --git a/htdocs/langs/es_MX/categories.lang b/htdocs/langs/es_MX/categories.lang
index 62392ec33f5..7e6b383c287 100644
--- a/htdocs/langs/es_MX/categories.lang
+++ b/htdocs/langs/es_MX/categories.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - es_MX - categories
-NotCategorized=Sin Categoría
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - categories
+NotCategorized=Sin Categoría
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index 4bbfff9bf2c..3727bea2735 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -1,7 +1,7 @@
-# Dolibarr language file - es_MX - companies
+# Dolibarr language file - Source file is en_US - companies
State=Estado
Town=Municipio
-CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles
VATIntra=RFC
VATIntraShort=RFC
-VATIntraVeryShort=RFC
\ No newline at end of file
+VATIntraVeryShort=RFC
+CompanyHasCreditNote=Este cliente tiene %s %s notas de crédito/anticipos disponibles
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index 4b26f3b3e23..cf154fa6429 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -1,6 +1,24 @@
-# Dolibarr language file - es_MX - main
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=.
SeparatorThousand=,
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
AmountHT=Subtotal
TotalHT=Subtotal
-TotalVAT=IVA
\ No newline at end of file
+TotalVAT=IVA
diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
index 84fbd98945f..295151fbd08 100644
--- a/htdocs/langs/es_MX/stocks.lang
+++ b/htdocs/langs/es_MX/stocks.lang
@@ -1,3 +1,3 @@
-# Dolibarr language file - es_MX - stocks
+# Dolibarr language file - Source file is en_US - stocks
DeStockOnBill=Decrementar los stocks físicos sobre las facturas/notas de crédito a clientes
ReStockOnBill=Incrementar los stocks físicos sobre las facturas/notas de crédito de proveedores
diff --git a/htdocs/langs/es_PE/bills.lang b/htdocs/langs/es_PE/bills.lang
index 6ba6bb049a6..adca33be66b 100644
--- a/htdocs/langs/es_PE/bills.lang
+++ b/htdocs/langs/es_PE/bills.lang
@@ -1,9 +1,7 @@
-# Dolibarr language file - es_PU - bills
+# Dolibarr language file - Source file is en_US - bills
ErrorVATIntraNotConfigured=Número de IGV intracomunitario aún no configurado
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento acordado después de la factura. Acepto perder el IGV de este descuento
AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IGV)
IntracommunityVATNumber=Número de IGV intracomunitario
VATIsNotUsedForInvoice=* IGV no aplicable art-293B del CGI
-PDFBerniqueDescription=Modelo para las facturas con varios tipos de IGV, incluido también el número de IGV Intracomunitario
PDFCrabeDescription=Modelo de factura completo (IGV, método de pago a mostrar, logotipo...)
-PDFOursinDescription=Modelo de factura completo (IGV, métodos de pago, entregas, nombre del proyecto, referencias de presupuesto, logotipo...)
diff --git a/htdocs/langs/es_PE/companies.lang b/htdocs/langs/es_PE/companies.lang
index 7b0dbfe2c6c..70edcf69a8f 100644
--- a/htdocs/langs/es_PE/companies.lang
+++ b/htdocs/langs/es_PE/companies.lang
@@ -1,6 +1,6 @@
-# Dolibarr language file - es_PU - companies
+# Dolibarr language file - Source file is en_US - companies
VATIsUsed=Sujeto a IGV
VATIsNotUsed=No sujeto a IGV
VATIntra=RUC
VATIntraShort=RUC
-VATIntraVeryShort=RUC
\ No newline at end of file
+VATIntraVeryShort=RUC
diff --git a/htdocs/langs/es_PE/compta.lang b/htdocs/langs/es_PE/compta.lang
index 2dbc3cc49b9..00857e477f6 100644
--- a/htdocs/langs/es_PE/compta.lang
+++ b/htdocs/langs/es_PE/compta.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_PU - compta
+# Dolibarr language file - Source file is en_US - compta
VATToPay=IGV ventas
VATReceived=IGV repercutido
VATToCollect=IGV compras
@@ -9,7 +9,6 @@ PaymentVat=Pago IGV
NewVATPayment=Nuevo pago de IGV
VATPayment=Pago IGV
VATPayments=Pagos IGV
-SocialContributionsPayments=Pagos cargas sociales
ShowVatPayment=Ver pagos IGV
TotalVATReceived=Total IGV percibido
RulesResultDue=- Los importes mostrados son importes totales
- Incluye las facturas, cargas e IGV debidos, que estén pagadas o no.
- Se basa en la fecha de validación para las facturas y el IGV y en la fecha de vencimiento para las cargas.
@@ -20,6 +19,4 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del IGV repercutido y paga
VATReportByQuartersInDueDebtMode=Informe por tasa del IGV repercutido y pagado (IGV debido)
SeeVATReportInInputOutputMode=Ver el informe %sIGV pagado%s para un modo de cálculo estandard
SeeVATReportInDueDebtMode=Ver el informe %sIGV debido%s para un modo de cálculo con la opción sobre lo debido
-RulesVATIn=- Para los servicios, el informe incluye el IGV de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura.
-RulesVATDue=- Para los servicios, el informe incluye el IGV de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IGV de las facturas basándose en la fecha de la factura.
ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IGV (si no está definido en el diccionario "Tasas de IGV")
diff --git a/htdocs/langs/es_PE/main.lang b/htdocs/langs/es_PE/main.lang
index d49d7a3445f..4b1f525d2bd 100644
--- a/htdocs/langs/es_PE/main.lang
+++ b/htdocs/langs/es_PE/main.lang
@@ -1,11 +1,28 @@
-Dolibarr language file - es_PU - main
+# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=None
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
AmountVAT=Importe IGV
TotalVAT=Total IGV
IncludedVAT=IGV incluido
HT=Sin IGV
TTC=IGV incluido
VAT=IGV
-VATRate=Tasa IGV
\ No newline at end of file
+VATRate=Tasa IGV
diff --git a/htdocs/langs/es_PE/propal.lang b/htdocs/langs/es_PE/propal.lang
index 6ee464d0e36..919d94b3e91 100644
--- a/htdocs/langs/es_PE/propal.lang
+++ b/htdocs/langs/es_PE/propal.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - es_PU - propal
-AmountOfProposalsByMonthHT=Importe por mes (Sin IGV)
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - propal
+AmountOfProposalsByMonthHT=Importe por mes (Sin IGV)
diff --git a/htdocs/langs/es_PR/bills.lang b/htdocs/langs/es_PR/bills.lang
index 658b997e3ae..fc033b8169c 100644
--- a/htdocs/langs/es_PR/bills.lang
+++ b/htdocs/langs/es_PR/bills.lang
@@ -1,9 +1,7 @@
-# Dolibarr language file - es_PR - bills
+# Dolibarr language file - Source file is en_US - bills
ErrorVATIntraNotConfigured=Número de IVU intracomunitario aún no configurado
ConfirmClassifyPaidPartiallyReasonDiscountNoVat=El resto a pagar (%s %s) es un descuento acordado después de la factura. Acepto perder el IVU de este descuento
AmountOfBillsByMonthHT=Importe de las facturas por mes (Sin IVU)
IntracommunityVATNumber=Número de IVU intracomunitario
VATIsNotUsedForInvoice=* IVU no aplicable art-293B del CGI
-PDFBerniqueDescription=Modelo para las facturas con varios tipos de IVU, incluido también el número de IVU Intracomunitario
PDFCrabeDescription=Modelo de factura completo (IVU, método de pago a mostrar, logotipo...)
-PDFOursinDescription=Modelo de factura completo (IVU, métodos de pago, entregas, nombre del proyecto, referencias de presupuesto, logotipo...)
diff --git a/htdocs/langs/es_PR/companies.lang b/htdocs/langs/es_PR/companies.lang
index 288e42f3027..080bedf4987 100644
--- a/htdocs/langs/es_PR/companies.lang
+++ b/htdocs/langs/es_PR/companies.lang
@@ -1,3 +1,3 @@
-# Dolibarr language file - es_PR - companies
+# Dolibarr language file - Source file is en_US - companies
VATIsUsed=Sujeto a IVU
-VATIsNotUsed=No sujeto a IVU
\ No newline at end of file
+VATIsNotUsed=No sujeto a IVU
diff --git a/htdocs/langs/es_PR/compta.lang b/htdocs/langs/es_PR/compta.lang
index c9226abe8f1..f5e1dc17fce 100644
--- a/htdocs/langs/es_PR/compta.lang
+++ b/htdocs/langs/es_PR/compta.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_PR - compta
+# Dolibarr language file - Source file is en_US - compta
VATToPay=IVU ventas
VATReceived=IVU repercutido
VATToCollect=IVU compras
@@ -9,7 +9,6 @@ PaymentVat=Pago IVU
NewVATPayment=Nuevo pago de IVU
VATPayment=Pago IVU
VATPayments=Pagos IVU
-SocialContributionsPayments=Pagos cargas sociales
ShowVatPayment=Ver pagos IVU
TotalVATReceived=Total IVU percibido
RulesResultDue=- Los importes mostrados son importes totales
- Incluye las facturas, cargas e IVU debidos, que estén pagadas o no.
- Se basa en la fecha de validación para las facturas y el IVU y en la fecha de vencimiento para las cargas.
@@ -20,6 +19,4 @@ VATReportByQuartersInInputOutputMode=Informe por tasa del IVU repercutido y paga
VATReportByQuartersInDueDebtMode=Informe por tasa del IVU repercutido y pagado (IVU debido)
SeeVATReportInInputOutputMode=Ver el informe %sIVU pagado%s para un modo de cálculo estandard
SeeVATReportInDueDebtMode=Ver el informe %sIVU debido%s para un modo de cálculo con la opción sobre lo debido
-RulesVATIn=- Para los servicios, el informe incluye el IVU de los pagos efectivamente recibidos o emitidos basándose en la fecha del pago.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura.
-RulesVATDue=- Para los servicios, el informe incluye el IVU de las facturas debidas, pagadas o no basándose en la fecha de estas facturas.
- Para los bienes materiales, incluye el IVU de las facturas basándose en la fecha de la factura.
ACCOUNTING_VAT_ACCOUNT=Código contable por defecto para el IVU (si no está definido en el diccionario "Tasas de IVU")
diff --git a/htdocs/langs/es_PR/main.lang b/htdocs/langs/es_PR/main.lang
index ea38a2bc1f5..5388286d4c9 100644
--- a/htdocs/langs/es_PR/main.lang
+++ b/htdocs/langs/es_PR/main.lang
@@ -1,11 +1,28 @@
-Dolibarr language file - es_PR - main
+# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=None
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
AmountVAT=Importe IVU
TotalVAT=Total IVU
IncludedVAT=IVU incluido
HT=Sin IVU
TTC=IVU incluido
VAT=IVU
-VATRate=Tasa IVU
\ No newline at end of file
+VATRate=Tasa IVU
diff --git a/htdocs/langs/es_PR/propal.lang b/htdocs/langs/es_PR/propal.lang
index 06af96213cb..0d94e5671f2 100644
--- a/htdocs/langs/es_PR/propal.lang
+++ b/htdocs/langs/es_PR/propal.lang
@@ -1,2 +1,2 @@
-# Dolibarr language file - es_PR - propal
-AmountOfProposalsByMonthHT=Importe por mes (Sin IVU)
\ No newline at end of file
+# Dolibarr language file - Source file is en_US - propal
+AmountOfProposalsByMonthHT=Importe por mes (Sin IVU)
diff --git a/htdocs/langs/es_PY/main.lang b/htdocs/langs/es_PY/main.lang
index 0342d2da7c0..1602d6a7ffa 100644
--- a/htdocs/langs/es_PY/main.lang
+++ b/htdocs/langs/es_PY/main.lang
@@ -1,4 +1,21 @@
-Dolibarr language file - es_PY - main
+# Dolibarr language file - Source file is en_US - main
DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
SeparatorDecimal=,
-SeparatorThousand=None
\ No newline at end of file
+SeparatorThousand=None
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%H:%M
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index cc2f8c9915d..0ab2363364b 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperimentaalne
VersionDevelopment=Arendusversioon
VersionUnknown=Teadmata
VersionRecommanded=Soovitatav
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sessiooni ID
SessionSaveHandler=Sessioonide töötleja
SessionSavePath=Salvestuse sessiooni lokaliseerimine
@@ -493,10 +498,16 @@ Module600Name=Teated
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Annetused
Module700Desc=Annetuste haldamine
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantise integratsioon
Module1400Name=Raamatupidamine
Module1400Desc=Raamatupidamise haldamine (topelt isikud)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategooriad
Module1780Desc=Kategooriate haldamine (tooted, hankijad ja kliendid)
Module2000Name=WYSIWYG toimeti
@@ -631,7 +642,7 @@ Permission181=Ostutellimuste vaatamine
Permission182=Ostutellimuste loomine/muutmine
Permission183=Ostutellimuste kinnitamine
Permission184=Ostutellimuste heaks kiitmine
-Permission185=Ostutellimuste tellimine
+Permission185=Order or cancel supplier orders
Permission186=Ostutellimuste vastu võtmine
Permission187=Ostutellimuste sulgemine
Permission188=Ostutellimuste tühistamine
@@ -711,6 +722,13 @@ Permission538=Teenuste eksport
Permission701=Annetuste vaatamine
Permission702=Annetuste loomine/muutmine
Permission703=Annetuste kustutamine
+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
Permission1001=Laojääkide vaatamine
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Puhverserveri salasõna
DefineHereComplementaryAttributes=Määratle siin kõik %s toetamiseks vajalikud atribuudid, mis ei ole vaikimisi saadaval.
ExtraFields=Täiendavad atribuudid
ExtraFieldsLines=Lisaatribuudid (read)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Täiendavad atribuudid (thirdparty e kolmas isik)
ExtraFieldsContacts=Täiendavad atribuudid (contact/address e kontakt/aadress)
ExtraFieldsMember=Täiendavad atribuudid (member e liige)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Toote/teenuse rida, mille koguseks on märgitud 0, pee
FreeLegalTextOnProposal=Vaba tekst pakkumistel
WatermarkOnDraftProposal=Vesimärk pakkumiste mustanditel (puudub, kui tühi)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Tellimuste haldamise seadistamine
OrdersNumberingModules=Tellimuste numeratsiooni mudelid
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=UPC tüüpi vöötkood
BarcodeDescISBN=ISBN tüüpi vöötkood
BarcodeDescC39=C39 tüüpi vöötkood
BarcodeDescC128=C128 tüüpi vöötkood
-GenbarcodeLocation=Käsurea tööriist vöötkoodi genereerimiseks (sisemine mootor kasutab seda mõnda tüüpi vöötkoodide loomiseks)
+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
BarcodeInternalEngine=Sisemine mootor
BarCodeNumberManager=Automaatselt määratletud vöötkoodide haldamine
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Sularahamaksete vastu võtmiseks kasutatav konto
CashDeskBankAccountForCheque= Tšekimaksete vastu võtmiseks kasutatav konto
CashDeskBankAccountForCB= Krediitkaardimaksete vastu võtmiseks kasutatav konto
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Järjehoidjate mooduli seadistamine
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Formaat
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index ab73f169a23..1003b8caa8e 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Vastavusse viimine
RIB=Arvelduskonto number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Püsikorraldused
StandingOrder=Püsikorraldus
Withdrawals=Väljamaksed
@@ -148,7 +152,7 @@ BackToAccount=Tagasi konto juurde
ShowAllAccounts=Näita kõigil kontodel
FutureTransaction=Tehing toimub tulevikus, ajaline ühitamine pole võimalik.
SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul.
-InputReceiptNumber=Vali vastavusse viimisega seotud panga väljavõte. Kasuta sorteeritavat numbrilist väärtust (näiteks YYYYMM).
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
ToConciliate=Vii vastavusse?
ThenCheckLinesAndConciliate=Siis märgista konto väljavõttel asuvad read ja klõpsa
diff --git a/htdocs/langs/et_EE/commercial.lang b/htdocs/langs/et_EE/commercial.lang
index d58174550dc..59657233c22 100644
--- a/htdocs/langs/et_EE/commercial.lang
+++ b/htdocs/langs/et_EE/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Huviline
Prospects=Huvilised
DeleteAction=Kustuta tegevus/ülesanne
NewAction=Uus tegevus/ülesanne
-AddAction=Lisa tegevus/ülesanne
-AddAnAction=Lisa tegevus/ülesanne
-AddActionRendezVous=Lisa kohtumine
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Kohtumine
ConfirmDeleteAction=Kas tahad kindlasti selle tegevuse/ülesande kustutada?
CardAction=Tegevuse kaart
@@ -44,8 +44,8 @@ DoneActions=Lõpetatud tegevused
DoneActionsFor=Teostaja %s lõpetatud tegevused
ToDoActions=Lõpetamata tegevused
ToDoActionsFor=Teostaja %s lõpetamata tegevused
-SendPropalRef=Saada pakkumine %s
-SendOrderRef=Saada tellimus %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Ei ole kohaldatav
StatusActionToDo=Teha
StatusActionDone=Tehtud
@@ -62,7 +62,7 @@ LastProspectContactDone=Võeti ühendust
DateActionPlanned=Tegevuse toimumiseks plaanitud kuupäev
DateActionDone=Tegevuse toimumise kuupäev
ActionAskedBy=Tegevuse pani kirja
-ActionAffectedTo=Tegevuse eest vastutav
+ActionAffectedTo=Event assigned to
ActionDoneBy=Tegevuse viis läbi
ActionUserAsk=Pani kirja
ErrorStatusCantBeZeroIfStarted=Kui väli "Toimumise kuupäev" on täidetud, siis on tegevus alustatud (või lõpetatud), seega ei saa välja "Status" väärtuseks olla 0%.
diff --git a/htdocs/langs/et_EE/contracts.lang b/htdocs/langs/et_EE/contracts.lang
index cdf9a5c2b82..1d6c23dd8cf 100644
--- a/htdocs/langs/et_EE/contracts.lang
+++ b/htdocs/langs/et_EE/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Aegunud
ServiceStatusClosed=Suletud
ServicesLegend=Teenuste legend
Contracts=Lepingud
+ContractsAndLine=Contracts and line of contracts
Contract=Leping
NoContracts=Lepinguid pole
MenuServices=Teenused
diff --git a/htdocs/langs/et_EE/cron.lang b/htdocs/langs/et_EE/cron.lang
index 419f0202b60..a8b2473acb2 100644
--- a/htdocs/langs/et_EE/cron.lang
+++ b/htdocs/langs/et_EE/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Käsurea käsk
CronMenu=Cro
CronCannotLoadClass=Klassi %s või objekti %s laadimine ebaõnnestus
UseMenuModuleToolsToAddCronJobs=Mine menüüsse "Kodu - Moodulite tööriistad - Tegevuste nimekiri" planeeritud tegevuste vaatamiseks ja muutmiseks.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index 4dec9c707e8..92f2ead7679 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Lähtekonto ja sihtkonto pevad olema erinevad.
ErrorBadThirdPartyName=Halb väärtus kolmanda isiku nimeks
ErrorProdIdIsMandatory=%s on kohustuslik
ErrorBadCustomerCodeSyntax=Halb kliendi koodi süntaks
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Kliendi kood on nõutud
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Kliendi kood on juba kasutuses
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Selle võimaluse töötamiseks peab JavaScript olem
ErrorPasswordsMustMatch=Sisestatud paroolid peavad klappima
ErrorContactEMail=Tekkis tehniline viga. Palun võta ühendust oma administraatoriga e-posti aadressil %s ning lisa sõnumisse vea kood %s või veel parem oleks lisada sõnumisse antud lehe kuvatõmmis.
ErrorWrongValueForField=Väli number %s sisaldab vale väärtust (väärtus'%s' ei sobi regulaaravaldisega %s)
-ErrorFieldValueNotIn=Väli number %s sisaldab vale väärtust (väärtus '%s' ei sobi välja %s tüübiga tabelis %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Väli number %s sisaldab vale väärtust (väärtus '%s' ei ole üksuse %s olemasolev viide)
ErrorsOnXLines=%s lähtekirje(t) on vigane/vigased
ErrorFileIsInfectedWithAVirus=Antiviiruse programm ei suutnud faili valideerida (fail võib olla viiruse poolt nakatatud)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Kohustuslikud seadistusparameetrid on määratlemata
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index 4ab6289f4f2..2c61df2288a 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Viimane samm: Määra siin tarkvaraga ühendumisek
ActivateModule=Aktiveeri moodul %s
ShowEditTechnicalParameters=Klõpsa siia lisaparameetrite näitamiseks/muutmiseks (spetsialisti režiim)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index 52b69c9f148..98632e2e74e 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -141,6 +141,7 @@ Cancel=Tühista
Modify=Muuda
Edit=Toimeta
Validate=Kinnita
+ValidateAndApprove=Validate and Approve
ToValidate=Kinnitada
Save=Salvesta
SaveAs=Salvesta kui
@@ -158,6 +159,7 @@ Search=Otsi
SearchOf=Otsi
Valid=Kehtiv
Approve=Kiida heaks
+Disapprove=Disapprove
ReOpen=Ava uuesti
Upload=Saada fail
ToLink=Seosta
@@ -219,6 +221,7 @@ Cards=Kaardid
Card=Kaart
Now=Nüüd
Date=Kuupäev
+DateAndHour=Date and hour
DateStart=Alguskuupäev
DateEnd=Lõppkuupäev
DateCreation=Loomise kuupäev
@@ -295,6 +298,7 @@ UnitPriceHT=Ühiku hind (neto)
UnitPriceTTC=Ühiku hind
PriceU=ÜH
PriceUHT=ÜH (neto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=ÜH
Amount=Summa
AmountInvoice=Arve summa
@@ -521,6 +525,7 @@ DateFromTo=Alates %s kuni %s
DateFrom=Alates %s
DateUntil=Kuni %s
Check=Kontrolli
+Uncheck=Uncheck
Internal=Sisene
External=Väline
Internals=Sisene
@@ -688,6 +693,7 @@ PublicUrl=Avalik link
AddBox=Lisa kast
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Esmaspäev
Tuesday=Teisipäev
diff --git a/htdocs/langs/et_EE/orders.lang b/htdocs/langs/et_EE/orders.lang
index 060a7ae2cfb..7c4e9a9b1d8 100644
--- a/htdocs/langs/et_EE/orders.lang
+++ b/htdocs/langs/et_EE/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Tühistatud
StatusOrderDraft=Mustand (vajab kinnitamist)
StatusOrderValidated=Kinnitatud
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Töödeldud
StatusOrderToBill=Saadetud
StatusOrderToBill2=Arve esitada
@@ -58,6 +59,7 @@ MenuOrdersToBill=Saadetud tellimused
MenuOrdersToBill2=Billable orders
SearchOrder=Otsi tellimust
SearchACustomerOrder=Otsi müügitellimust
+SearchASupplierOrder=Search a supplier order
ShipProduct=Saada toode
Discount=Allahindlus
CreateOrder=Loo tellimus
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index 6a0f355dfa7..1670ba75c7a 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maksimaalne suurus
AttachANewFile=Manusta uus fail/dokument
LinkedObject=Seostatud objekt
Miscellaneous=Muu
-NbOfActiveNotifications=Teadete arv
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=See on testkiri.\nNeed kaks rida on eraldatud reavahetusega.\n\n__SIGNATURE__
PredefinedMailTestHtml=See on test kiri (sõna test peab olema rasvases kirjas).
Need kaks rida peavad olema eraldatud reavahetusega.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/et_EE/productbatch.lang b/htdocs/langs/et_EE/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/et_EE/productbatch.lang
+++ b/htdocs/langs/et_EE/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index b90084c9ced..2d64e8c5345 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 7333f9ac138..af73d9b93c7 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Kõik
PrivateProject=Projekti kontaktid
MyProjectsDesc=Selles vaates näidatakse vaid neid projekte, mille kontaktiks oled märgitud (hoolimata liigist)
ProjectsPublicDesc=See vaade esitab kõik projektid, mida sul on lubatud vaadata.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=See vaade näitab kõiki projekte (sinu kasutajaõigused annavad ligipääsu kõigele)
MyTasksDesc=Selles vaates näidatakse vaid neid projekte või ülesandeid, mille kontaktiks oled märgitud (hoolimata liigist)
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=See vaade esitab kõik projektid ja ülesanded, mida sul on lubatud vaadata.
TasksDesc=See vaade näitab kõiki projekte ja ülesandeid (sinu kasutajaõigused annavad ligipääsu kõigele)
ProjectsArea=Projektide ala
@@ -29,6 +31,8 @@ NoProject=Ühtki projekti pole määratletud või ei oma ühtki projekt
NbOpenTasks=Avatud ülesandeid
NbOfProjects=Projekte
TimeSpent=Aega kulutatud
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Aega kulutatud
RefTask=Ülesande viide
LabelTask=Ülesande nimi
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Antud projektiga seotud ostutellimuste nimek
ListSupplierInvoicesAssociatedProject=Antud projektiga seotud ostuarvete nimekiri
ListContractAssociatedProject=Antud projektiga seotud lepingute nimekiri
ListFichinterAssociatedProject=Antud projektiga seotud sekkumiste nimekiri
-ListTripAssociatedProject=Antud projektiga seotud lähetuste ja kulude nimekiri
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Antud projektiga seotud tegevuste nimekiri
ActivityOnProjectThisWeek=Projekti aktiivsus sellel nädalal
ActivityOnProjectThisMonth=Projekti aktiivsus sellel kuul
@@ -133,3 +137,6 @@ SearchAProject=Otsi projekti
ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
ProjectDraft=Projektide mustandid
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/et_EE/salaries.lang b/htdocs/langs/et_EE/salaries.lang
index 963209a58e8..a694b60850e 100644
--- a/htdocs/langs/et_EE/salaries.lang
+++ b/htdocs/langs/et_EE/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Palk
Salaries=Palgad
Employee=Töötaja
@@ -6,3 +8,6 @@ NewSalaryPayment=Uus palga makse
SalaryPayment=Palga makse
SalariesPayments=Palkade maksed
ShowSalaryPayment=Näita palga makset
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/et_EE/sendings.lang b/htdocs/langs/et_EE/sendings.lang
index 515ab2ca303..e343a62f82d 100644
--- a/htdocs/langs/et_EE/sendings.lang
+++ b/htdocs/langs/et_EE/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Tellitud kogus
QtyShipped=Saadetud kogus
QtyToShip=Kogus saata
QtyReceived=Saabunud kogus
-KeepToShip=Jätkuvalt saata
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Tellimusega seotud teised saadetised
DateSending=Tellimuse saatmise kuupäev
DateSendingShort=Tellimuse saatmise kuupäev
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 9e250e14562..026f5f6aefe 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Kaalutud keskmine hind
PMPValueShort=KKH
EnhancedValueOfWarehouses=Ladude väärtus
UserWarehouseAutoCreate=Loo kasutaja loomisel automaatselt ladu
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Saadetud kogus
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Laojäägi vähendamiseks kasutatakse ladu %s
WarehouseForStockIncrease=Laojäägi suurendamiseks kasutatakse ladu %s
ForThisWarehouse=Antud lao tarbeks
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=See on kõigi avatud ostutellimuste nimekiri
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Värskendamised
NbOfProductBeforePeriod=Toote %s laojääk enne valitud perioodi (< %s)
NbOfProductAfterPeriod=Toote %s laojääk pärast valitud perioodi (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/et_EE/suppliers.lang b/htdocs/langs/et_EE/suppliers.lang
index 894a1dfcad6..be8bd178d54 100644
--- a/htdocs/langs/et_EE/suppliers.lang
+++ b/htdocs/langs/et_EE/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Hankijad
-Supplier=Hankija
AddSupplier=Create a supplier
SupplierRemoved=Hankija kustutatud
SuppliersInvoice=Ostuarved
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Ostuarved ja maksed
ExportDataset_fournisseur_3=Ostutellimused ja tellimuste read
ApproveThisOrder=KIida see tellimuse heaks
ConfirmApproveThisOrder=Kas oled täiesti kindel, et soovid heaks kiita tellimuse %s ?
-DenyingThisOrder=Lükka tellimus tagasi
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Kas oled täiesti kindel, et soovid tagasi lükata tellimuse %s ?
ConfirmCancelThisOrder=Kas oled täiesti kindel, et soovid tühistada telllimuse %s ?
AddCustomerOrder=Loo müügitellimus
diff --git a/htdocs/langs/et_EE/trips.lang b/htdocs/langs/et_EE/trips.lang
index c9ec60bb29b..12661480a8e 100644
--- a/htdocs/langs/et_EE/trips.lang
+++ b/htdocs/langs/et_EE/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Reis
-Trips=Trips
-TripsAndExpenses=Matkad ja kulud
-TripsAndExpensesStatistics=Reiside ja kulude statistika
-TripCard=Reisi kaart
-AddTrip=Lisa trip
-ListOfTrips=List of väljasõidud
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List tasude
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Äriühingu/ühenduse külastas
Kilometers=Kilomeetrid
FeesKilometersOrAmout=Summa või kilomeetrites
-DeleteTrip=Kustuta trip
-ConfirmDeleteTrip=Oled sa kindel, et soovite kustutada selle reisi?
-TF_OTHER=Muu
-TF_LUNCH=Lõuna
-TF_TRIP=Reis
-ListTripsAndExpenses=List reiside ja kulude
-ExpensesArea=Matkad ja kulud ala
-SearchATripAndExpense=Otsi reisi ja kulu
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Muu
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lõuna
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 15b5248bbbd..283b7d567cf 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Esperimentala
VersionDevelopment=Garapena
VersionUnknown=Ezezaguna
VersionRecommanded=Gomendatua
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sesioaren ID
SessionSaveHandler=Kudeatzailea sesioak gordetzeko
SessionSavePath=Sesio biltegiaren kokapena
@@ -493,10 +498,16 @@ Module600Name=Jakinarazpenak
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Diru-emateak
Module700Desc=Diru-emateak kudeatzea
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Kontabilitatea
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategoriak
Module1780Desc=Kategoriak kudeatzea (produktuak, hornitzaileak eta bezeroak)
Module2000Name=WYSIWYG editorea
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=UPC motako barra-kodea
BarcodeDescISBN=ISBN motako barra-kodea
BarcodeDescC39=C39 motako barra-kodea
BarcodeDescC128=C128 motako barra-kodea
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Barne-eragilea
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/eu_ES/banks.lang b/htdocs/langs/eu_ES/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/eu_ES/banks.lang
+++ b/htdocs/langs/eu_ES/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/eu_ES/commercial.lang b/htdocs/langs/eu_ES/commercial.lang
index b83fe1d4671..5e6f75fc30c 100644
--- a/htdocs/langs/eu_ES/commercial.lang
+++ b/htdocs/langs/eu_ES/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact done
DateActionPlanned=Date event planned for
DateActionDone=Date event done
ActionAskedBy=Event reported by
-ActionAffectedTo=Event owned by
+ActionAffectedTo=Event assigned to
ActionDoneBy=Event done by
ActionUserAsk=Reported by
ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%.
diff --git a/htdocs/langs/eu_ES/contracts.lang b/htdocs/langs/eu_ES/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/eu_ES/contracts.lang
+++ b/htdocs/langs/eu_ES/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/eu_ES/cron.lang b/htdocs/langs/eu_ES/cron.lang
index 36270d08f1b..c55f6c923ce 100644
--- a/htdocs/langs/eu_ES/cron.lang
+++ b/htdocs/langs/eu_ES/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/eu_ES/install.lang b/htdocs/langs/eu_ES/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/eu_ES/install.lang
+++ b/htdocs/langs/eu_ES/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/eu_ES/main.lang b/htdocs/langs/eu_ES/main.lang
index 6045b98edb1..5913029999d 100644
--- a/htdocs/langs/eu_ES/main.lang
+++ b/htdocs/langs/eu_ES/main.lang
@@ -141,6 +141,7 @@ Cancel=Utzi
Modify=Eraldatu
Edit=Editatu
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Gorde
SaveAs=Gorde honela
@@ -158,6 +159,7 @@ Search=Bilatu
SearchOf=Bilatu
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Orain
Date=Data
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/eu_ES/orders.lang b/htdocs/langs/eu_ES/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/eu_ES/orders.lang
+++ b/htdocs/langs/eu_ES/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/eu_ES/productbatch.lang b/htdocs/langs/eu_ES/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/eu_ES/productbatch.lang
+++ b/htdocs/langs/eu_ES/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/eu_ES/salaries.lang b/htdocs/langs/eu_ES/salaries.lang
index 31629a4ee99..98551e32117 100644
--- a/htdocs/langs/eu_ES/salaries.lang
+++ b/htdocs/langs/eu_ES/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Soldaten ordainketak
ShowSalaryPayment=Soldataren ordainketa erakutsi
THM=Batezbesteko orduko prezioa
TJM=Batezbesteko eguneko prezioa
+CurrentSalary=Current salary
diff --git a/htdocs/langs/eu_ES/sendings.lang b/htdocs/langs/eu_ES/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/eu_ES/sendings.lang
+++ b/htdocs/langs/eu_ES/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/eu_ES/stocks.lang b/htdocs/langs/eu_ES/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/eu_ES/stocks.lang
+++ b/htdocs/langs/eu_ES/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/eu_ES/suppliers.lang b/htdocs/langs/eu_ES/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/eu_ES/suppliers.lang
+++ b/htdocs/langs/eu_ES/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/eu_ES/trips.lang b/htdocs/langs/eu_ES/trips.lang
index e9d7c242e07..35f4d8f1cad 100644
--- a/htdocs/langs/eu_ES/trips.lang
+++ b/htdocs/langs/eu_ES/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Bidaia
-Trips=Bidaiak
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Bidaia sortu
-ListOfTrips=Bidaien zerrenda
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=Bidai berria
+NewTrip=New expense report
CompanyVisited=Bisitatutako konpania/erakundea
Kilometers=Kilometroak
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Bidaia ezabatu
-ConfirmDeleteTrip=Ziur zaude bidai hau ezabatu nahi duzuna?
-TF_OTHER=Other
-TF_LUNCH=Bazkaria
-TF_TRIP=Bidaia
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Bazkaria
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index a943825df33..c9304d083b0 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=تجربی
VersionDevelopment=توسعه
VersionUnknown=ناشناخته
VersionRecommanded=توصیه شده
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=جلسه ID
SessionSaveHandler=هندلر برای صرفه جویی در جلسات
SessionSavePath=محلی سازی را وارد نمایید و ذخیره سازی
@@ -493,10 +498,16 @@ Module600Name=اطلاعیه ها
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=کمک های مالی
Module700Desc=مدیریت کمک مالی
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=اخوندک
Module1200Desc=ادغام آخوندک
Module1400Name=حسابداری
Module1400Desc=مدیریت حسابداری (احزاب دو)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=دسته بندی ها
Module1780Desc=مدیریت گروه (محصولات، تامین کنندگان و مشتریان)
Module2000Name=ویرایشگر WYSIWYG
@@ -631,7 +642,7 @@ Permission181=خوانده شده سفارشات کالا
Permission182=ایجاد / تغییر سفارشات کالا
Permission183=اعتبارسنجی سفارشات کالا
Permission184=تصویب سفارشات کالا
-Permission185=سفارشات تامین کننده نظم
+Permission185=Order or cancel supplier orders
Permission186=دریافت سفارشات کالا
Permission187=نزدیک سفارشات کالا
Permission188=لغو سفارشات کالا
@@ -711,6 +722,13 @@ Permission538=خدمات صادرات
Permission701=خوانده شده
Permission702=ایجاد / تغییر کمک های مالی
Permission703=حذف کمک های مالی
+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
Permission1001=خوانده شده سهام
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=رمز عبور به استفاده از پروکسی سرور
DefineHereComplementaryAttributes=تعریف در اینجا تمام صفات، در حال حاضر به طور پیش فرض در دسترس نیست، و این که شما می خواهید برای٪ s پشتیبانی می شود.
ExtraFields=ویژگی های مکمل
ExtraFieldsLines=ویژگی های مکمل (خط)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=ویژگی های مکمل (thirdparty)
ExtraFieldsContacts=ویژگی های مکمل (تماس / آدرس)
ExtraFieldsMember=ویژگی های مکمل (عضو)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=یک خط از محصول / خدمات با مقدار
FreeLegalTextOnProposal=متن رایگان در طرح های تجاری
WatermarkOnDraftProposal=تعیین میزان مد آب در پیش نویس طرح تجاری (هیچ اگر خالی)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=راه اندازی مدیریت سفارش
OrdersNumberingModules=سفارشات شماره مدل
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=بارکد از نوع UPC
BarcodeDescISBN=بارکد از نوع ISBN
BarcodeDescC39=بارکد از نوع C39
BarcodeDescC128=بارکد از نوع C128
-GenbarcodeLocation=تولید کد نوار ابزار خط فرمان (استفاده شده توسط موتور داخلی برای برخی از انواع بارکد)
+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
BarcodeInternalEngine=موتور داخلی
BarCodeNumberManager=مدیر به صورت خودکار تعریف اعداد بارکد
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=پیش فرض حساب استفاده برای دریافت پرداخت های نقدی
CashDeskBankAccountForCheque= پیش فرض حساب استفاده برای دریافت پرداخت توسط چک
CashDeskBankAccountForCB= پیش فرض حساب استفاده برای دریافت پرداخت توسط کارت های اعتباری
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=راه اندازی ماژول چوب الف
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=قالب
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/fa_IR/banks.lang b/htdocs/langs/fa_IR/banks.lang
index b94e76dd3c6..30e1877cfe8 100644
--- a/htdocs/langs/fa_IR/banks.lang
+++ b/htdocs/langs/fa_IR/banks.lang
@@ -33,7 +33,11 @@ AllTime=از شروع
Reconciliation=مصالحه
RIB=شماره حساب بانکی
IBAN=شماره IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / تعداد SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=سفارشات ایستاده
StandingOrder=نظام نامه
Withdrawals=برداشت ها
@@ -148,7 +152,7 @@ BackToAccount=برگشت به حساب
ShowAllAccounts=نمایش برای همه حساب ها
FutureTransaction=معامله در futur. هیچ راهی برای مصالحه.
SelectChequeTransactionAndGenerate=انتخاب چک / فیلتر به چک دریافت سپرده شامل و کلیک بر روی "ایجاد".
-InputReceiptNumber=بیانیه بانک مرتبط با مصالحه را انتخاب کنید. استفاده از یک مقدار عددی قابل مرتب شدن است (مانند، YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=در نهایت، تعیین یک دسته بندی است که در آن برای طبقه بندی پرونده
ToConciliate=به مصالحه؟
ThenCheckLinesAndConciliate=سپس، بررسی خطوط موجود در صورت حساب بانکی و کلیک کنید
diff --git a/htdocs/langs/fa_IR/commercial.lang b/htdocs/langs/fa_IR/commercial.lang
index 46d83514095..58154b70276 100644
--- a/htdocs/langs/fa_IR/commercial.lang
+++ b/htdocs/langs/fa_IR/commercial.lang
@@ -9,9 +9,9 @@ Prospect=چشم انداز
Prospects=چشم انداز
DeleteAction=حذف یک رویداد / کار
NewAction=رویداد جدید / کار
-AddAction=اضافه کردن رویداد / کار
-AddAnAction=اضافه کردن یک رویداد / کار
-AddActionRendezVous=اضافه کردن یک رویداد Rendez-vous
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=قرار ملاقات گذاشتن
ConfirmDeleteAction=آیا مطمئن هستید که می خواهید این رویداد / وظیفه را حذف کنید؟
CardAction=کارت رویداد
@@ -44,8 +44,8 @@ DoneActions=رویدادهای انجام شده
DoneActionsFor=رویدادهای انجام شده برای٪ s
ToDoActions=رویدادهای ناقص
ToDoActionsFor=رویدادهای ناقص برای٪ s
-SendPropalRef=ارسال پیشنهاد تجاری از٪ s
-SendOrderRef=ارسال منظور از٪ s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=قابل اجرا نیست
StatusActionToDo=برای انجام این کار
StatusActionDone=کامل
@@ -62,7 +62,7 @@ LastProspectContactDone=تماس با انجام
DateActionPlanned=تاریخ رویداد برنامه ریزی شده برای
DateActionDone=تاریخ رویداد انجام می شود
ActionAskedBy=رویداد گزارش شده توسط
-ActionAffectedTo=رویداد اختصاص یافته به
+ActionAffectedTo=Event assigned to
ActionDoneBy=رویداد های انجام شده توسط
ActionUserAsk=به گزارش
ErrorStatusCantBeZeroIfStarted=اگر زمینه 'تاریخ انجام می شود' پر شده است، اقدام آغاز شده است (و یا به پایان رسید)، پس درست است 'وضعیت' می تواند 0٪٪ نیست.
diff --git a/htdocs/langs/fa_IR/contracts.lang b/htdocs/langs/fa_IR/contracts.lang
index 66101dfbec6..399617a86aa 100644
--- a/htdocs/langs/fa_IR/contracts.lang
+++ b/htdocs/langs/fa_IR/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=منقضی شده
ServiceStatusClosed=بسته
ServicesLegend=خدمات افسانه
Contracts=قراردادها
+ContractsAndLine=Contracts and line of contracts
Contract=قرارداد
NoContracts=بدون قرارداد
MenuServices=خدمات
diff --git a/htdocs/langs/fa_IR/cron.lang b/htdocs/langs/fa_IR/cron.lang
index c7464dd88b9..feca42ac429 100644
--- a/htdocs/langs/fa_IR/cron.lang
+++ b/htdocs/langs/fa_IR/cron.lang
@@ -84,3 +84,4 @@ CronType_command=فرمان شل
CronMenu=cron را
CronCannotLoadClass=آیا می توانم کلاس٪ s را بار نیست و یا شی از٪ s
UseMenuModuleToolsToAddCronJobs=برو به منوی "صفحه اصلی - ماژول ابزار - فهرست فرصت های شغلی" برای دیدن و ویرایش کار برنامه ریزی شده.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 2b562f769ad..feea5472afb 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=منبع و اهداف حساب های بانکی
ErrorBadThirdPartyName=ارزش بد برای نام شخص ثالث
ErrorProdIdIsMandatory=٪ بازدید کنندگان الزامی است
ErrorBadCustomerCodeSyntax=نحو بد برای کد مشتری
-ErrorBadBarCodeSyntax=نحو بد بارکد
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=کد مشتریان مورد نیاز
ErrorBarCodeRequired=کد نوار مورد نیاز
ErrorCustomerCodeAlreadyUsed=کد مشتری در حال حاضر استفاده می شود
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=جاوا اسکریپت نمی باید غیر فع
ErrorPasswordsMustMatch=هر دو کلمه عبور تایپ شده باید با یکدیگر مطابقت
ErrorContactEMail=یک خطای فنی رخ داد. لطفا، با مدیر سایت تماس به زیر ایمیل از٪ s EN ارائه کد خطا٪ s در پیام خود، و یا حتی بهتر با اضافه کردن یک کپی روی صفحه نمایش از این صفحه.
ErrorWrongValueForField=ارزش اشتباه برای تعداد فیلد٪ s (مقدار «٪ s» به عبارت منظم حکومت از٪ s مطابقت ندارد)
-ErrorFieldValueNotIn=ارزش اشتباه برای تعداد فیلد٪ s (مقدار «٪ s» است مقدار موجود در فیلد٪ s را از جدول٪ نیست)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=ارزش اشتباه برای تعداد فیلد٪ s (مقدار «٪ s» است از٪ s کد عکس موجود نیست)
ErrorsOnXLines=خطا در٪ s را ثبت منبع (ها)
ErrorFileIsInfectedWithAVirus=برنامه آنتی ویروس قادر به اعتبار فایل (فایل ممکن است توسط یک ویروس آلوده)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=پارامترهای راه اندازی اجباری هنوز تعریف نشده
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index ac1ba6dc068..0b4f81b7903 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=آخرین مرحله: تعریف اینجا کا
ActivateModule=فعال بخش٪ s
ShowEditTechnicalParameters=برای نشان دادن پارامترهای پیشرفته / ویرایش اینجا را کلیک کنید (حالت کارشناسی)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index f75a9926e70..8e9afbf39b0 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -141,6 +141,7 @@ Cancel=لغو کردن
Modify=تغییر دادن
Edit=ویرایش
Validate=معتبر ساختن
+ValidateAndApprove=Validate and Approve
ToValidate=به اعتبار
Save=جویی در هزینه
SaveAs=ذخیره به عنوان
@@ -158,6 +159,7 @@ Search=جستجو
SearchOf=جستجو
Valid=معتبر
Approve=تصویب
+Disapprove=Disapprove
ReOpen=دوباره باز
Upload=ارسال فایل
ToLink=پیوند
@@ -219,6 +221,7 @@ Cards=کارت
Card=کارت
Now=اکنون
Date=تاریخ
+DateAndHour=Date and hour
DateStart=تاریخ شروع
DateEnd=تاریخ پایان
DateCreation=تاریخ ایجاد
@@ -295,6 +298,7 @@ UnitPriceHT=قیمت واحد (خالص)
UnitPriceTTC=قیمت واحد
PriceU=UP
PriceUHT=UP (خالص)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=مقدار
AmountInvoice=مقدار فاکتور
@@ -521,6 +525,7 @@ DateFromTo=از٪ s به٪ s
DateFrom=از٪ s
DateUntil=تا از٪ s
Check=بررسی
+Uncheck=Uncheck
Internal=داخلی
External=خارجی
Internals=داخلی
@@ -688,6 +693,7 @@ PublicUrl=URL عمومی
AddBox=اضافه کردن جعبه
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=دوشنبه
Tuesday=سهشنبه
diff --git a/htdocs/langs/fa_IR/orders.lang b/htdocs/langs/fa_IR/orders.lang
index 43f430681cb..c680e0c4e84 100644
--- a/htdocs/langs/fa_IR/orders.lang
+++ b/htdocs/langs/fa_IR/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=لغو شد
StatusOrderDraft=پیش نویس (نیاز به تایید می شود)
StatusOrderValidated=اعتبار
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=پردازش
StatusOrderToBill=تحویل
StatusOrderToBill2=به بیل
@@ -58,6 +59,7 @@ MenuOrdersToBill=سفارشات تحویل
MenuOrdersToBill2=Billable orders
SearchOrder=نتایج جستجو
SearchACustomerOrder=جستجوی یک سفارش مشتری
+SearchASupplierOrder=Search a supplier order
ShipProduct=محصول کشتی
Discount=تخفیف
CreateOrder=ایجاد نظم
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index a510a002ae4..0276748a4da 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -54,12 +54,13 @@ MaxSize=حداکثر اندازه
AttachANewFile=ضمیمه کردن فایل جدید / سند
LinkedObject=شی مرتبط
Miscellaneous=متفرقه
-NbOfActiveNotifications=تعداد اطلاعیه ها
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=این یک پست تست است. دو خط با بازگشت نورد جدا شده است. __SIGNATURE__
PredefinedMailTestHtml=این ایمیل آزمون (آزمون کلمه باید در پررنگ باشد) است.
دو خط با بازگشت نورد جدا شده است.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ ما می خواهیم به شما هشدار می دهند که فاکتور __ FACREF__ به نظر می رسد که غیر انتفایی نیست. پس این فاکتور در پیوست است دوباره، به عنوان یک یادآوری. __PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ شما در اینجا خواهید دید پیشنهاد تجاری __ PROPREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید که منظور __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ شما در اینجا خواهید دید منظور ما __ ORDERREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ شما در اینجا خواهید دید فاکتور __ FACREF__ __ PERSONALIZED__Sincerely __ SIGNATURE__
diff --git a/htdocs/langs/fa_IR/productbatch.lang b/htdocs/langs/fa_IR/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/fa_IR/productbatch.lang
+++ b/htdocs/langs/fa_IR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 2fcdf5eed69..f7f332d68a0 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index 2606f870f39..0e685cffc26 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -8,8 +8,10 @@ SharedProject=هر کسی
PrivateProject=اطلاعات تماس پروژه
MyProjectsDesc=این دیدگاه محدود به پروژه شما یک تماس برای (هر چه باشد نوع) می باشد.
ProjectsPublicDesc=این دیدگاه ارائه تمام پروژه ها به شما این اجازه را بخوانید.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=این دیدگاه ارائه تمام پروژه (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
MyTasksDesc=این دیدگاه به پروژه ها و یا کارهای شما تماس برای (هر چه باشد نوع) می باشد محدود است.
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=این دیدگاه ارائه تمام پروژه ها و کارهای شما مجاز به خواندن.
TasksDesc=این دیدگاه ارائه تمام پروژه ها و وظایف (مجوز دسترسی خود را به شما عطا اجازه دسترسی به همه چیز).
ProjectsArea=منطقه پروژه ها
@@ -29,6 +31,8 @@ NoProject=هیچ پروژه تعریف شده و یا متعلق به
NbOpenTasks=NB از وظایف باز
NbOfProjects=Nb در پروژه
TimeSpent=زمان صرف شده
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=زمان صرف شده
RefTask=کد عکس. کار
LabelTask=کار برچسب
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=فهرست سفارشات منبع در ار
ListSupplierInvoicesAssociatedProject=فهرست فاکتورها منبع در ارتباط با پروژه
ListContractAssociatedProject=فهرست قرارداد در ارتباط با پروژه
ListFichinterAssociatedProject=فهرست مداخلات مرتبط با پروژه
-ListTripAssociatedProject=فهرست از سفر و هزینه های مرتبط با پروژه
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=فهرست رویدادی به این پروژه
ActivityOnProjectThisWeek=فعالیت در پروژه این هفته
ActivityOnProjectThisMonth=فعالیت در پروژه این ماه
@@ -133,3 +137,6 @@ SearchAProject=جستجوی یک پروژه
ProjectMustBeValidatedFirst=پروژه ابتدا باید معتبر باشد
ProjectDraft=پروژه های پیش نویس
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/fa_IR/salaries.lang b/htdocs/langs/fa_IR/salaries.lang
index 2cb6f372f7e..63b2ea6e372 100644
--- a/htdocs/langs/fa_IR/salaries.lang
+++ b/htdocs/langs/fa_IR/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=حقوق
Salaries=حقوق
Employee=کارمند
@@ -6,3 +8,6 @@ NewSalaryPayment=پرداخت حقوق و دستمزد جدید
SalaryPayment=پرداخت حقوق و دستمزد
SalariesPayments=حقوق پرداخت
ShowSalaryPayment=نمایش پرداخت حقوق و دستمزد
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/fa_IR/sendings.lang b/htdocs/langs/fa_IR/sendings.lang
index de9d8feaa46..f456863b564 100644
--- a/htdocs/langs/fa_IR/sendings.lang
+++ b/htdocs/langs/fa_IR/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=تعداد سفارش داده شده
QtyShipped=تعداد حمل
QtyToShip=تعداد به کشتی
QtyReceived=تعداد دریافت
-KeepToShip=نگه دارید به کشتی
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=دیگر محموله برای این منظور
DateSending=عضویت جهت ارسال
DateSendingShort=عضویت جهت ارسال
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index 0d849cdaf73..1e27de088b8 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=قیمت به طور متوسط وزنی
PMPValueShort=WAP
EnhancedValueOfWarehouses=ارزش ساختمان و ذخیره سازی
UserWarehouseAutoCreate=ایجاد یک انبار به طور خودکار در هنگام ایجاد یک کاربر
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=تعداد اعزام
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=انبار٪ خواهد شد برای سهام
WarehouseForStockIncrease=انبار٪ خواهد شد برای افزایش سهام استفاده
ForThisWarehouse=برای این انبار
ReplenishmentStatusDesc=این لیست از همه محصول با سهام پایین تر از سهام مورد نظر (یا کمتر از ارزش هشدار اگر گزینه "هشدار تنها" بررسی می شود)، و نشان می دهد به شما برای ایجاد سفارشات منبع برای پر کردن تفاوت است.
-ReplenishmentOrdersDesc=این لیست از تمام سفارشات منبع باز است
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=پر کردن
NbOfProductBeforePeriod=تعداد محصول٪ s را در انبار قبل از دوره (<٪) انتخاب
NbOfProductAfterPeriod=تعداد محصول٪ s را در سهام بعد از دوره زمانی انتخاب شده (>٪ بازدید کنندگان)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/fa_IR/suppliers.lang b/htdocs/langs/fa_IR/suppliers.lang
index 62cfdfdd084..917a56b1758 100644
--- a/htdocs/langs/fa_IR/suppliers.lang
+++ b/htdocs/langs/fa_IR/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=تولید کنندگان
-Supplier=تهیه کننده
AddSupplier=Create a supplier
SupplierRemoved=تامین کننده حذف
SuppliersInvoice=تولید کنندگان صورتحساب
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=فاکتورها تامین کننده و پرداخ
ExportDataset_fournisseur_3=سفارشات تامین کننده و خطوط جهت
ApproveThisOrder=تصویب این منظور
ConfirmApproveThisOrder=آیا مطمئن هستید که می خواهید برای تایید از٪ s؟
-DenyingThisOrder=انکار این منظور
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=آیا مطمئن هستید که می خواهید برای انکار این منظور از٪ s؟
ConfirmCancelThisOrder=آیا مطمئن هستید که می خواهید به لغو این منظور از٪ s؟
AddCustomerOrder=ایجاد سفارش مشتری
diff --git a/htdocs/langs/fa_IR/trips.lang b/htdocs/langs/fa_IR/trips.lang
index 5cefadd2e55..3b596baa3e7 100644
--- a/htdocs/langs/fa_IR/trips.lang
+++ b/htdocs/langs/fa_IR/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=سفر
-Trips=سفر
-TripsAndExpenses=سفر و هزینه های عملیاتی
-TripsAndExpensesStatistics=سفر و هزینه های آمار
-TripCard=کارت سفر
-AddTrip=اضافه کردن سفر
-ListOfTrips=فهرست از سفر
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=فهرست هزینه ها
-NewTrip=سفر جدید
+NewTrip=New expense report
CompanyVisited=شرکت / بنیاد بازدید کردند
Kilometers=کیلومتر
FeesKilometersOrAmout=مقدار و یا کیلومتر
-DeleteTrip=حذف سفر
-ConfirmDeleteTrip=آیا مطمئن هستید که می خواهید این سفر را حذف کنید؟
-TF_OTHER=دیگر
-TF_LUNCH=ناهار
-TF_TRIP=سفر
-ListTripsAndExpenses=فهرست سفر و هزینه های عملیاتی
-ExpensesArea=سفر و هزینه های عملیاتی منطقه
-SearchATripAndExpense=جستجوی یک سفر و هزینه
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=دیگر
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=ناهار
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index 5096161d388..9ead36d476c 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Kokeellinen
VersionDevelopment=Kehitys
VersionUnknown=Tuntematon
VersionRecommanded=Suositeltava
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Istunnon tunnus
SessionSaveHandler=Handler tallentaa istuntojen
SessionSavePath=Varasto istuntojakson localization
@@ -493,10 +498,16 @@ Module600Name=Ilmoitukset
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Lahjoitukset
Module700Desc=Lahjoitukset hallinto
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis yhdentyminen
Module1400Name=Kirjanpidon asiantuntija
Module1400Desc=Kirjanpidon hallinta asiantuntijoille (double osapuolet)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategoriat
Module1780Desc=Kategoriat hallintaa (tuotteet, tavarantoimittajat ja asiakkaat)
Module2000Name=FCKeditor
@@ -631,7 +642,7 @@ Permission181=Lue toimittaja tilaukset
Permission182=Luoda / muuttaa toimittajan tilaukset
Permission183=Validate toimittaja tilaukset
Permission184=Hyväksy toimittaja tilaukset
-Permission185=Tilaa toimittaja tilaukset
+Permission185=Order or cancel supplier orders
Permission186=Vastaanota toimittaja tilaukset
Permission187=Sulje toimittaja tilaukset
Permission188=Peruuta toimittaja tilaukset
@@ -711,6 +722,13 @@ Permission538=Vienti palvelut
Permission701=Lue lahjoitukset
Permission702=Luoda / muuttaa lahjoitusten
Permission703=Poista lahjoitukset
+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
Permission1001=Lue varastot
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Salasana käyttää välityspalvelinta
DefineHereComplementaryAttributes=Määritä tässä kaikki atributes, jo ole oletuksena, ja että haluat tuettava %s.
ExtraFields=Täydentävät ominaisuudet
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Rivi tuotteen / palvelun nolla määrä pidetään vai
FreeLegalTextOnProposal=Vapaa tekstihaku kaupallisiin ehdotuksia
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Tilaukset hallinto-setup
OrdersNumberingModules=Tilaukset numerointiin modules
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Viivakoodi tyypin UPC
BarcodeDescISBN=Viivakoodi tyypin ISBN
BarcodeDescC39=Viivakoodi tyypin C39
BarcodeDescC128=Viivakoodi tyypin C128
-GenbarcodeLocation=Viivakoodi sukupolven komentoriviksi työkalu (käyttää phpbarcode moottorin joidenkin viivakoodi tyypit)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Rahat tilille käyttää myy
CashDeskBankAccountForCheque= Tilin käyttö vastaanottaa maksuja sekillä
CashDeskBankAccountForCB= Tilin käyttö voidaan saada käteismaksujen luottokorttia
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Kirjanmerkin moduulin asetukset
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/fi_FI/banks.lang b/htdocs/langs/fi_FI/banks.lang
index 56fd08fead5..3a30c33e0f4 100644
--- a/htdocs/langs/fi_FI/banks.lang
+++ b/htdocs/langs/fi_FI/banks.lang
@@ -33,7 +33,11 @@ AllTime=Alkaen
Reconciliation=Yhteensovittaminen
RIB=Pankkitilin numero
IBAN=IBAN-numero
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT-koodi
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Kestotilaus
StandingOrder=Kestotilaus
Withdrawals=Nostot
@@ -148,7 +152,7 @@ BackToAccount=Takaisin tiliin
ShowAllAccounts=Näytä kaikki tilit
FutureTransaction=Tapahtuma on tulevaisuudessa. Ei soviteltavissa.
SelectChequeTransactionAndGenerate=Valitse / suodattaa tarkastuksiin sisällyttää osaksi tarkastus talletuksen vastaanottamisesta ja klikkaa "Luo".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/fi_FI/commercial.lang b/htdocs/langs/fi_FI/commercial.lang
index 5c737e339a1..a3dc28186cc 100644
--- a/htdocs/langs/fi_FI/commercial.lang
+++ b/htdocs/langs/fi_FI/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Mahdollisuus
Prospects=Mahdollisuudet
DeleteAction=Poista toiminto / tehtävä
NewAction=Uusi toimi / tehtävä
-AddAction=Lisää toiminta / tehtävä
-AddAnAction=Lisää toiminta / tehtävä
-AddActionRendezVous=Lisää Rendezvous tehtävä
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Oletko varma, että haluat poistaa tämän tehtävän?
CardAction=Tapahtumakortti
@@ -44,8 +44,8 @@ DoneActions=Tehty toimia
DoneActionsFor=Tehty toimia %s
ToDoActions=Puutteellinen toimet
ToDoActionsFor=Puutteellinen toimia %s
-SendPropalRef=Lähetä kaupallinen ehdotus %s
-SendOrderRef=Lähetä jotta %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Ei sovelleta
StatusActionToDo=Voit tehdä
StatusActionDone=Tehty
@@ -62,7 +62,7 @@ LastProspectContactDone=Yhteystiedot tehnyt
DateActionPlanned=Päiväys toimia varten
DateActionDone=Päiväys toiminta tapahtuu
ActionAskedBy=Toimi pyytänyt
-ActionAffectedTo=Toiminta vaikuttaa
+ActionAffectedTo=Event assigned to
ActionDoneBy=Toiminta tapahtuu
ActionUserAsk=Tallennettu
ErrorStatusCantBeZeroIfStarted=Jos kenttä "Päiväys tehtävä on täytetty, toiminta on alkanut (tai valmis), joten alalla" Tila "ei voi olla 0%%.
diff --git a/htdocs/langs/fi_FI/contracts.lang b/htdocs/langs/fi_FI/contracts.lang
index 8d44a9b256e..fb36e753d96 100644
--- a/htdocs/langs/fi_FI/contracts.lang
+++ b/htdocs/langs/fi_FI/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Lakkaa
ServiceStatusClosed=Suljettu
ServicesLegend=Palvelut legenda
Contracts=Sopimukset
+ContractsAndLine=Contracts and line of contracts
Contract=Sopimus
NoContracts=Sopimuksia ei
MenuServices=Palvelut
diff --git a/htdocs/langs/fi_FI/cron.lang b/htdocs/langs/fi_FI/cron.lang
index 305bf312025..bba69fbb33f 100644
--- a/htdocs/langs/fi_FI/cron.lang
+++ b/htdocs/langs/fi_FI/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index edbe3fa5f22..3a31847c78b 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Lähde ja tavoitteet pankkitilit on erilainen.
ErrorBadThirdPartyName=Bad arvo kolmannen osapuolen nimi
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntaksi asiakas-koodi
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Asiakas-koodi tarvitaan
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Asiakas-koodi on jo käytetty
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ei saa keskeytyä, on tämä ominaisuus
ErrorPasswordsMustMatch=Molemmat kirjoittaa salasanat on vastattava toisiaan
ErrorContactEMail=Tekninen virhe. Ota yhteys järjestelmänvalvojaan jälkeen sähköpostin %s en antaa virhekoodi %s viesti, tai jopa paremmin lisäämällä näytön kopion tästä sivusta.
ErrorWrongValueForField=Väärä arvo kentän numero %s (arvo "%s" ei vastaa regex sääntö %s)
-ErrorFieldValueNotIn=Väärä arvo kentän numero %s (arvo "%s" ei ole arvoa käytettävissä tulee kenttään %s taulukon %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Väärä arvo kentän numero %s (arvo "%s" ei %s olemassa ref)
ErrorsOnXLines=Virheet %s lähde linjat
ErrorFileIsInfectedWithAVirus=Virustentorjuntaohjelma ei voinut tarkistaa tiedoston (tiedosto saattaa olla tartunnan virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index d1528d62722..80b688dca44 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Viimeinen askel: Määritä tässä käyttäjätun
ActivateModule=Aktivoi moduuli %s
ShowEditTechnicalParameters=Klikkaa tästä näyttääksesi/muuttaaksesi edistyneemmät parametrit (asiantuntija tila)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 9df855ba004..4e6098fd766 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -141,6 +141,7 @@ Cancel=Peruuta
Modify=Muokkaa
Edit=Muokkaa
Validate=Vahvista
+ValidateAndApprove=Validate and Approve
ToValidate=Validoida
Save=Tallenna
SaveAs=Tallenna nimellä
@@ -158,6 +159,7 @@ Search=Haku
SearchOf=Haku
Valid=Voimassa
Approve=Hyväksy
+Disapprove=Disapprove
ReOpen=Avaa uudelleen
Upload=Lähetä tiedosto
ToLink=Linkki
@@ -219,6 +221,7 @@ Cards=Kortit
Card=Kortti
Now=Nyt
Date=Päivä
+DateAndHour=Date and hour
DateStart=Alkaen
DateEnd=Päättyen
DateCreation=Luotu
@@ -295,6 +298,7 @@ UnitPriceHT=Yksikköhinta (netto)
UnitPriceTTC=Yksikköhinta
PriceU=UP
PriceUHT=UP (netto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Määrä
AmountInvoice=Laskun summa
@@ -521,6 +525,7 @@ DateFromTo=Kohteesta %s %s
DateFrom=Kohteesta %s
DateUntil=Vasta %s
Check=Shekki
+Uncheck=Uncheck
Internal=Sisäinen
External=Ulkoinen
Internals=Sisäinen
@@ -688,6 +693,7 @@ PublicUrl=Julkinen URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Maanantai
Tuesday=Tiistai
diff --git a/htdocs/langs/fi_FI/orders.lang b/htdocs/langs/fi_FI/orders.lang
index dade4367732..408212eb534 100644
--- a/htdocs/langs/fi_FI/orders.lang
+++ b/htdocs/langs/fi_FI/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Peruutettu
StatusOrderDraft=Luonnos (on vahvistettu)
StatusOrderValidated=Validoidut
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Jalostettu
StatusOrderToBill=Bill
StatusOrderToBill2=Bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Tilaukset laskuttaa
MenuOrdersToBill2=Billable orders
SearchOrder=Haku jotta
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Laiva tuote
Discount=Discount
CreateOrder=Luo Tilaa
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 155ef697744..66aea85c008 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -54,12 +54,13 @@ MaxSize=Enimmäiskoko
AttachANewFile=Liitä uusi tiedosto / asiakirjan
LinkedObject=Linkitettyä objektia
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Ilmoitusten lukumäärä
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Tämä on testi postitse. \\ NOsoitteen kaksi riviä välissä rivinvaihto.
PredefinedMailTestHtml=Tämä on testi postitse (sana testi on lihavoitu).
Kaksi riviä välissä rivinvaihto.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/fi_FI/productbatch.lang b/htdocs/langs/fi_FI/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/fi_FI/productbatch.lang
+++ b/htdocs/langs/fi_FI/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 0839abf00df..6b6c461876d 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 17674103313..3772988a48c 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Yhteiset hanke
PrivateProject=Yhteystiedot Hankkeen
MyProjectsDesc=Tämä näkemys on vain hankkeisiin olet yhteyshenkilö (mikä on tyyppi).
ProjectsPublicDesc=Tämä näkemys esitetään kaikki hankkeet sinulla voi lukea.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Tämä näkemys esitetään kaikki hankkeet (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
MyTasksDesc=Tämä näkemys on vain hankkeisiin tai tehtäviä olet yhteyshenkilö (mikä on tyyppi).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät sinulla voi lukea.
TasksDesc=Tämä näkemys esitetään kaikki hankkeet ja tehtävät (käyttäjäoikeuksien antaa sinulle luvan katsella kaikkea).
ProjectsArea=Projektit alueella
@@ -29,6 +31,8 @@ NoProject=Ei hanke määritellään
NbOpenTasks=Nb on avattu tehtävät
NbOfProjects=Nb hankkeiden
TimeSpent=Käytetty aika
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Käytetty aika
RefTask=Ref. tehtävä
LabelTask=Label tehtävä
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Luettelo toimittajien tilaukset hankkeeseen
ListSupplierInvoicesAssociatedProject=Luettelo tavarantoimittajien laskut liittyvät hankkeen
ListContractAssociatedProject=Luettelo sopimukset hankkeeseen liittyvät
ListFichinterAssociatedProject=Luettelo toimien hankkeeseen liittyvän
-ListTripAssociatedProject=Luettelo matkat ja kulut hankkeeseen liittyvät
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Luettelo toimia, jotka liittyvät hankkeen
ActivityOnProjectThisWeek=Toiminta hanke tällä viikolla
ActivityOnProjectThisMonth=Toiminta hankkeen tässä kuussa
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/fi_FI/salaries.lang b/htdocs/langs/fi_FI/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/fi_FI/salaries.lang
+++ b/htdocs/langs/fi_FI/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/fi_FI/sendings.lang b/htdocs/langs/fi_FI/sendings.lang
index b1eaea2a4db..27c8093e232 100644
--- a/htdocs/langs/fi_FI/sendings.lang
+++ b/htdocs/langs/fi_FI/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Kpl velvoitti
QtyShipped=Kpl lähetysvuotta
QtyToShip=Kpl alusten
QtyReceived=Kpl saanut
-KeepToShip=Pidä alusten
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Muut sendings tässä tilauksessa
DateSending=Päiväys lähettämistä, jotta
DateSendingShort=Päiväys lähettämistä, jotta
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index f41c19262d0..797bda3896d 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Value
PMPValueShort=WAP
EnhancedValueOfWarehouses=Varastot arvo
UserWarehouseAutoCreate=Luo varastossa automaattisesti luoda käyttäjä
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Määrä lähetysolosuhteita
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/fi_FI/suppliers.lang b/htdocs/langs/fi_FI/suppliers.lang
index cdb12ae7d8b..aca987a8016 100644
--- a/htdocs/langs/fi_FI/suppliers.lang
+++ b/htdocs/langs/fi_FI/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Tavarantoimittajat
-Supplier=Toimittaja
AddSupplier=Create a supplier
SupplierRemoved=Toimittaja poistettu
SuppliersInvoice=Tavarantoimittajan lasku
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Toimittajan laskut ja maksut
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Hyväksy tämä tilaus
ConfirmApproveThisOrder=Oletko varma, että haluat hyväksyä tämän tilauksen?
-DenyingThisOrder=Kiellä tätä järjestystä
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Oletko varma, että haluat kieltää tämän tilauksen?
ConfirmCancelThisOrder=Oletko varma, että haluat peruuttaa tämän tilauksen?
AddCustomerOrder=Luo asiakas jotta
diff --git a/htdocs/langs/fi_FI/trips.lang b/htdocs/langs/fi_FI/trips.lang
index c8c22dcbe9e..2012c28cf44 100644
--- a/htdocs/langs/fi_FI/trips.lang
+++ b/htdocs/langs/fi_FI/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Matka
-Trips=Retket
-TripsAndExpenses=Matkat ja kulut
-TripsAndExpensesStatistics=Retket ja kulut tilastot
-TripCard=Trip-kortti
-AddTrip=Lisää matka
-ListOfTrips=Luettelo matkat
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Luettelo palkkiot
-NewTrip=Uusi matka
+NewTrip=New expense report
CompanyVisited=Yritys / säätiö vieraili
Kilometers=Kilometers
FeesKilometersOrAmout=Määrä tai kilometreinä
-DeleteTrip=Poista matka
-ConfirmDeleteTrip=Oletko varma, että haluat poistaa tämän matkan?
-TF_OTHER=Muu
-TF_LUNCH=Lounas
-TF_TRIP=Matka
-ListTripsAndExpenses=Luettelo matkat ja kulut
-ExpensesArea=Retket ja kulut alue
-SearchATripAndExpense=Etsi matka-ja kulut
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Muu
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lounas
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 0b48f915961..a3a5442d2cd 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 712f481720d..376a1f72966 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index d3624332bec..6b54a4fde3e 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd-MM-yyyy
FormatDateShortJavaInput=dd-MM-yyyy
FormatDateShortJQuery=dd-mm-yy
FormatDateShortJQueryInput=dd-mm-yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 8cf990b17a4..c931ab45d5b 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -13,9 +13,9 @@ ConfigAccountingExpert=Configuration du module comptabilité expert
Journaux=Journaux
JournalFinancial=Journaux financiers
Exports=Exports
-Export=Export
+Export=Exporter
Modelcsv=Modèle d'export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=Pour ce modèle d'export, les options sont désactivées
Selectmodelcsv=Sélectionner un modèle d'export
Modelcsv_normal=Export standard
Modelcsv_CEGID=Export vers CEGID Expert
@@ -68,7 +68,7 @@ Lineofinvoice=Ligne de la facture
VentilatedinAccount=Ventilé avec succès dans le compte comptable
NotVentilatedinAccount=Non ventilé dans le compte comptable
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Séparateur de colonne dans le fichier export
ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50)
ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 9b6dec0e2d1..512b2f3133d 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Expérimental
VersionDevelopment=Développement
VersionUnknown=Inconnue
VersionRecommanded=Recommandé
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID Session
SessionSaveHandler=Modalité de sauvegarde des sessions
SessionSavePath=Emplacement de sauvegarde sessions
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Envoi de notifications Email sur certains événements métiers Dolibarr, aux contacts de tiers (configuration réalisé sur chaque tiers)
Module700Name=Dons
Module700Desc=Gestion des dons
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Interface avec le bug tracker Mantis
Module1400Name=Comptabilité
Module1400Desc=Gestion de la comptabilité (partie double)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Catégories
Module1780Desc=Gestion des catégories (produits, fournisseurs, clients et adhérents)
Module2000Name=Éditeur WYSIWYG
@@ -631,7 +642,7 @@ Permission181=Consulter les commandes fournisseurs
Permission182=Créer/modifier les commandes fournisseurs
Permission183=Valider les commandes fournisseurs
Permission184=Approuver les commandes fournisseurs
-Permission185=Passer les commandes fournisseurs
+Permission185=Order or cancel supplier orders
Permission186=Accuser réception des commandes fournisseurs
Permission187=Clôturer les commandes fournisseurs
Permission188=Annuler les commandes fournisseurs
@@ -711,6 +722,13 @@ Permission538=Exporter les services
Permission701=Consulter les dons
Permission702=Créer/modifier les dons
Permission703=Supprimer les dons
+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
Permission1001=Consulter les stocks
Permission1002=Créer/modifier entrepôts
Permission1003=Supprimer entrepôts
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Mot de passe pour passer le serveur proxy mandataire
DefineHereComplementaryAttributes=Définissez ici la liste des attributs supplémentaires, non disponibles en standard, et que vous voulez voir gérer sur les %s.
ExtraFields=Attributs supplémentaires
ExtraFieldsLines=Attributs supplémentaires (lignes)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Attributs supplémentaires (tiers)
ExtraFieldsContacts=Attributs supplémentaires (contacts/adresses)
ExtraFieldsMember=Attributs supplémentaires (adhérents)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Une ligne de produit/service ayant une quantité nulle
FreeLegalTextOnProposal=Mention complémentaire sur les propositions commerciales
WatermarkOnDraftProposal=Filigrane sur les brouillons de propositions commerciales (aucun si vide)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Saisir le compte bancaire cible lors de la proposition commerciale
+##### 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
##### Orders #####
OrdersSetup=Configuration du module Commandes
OrdersNumberingModules=Modèles de numérotation des commandes
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=code-barres de type UPC
BarcodeDescISBN=code-barres de type ISBN
BarcodeDescC39=code-barres de type C39
BarcodeDescC128=code-barres de type C128
-GenbarcodeLocation=Outil de génération de code-barres en ligne de commande (utilisé par le moteur interne pour certains types de codes-barres)
+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
BarcodeInternalEngine=Moteur interne
BarCodeNumberManager=Gestionnaire pour la génération automatique de numéro de code-barre
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Tiers générique à utiliser par défaut pour les ven
CashDeskBankAccountForSell=Compte par défaut à utiliser pour l'encaissement en liquide
CashDeskBankAccountForCheque= Compte par défaut à utiliser pour l'encaissement en chèque
CashDeskBankAccountForCB= Compte par défaut à utiliser pour l'encaissement en carte de crédit
-CashDeskDoNotDecreaseStock=Désactiver la réduction de stock quand une vente est faite depuis le Point de Vente. Si "non", la réduction du stock est faite d'office par le module Point de Vente, quelque soit le mode choisi dans la configuration du module stock.
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Forcer et restreindre l'emplacement/entrepôt à utiliser pour la réduction de stock
StockDecreaseForPointOfSaleDisabled=Réduction de stock lors de l'utilisation du Point de Vente désactivée
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=Vous n'avez pas désactivé la réduction de stocks lors de la réalisation d'une vente depuis le Point de Vente. Aussi, un entrepôt/emplacement est nécessaire.
##### Bookmark #####
BookmarkSetup=Configuration du module Marque-pages
@@ -1569,3 +1597,7 @@ SortOrder=Ordre de tri
Format=Format
TypePaymentDesc=0:Type de paiement client, 1:Type de paiement fournisseur, 2:Paiement de type client et fournisseur
IncludePath=Chemin Include (définir dans la variable %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.
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 930487955e3..bd6c96ae3fd 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -33,7 +33,11 @@ AllTime=Depuis le début
Reconciliation=Rapprochement
RIB=Numéro de compte bancaire
IBAN=Identifiant IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Identifiant BIC/SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Prélèvements
StandingOrder=Prélèvement
Withdrawals=Retraits
@@ -148,7 +152,7 @@ BackToAccount=Retour au compte
ShowAllAccounts=Afficher pour tous les comptes
FutureTransaction=Transaction future. Pas moyen de concilier.
SelectChequeTransactionAndGenerate=Sélectionner/filtrer les chèques à inclure dans le bordereau de remise et cliquer sur "Créer".
-InputReceiptNumber=Saisissez le relevé bancaire concerné par le rapprochement. Utilisez une valeur numérique triable (par exemple YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventuellement, saisissez une catégorie dans laquelle classer les écritures
ToConciliate=À rapprocher ?
ThenCheckLinesAndConciliate=Ensuite, cochez les lignes présentes sur le relevé et cliquez sur
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index f6493015cc3..1956ca025be 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -422,9 +422,9 @@ SituationDeduction=Différence de situation
Progress=Progression
ModifyAllLines=Modifier toutes les lignes
CreateNextSituationInvoice=Créer prochaine situation
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
+NotLastInCycle=Cette facture n'est pas la dernière dans le cycle et ne doit pas être modifiée
+DisabledBecauseNotLastInCycle=Une facture de situation suivante existe
DisabledBecauseFinal=Cette situation est la dernière
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
+CantBeLessThanMinPercent=La progression ne peut être inférieure à la valeur de progression du point de situation précédent
+NoSituations=Pas de point de situation ouvert
InvoiceSituationLast=Dernière facture
diff --git a/htdocs/langs/fr_FR/commercial.lang b/htdocs/langs/fr_FR/commercial.lang
index d3125a8edd6..f4961a1e1c5 100644
--- a/htdocs/langs/fr_FR/commercial.lang
+++ b/htdocs/langs/fr_FR/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Prospects contactés
DateActionPlanned=Date réalisation prévue
DateActionDone=Date réalisation effective
ActionAskedBy=Action enregistrée par
-ActionAffectedTo=Propriétaire de l'événement
+ActionAffectedTo=Event assigned to
ActionDoneBy=Action faite par
ActionUserAsk=Enregistré par
ErrorStatusCantBeZeroIfStarted=Si le champ 'Date début réalisation réelle' est renseigné alors l'action est commencée voire finie, aussi le champ 'État' ne peut être 0%%.
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 0be7345fe48..5a8f99a9308 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -29,7 +29,7 @@ ReportTurnover=Chiffre d'affaires
PaymentsNotLinkedToInvoice=Paiements liés à aucune facture, donc aucun tiers
PaymentsNotLinkedToUser=Paiements non liés à un utilisateur
Profit=Bénéfice
-AccountingResult=Accounting result
+AccountingResult=Résultat comptable
Balance=Solde
Debit=Débit
Credit=Crédit
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 895e3c95cad..e305789f82d 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expiré
ServiceStatusClosed=Fermé
ServicesLegend=Légende pour les services
Contracts=Contrats
+ContractsAndLine=Contracts and line of contracts
Contract=Contrat
NoContracts=Pas de contrats
MenuServices=Services
diff --git a/htdocs/langs/fr_FR/cron.lang b/htdocs/langs/fr_FR/cron.lang
index da6907c85db..a94a7bafe3f 100644
--- a/htdocs/langs/fr_FR/cron.lang
+++ b/htdocs/langs/fr_FR/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Commande terminal
CronMenu=Cron
CronCannotLoadClass=Impossible de charger la classe %s ou l'objet %s
UseMenuModuleToolsToAddCronJobs=Aller dans le menu "Accueil - Outils modules - Liste des travaux" pour voir et éditer les travaux planifiés.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index b7042a8a33e..7bcae13433a 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Les comptes source et destination doivent être d
ErrorBadThirdPartyName=Nom de tiers incorrect
ErrorProdIdIsMandatory=Le %s est obligatoire
ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte
-ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code-barre
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Code client obligatoire
ErrorBarCodeRequired=Code-barre requis
ErrorCustomerCodeAlreadyUsed=Code client déjà utilisé
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour qu
ErrorPasswordsMustMatch=Les 2 mots de passe saisis doivent correspondre
ErrorContactEMail=Une erreur technique est apparue. Merci de contacter l'administrateur à l'email suivant %s en lui indiquant le code erreur %s dans votre message ou mieux en fournissant une copie d'écran de cette page.
ErrorWrongValueForField=Mauvaise valeur pour le champ numéro %s (la valeur '%s' ne respecte pas la règle %s)
-ErrorFieldValueNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une valeure présente dans le champ %s de la table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Mauvaise valeur pour le champ numéro %s (la valeur '%s' n'est pas une référence existante comme %s)
ErrorsOnXLines=Erreurs sur %s enregistrement(s) source
ErrorFileIsInfectedWithAVirus=L'antivirus n'a pas pu valider ce fichier (il est probablement infecté par un virus) !
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Erreur interne '%s'
ErrorPriceExpressionUnknown=Erreur inconnue '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Les entrepôts source et destination doivent être différents
ErrorTryToMakeMoveOnProductRequiringBatchData=Erreur, vous essayez de faire un mouvement sans lot/numéro de série, sur un produit qui exige un lot/numéro de série.
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 4a0c5a9aafb..7b0a6256ede 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Dernière étape: Définissez ici l'identifiant et
ActivateModule=Activation du module %s
ShowEditTechnicalParameters=Cliquer ici pour afficher/éditer les paramètres techniques (mode expert)
WarningUpgrade=Attention :\nAvez-vous fait une sauvegarde de la base de données en premier ?\nA cause de problèmes dans le système de base de données (Par exemple mysql version 5.5.40), beaucoup de données ou de tables peuvent être perdu pendant le processus de migration, il est donc très recommandé d'avoir une sauvegarde complète de votre base de données avant de commencer le processus de migration.\n\nCliquez OK pour commencer le processus de migration
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
@@ -207,7 +208,7 @@ MigrationProjectTaskTime=Mise à jour du temps consommé en secondes
MigrationActioncommElement=Mise à jour des données des actions des éléments
MigrationPaymentMode=Migration des modes de paiement
MigrationCategorieAssociation=Migration des categories
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Migration des évènements pour ajouter les propriétaires dans la table des utilisateurs assignés
ShowNotAvailableOptions=Afficher les choix non disponibles
HideNotAvailableOptions=Cacher les choix non disponibles
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index a8ab47c9c4d..173594ef593 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -141,6 +141,7 @@ Cancel=Annuler
Modify=Modifier
Edit=Éditer
Validate=Valider
+ValidateAndApprove=Validate and Approve
ToValidate=À valider
Save=Enregistrer
SaveAs=Enregistrer sous
@@ -158,6 +159,7 @@ Search=Rechercher
SearchOf=Recherche de
Valid=Valider
Approve=Approuver
+Disapprove=Disapprove
ReOpen=Réouvrir
Upload=Envoyer fichier
ToLink=Lier
@@ -219,6 +221,7 @@ Cards=Fiches
Card=Fiche
Now=Maintenant
Date=Date
+DateAndHour=Date and hour
DateStart=Date début
DateEnd=Date fin
DateCreation=Date création
@@ -295,6 +298,7 @@ UnitPriceHT=Prix unitaire HT
UnitPriceTTC=Prix unitaire TTC
PriceU=P.U.
PriceUHT=P.U. HT
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=P.U. TTC
Amount=Montant
AmountInvoice=Montant facture
@@ -521,6 +525,7 @@ DateFromTo=Du %s au %s
DateFrom=A partir du %s
DateUntil=Jusqu'au %s
Check=Vérifier
+Uncheck=Uncheck
Internal=Interne
External=Externe
Internals=Internes
@@ -688,6 +693,7 @@ PublicUrl=URL publique
AddBox=Ajouter boite
SelectElementAndClickRefresh=Sélectionnez un élément et cliquez sur Rafraichir
PrintFile=Imprimer fichier %s
+ShowTransaction=Show transaction
# Week day
Monday=Lundi
Tuesday=Mardi
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index a920f58d399..78565d17a8a 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Annulée
StatusOrderDraft=Brouillon (à valider)
StatusOrderValidated=Validée
StatusOrderOnProcess=Commandé - en attente de réception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Traitée
StatusOrderToBill=Délivrée
StatusOrderToBill2=À facturer
@@ -58,6 +59,7 @@ MenuOrdersToBill=Commandes délivrées
MenuOrdersToBill2=Commandes facturables
SearchOrder=Rechercher une commande
SearchACustomerOrder=Rechercher une commande client
+SearchASupplierOrder=Search a supplier order
ShipProduct=Expédier produit
Discount=Remise
CreateOrder=Créer Commande
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 1c23cce68cb..45ba7c01e89 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -54,12 +54,13 @@ MaxSize=Taille maximum
AttachANewFile=Ajouter un nouveau fichier/document
LinkedObject=Objet lié
Miscellaneous=Divers
-NbOfActiveNotifications=Nombre de notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Ceci est un message de test.\nLes 2 lignes sont séparées par un retour à la ligne.\n\n__SIGNATURE__
PredefinedMailTestHtml=Ceci est un message de test (le mot test doit être en gras).
Les 2 lignes sont séparées par un retour à la ligne.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\nNous voudrions porter à votre connaissance que la facture __FACREF__ ne semble pas avoir été réglée. La voici donc, pour rappel, en pièce jointe.\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la proposition commerciale __PROPREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint notre commande __ORDERREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeuillez trouver ci-joint la facture __FACREF__\n\n__PERSONALIZED__Cordialement\n\n__SIGNATURE__
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 6cf152e6f80..d1c1edb2b8e 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Lot/Numéro de série
l_eatby=Date limite de consommation
l_sellby=Date de péremption
DetailBatchNumber=Détails Lot/Série
-DetailBatchFormat=Lot/Série: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Lot/Série: %s
printEatby=Limite de consommation : %s
printSellby=Péremption : %s
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 5e27359209f..3443b2c7aac 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Dans les produits commes les services et les prix fou
PriceExpressionEditorHelp4=Dans les prix produits/services uniquement: #supplier_min_price#
Dans les prix fournisseurs uniquement: #supplier_quantity# et #supplier_tva_tx#
PriceMode=Mode de tarification
PriceNumeric=Nombre
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index 302732b6e71..08d2436c16e 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Tout le monde
PrivateProject=Contacts du projet
MyProjectsDesc=Cette vue projet est restreinte aux projets pour lesquels vous êtes un contact affecté (quel qu'en soit le type).
ProjectsPublicDesc=Cette vue présente tous les projets pour lesquels vous êtes habilité à avoir une visibilité.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offrant une vue exhaustive).
MyTasksDesc=Cette vue est restreinte aux projets et tâches pour lesquels vous êtes un contact affecté à au moins une tâche (quel qu'en soit le type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
ProjectsArea=Espace projet
@@ -29,6 +31,8 @@ NoProject=Aucun projet défini ou responsable
NbOpenTasks=Nb Tâches Ouvertes
NbOfProjects=Nombre de projets
TimeSpent=Temps consommé
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Temps consommés
RefTask=Ref. tâche
LabelTask=Libellé tâche
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste des commandes fournisseurs associées
ListSupplierInvoicesAssociatedProject=Liste des factures fournisseurs associées au projet
ListContractAssociatedProject=Liste des contrats associés au projet
ListFichinterAssociatedProject=Liste des interventions associées au projet
-ListTripAssociatedProject=Liste des notes de frais associées au projet
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Liste des événements associés au projet
ActivityOnProjectThisWeek=Activité sur les projets cette semaine
ActivityOnProjectThisMonth=Activité sur les projets ce mois
@@ -133,3 +137,6 @@ SearchAProject=Rechercher un projet
ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
ProjectDraft=Projets brouillons
FirstAddRessourceToAllocateTime=Ajouter une ressource pour pouvoir allouer tu temps
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index c76f03c8d9f..4d6cee75748 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Règlements des salaires
ShowSalaryPayment=Afficher règlement de salaire
THM=Tarif horaire moyen
TJM=Tarif journalier moyen
+CurrentSalary=Current salary
diff --git a/htdocs/langs/fr_FR/sendings.lang b/htdocs/langs/fr_FR/sendings.lang
index 356fa55b946..e65707e186c 100644
--- a/htdocs/langs/fr_FR/sendings.lang
+++ b/htdocs/langs/fr_FR/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qté. commandée
QtyShipped=Qté. expédiée
QtyToShip=Qté. à expédier
QtyReceived=Qté. reçue
-KeepToShip=Reste à expédier
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Autres expéditions pour cette commande
DateSending=Date ordre d'expédition
DateSendingShort=Date ordre exp.
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index d7b32c8ff44..7a342f04a7d 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Valorisation (PMP)
PMPValueShort=PMP
EnhancedValueOfWarehouses=Valorisation des stocks
UserWarehouseAutoCreate=Créer automatiquement un stock/entrepôt propre à l'utilisateur lors de sa création
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantité ventilée
QtyDispatchedShort=Qté ventilée
QtyToDispatchShort=Qté à ventiler
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=L'entrepôt %s sera utilisé pour la décrémen
WarehouseForStockIncrease=L'entrepôt %s sera utilisé pour l'incrémentation du stock
ForThisWarehouse=Pour cet entrepôt
ReplenishmentStatusDesc=Cet écran permet de voir les produits avec un stock inférieur à la quantité minimale désirée (ou à la quantité du seuil d'alerte si la case "Alertes seulement" est cochée) et propose de créer des commandes fournisseurs pour compléter la différence
-ReplenishmentOrdersDesc=Voici la liste des commandes fournisseurs en cours
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Réapprovisionnement
NbOfProductBeforePeriod=Quantité du produit %s en stock avant la période sélectionnée (< %s)
NbOfProductAfterPeriod=Quantité du produit %s en stock après la période sélectionnée (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Inclus dans un package
ShowWarehouse=Afficher entrepôt
MovementCorrectStock=Correction du contenu en stock pour le produit %s
MovementTransferStock=Transfert de stock du produit %s dans un autre entrepôt
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index ea0ecef8e39..07904930bf2 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Fournisseurs
-Supplier=Fournisseur
AddSupplier=Créer un fournisseur
SupplierRemoved=Fournisseur supprimé
SuppliersInvoice=Facture fournisseur
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Factures fournisseurs et règlements
ExportDataset_fournisseur_3=Commandes fournisseur et lignes de commande
ApproveThisOrder=Approuver la commande
ConfirmApproveThisOrder=Êtes-vous sûr de vouloir approuver la commande fournisseur %s ?
-DenyingThisOrder=Refuser la commande
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande fournisseur %s ?
ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande fournisseur %s ?
AddCustomerOrder=Créer commande client
diff --git a/htdocs/langs/fr_FR/trips.lang b/htdocs/langs/fr_FR/trips.lang
index 5cad7a4b4a0..1d9f41e09c9 100644
--- a/htdocs/langs/fr_FR/trips.lang
+++ b/htdocs/langs/fr_FR/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Déplacement
-Trips=Déplacements
-TripsAndExpenses=Note de frais
-TripsAndExpensesStatistics=Statistiques notes de frais
-TripCard=Fiche frais
-AddTrip=Créer note de frais
-ListOfTrips=Liste des frais
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Liste des notes de frais
-NewTrip=Nouvelle note de frais
+NewTrip=New expense report
CompanyVisited=Société/institution visitée
Kilometers=Kilomètres
FeesKilometersOrAmout=Montant ou kilomètres
-DeleteTrip=Supprimer déplacement
-ConfirmDeleteTrip=Êtes-vous sûr de vouloir supprimer cette note de frais ?
-TF_OTHER=Autre
-TF_LUNCH=Repas
-TF_TRIP=Déplacement
-ListTripsAndExpenses=Liste des notes de frais
-ExpensesArea=Espace notes de frais
-SearchATripAndExpense=Rechercher une note de frais
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classer 'Remboursé'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Autre
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Repas
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/fr_NC/main.lang b/htdocs/langs/fr_NC/main.lang
index 80513df8eea..bd886d9e846 100644
--- a/htdocs/langs/fr_NC/main.lang
+++ b/htdocs/langs/fr_NC/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 72578ac824d..40ebcc8f65d 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=נסיוני
VersionDevelopment=התפתחות
VersionUnknown=לא ידוע
VersionRecommanded=מומלץ
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=מושב מזהה
SessionSaveHandler=הנדלר להציל הפעלות
SessionSavePath=הפגישה אחסון לוקליזציה
@@ -493,10 +498,16 @@ Module600Name=הודעות
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=תרומות
Module700Desc=התרומה של ההנהלה
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=גמל שלמה
Module1200Desc=גמל שלמה אינטגרציה
Module1400Name=חשבונאות
Module1400Desc=חשבונאות וניהול (צד כפולות)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=קטגוריות
Module1780Desc=Categorie ההנהלה (מוצרים, ספקים ולקוחות)
Module2000Name=עורך WYSIWYG
@@ -631,7 +642,7 @@ Permission181=לקרוא הזמנות ספקים
Permission182=ליצור / לשנות הספק הזמנות
Permission183=תוקף צווי הספק
Permission184=לאשר הזמנות ספקים
-Permission185=הספק סדר הזמנות
+Permission185=Order or cancel supplier orders
Permission186=לקבל הזמנות ספקים
Permission187=הספק הזמנות סגור
Permission188=ביטול הזמנות ספקים
@@ -711,6 +722,13 @@ Permission538=יצוא שירותים
Permission701=לקרוא תרומות
Permission702=צור / לשנות תרומות
Permission703=מחק תרומות
+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
Permission1001=לקרוא מניות
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=סיסמה כדי להשתמש בשרת proxy
DefineHereComplementaryAttributes=להגדיר כאן את כל atributes, אינו זמין כבר כברירת מחדל, כי אתה רוצה להיות נתמך על %s.
ExtraFields=משלימים תכונות
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=קו של המוצר / שירות עם כמות אפס
FreeLegalTextOnProposal=טקסט חופשי על הצעות מסחריות
WatermarkOnDraftProposal=סימן מים על הצעות טיוטה מסחריים (כל אם ריק)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=התקנה וניהול של סדר
OrdersNumberingModules=הזמנות מספור מודולים
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=ברקוד מסוג UPC
BarcodeDescISBN=ברקוד מסוג ISBN
BarcodeDescC39=ברקוד מסוג C39
BarcodeDescC128=ברקוד מסוג C128
-GenbarcodeLocation=הברקוד הדור הפקודה כלי הקו (בשימוש על ידי מנוע phpbarcode עבור סוגים מסוימים ברקוד)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן
CashDeskBankAccountForCheque= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים על ידי סימון
CashDeskBankAccountForCB= חשבון ברירת מחדל להשתמש כדי לקבל תשלומים במזומן באמצעות כרטיסי אשראי
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=הפוך ההתקנה מודול
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/he_IL/banks.lang b/htdocs/langs/he_IL/banks.lang
index 0041d4550f2..ccc6050c6f1 100644
--- a/htdocs/langs/he_IL/banks.lang
+++ b/htdocs/langs/he_IL/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=הוראות קבע
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/he_IL/commercial.lang b/htdocs/langs/he_IL/commercial.lang
index 2c1a8e5b82a..49d3d353137 100644
--- a/htdocs/langs/he_IL/commercial.lang
+++ b/htdocs/langs/he_IL/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/he_IL/contracts.lang b/htdocs/langs/he_IL/contracts.lang
index 52c05d495ad..3c4d235e884 100644
--- a/htdocs/langs/he_IL/contracts.lang
+++ b/htdocs/langs/he_IL/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=חוזים
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=שירותים
diff --git a/htdocs/langs/he_IL/cron.lang b/htdocs/langs/he_IL/cron.lang
index 349d2275749..bb128746069 100644
--- a/htdocs/langs/he_IL/cron.lang
+++ b/htdocs/langs/he_IL/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/he_IL/install.lang b/htdocs/langs/he_IL/install.lang
index d0d0973e729..c72668ff058 100644
--- a/htdocs/langs/he_IL/install.lang
+++ b/htdocs/langs/he_IL/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 410198e13c9..510dc2d1443 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/he_IL/orders.lang b/htdocs/langs/he_IL/orders.lang
index 57c3dccde16..3e45ed9db31 100644
--- a/htdocs/langs/he_IL/orders.lang
+++ b/htdocs/langs/he_IL/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index b9e26e405c8..4c5e1b6346f 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=שונות
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/he_IL/productbatch.lang b/htdocs/langs/he_IL/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/he_IL/productbatch.lang
+++ b/htdocs/langs/he_IL/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 2d4bdafd5a4..9c98812f2a3 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 2d1abe5706f..31faca7c515 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/he_IL/salaries.lang b/htdocs/langs/he_IL/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/he_IL/salaries.lang
+++ b/htdocs/langs/he_IL/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/he_IL/sendings.lang b/htdocs/langs/he_IL/sendings.lang
index 5167582502a..51b04b2db35 100644
--- a/htdocs/langs/he_IL/sendings.lang
+++ b/htdocs/langs/he_IL/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/he_IL/stocks.lang b/htdocs/langs/he_IL/stocks.lang
index 79d03a24da0..4cb004102f8 100644
--- a/htdocs/langs/he_IL/stocks.lang
+++ b/htdocs/langs/he_IL/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/he_IL/suppliers.lang b/htdocs/langs/he_IL/suppliers.lang
index b910d186708..591b1d13545 100644
--- a/htdocs/langs/he_IL/suppliers.lang
+++ b/htdocs/langs/he_IL/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=ספקים
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/he_IL/trips.lang b/htdocs/langs/he_IL/trips.lang
index 2874de3a593..34b879b2751 100644
--- a/htdocs/langs/he_IL/trips.lang
+++ b/htdocs/langs/he_IL/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=אחר
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=אחר
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index b7ca8542a9b..22a62f00d59 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
VersionRecommanded=Recommended
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/hr_HR/banks.lang b/htdocs/langs/hr_HR/banks.lang
index 25f0ecbc3a0..da71da227fb 100644
--- a/htdocs/langs/hr_HR/banks.lang
+++ b/htdocs/langs/hr_HR/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN broj
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Otvorene narudžbe
StandingOrder=Otvorena narudžba
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index 90bf154d2f3..0be24ffda59 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Potencijalni kupac
Prospects=Potencijalni kupci
DeleteAction=Izbriši događaj/zadatak
NewAction=Novi događaj/zadatak
-AddAction=Dodaj događaj/zadatak
-AddAnAction=Dodaj događaj/zadatak
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Završeni događaji
DoneActionsFor=Završeni događaji za %s
ToDoActions=Nedovršeni događaji
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Pošalji narudžbu %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Završeno
diff --git a/htdocs/langs/hr_HR/contracts.lang b/htdocs/langs/hr_HR/contracts.lang
index 26ec3f1e5a4..59e6ca9670f 100644
--- a/htdocs/langs/hr_HR/contracts.lang
+++ b/htdocs/langs/hr_HR/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Završen
ServiceStatusClosed=Zatvoren
ServicesLegend=Knjiga usluga
Contracts=Ugovori
+ContractsAndLine=Contracts and line of contracts
Contract=Ugovor
NoContracts=Nema ugovora
MenuServices=Usluge
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 2729f374a7e..3e299f51788 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=Od %s za %s
DateFrom=Od %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/hr_HR/orders.lang b/htdocs/langs/hr_HR/orders.lang
index cd0b42c8adf..f59089eee0f 100644
--- a/htdocs/langs/hr_HR/orders.lang
+++ b/htdocs/langs/hr_HR/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Poništeno
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Ovjereno
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Obrađeno
StatusOrderToBill=Dostavljeno
StatusOrderToBill2=Za naplatu
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Pretraži narudžbe
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Pošalji proizvod
Discount=Popust
CreateOrder=Kreiraj narudžbu
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/hr_HR/productbatch.lang b/htdocs/langs/hr_HR/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/hr_HR/productbatch.lang
+++ b/htdocs/langs/hr_HR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index a42bd146177..0b8b37f2a97 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index 4127fc0fb7e..58ef04b2e35 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=Nema definiranih ili vlastih projekata
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Vrijeme utrošeno
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Vrijeme utrošeno
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/hr_HR/salaries.lang b/htdocs/langs/hr_HR/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/hr_HR/salaries.lang
+++ b/htdocs/langs/hr_HR/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/hr_HR/sendings.lang b/htdocs/langs/hr_HR/sendings.lang
index d5ec2daa761..b4f1e2b8e25 100644
--- a/htdocs/langs/hr_HR/sendings.lang
+++ b/htdocs/langs/hr_HR/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Količina naručena
QtyShipped=Količina poslana
QtyToShip=Količina za poslat
QtyReceived=Količina primljena
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/hr_HR/suppliers.lang b/htdocs/langs/hr_HR/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/hr_HR/suppliers.lang
+++ b/htdocs/langs/hr_HR/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index ebe81e0bf63..6bf991e2634 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Kísérleti
VersionDevelopment=Fejlesztés
VersionUnknown=Ismeretlen
VersionRecommanded=Ajánlott
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler menteni ülések
SessionSavePath=Tárolás munkamenet lokalizáció
@@ -493,10 +498,16 @@ Module600Name=Értesítések
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Adományok
Module700Desc=Adomány vezetése
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integráció
Module1400Name=Számvitel
Module1400Desc=Számviteli menedzsment (dupla felek)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategóriák
Module1780Desc=Kategóriában vezetősége (termékek, szállítók és vevők)
Module2000Name=WYSIWYG szerkesztő
@@ -631,7 +642,7 @@ Permission181=Olvassa szállító megrendelések
Permission182=Létrehozza / módosítja szállító megrendelések
Permission183=Érvényesítés szállító megrendelések
Permission184=Jóváhagyás beszállítói megrendelések
-Permission185=Rendelés szállító megrendelések
+Permission185=Order or cancel supplier orders
Permission186=Vételi megbízás beszállító
Permission187=Bezár szállító megrendelések
Permission188=Mégsem beszállítói megrendelések
@@ -711,6 +722,13 @@ Permission538=Export szolgáltatások
Permission701=Olvassa el adományokat
Permission702=Létrehozza / módosítja adományok
Permission703=Törlés adományok
+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
Permission1001=Olvassa készletek
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Jelszó a proxy szerver használata
DefineHereComplementaryAttributes=Adjuk meg itt minden atributes, még nem álltak rendelkezésre az alapból, hogy azt szeretné, hogy támogatja %s.
ExtraFields=Kiegészítő tulajdonságok
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Egy sor termék / szolgáltatás nulla összeg szóba,
FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order Management Setup
OrdersNumberingModules=Megrendelés számozási modulok
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Vonalkód típusú UPC
BarcodeDescISBN=Vonalkód típusú ISBN
BarcodeDescC39=Vonalkód típusú C39
BarcodeDescC128=Vonalkód típusú C128
-GenbarcodeLocation=Vonalkód generáló parancssori eszköz (phpbarcode motor használja egyes vonalkód típusokhoz)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Alapértelmezett fiók kezelhető készpénz kifizetések
CashDeskBankAccountForCheque= Alapértelmezett fiók használata fizetések fogadására csekkel
CashDeskBankAccountForCB= Alapértelmezett fiók kezelhető készpénz kifizetések hitelkártyák
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Könyvjelző beállítása modul
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index 0056818fa07..7f12abcf832 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Egyeztetés
RIB=Bankszámla száma
IBAN=IBAN szám
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT száma
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Állandó megbízás
StandingOrder=Állandó érvényű parancs
Withdrawals=Kivonás
@@ -148,7 +152,7 @@ BackToAccount=Visszalép a számla
ShowAllAccounts=Mutasd az összes fiók
FutureTransaction=Ügylet Futur. Semmiképpen egyeztetni.
SelectChequeTransactionAndGenerate=Válassza / filter ellenőrzéseket be kell vonni a csekket befizetés beérkezésének és kattintson a "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index 882531d8908..e3bd1fedfda 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Kilátás
Prospects=Kilátások
DeleteAction=Cselekvés / feladat törlése
NewAction=Új cselekvés / feladat
-AddAction=Cselekvés / feladat hozzáadása
-AddAnAction=Cselekvés / feladat hozzáadása
-AddActionRendezVous=Találkozó hozzáadása
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Találkozó
ConfirmDeleteAction=Biztos törölni akarja ezt a feladatot?
CardAction=Cselekvés kártya
@@ -44,8 +44,8 @@ DoneActions=Befejezett cselekvések
DoneActionsFor=Befejezett cselekvések %s részére
ToDoActions=Befejezetlen cselekvések
ToDoActionsFor=Befejezetlen cselekvések %s részére
-SendPropalRef=Ajánlat küldése %s
-SendOrderRef=Megrendelés küldése %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Nem alkalmazható
StatusActionToDo=Végrehajtani
StatusActionDone=Kész
@@ -62,7 +62,7 @@ LastProspectContactDone=Kapcsolatba lépés megtörtént
DateActionPlanned=Cselekmény dátuma
DateActionDone=Cselekvés befejezésésnek a dátuma
ActionAskedBy=Cselekvést kérte
-ActionAffectedTo=Cselekvés hatással van rá
+ActionAffectedTo=Event assigned to
ActionDoneBy=Cselekvést végrehatja
ActionUserAsk=Jegyezte
ErrorStatusCantBeZeroIfStarted=Ha a 'Cselekvés befejezésésnek a dátuma' mező rendelkezik tartalommal, a cselekvés elkezdődőtt (vagy befejeződtt), az 'Állapot' mező nem lehet 0%%.
diff --git a/htdocs/langs/hu_HU/contracts.lang b/htdocs/langs/hu_HU/contracts.lang
index df24822ebb1..426c7a37859 100644
--- a/htdocs/langs/hu_HU/contracts.lang
+++ b/htdocs/langs/hu_HU/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Lejárt
ServiceStatusClosed=Lezárva
ServicesLegend=Szolgáltatások magyarázat
Contracts=Szerződések
+ContractsAndLine=Contracts and line of contracts
Contract=Szerződés
NoContracts=Nincs szerződés
MenuServices=Szolgáltatás
diff --git a/htdocs/langs/hu_HU/cron.lang b/htdocs/langs/hu_HU/cron.lang
index 119ae6079d5..b186a698110 100644
--- a/htdocs/langs/hu_HU/cron.lang
+++ b/htdocs/langs/hu_HU/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index 75d66c5b78f..197f9806cca 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Forrás és célok bankszámlák különbözőnek
ErrorBadThirdPartyName=Rossz érték a harmadik fél nevében
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Rossz a szintaxisa az ügyfél kód
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Ügyfél kód szükséges
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Ügyfél kód már használatban
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript nem szabad tiltani, hogy ez a funkció m
ErrorPasswordsMustMatch=Mindkét típusú jelszavakat kell egyeznie egymással
ErrorContactEMail=Egy technikai hiba történt. Kérjük, lépjen kapcsolatba a következő e-mail rendszergazda %s en biztosítja a hibakódot %s be az üzenetet, vagy még jobb hozzáadásával képernyő ezen oldal másolatát.
ErrorWrongValueForField=Rossz érték mezőszám %s (érték "%s" nem egyezik regex szabály %s)
-ErrorFieldValueNotIn=Rossz érték mezőszám %s (érték "%s" nem érték áll rendelkezésre a területen %s %s táblázat)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Rossz érték mezőszám %s (érték "%s" nem létező %s ref)
ErrorsOnXLines=%s hibák forrása vonalak
ErrorFileIsInfectedWithAVirus=A víruskereső program nem tudta érvényesíteni a fájl (file lehet megfertőzte egy vírus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 1da3c2c7cbc..78d675524cd 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Utolsó lépés: Adjuk meg itt bejelentkezési né
ActivateModule=Modul aktiválása %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 21c0caa72a0..47b61bbf942 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -141,6 +141,7 @@ Cancel=Megszakítás
Modify=Módosítás
Edit=Szerkesztés
Validate=Hitelesítés
+ValidateAndApprove=Validate and Approve
ToValidate=Hitelesyteni
Save=Mentés
SaveAs=Mentés másként
@@ -158,6 +159,7 @@ Search=Keresés
SearchOf=Keresés
Valid=Hiteles
Approve=Jóváhagy
+Disapprove=Disapprove
ReOpen=Újra megnyit
Upload=Fájl küldése
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Kártáy
Card=Kártya
Now=Most
Date=Dátum
+DateAndHour=Date and hour
DateStart=Kezdés
DateEnd=Végzés
DateCreation=Létrehozás dátuma
@@ -295,6 +298,7 @@ UnitPriceHT=Egység ár (nettó)
UnitPriceTTC=Egység ár
PriceU=E.Á.
PriceUHT=E.Á. (nettó)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=E.Á.
Amount=Mennyiség
AmountInvoice=Számla mennyiség
@@ -521,6 +525,7 @@ DateFromTo=%s -től %s -ig
DateFrom=%s -től
DateUntil=%s -ig
Check=Ellenőriz
+Uncheck=Uncheck
Internal=Belső
External=Külső
Internals=Belső
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Hétfő
Tuesday=Kedd
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index b1d273e4106..d146ad13e0b 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Törölve
StatusOrderDraft=Tervezet (kell érvényesíteni)
StatusOrderValidated=Hitelesítette
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Feldolgozott
StatusOrderToBill=Bill
StatusOrderToBill2=Bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Megrendelés Bill
MenuOrdersToBill2=Billable orders
SearchOrder=Keresés érdekében
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Hajó termék
Discount=Kedvezmény
CreateOrder=Rendet
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index e9ddc4edf81..5b4e01644cd 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximális méret
AttachANewFile=Helyezzen fel egy új file / dokumentum
LinkedObject=Csatolt objektum
Miscellaneous=Vegyes
-NbOfActiveNotifications=Bejelentések száma
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Ez egy teszt mailt. \\ NA két vonal választja el egymástól kocsivissza.
PredefinedMailTestHtml=Ez egy teszt mail (a szó vizsgálatot kell vastagon).
A két vonal választja el egymástól kocsivissza.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/hu_HU/productbatch.lang b/htdocs/langs/hu_HU/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/hu_HU/productbatch.lang
+++ b/htdocs/langs/hu_HU/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index ccba6ede02d..584d47aeb70 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index 274c306e716..085c0f39bc5 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Mindenki
PrivateProject=A projekt kapcsolatai
MyProjectsDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen összefüggésben áll.
ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Ez a nézet minden projektet tartalmaz.
MyTasksDesc=Ez a nézet azokra a projektekre van korlátozva amivel valamilyen összefüggésben áll.
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
TasksDesc=Ez a nézet minden projektet tartalmaz.
ProjectsArea=Projektek terület
@@ -29,6 +31,8 @@ NoProject=Nincs létrehozott vagy tulajdonolt projekt
NbOpenTasks=Nyitott feladatok száma
NbOfProjects=Projektek száma
TimeSpent=Eltöltött idő
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Töltött idő
RefTask=Feladat ref#
LabelTask=Feladat cimkéje
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=A projekthez tartozó beszállítói rendel
ListSupplierInvoicesAssociatedProject=A projekthez tartozó beszállítói számlák listája
ListContractAssociatedProject=A projekthez tartozó szerződések listája
ListFichinterAssociatedProject=A projekthez tartozó intervenciók listája
-ListTripAssociatedProject=A projekthez tartozó utazási kiadások listája
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=A projekthez tartozó cselekvések listája
ActivityOnProjectThisWeek=Heti projekt aktivitás
ActivityOnProjectThisMonth=Havi projekt aktivitás
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index 82c7da53ef0..b2c42484995 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Rendelt mennyiség
QtyShipped=Kiszállított mennyiség
QtyToShip=Szállítandó mennyiség
QtyReceived=Átvett mennyiség
-KeepToShip=Szállításra félretenni
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Más szállítások ehhez a megrendeléshez
DateSending=Date sending order
DateSendingShort=Küldési dátum sorrend
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 2f5b54b3bfc..c3570f47006 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Súlyozott árlak érték
PMPValueShort=SÁÉ
EnhancedValueOfWarehouses=Raktárak értéke
UserWarehouseAutoCreate=Raktár autómatikus létrehozása felhasználó létrehozásakor
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Mennyiség kiküldése
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index e8faa8de1ae..bf6540154b1 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Beszállítók
-Supplier=Beszállító
AddSupplier=Create a supplier
SupplierRemoved=Beszállító eltávolítva
SuppliersInvoice=Beszállító számla
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Beszállítói számlák és fizetések
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Megrendelés jóváhagyása
ConfirmApproveThisOrder=Biztos jóvá akarja hagyni a megrendelést?
-DenyingThisOrder=Megrendelés elutasítása
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Biztos el akarja utasítani a megrendelést?
ConfirmCancelThisOrder=Biztos meg akarja szakítani a megrendelést?
AddCustomerOrder=Ügyfél megrendelés létrehozása
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index 9daea3f2f0e..b1d1f636ca8 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=utazás
-Trips=Utak
-TripsAndExpenses=Utazások és kiadások
-TripsAndExpensesStatistics=Utazások és kiadások statisztikák
-TripCard=Utazás kártya
-AddTrip=Út hozzáadása
-ListOfTrips=Utazások listája
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Költségek listája
-NewTrip=Új út
+NewTrip=New expense report
CompanyVisited=Látogatott Cég/alapítvány
Kilometers=Kilométerek
FeesKilometersOrAmout=Kilóméterek száma
-DeleteTrip=Utazás törlése
-ConfirmDeleteTrip=Biztos törölni akarja ezt az utat?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=Utak és kiadások listája
-ExpensesArea=Kirándulások és kiadások területén
-SearchATripAndExpense=Keresés út és költségek
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index 91b5e8d77f0..7c834ac36f8 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Percobaan
VersionDevelopment=Pengembangan
VersionUnknown=Tidak diketahui
VersionRecommanded=Direkomendasikan
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sesi ID
SessionSaveHandler=Handler untuk menyimpan sesi
SessionSavePath=Peyimpanan untuk lokalisasi sesi
@@ -493,10 +498,16 @@ Module600Name=Notifikasi
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Sumbangan
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Akunting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategori
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Membaca Sumbangan
Permission702=Membuat/Merubah Sumbangan
Permission703=Menghapus Sumbangan
+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
Permission1001=Membaca Stok
Permission1002=Membuat/Merubah Gudang
Permission1003=Menghapus Gudang
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/id_ID/commercial.lang b/htdocs/langs/id_ID/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/id_ID/commercial.lang
+++ b/htdocs/langs/id_ID/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/id_ID/contracts.lang b/htdocs/langs/id_ID/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/id_ID/contracts.lang
+++ b/htdocs/langs/id_ID/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/id_ID/cron.lang b/htdocs/langs/id_ID/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/id_ID/cron.lang
+++ b/htdocs/langs/id_ID/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index 62986a9dfba..278965595b2 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 62adb884547..81deb7c28f0 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/id_ID/orders.lang b/htdocs/langs/id_ID/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/id_ID/orders.lang
+++ b/htdocs/langs/id_ID/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 25d3aa806d0..1f2b7c1b38d 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/id_ID/productbatch.lang b/htdocs/langs/id_ID/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/id_ID/productbatch.lang
+++ b/htdocs/langs/id_ID/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/id_ID/salaries.lang b/htdocs/langs/id_ID/salaries.lang
index 666632bf28e..17b07d2a8b7 100644
--- a/htdocs/langs/id_ID/salaries.lang
+++ b/htdocs/langs/id_ID/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Pembayaran Gaji
ShowSalaryPayment=Menampilkan Pembayaran Gaji
THM=rata - rata per jam
TJM=rata - rata per hari
+CurrentSalary=Current salary
diff --git a/htdocs/langs/id_ID/sendings.lang b/htdocs/langs/id_ID/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/id_ID/sendings.lang
+++ b/htdocs/langs/id_ID/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/id_ID/suppliers.lang b/htdocs/langs/id_ID/suppliers.lang
index fe4a33edeae..1f90724539e 100644
--- a/htdocs/langs/id_ID/suppliers.lang
+++ b/htdocs/langs/id_ID/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suplier langganan
-Supplier=Suplier
AddSupplier=Create a supplier
SupplierRemoved=Suplier dihapus
SuppliersInvoice=Invoice suplier
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Setujui pesanan
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Tolak pesanan
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Buat pesanan pelanggan
diff --git a/htdocs/langs/id_ID/trips.lang b/htdocs/langs/id_ID/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/id_ID/trips.lang
+++ b/htdocs/langs/id_ID/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 6ab56c9cb5c..50ac8371a52 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Þróun
VersionUnknown=Óþekkt
VersionRecommanded=Mælt
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler að vista fundur
SessionSavePath=Bílskúr fundur localization
@@ -493,10 +498,16 @@ Module600Name=Tilkynningar
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Fjárframlög
Module700Desc=Framlög í stjórnun
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis sameining
Module1400Name=Bókhald
Module1400Desc=Bókhald stjórnun (tvöfaldur aðila)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Flokkar
Module1780Desc=Stjórn Flokkur's (vörur, birgja og viðskiptavina)
Module2000Name=Fckeditor
@@ -631,7 +642,7 @@ Permission181=Lesa birgir pantanir
Permission182=Búa til / breyta birgi pantanir
Permission183=Staðfesta birgir pantanir
Permission184=Samþykkja birgir pantanir
-Permission185=Panta birgir pantanir
+Permission185=Order or cancel supplier orders
Permission186=Fá pantanir birgir
Permission187=Loka birgir pantanir
Permission188=Hætta við birgi pantanir
@@ -711,6 +722,13 @@ Permission538=Útflutningur þjónustu
Permission701=Lesa Fjárframlög
Permission702=Búa til / breyta framlög
Permission703=Eyða Fjárframlög
+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
Permission1001=Lesa fiskistofna
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Lykilorð til að nota proxy-miðlara
DefineHereComplementaryAttributes=Skilgreindu hér öll atributes, ekki þegar í boði sjálfgefið, og að þú viljir vera studd %s.
ExtraFields=Fyllingar eiginleika
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A lína af vöru / þjónustu með núll upphæð er t
FreeLegalTextOnProposal=Frjáls texti um viðskiptabanka tillögur
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Stjórn Order's skipulag
OrdersNumberingModules=Pantanir tala mát
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Strikamerki af gerðinni UPC
BarcodeDescISBN=Strikamerki af gerðinni ISBN
BarcodeDescC39=Strikamerki á C39 tegund
BarcodeDescC128=Strikamerki af gerðinni C128
-GenbarcodeLocation=Strikamerki kynslóð stjórn lína tól (notað af phpbarcode vél fyrir sumir merkjamál barnum tegund)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Reikning til að nota til að taka á móti peningum greiðslur
CashDeskBankAccountForCheque= Reikning til að nota til að taka á móti greiðslum með því að stöðva
CashDeskBankAccountForCB= Reikning til að nota til að taka á móti peningum greiðslur með kreditkortum
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bókamerki mát skipulag
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/is_IS/banks.lang b/htdocs/langs/is_IS/banks.lang
index b6516a6fa11..3b8b3123521 100644
--- a/htdocs/langs/is_IS/banks.lang
+++ b/htdocs/langs/is_IS/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Sættir
RIB=Bankareikningur Fjöldi
IBAN=IBAN númer
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT númer
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standandi pantanir
StandingOrder=Standandi pöntun
Withdrawals=Útborganir
@@ -148,7 +152,7 @@ BackToAccount=Til baka á reikning
ShowAllAccounts=Sýna allra reikninga
FutureTransaction=Færsla í futur. Engin leið til leitar sátta.
SelectChequeTransactionAndGenerate=Select / sía ávísanir til fela í innborgun stöðva móttöku og smelltu á "Create."
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/is_IS/commercial.lang b/htdocs/langs/is_IS/commercial.lang
index 80a7c534614..d80b68c1c53 100644
--- a/htdocs/langs/is_IS/commercial.lang
+++ b/htdocs/langs/is_IS/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Horfur
DeleteAction=Eyða aðgerð / verkefni
NewAction=Ný aðgerð / verkefni
-AddAction=Bæta við aðgerðir / verkefni
-AddAnAction=Bæta við óákveðinn greinir í ensku aðgerð / verkefni
-AddActionRendezVous=Bæta við stefnumót verkefni
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Stefnumót
ConfirmDeleteAction=Ertu viss um að þú viljir eyða þessu verkefni?
CardAction=Aðgerð kort
@@ -44,8 +44,8 @@ DoneActions=Lauk aðgerðum
DoneActionsFor=Lauk aðgerðum á %s
ToDoActions=Ófullnægjandi aðgerðir
ToDoActionsFor=Ófullnægjandi aðgerðir til %s
-SendPropalRef=Senda auglýsing tillögu %s
-SendOrderRef=Senda til %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Á ekki við
StatusActionToDo=Til að gera
StatusActionDone=Complete
@@ -62,7 +62,7 @@ LastProspectContactDone=Hafðu gert
DateActionPlanned=Date aðgerð skipuleggjandi fyrir
DateActionDone=Date aðgerð lokið
ActionAskedBy=Aðgerð bað
-ActionAffectedTo=Aðgerð áhrif til
+ActionAffectedTo=Event assigned to
ActionDoneBy=Aðgerð lokið við
ActionUserAsk=Skráð af
ErrorStatusCantBeZeroIfStarted=Ef "Date sviði gert 'er fyllt, aðgerð er hafin (eða búin),' Staða 'svo sviði er ekki hægt að 0%%.
diff --git a/htdocs/langs/is_IS/contracts.lang b/htdocs/langs/is_IS/contracts.lang
index 8faf347b95c..6f81b9bfc44 100644
--- a/htdocs/langs/is_IS/contracts.lang
+++ b/htdocs/langs/is_IS/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Útrunnið
ServiceStatusClosed=Loka
ServicesLegend=Þjónusta þjóðsaga
Contracts=Samningar
+ContractsAndLine=Contracts and line of contracts
Contract=Samningur
NoContracts=Engir samningar
MenuServices=Þjónusta
diff --git a/htdocs/langs/is_IS/cron.lang b/htdocs/langs/is_IS/cron.lang
index 34d66fdb353..746b799208a 100644
--- a/htdocs/langs/is_IS/cron.lang
+++ b/htdocs/langs/is_IS/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index 52ae8adce65..4676457743f 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Heimild og markmið bankareikninga verður að ve
ErrorBadThirdPartyName=Bad gildi fyrir þriðja aðila Nafn
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad setningafræði fyrir kóða viðskiptavina
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Viðskiptavinur númer sem þarf
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Viðskiptavinur sem notaður er þegar
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript þarf ekki að vera óvirkur til að haf
ErrorPasswordsMustMatch=Bæði tegund lykilorð verður að samsvara hvor öðrum
ErrorContactEMail=Tæknilegt villa kom upp. Vinsamlegast hafðu samband við kerfisstjóra til að fylgja email %s en veita merkjamál villa %s í skilaboðin, eða jafnvel enn betri með því að bæta skjár afrit af þessari síðu.
ErrorWrongValueForField=Wrong gildi fyrir reitinn númer %s (gildi ' %s ' er ekki það sama ríkisstjóratíð reglu %s )
-ErrorFieldValueNotIn=Rangt gildi fyrir sviði númer %s ('%s "gildi er ekki gildi í boði í %s svið %s borð)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Rangt gildi fyrir sviði númer %s ('á %s "gildi er ekki %s núverandi dómari)
ErrorsOnXLines=Villur á %s uppspretta línur
ErrorFileIsInfectedWithAVirus=The antivirus program was not 'fær til setja í gildi the skrá (skrá gæti verið sýkt af veiru)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 25b309f93ba..7aa233a456a 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Síðasta skref: Tilgreindu hér notandanafn og ly
ActivateModule=Virkja mát %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 704097d023c..0e595e2d7be 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -141,6 +141,7 @@ Cancel=Hætta við
Modify=Breyta
Edit=Breyta
Validate=Staðfesta
+ValidateAndApprove=Validate and Approve
ToValidate=Til að sannprófa
Save=Vista
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Leita
SearchOf=Leita
Valid=Gildir
Approve=Samþykkja
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Senda skrá
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Spil
Card=Card
Now=Nú
Date=Dagsetning
+DateAndHour=Date and hour
DateStart=Upphafsdagsetning
DateEnd=Lokadagsetning
DateCreation=Creation dagsetning
@@ -295,6 +298,7 @@ UnitPriceHT=Unit verð (nettó)
UnitPriceTTC=Eining verðs
PriceU=UPP
PriceUHT=UP (nettó)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UPP
Amount=Upphæð
AmountInvoice=Invoice upphæð
@@ -521,6 +525,7 @@ DateFromTo=Úr %s í %s
DateFrom=Frá %s
DateUntil=Þangað til %s
Check=Athuga
+Uncheck=Uncheck
Internal=Innri
External=Ytri
Internals=Innri
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Mánudagur
Tuesday=Þriðjudagur
diff --git a/htdocs/langs/is_IS/orders.lang b/htdocs/langs/is_IS/orders.lang
index 620cd8ca531..29a82746738 100644
--- a/htdocs/langs/is_IS/orders.lang
+++ b/htdocs/langs/is_IS/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Hætt við
StatusOrderDraft=Víxill (þarf að vera staðfest)
StatusOrderValidated=Staðfestar
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Afgreitt
StatusOrderToBill=Við reikning
StatusOrderToBill2=Við reikning
@@ -58,6 +59,7 @@ MenuOrdersToBill=Pantanir við reikning
MenuOrdersToBill2=Billable orders
SearchOrder=Leita röð
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Skip vöru
Discount=Afsláttur
CreateOrder=Búa Order
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index b9f670340db..051c37066dc 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -54,12 +54,13 @@ MaxSize=Hámarks stærð
AttachANewFile=Hengja nýja skrá / skjal
LinkedObject=Tengd mótmæla
Miscellaneous=Ýmislegt
-NbOfActiveNotifications=Fjöldi tilkynninga
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Þetta er prófun póst. \\ NThe tvær línur eru aðskilin með vagn til baka.
PredefinedMailTestHtml=Þetta er prófun póstur (orðið próf verður feitletruð).
Þessar tvær línur eru aðskilin með vagn til baka.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/is_IS/productbatch.lang b/htdocs/langs/is_IS/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/is_IS/productbatch.lang
+++ b/htdocs/langs/is_IS/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index 2d9c72298ee..655a4801339 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index c7785cf88a8..ee5af4c6a48 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Allir
PrivateProject=Tengiliðir verkefnisins
MyProjectsDesc=Þessi skoðun er takmörkuð við verkefni sem þú ert að hafa samband við (hvað sem er gerð).
ProjectsPublicDesc=Þetta sýnir öll verkefni sem þú ert að fá að lesa.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Þetta sýnir öll verkefni (notandi heimildir veita þér leyfi til að skoða allt).
MyTasksDesc=Þessi skoðun er takmörkuð við verkefni eða verkefni sem þú ert að hafa samband við (hvað sem er gerð).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Þetta sýnir öll verkefni og verkefni sem þú ert að fá að lesa.
TasksDesc=Þetta sýnir öll verkefni og verkefni (notandi heimildir veita þér leyfi til að skoða allt).
ProjectsArea=Verkefni area
@@ -29,6 +31,8 @@ NoProject=Engin verkefni skilgreind eða í eigu
NbOpenTasks=ATH að opna verkefni
NbOfProjects=ATH verkefna
TimeSpent=Tíma sem fer
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tími
RefTask=Tilv. verkefni
LabelTask=Merki verkefni
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Listi yfir pantanir birgis í tengslum við
ListSupplierInvoicesAssociatedProject=Listi yfir reikninga birgis í tengslum við verkefnið
ListContractAssociatedProject=Listi yfir samninga í tengslum við verkefnið
ListFichinterAssociatedProject=Listi yfir inngrip í tengslum við verkefnið
-ListTripAssociatedProject=Listi ferða og kostnaði í tengslum við verkefnið
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Listi yfir aðgerðir í tengslum við verkefnið
ActivityOnProjectThisWeek=Afþreying á verkefni í þessari viku
ActivityOnProjectThisMonth=Afþreying á verkefni í þessum mánuði
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/is_IS/salaries.lang b/htdocs/langs/is_IS/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/is_IS/salaries.lang
+++ b/htdocs/langs/is_IS/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/is_IS/sendings.lang b/htdocs/langs/is_IS/sendings.lang
index 97e0553dc1d..0e2e1d76be7 100644
--- a/htdocs/langs/is_IS/sendings.lang
+++ b/htdocs/langs/is_IS/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Magn röð
QtyShipped=Magn flutt
QtyToShip=Magn til skip
QtyReceived=Magn móttekin
-KeepToShip=Halda til skip
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Aðrar sendingar fyrir þessari röð
DateSending=Date senda til
DateSendingShort=Date senda til
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 15dcb039c33..66d6b14f260 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Vegið meðalverð
PMPValueShort=WAP
EnhancedValueOfWarehouses=Vöruhús gildi
UserWarehouseAutoCreate=Búa til birgðir sjálfkrafa þegar þú býrð til notanda
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Magn send
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/is_IS/suppliers.lang b/htdocs/langs/is_IS/suppliers.lang
index a5d796e6e39..6635f860563 100644
--- a/htdocs/langs/is_IS/suppliers.lang
+++ b/htdocs/langs/is_IS/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Birgjar
-Supplier=Birgir
AddSupplier=Create a supplier
SupplierRemoved=Birgir fjarri
SuppliersInvoice=Birgjar Reikningar
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Birgir reikninga og greiðslur
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Samþykkja þessari röð
ConfirmApproveThisOrder=Ertu viss um að þú viljir samþykkja þessari röð?
-DenyingThisOrder=Afneita þessari röð
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Ertu viss um að þú viljir afneita þessari röð?
ConfirmCancelThisOrder=Ertu viss um að þú viljir hætta í þessari röð?
AddCustomerOrder=Búa til viðskiptavina til
diff --git a/htdocs/langs/is_IS/trips.lang b/htdocs/langs/is_IS/trips.lang
index 39edbd5faa3..ca49d8ad9aa 100644
--- a/htdocs/langs/is_IS/trips.lang
+++ b/htdocs/langs/is_IS/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Ferðalag
-Trips=Ferðir
-TripsAndExpenses=Ferðir og kostnaður
-TripsAndExpensesStatistics=Ferðir og kostnaður tölfræði
-TripCard=Trip kort
-AddTrip=Bæta ferð
-ListOfTrips=Listi ferða
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Listi yfir gjöld
-NewTrip=New ferð
+NewTrip=New expense report
CompanyVisited=Fyrirtæki / stofnun heimsótt
Kilometers=Kílómetrar
FeesKilometersOrAmout=Magn eða kílómetrar
-DeleteTrip=Eyða ferð
-ConfirmDeleteTrip=Ertu viss um að þú viljir eyða þessari ferð?
-TF_OTHER=Önnur
-TF_LUNCH=Hádegisverður
-TF_TRIP=Ferðalag
-ListTripsAndExpenses=Listi yfir ferðir og gjöld
-ExpensesArea=Ferðir og gjöld area
-SearchATripAndExpense=Leita ferð og kostnað
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Önnur
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Hádegisverður
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index a16d58e6b7c..9348b460f9a 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Sperimentale
VersionDevelopment=Sviluppo
VersionUnknown=Sconosciuta
VersionRecommanded=Raccomandata
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID di sessione
SessionSaveHandler=Handler per il salvataggio dell sessioni
SessionSavePath=Percorso per il salvataggio delle sessioni
@@ -493,10 +498,16 @@ Module600Name=Notifiche
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donazioni
Module700Desc=Gestione donazioni
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Integrazione Mantis
Module1400Name=Contabilità avanzata
Module1400Desc=Gestione contabilità per esperti (partita doppia)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categorie
Module1780Desc=Gestione Categorie (prodotti, fornitori e clienti)
Module2000Name=FCKeditor
@@ -631,7 +642,7 @@ Permission181=Vedere ordini fornitore
Permission182=Creare / modificare ordini fornitore
Permission183=Validare ordini fornitore
Permission184=Approvare ordini fornitore
-Permission185=Ordinare ordini fornitore
+Permission185=Order or cancel supplier orders
Permission186=Ricevere ordini fornitore
Permission187=Chiudere fornitore ordini
Permission188=Annullare ordini fornitore
@@ -711,6 +722,13 @@ Permission538=Esportare servizi
Permission701=Vedere donazioni
Permission702=Creare/modificare donazioni
Permission703=Eliminare donazioni
+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
Permission1001=Vedere magazzino
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password per utilizzare il server proxy
DefineHereComplementaryAttributes=Definire qui tutti gli attributi non predefiniti che vuoi supportati da %s.
ExtraFields=Campi extra
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Attributi complementari (terze parti)
ExtraFieldsContacts=Attributi Complementari (contatti/indirizzi)
ExtraFieldsMember=Attributi Complementari (membri)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Una linea di prodotto/servizio con un importo pari a 0
FreeLegalTextOnProposal=Testo libero sulle proposte commerciali
WatermarkOnDraftProposal=Bozze dei preventivi filigranate (nessuna filigrana se vuoto)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Configurazione della gestione ordini
OrdersNumberingModules=Modelli di numerazione degli ordini
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Codice a barre di tipo UPC
BarcodeDescISBN=Codice a barre di tipo ISBN
BarcodeDescC39=Codice a barre di tipo C39
BarcodeDescC128=Codice a barre di tipo C128
-GenbarcodeLocation=Programma a riga di comando per generare i codici a barre (utilizzato dal modulo phpbarcode per alcuni tipi di codici a barre)
+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
BarcodeInternalEngine=Motore interno
BarCodeNumberManager=Manager per auto-definizione dei numeri barcode
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Conto bancario da utilizzare per pagamenti in contanti
CashDeskBankAccountForCheque= Conto bancario da utilizzare per pagamenti con assegno
CashDeskBankAccountForCB= Conto bancario da utilizzare per pagamenti con carta di credito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Impostazioni modulo segnalibri
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Formato
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index 43f61a91c1b..b83707e59df 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -33,7 +33,11 @@ AllTime=Dall'inizio
Reconciliation=Riconciliazione
RIB=Coordinate bancarie
IBAN=Codice IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Codice BIC (Swift)
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Mandati di incasso
StandingOrder=Mandato di incasso
Withdrawals=Prelievi
@@ -148,7 +152,7 @@ BackToAccount=Torna al conto
ShowAllAccounts=Mostra per tutti gli account
FutureTransaction=Transazione futura. Non è possibile conciliare.
SelectChequeTransactionAndGenerate=Seleziona gli assegni dar includere nella ricevuta di versamento e clicca su "Crea".
-InputReceiptNumber=Scegli la transazione collegata alla conciliazione. Usa un valore numerico ordinabile (per esempio, AAAAMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
ToConciliate=Da conciliare?
ThenCheckLinesAndConciliate=Controlla tutte le informazioni prima di cliccare
diff --git a/htdocs/langs/it_IT/commercial.lang b/htdocs/langs/it_IT/commercial.lang
index a4d5cad6499..3478754d9dd 100644
--- a/htdocs/langs/it_IT/commercial.lang
+++ b/htdocs/langs/it_IT/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Cliente potenziale
Prospects=Clienti potenziali
DeleteAction=Elimina un'azione/compito
NewAction=Nuova azione/compito
-AddAction=Aggiungi azione/compito
-AddAnAction=Aggiungi un'azione/compito
-AddActionRendezVous=Aggiungi un appuntamento
+AddAction=Crea evento/attività
+AddAnAction=Crea un evento/attività
+AddActionRendezVous=Crea un appuntamento
Rendez-Vous=Appuntantamenti
ConfirmDeleteAction=Vuoi davvero eliminare questa azione?
CardAction=Scheda Azione/compito
@@ -44,8 +44,8 @@ DoneActions=Azioni fatte
DoneActionsFor=Azioni fatte per %s
ToDoActions=Azioni da fare
ToDoActionsFor=Azioni da fare per %s
-SendPropalRef=Invia preventivo %s
-SendOrderRef=Invia per %s
+SendPropalRef=Invio di proposta commerciale %s
+SendOrderRef=Invio di ordine %s
StatusNotApplicable=Non applicabile
StatusActionToDo=Da fare
StatusActionDone=Fatto
@@ -62,7 +62,7 @@ LastProspectContactDone=Ultimo contatto effettuato
DateActionPlanned=Data prevista per l'azione
DateActionDone=Data compimento azione
ActionAskedBy=Azione richiesta da
-ActionAffectedTo=Azione riguardante
+ActionAffectedTo=Event assigned to
ActionDoneBy=Azione da fare
ActionUserAsk=Riferita da
ErrorStatusCantBeZeroIfStarted=Se il campo "fatto in Data" contiene qualcosa e l'azione è stata avviata (o finita), il campo "Stato" non può essere 0%%.
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 30637765163..64ae0e1cbea 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Scaduto
ServiceStatusClosed=Chiuso
ServicesLegend=Legenda servizi
Contracts=Contratti
+ContractsAndLine=Contracts and line of contracts
Contract=Contratto
NoContracts=Nessun contratto
MenuServices=Servizi
diff --git a/htdocs/langs/it_IT/cron.lang b/htdocs/langs/it_IT/cron.lang
index 073c9dabf7c..edb0ea5183b 100644
--- a/htdocs/langs/it_IT/cron.lang
+++ b/htdocs/langs/it_IT/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Comando da shell
CronMenu=Cron
CronCannotLoadClass=Non posso caricare la classe %s o l'oggetto %s
UseMenuModuleToolsToAddCronJobs=Andare nel menu "Home - Modules tools - Job list" per vedere e modificare le azioni pianificate.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 9fac6970fe5..69de1916c4b 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono
ErrorBadThirdPartyName=Valore non valido per il nome del soggetto terzo
ErrorProdIdIsMandatory=%s obbligatorio
ErrorBadCustomerCodeSyntax=Sintassi del codice cliente errata
-ErrorBadBarCodeSyntax=Sintassi del barcode errata
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Il codice cliente è obbligatorio
ErrorBarCodeRequired=Barcode richiesto
ErrorCustomerCodeAlreadyUsed=Codice cliente già utilizzato
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Per questa funzionalità Javascript deve essere att
ErrorPasswordsMustMatch=Le due password digitate devono essere identiche
ErrorContactEMail=Si è verificato un errore tecnico. Si prega di contattare l'amministratore all'indirizzo %s %s indicando il codice di errore nel messaggio, o, meglio ancora, allegando uno screenshot della schermata attuale.
ErrorWrongValueForField=Valore errato nel campo numero %s (il valore '%s'non corrisponde alla regex %s)
-ErrorFieldValueNotIn=Valore errato nel campo numero %s(il valore %s non è un valore disponibile nel campo%s campo della tabella %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Valore errato nel campo numero %s (il valore %snon è un riferimento %s esistente)
ErrorsOnXLines=Errori in %s righe del sorgente
ErrorFileIsInfectedWithAVirus=Il programma antivirus non è stato in grado di convalidare il file (il file potrebbe essere infetto)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=I parametri di configurazione obbligatori non sono ancora stati definiti
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 81b627f39fb..39341881654 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Ultimo passo: Indicare qui login e password che si
ActivateModule=Attiva modulo %s
ShowEditTechnicalParameters=Clicca qui per mostrare/modificare i parametri avanzati (modalità esperti)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 12bcfd808db..a545e5a156d 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -141,6 +141,7 @@ Cancel=Annulla
Modify=Modifica
Edit=Modifica
Validate=Convalida
+ValidateAndApprove=Validate and Approve
ToValidate=Convalidare
Save=Salva
SaveAs=Salva con nome
@@ -158,6 +159,7 @@ Search=Ricerca
SearchOf=Cerca
Valid=Convalida
Approve=Approva
+Disapprove=Disapprove
ReOpen=Riapri
Upload=Invia file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Schede
Card=Scheda
Now=Adesso
Date=Data
+DateAndHour=Date and hour
DateStart=Data inizio
DateEnd=Data fine
DateCreation=Data di creazione
@@ -295,6 +298,7 @@ UnitPriceHT=Prezzo unitario (netto)
UnitPriceTTC=Prezzo unitario (lordo)
PriceU=P.U.
PriceUHT=P.U.(netto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=P.U.(lordo)
Amount=Importo
AmountInvoice=Importo della fattura
@@ -521,6 +525,7 @@ DateFromTo=Da %s a %s
DateFrom=Da %s
DateUntil=Fino a %s
Check=Controllo
+Uncheck=Uncheck
Internal=Interno
External=Esterno
Internals=Interni
@@ -688,6 +693,7 @@ PublicUrl=URL pubblico
AddBox=Aggiungi box
SelectElementAndClickRefresh=Seleziona un elemento e clicca Aggiorna
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Lunedì
Tuesday=Martedì
diff --git a/htdocs/langs/it_IT/orders.lang b/htdocs/langs/it_IT/orders.lang
index a6992dd91b4..7206efd62c2 100644
--- a/htdocs/langs/it_IT/orders.lang
+++ b/htdocs/langs/it_IT/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Annullato
StatusOrderDraft=Bozza (deve essere convalidata)
StatusOrderValidated=Convalidato
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Lavorato
StatusOrderToBill=Spedito
StatusOrderToBill2=Da fatturare
@@ -58,6 +59,7 @@ MenuOrdersToBill=Ordini spediti
MenuOrdersToBill2=Ordini fatturabili
SearchOrder=Ricerca ordine
SearchACustomerOrder=Cerca un ordine cliente
+SearchASupplierOrder=Search a supplier order
ShipProduct=Spedisci prodotto
Discount=Sconto
CreateOrder=Crea ordine
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index 156441b3cd8..ef337e3c36c 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -54,12 +54,13 @@ MaxSize=La dimensione massima è
AttachANewFile=Allega un nuovo file/documento
LinkedObject=Oggetto collegato
Miscellaneous=Varie
-NbOfActiveNotifications=Numero di notifiche attive
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Questa è una mail di prova. \\NLe due linee sono separate da un a capo.
PredefinedMailTestHtml=Questa è una mail di test (la parola test deve risultare in grassetto).
Le due linee sono separate da un a capo.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura numero __FACREF__\n\n__PERSONALIZED__Cordiali saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \nVorremmo portare alla Vostra attenzione che la fattura __FACREF__ sembra non essere stata saldata. La fattura è allegata alla presente, come promemoria.\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nAlleghiamo la proposta commerciale __PROPREF__ \n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nAlleghiamo l'ordine __ORDERREF__\n\n__PERSONALIZED__ Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nAlleghiamo il nostro ordine __ORDERREF__\n\n__PERSONALIZED__Cordiali Saluti\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nGentile Cliente,\nin allegato trova la nostra fattura __FACREF__\n\n__PERSONALIZED__Cordiali Saluti\n\nIl presente invio SOSTITUISCE INTEGRALMENTE quello effettuato in modo tradizionale a mezzo servizio postale.\n\nTale operazione è ammessa dalla normativa fiscale in essere, relativa alla "Trasmissione delle Fatture" per via Telematica:\nR.M. n. 571134 del 19/07/88 - (posta elettronica);\nR.M. n. 450217 del 30/07/90 - (procedure informatizzate);R.M. n. 107 del 04/07/01 - (trasmissione atture);\nR.M. n. 202/E del 04/12/01 - (archiviazione fatture).\nRisoluzioni che forniscono chiarimenti in ordine alle condizioni necessarie per l'ammissibilità ai sensi dell'art. 21 D.P.R. 26/10/72, n.633, della procedura di trasmissione e memorizzazione delle fatture mediante sistemi combinati fondati sull'impiego congiunto di supporti informatici, telefax\ne posta elettronica.\n\n È necessario GENERARNE UNA STAMPA e procedere alla relativa archiviazione come da prassi a norma di legge.\n\nRimaniamo a completa disposizione per qualsiasi informazione.\n\n__SIGNATURE__
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index a95f07e2f87..147b856f35d 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index 25ad81ab3b9..6bb5e68614e 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index d387d08f9ca..ce4d893f0fd 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Progetto condiviso
PrivateProject=Contatti del progetto
MyProjectsDesc=Questa visualizzazione mostra solo i progetti in cui sei indicato come contatto (di qualsiasi tipo).
ProjectsPublicDesc=Questa visualizzazione mostra tutti i progetti che sei autorizzato a vedere.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
MyTasksDesc=Questa visualizzazione mostra solo i progetti o i compiti in cui sei indicati come contatto (di qualsiasi tipo).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
ProjectsArea=Area progetti
@@ -29,6 +31,8 @@ NoProject=Nessun progetto definito o assegnato
NbOpenTasks=Num. di compiti aperti
NbOfProjects=Num. di progetti
TimeSpent=Tempo lavorato
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tempo lavorato
RefTask=Rif. compito
LabelTask=Etichetta compito
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Elenco degli ordini fornitori associati al p
ListSupplierInvoicesAssociatedProject=Elenco delle fatture passive associate al progetto
ListContractAssociatedProject=Elenco dei contratti associati al progetto
ListFichinterAssociatedProject=Elenco degli interventi associati al progetto
-ListTripAssociatedProject=Elenco dei viaggi e delle spese associate al progetto
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Elenco delle azioni associate al progetto
ActivityOnProjectThisWeek=Operatività sul progetto questa settimana
ActivityOnProjectThisMonth=Operatività sul progetto questo mese
@@ -133,3 +137,6 @@ SearchAProject=Cerca un progetto
ProjectMustBeValidatedFirst=I progetti devono prima essere validati
ProjectDraft=Progetti bozza
FirstAddRessourceToAllocateTime=Associa una risorsa per allocare il tempo
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/it_IT/salaries.lang b/htdocs/langs/it_IT/salaries.lang
index 01e019c5a0b..fcd094e4682 100644
--- a/htdocs/langs/it_IT/salaries.lang
+++ b/htdocs/langs/it_IT/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Codice di contabilità per i pagamenti dei salari
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Codice di contabilità per oneri finanziari
Salary=Stipendio
Salaries=Stipendi
Employee=Dipendente
@@ -6,3 +8,6 @@ NewSalaryPayment=Nuovo pagamento stipendio
SalaryPayment=Pagamento stipendio
SalariesPayments=Pagamento stipendi
ShowSalaryPayment=Mostra i pagamenti stipendio
+THM=Prezzo medio orario
+TJM=Prezzo medio giornaliero
+CurrentSalary=Current salary
diff --git a/htdocs/langs/it_IT/sendings.lang b/htdocs/langs/it_IT/sendings.lang
index f309ede2aad..b4a29ef16c4 100644
--- a/htdocs/langs/it_IT/sendings.lang
+++ b/htdocs/langs/it_IT/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Quantità ordinata
QtyShipped=Quantità spedita
QtyToShip=Quantità da spedire
QtyReceived=Quantità ricevuta
-KeepToShip=Ancora da spedire
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Altre Spedizioni per questo ordine
DateSending=Data spedizione
DateSendingShort=Data di invio
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 0766d101bee..51c52f31d8e 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Media ponderata prezzi
PMPValueShort=MPP
EnhancedValueOfWarehouses=Incremento valore dei magazzini
UserWarehouseAutoCreate=Creare automaticamente un magazzino alla creazione di un utente
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantità spedita
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Il magazzino %s sarà usato per la diminuzione
WarehouseForStockIncrease=Il magazzino %s sarà usato per l'aumento delle scorte
ForThisWarehouse=Per questo magazzino
ReplenishmentStatusDesc=Questa è una lista di tutti i prodotti con una giacenza inferiore a quella desiderata (o inferiore a quella del valore di allarme se la casella "solo allarmi" è spuntata)
-ReplenishmentOrdersDesc=Questa è una lista di tutti gli ordini di acquisto aperti
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Rifornimento
NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index e9e64c3e9ab..9d21cef1c12 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Fornitori
-Supplier=Fornitore
AddSupplier=Crea un fornitore
SupplierRemoved=Fornitore rimosso
SuppliersInvoice=Fattura Fornitore
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Fatture fornitore e pagamenti
ExportDataset_fournisseur_3=Ordini fornitore e righe degli ordini
ApproveThisOrder=Approva l'ordine
ConfirmApproveThisOrder=Vuoi davvero approvare l'ordine?
-DenyingThisOrder=Rifiuta l'ordine
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Vuoi davvero rifiutare l'ordine?
ConfirmCancelThisOrder=Vuoi davvero annullare l'ordine?
AddCustomerOrder=Crea ordine cliente
diff --git a/htdocs/langs/it_IT/trips.lang b/htdocs/langs/it_IT/trips.lang
index 413dcf89c4c..bc73c8119be 100644
--- a/htdocs/langs/it_IT/trips.lang
+++ b/htdocs/langs/it_IT/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Viaggio
-Trips=Viaggi
-TripsAndExpenses=Viaggi e spese
-TripsAndExpensesStatistics=Statistiche viaggi e spese
-TripCard=Scheda viaggio
-AddTrip=Aggiungi viaggio
-ListOfTrips=Elenco dei viaggi
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Elenco delle tariffe
-NewTrip=Nuovo viaggio
+NewTrip=New expense report
CompanyVisited=Società/Fondazione visitata
Kilometers=Kilometri
FeesKilometersOrAmout=Tariffa kilometrica o importo
-DeleteTrip=Elimina viaggio
-ConfirmDeleteTrip=Sei sicuro di voler eliminare questo viaggio?
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
+ClassifyRefunded=Classifica come "Rimborsata"
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
TF_OTHER=Altro
+TF_TRANSPORTATION=Transportation
TF_LUNCH=Pranzo
-TF_TRIP=Viaggio
-ListTripsAndExpenses=Elenco dei viaggi e delle spese
-ExpensesArea=Area viaggi e spese
-SearchATripAndExpense=Cerca viaggi e spese
-ClassifyRefunded=Classify 'Refunded'
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 3785571b48b..bac8eb6dbcf 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=実験的
VersionDevelopment=開発
VersionUnknown=未知の
VersionRecommanded=推奨される
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=セッションID
SessionSaveHandler=セッションを保存するためのハンドラ
SessionSavePath=ストレージ·セッションのローカライズ
@@ -493,10 +498,16 @@ Module600Name=通知
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=寄付
Module700Desc=寄付金の管理
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=カマキリ
Module1200Desc=カマキリの統合
Module1400Name=会計
Module1400Desc=会計管理(二者)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=カテゴリー
Module1780Desc=Categorieの管理(製品、サプライヤー、顧客)
Module2000Name=WYSIWYGエディタ
@@ -631,7 +642,7 @@ Permission181=サプライヤーの受注を読む
Permission182=作成/変更サプライヤーの受注
Permission183=サプライヤーの受注を検証する
Permission184=サプライヤの注文を承認する
-Permission185=注文サプライヤーの受注
+Permission185=Order or cancel supplier orders
Permission186=サプライヤの注文を受ける
Permission187=閉じるサプライヤーの受注
Permission188=サプライヤの注文を取り消す
@@ -711,6 +722,13 @@ Permission538=輸出サービス
Permission701=寄付を読む
Permission702=寄付を作成/変更
Permission703=寄付を削除します。
+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
Permission1001=株式を読む
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=プロキシサーバーを使用するためのパスワード
DefineHereComplementaryAttributes=デフォルトでは既に利用できない、ここですべての属性を定義して、あなたは%sのためにサポートさせたい。
ExtraFields=補完的な属性
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=ゼロ量と製品/サービスのラインは、オ
FreeLegalTextOnProposal=商業的な提案でフリーテキスト
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=注文の管理セットアップ
OrdersNumberingModules=モジュールの番号受注
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=タイプUPCのバーコード
BarcodeDescISBN=型商品のバーコード
BarcodeDescC39=タイプC39のバーコード
BarcodeDescC128=タイプC128のバーコード
-GenbarcodeLocation=バーコードを生成するコマンドラインツール(一部のバーコードタイプのphpbarcodeエンジンで使用されます)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトのアカウント
CashDeskBankAccountForCheque= 小切手による支払いを受け取るために使用するデフォルトのアカウント
CashDeskBankAccountForCB= クレジットカードでの現金支払いを受け取るために使用するデフォルトのアカウント
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=モジュールのセットアップをブックマーク
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 23051984ea3..415d74642e7 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=和解
RIB=銀行の口座番号
IBAN=IBAN番号
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT番号
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=立ち受注
StandingOrder=立ち順
Withdrawals=引出し
@@ -148,7 +152,7 @@ BackToAccount=戻るアカウントへ
ShowAllAccounts=すべてのアカウントに表示
FutureTransaction=フューチャーのトランザクション。調停する方法はありません。
SelectChequeTransactionAndGenerate=チェックの預金証書に含まれると、"作成"をクリックしてチェックをフィルタリング/選択してください。
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index babd7265f5f..6953d91769a 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -9,9 +9,9 @@ Prospect=見通し
Prospects=見込み
DeleteAction=イベント/タスクを削除します。
NewAction=新しいイベント/タスク
-AddAction=イベント/タスクを追加する
-AddAnAction=イベント/タスクを追加する
-AddActionRendezVous=ランデヴーイベントを追加
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=ランデブー
ConfirmDeleteAction=このイベント/タスクを削除してもよろしいですか?
CardAction=イベントカード
@@ -44,8 +44,8 @@ DoneActions=完了イベント
DoneActionsFor=%sの完成イベント
ToDoActions=不完全なイベント
ToDoActionsFor=%s不完全なイベント
-SendPropalRef=商業提案%sを送る
-SendOrderRef=オーダーの%sを送る
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=適用されない
StatusActionToDo=実行する
StatusActionDone=完了する
@@ -62,7 +62,7 @@ LastProspectContactDone=行わ連絡
DateActionPlanned=日付イベントがために計画
DateActionDone=日付イベントが行われ
ActionAskedBy=によって報告されたイベント
-ActionAffectedTo=イベントに影響を受けた
+ActionAffectedTo=Event assigned to
ActionDoneBy=することにより、イベントを行って
ActionUserAsk=によって報告された
ErrorStatusCantBeZeroIfStarted=フィールド" 日付が行わ ' が入力されている場合は、アクションが(または終了)が開始されているので、フィールドのステータスが " 0%%にすることはできません。
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index 3f44104d7fb..db028796696 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=期限切れの
ServiceStatusClosed=閉じ
ServicesLegend=サービス伝説
Contracts=契約
+ContractsAndLine=Contracts and line of contracts
Contract=契約
NoContracts=いいえ契約なし
MenuServices=サービス
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index f2f35b1838c..d10cb4a8784 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index a7b905a2127..852bc364ace 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異
ErrorBadThirdPartyName=サードパーティの名前の値が正しくありません
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=顧客コードの不正な構文
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=顧客コードが必要です
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=顧客コードは既に使用され
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascriptがこの機能が動作しているた
ErrorPasswordsMustMatch=両方入力したパスワードは、互いに一致している必要があります
ErrorContactEMail=技術的なエラーが発生しました。 、次の電子メール%sに管理者に連絡してenはエラーコードメッセージで%s、またはこのページの画面コピーを追加することにより、さらに優れたを提供してください。
ErrorWrongValueForField=フィールド番号%sの間違った値(値'%s'は正規表現のルール%s一致しません)
-ErrorFieldValueNotIn=フィールド番号%sの間違った値(値'%s'は、テーブルの%sのフィールド%sに使用可能な値ではありません)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=フィールド番号%sのために間違った値(値"%s"は%s既存のREFではありません)
ErrorsOnXLines=%sソース行のエラー
ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができませんでした(ファイルがウイルスに感染されるかもしれません)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 2038751025f..8a75022f2a5 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=最後のステップ :ここにあなたがソ
ActivateModule=モジュール%sをアクティブにする
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index a5ce0161b53..66fd5efdecf 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -141,6 +141,7 @@ Cancel=キャンセル
Modify=修正する
Edit=編集
Validate=検証
+ValidateAndApprove=Validate and Approve
ToValidate=検証するには
Save=保存
SaveAs=名前を付けて保存
@@ -158,6 +159,7 @@ Search=検索
SearchOf=検索
Valid=有効な
Approve=承認する
+Disapprove=Disapprove
ReOpen=再オープン
Upload=ファイルを送信する
ToLink=Link
@@ -219,6 +221,7 @@ Cards=カード
Card=カード
Now=現在
Date=日付
+DateAndHour=Date and hour
DateStart=開始日
DateEnd=日付の末尾
DateCreation=作成日
@@ -295,6 +298,7 @@ UnitPriceHT=単価(純額)
UnitPriceTTC=単価
PriceU=UP
PriceUHT=UP(純額)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=量
AmountInvoice=請求額
@@ -521,6 +525,7 @@ DateFromTo=%sから%sへ
DateFrom=%sから
DateUntil=%sまで
Check=チェック
+Uncheck=Uncheck
Internal=内部
External=外部
Internals=内部
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=月曜日
Tuesday=火曜日
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 786cc3c40cf..f0267668aed 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=キャンセル
StatusOrderDraft=ドラフト(検証する必要があります)
StatusOrderValidated=検証
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=処理
StatusOrderToBill=請求する
StatusOrderToBill2=請求する
@@ -58,6 +59,7 @@ MenuOrdersToBill=法案に注文
MenuOrdersToBill2=Billable orders
SearchOrder=検索順序
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=船積
Discount=割引
CreateOrder=順序を作成します。
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index 9461761ac71..fe4bdc9e962 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -54,12 +54,13 @@ MaxSize=最大サイズ
AttachANewFile=新しいファイル/文書を添付する
LinkedObject=リンクされたオブジェクト
Miscellaneous=その他
-NbOfActiveNotifications=通知の数
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=これはテストメールです。\\ nこの2行は、キャリッジリターンで区切られています。
PredefinedMailTestHtml=これはテストメール(ワードテストでは、太字でなければなりません)です。
の2行は、キャリッジリターンで区切られています。
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index 84f960b8c86..cadaad87d96 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index 42c4317dc59..0011d0ab801 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -8,8 +8,10 @@ SharedProject=皆
PrivateProject=プロジェクトの連絡先
MyProjectsDesc=このビューは、(型が何であれ)の連絡先であるプロジェクトに限定されています。
ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介します。
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=このビューはすべてのプロジェクトを(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
MyTasksDesc=このビューは、連絡先の(種類は何でも)がプロジェクトやタスクに制限されています。
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示します。
TasksDesc=このビューは、すべてのプロジェクトとタスク(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示します。
ProjectsArea=プロジェクトエリア
@@ -29,6 +31,8 @@ NoProject=はプロジェクトが定義されていませんまたは所有し
NbOpenTasks=開かれたタスクのNb
NbOfProjects=プロジェクトのNb
TimeSpent=に費やされた時間は
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=に費やされた時間は
RefTask=REF。タスク
LabelTask=ラベルタスク
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=プロジェクトに関連付けられて
ListSupplierInvoicesAssociatedProject=プロジェクトに関連付けられている仕入先の請求書の一覧
ListContractAssociatedProject=プロジェクトに関連付けられている契約のリスト
ListFichinterAssociatedProject=プロジェクトに関連付けられている介入のリスト
-ListTripAssociatedProject=プロジェクトに関連付けられている旅行および費用のリスト
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=プロジェクトに関連付けられているイベントのリスト
ActivityOnProjectThisWeek=プロジェクト今週のアクティビティ
ActivityOnProjectThisMonth=プロジェクトの活動今月
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index d73b5069169..43ca3aaec39 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=数量は、注文された
QtyShipped=個数出荷
QtyToShip=出荷する数量
QtyReceived=個数は、受信した
-KeepToShip=出荷できるようにしておく
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=このため、他の出荷
DateSending=オーダーを送信した日付
DateSendingShort=オーダーを送信した日付
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 3ae54c5c68b..45f66be1a15 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=加重平均価格
PMPValueShort=WAP
EnhancedValueOfWarehouses=倉庫の値
UserWarehouseAutoCreate=ユーザーの作成時に自動的に倉庫を作成します。
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=数量派遣
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 7795c0f6ee7..0596adaa02c 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=サプライヤー
-Supplier=サプライヤー
AddSupplier=Create a supplier
SupplierRemoved=サプライヤーは、削除
SuppliersInvoice=仕入先の請求書
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=サプライヤーの請求書と支払い
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=この注文を承認
ConfirmApproveThisOrder=あなたは、注文%sを承認してもよろしいですか?
-DenyingThisOrder=この順序を否定
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=あなたは、この順序%sを拒否してもよろしいですか?
ConfirmCancelThisOrder=あなたは、この順序%sをキャンセルしてもよろしいですか?
AddCustomerOrder=顧客の注文を作成します。
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index e4999a7b1ec..273382c38a9 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=旅行
-Trips=ツアー
-TripsAndExpenses=旅行や経費
-TripsAndExpensesStatistics=旅行や経費の統計情報
-TripCard=旅行カード
-AddTrip=旅行を追加します。
-ListOfTrips=ツアーのリスト
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=手数料のリスト
-NewTrip=新しい旅行
+NewTrip=New expense report
CompanyVisited=会社概要/基礎を訪問
Kilometers=キロ
FeesKilometersOrAmout=量またはキロ
-DeleteTrip=旅を削除します。
-ConfirmDeleteTrip=この旅を削除してもよろしいですか?
-TF_OTHER=その他
-TF_LUNCH=ランチ
-TF_TRIP=旅行
-ListTripsAndExpenses=旅行や費用のリスト
-ExpensesArea=旅行や経費エリア
-SearchATripAndExpense=旅行と費用を検索
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=その他
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=ランチ
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 38634cbd497..9782c2ea27f 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
VersionRecommanded=Recommended
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/ka_GE/banks.lang b/htdocs/langs/ka_GE/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/ka_GE/banks.lang
+++ b/htdocs/langs/ka_GE/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/ka_GE/commercial.lang b/htdocs/langs/ka_GE/commercial.lang
index 390a7f837e8..7acdc7bd7e6 100644
--- a/htdocs/langs/ka_GE/commercial.lang
+++ b/htdocs/langs/ka_GE/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact done
DateActionPlanned=Date event planned for
DateActionDone=Date event done
ActionAskedBy=Event reported by
-ActionAffectedTo=Event owned by
+ActionAffectedTo=Event assigned to
ActionDoneBy=Event done by
ActionUserAsk=Reported by
ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%.
diff --git a/htdocs/langs/ka_GE/contracts.lang b/htdocs/langs/ka_GE/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/ka_GE/contracts.lang
+++ b/htdocs/langs/ka_GE/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/ka_GE/cron.lang b/htdocs/langs/ka_GE/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/ka_GE/cron.lang
+++ b/htdocs/langs/ka_GE/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ka_GE/install.lang b/htdocs/langs/ka_GE/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/ka_GE/install.lang
+++ b/htdocs/langs/ka_GE/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/ka_GE/main.lang b/htdocs/langs/ka_GE/main.lang
index 8996c1f6d83..d40e28cb776 100644
--- a/htdocs/langs/ka_GE/main.lang
+++ b/htdocs/langs/ka_GE/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/ka_GE/orders.lang b/htdocs/langs/ka_GE/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/ka_GE/orders.lang
+++ b/htdocs/langs/ka_GE/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ka_GE/productbatch.lang b/htdocs/langs/ka_GE/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/ka_GE/productbatch.lang
+++ b/htdocs/langs/ka_GE/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ka_GE/salaries.lang b/htdocs/langs/ka_GE/salaries.lang
index 0087cbe83e6..28c21adfad3 100644
--- a/htdocs/langs/ka_GE/salaries.lang
+++ b/htdocs/langs/ka_GE/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
THM=Average hourly price
TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ka_GE/sendings.lang b/htdocs/langs/ka_GE/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/ka_GE/sendings.lang
+++ b/htdocs/langs/ka_GE/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/ka_GE/stocks.lang b/htdocs/langs/ka_GE/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/ka_GE/stocks.lang
+++ b/htdocs/langs/ka_GE/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ka_GE/suppliers.lang b/htdocs/langs/ka_GE/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/ka_GE/suppliers.lang
+++ b/htdocs/langs/ka_GE/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/ka_GE/trips.lang b/htdocs/langs/ka_GE/trips.lang
index ab29ec23b5f..ba36fc9b07b 100644
--- a/htdocs/langs/ka_GE/trips.lang
+++ b/htdocs/langs/ka_GE/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Create trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index a2d1447071a..af647d9f52c 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
VersionRecommanded=Recommended
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/ko_KR/banks.lang b/htdocs/langs/ko_KR/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/ko_KR/banks.lang
+++ b/htdocs/langs/ko_KR/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/ko_KR/commercial.lang b/htdocs/langs/ko_KR/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/ko_KR/commercial.lang
+++ b/htdocs/langs/ko_KR/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/ko_KR/contracts.lang b/htdocs/langs/ko_KR/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/ko_KR/contracts.lang
+++ b/htdocs/langs/ko_KR/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/ko_KR/cron.lang b/htdocs/langs/ko_KR/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/ko_KR/cron.lang
+++ b/htdocs/langs/ko_KR/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index f374da9cf98..7c88ed9e005 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/ko_KR/install.lang b/htdocs/langs/ko_KR/install.lang
index b4ebd2a51a6..fc4daabf0e6 100644
--- a/htdocs/langs/ko_KR/install.lang
+++ b/htdocs/langs/ko_KR/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/ko_KR/main.lang b/htdocs/langs/ko_KR/main.lang
index 104a3f3ad11..de1eb65bf14 100644
--- a/htdocs/langs/ko_KR/main.lang
+++ b/htdocs/langs/ko_KR/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=월요일
Tuesday=화요일
diff --git a/htdocs/langs/ko_KR/orders.lang b/htdocs/langs/ko_KR/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/ko_KR/orders.lang
+++ b/htdocs/langs/ko_KR/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index d20bb5f39b1..80399108329 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ko_KR/productbatch.lang b/htdocs/langs/ko_KR/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/ko_KR/productbatch.lang
+++ b/htdocs/langs/ko_KR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ko_KR/salaries.lang b/htdocs/langs/ko_KR/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/ko_KR/salaries.lang
+++ b/htdocs/langs/ko_KR/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ko_KR/sendings.lang b/htdocs/langs/ko_KR/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/ko_KR/sendings.lang
+++ b/htdocs/langs/ko_KR/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/ko_KR/stocks.lang b/htdocs/langs/ko_KR/stocks.lang
index 8ab2a113cb9..d2762213627 100644
--- a/htdocs/langs/ko_KR/stocks.lang
+++ b/htdocs/langs/ko_KR/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ko_KR/suppliers.lang b/htdocs/langs/ko_KR/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/ko_KR/suppliers.lang
+++ b/htdocs/langs/ko_KR/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/ko_KR/trips.lang b/htdocs/langs/ko_KR/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/ko_KR/trips.lang
+++ b/htdocs/langs/ko_KR/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 219441ecd9c..0a9afd42fe8 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Ekspermentinis
VersionDevelopment=Plėtojimas
VersionUnknown=Nežinomas
VersionRecommanded=Rekomenduojamas
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sesijos ID
SessionSaveHandler=Vedlys, sesijai išsaugoti
SessionSavePath=Talpinimo sesijos lokalizavimas
@@ -493,10 +498,16 @@ Module600Name=Pranešimai
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Parama
Module700Desc=Paramos valdymas
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mančio integracija
Module1400Name=Apskaita
Module1400Desc=Apskaitos valdymas (dvivietės šalys)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorijos
Module1780Desc=Kategorijų valdymas (produktai, tiekėjai ir klientai)
Module2000Name=WYSIWYG redaktorius
@@ -631,7 +642,7 @@ Permission181=Skaityti tiekėjo užsakymus
Permission182=Sukurti/keisti tiekėjo užsakymus
Permission183=Patvirtinti tiekėjo užsakymus
Permission184=Patvirtinti tiekėjo užsakymus
-Permission185=Rūšiuoti tiekėjo užsakymus
+Permission185=Order or cancel supplier orders
Permission186=Gauti tiekėjo užsakymus
Permission187=Uždaryti tiekėjo užsakymus
Permission188=Nutraukti tiekėjo užsakymus
@@ -711,6 +722,13 @@ Permission538=Eksportuoti paslaugas
Permission701=Skaityti aukas
Permission702=Sukurti/keisti aukas
Permission703=Ištrinti aukas
+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
Permission1001=Skaityti atsargas
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Proxy serverio slaptažodis
DefineHereComplementaryAttributes=Čia nustatykite visus atributus, ne tik jau nustatytus pagal nutylėjimą, bet ir tuos, kuriuos Jūs norite, kad būtų palaikomi %s.
ExtraFields=Papildomi požymiai
ExtraFieldsLines=Papildomi atributai (linijos)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Papildomi požymiai (trečiosios šalys)
ExtraFieldsContacts=Papildomi požymiai (kontaktas/adresas)
ExtraFieldsMember=Papildomi požymiai (narys)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Produkto/paslaugos linija su nuline suma yra laikoma g
FreeLegalTextOnProposal=Laisvas tekstas komerciniame pasiūlyme
WatermarkOnDraftProposal=Vandens ženklas komercinių pasiūlymų projekte (nėra, jei lapas tuščias)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Užsakymų valdymo nuostatos
OrdersNumberingModules=Užsakymų numeracijos modeliai
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Brūkšninio kodo tipas UPC
BarcodeDescISBN=Brūkšninio kodo tipas ISBN
BarcodeDescC39=Brūkšninio kodo tipas C39
BarcodeDescC128=Brūkšninio kodo tipas C128
-GenbarcodeLocation=Brūkšninio kodo generavimo komandinės eilutės įrankis (naudojamas vidinio variklio kai kurių brūkšninių kodų tipams)
+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
BarcodeInternalEngine=Vidinis variklis
BarCodeNumberManager=Automatinio brūkšninių kodų numerių nustatymo valdiklis
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Sąskaita grynųjų pinigų įmokoms pagal nutylėjimą
CashDeskBankAccountForCheque= Sąskaita čekių įmokoms pagal nutylėjimą
CashDeskBankAccountForCB= Sąskaita įmokoms kreditinėmis kortelėmis pagal nutylėjimą
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Žymeklių modulio nustatymas
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/lt_LT/banks.lang b/htdocs/langs/lt_LT/banks.lang
index 27d83cc3325..d471ea6ac55 100644
--- a/htdocs/langs/lt_LT/banks.lang
+++ b/htdocs/langs/lt_LT/banks.lang
@@ -33,7 +33,11 @@ AllTime=Nuo pradžios
Reconciliation=Suderinimas
RIB=Banko sąskaitos numeris
IBAN=IBAN numeris
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT numeris
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Pastovūs užsakymai
StandingOrder=Pastovus užsakymas
Withdrawals=Išėmimai
@@ -148,7 +152,7 @@ BackToAccount=Atgal į sąskaitą
ShowAllAccounts=Rodyti visas sąskaitas
FutureTransaction=Operacija ateityje. Negalima taikyti
SelectChequeTransactionAndGenerate=Pasirinkti/filtruoti čekius, kad įtraukti į čekio depozito kvitą ir paspausti mygtuką "Sukurti".
-InputReceiptNumber=Pasirinkti banko suvestinę, susijusią su taikymu. Naudokite rūšiuojamą skaitinę vertę (pvz., YYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Nurodyti kategoriją, kurioje klasifikuoti įrašus
ToConciliate=Taikyti ?
ThenCheckLinesAndConciliate=Tada patikrinkite linijas, esančias banko suvestinėje ir paspauskite
diff --git a/htdocs/langs/lt_LT/commercial.lang b/htdocs/langs/lt_LT/commercial.lang
index aab16dcdd9b..1c66d76a7af 100644
--- a/htdocs/langs/lt_LT/commercial.lang
+++ b/htdocs/langs/lt_LT/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Planas
Prospects=Planai
DeleteAction=Ištrinti įvykį/užduotį
NewAction=Naujas įvykis/užduotis
-AddAction=Pridėti įvykį/užduotį
-AddAnAction=Pridėti įvykį/užduotį
-AddActionRendezVous=Pridėti Rendez-vous įvykį
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Pasimatymas
ConfirmDeleteAction=Ar tikrai norite ištrinti šį įvykį/užduotį ?
CardAction=Įvykio kortelė
@@ -44,8 +44,8 @@ DoneActions=Įvykdyti įvykiai
DoneActionsFor=Įvykdyti įvykiai %s
ToDoActions=Neįvykdyti įvykiai
ToDoActionsFor=Neįvykdyti įvykiai %s
-SendPropalRef=Siųsti komercinį pasiūlymą %s
-SendOrderRef=Siųsti užsakymą %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Netaikoma
StatusActionToDo=Atlikti
StatusActionDone=Pilnas
@@ -62,7 +62,7 @@ LastProspectContactDone=Susisiekmas įvyko
DateActionPlanned=Įvykio suplanuota data
DateActionDone=Įvykusio įvykio data
ActionAskedBy=Įvykį pranešė
-ActionAffectedTo=Įvykis priskiriamas
+ActionAffectedTo=Event assigned to
ActionDoneBy=Įvykį įvykdė
ActionUserAsk=Pranešė
ErrorStatusCantBeZeroIfStarted=Jei laukas 'Date done' yra užpildytas, veiksmas pradėtas (arba užbaigtas), todėl laukas 'Status' negali būti 0%%.
diff --git a/htdocs/langs/lt_LT/contracts.lang b/htdocs/langs/lt_LT/contracts.lang
index 669a370db74..cf070570ff6 100644
--- a/htdocs/langs/lt_LT/contracts.lang
+++ b/htdocs/langs/lt_LT/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Pasibaigęs
ServiceStatusClosed=Uždarytas
ServicesLegend=Paslaugų legenda
Contracts=Sutartys
+ContractsAndLine=Contracts and line of contracts
Contract=Sutartis
NoContracts=Nėra sutarčių
MenuServices=Paslaugos
diff --git a/htdocs/langs/lt_LT/cron.lang b/htdocs/langs/lt_LT/cron.lang
index 77417db0902..55aee3fddce 100644
--- a/htdocs/langs/lt_LT/cron.lang
+++ b/htdocs/langs/lt_LT/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Apvalkalo komanda
CronMenu=Cron
CronCannotLoadClass=Nepavyko įkelti klasės %s arba objekto %s
UseMenuModuleToolsToAddCronJobs=Eikite į meniu "Pagrindinis - Modulių įrankiai - Darbo sąrašas" norėdami peržiūrėti ir redaguoti numatytus darbus.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 515ddde0c6e..4f45a89c521 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Šaltinis ir tikslinės banko sąskaitos turi bū
ErrorBadThirdPartyName=Bloga trečiosios šalies pavadinimo reikšmė
ErrorProdIdIsMandatory=%s yra privalomas
ErrorBadCustomerCodeSyntax=Bloga kliento kodo sintaksė
-ErrorBadBarCodeSyntax=Bloga brūkšninio kodo sintaksė
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Kliento kodas reikalingas
ErrorBarCodeRequired=Reikalingas brūkšninis kodas
ErrorCustomerCodeAlreadyUsed=Kliento kodas jau naudojamas
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=JavaScript turi būti neišjungtas, kad ši funkcij
ErrorPasswordsMustMatch=Abu įvesti slaptažodžiai turi sutapti tarpusavyje
ErrorContactEMail=Įvyko techninė klaida. Kreipkitės į administratorių e-paštu %s ir pateikite klaidos kodą %s savo laiške, arba dar geriau, pridėkite šio puslapio ekrano kopiją.
ErrorWrongValueForField=Neteisinga laukelio numerio reikšmė %s (reikšmė '%s' neatitinka reguliarios išraiškos (regex) taisyklės %s)
-ErrorFieldValueNotIn=Neteisinga reikšmė laukelio numeriui %s (reikšmė '%s' nėra reikšmė galima laukeliui %s lentelėje %s
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Neteisinga reikšmė laukelio numeriui %s (reikšmė '%s' yra ne %s egzistuojanti nuoroda)
ErrorsOnXLines=Klaidos %s šaltinio įraše (-uose)
ErrorFileIsInfectedWithAVirus=Antivirusinė programa negali patvirtinti failo (failas gali būti užkrėstas virusu)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Privalomi nustatymų parametrai dar nėra apibrėžti
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index 8eb2ffae566..c674023e512 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Paskutinis žingsnis: Nustatykite čia prisijungim
ActivateModule=Įjungti modulį %s
ShowEditTechnicalParameters=Spauskite čia, kad galėtumete matyti/redaguoti išplėstinius parametrus (eksperto režime)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/lt_LT/main.lang b/htdocs/langs/lt_LT/main.lang
index e40b7b58905..1ff97860263 100644
--- a/htdocs/langs/lt_LT/main.lang
+++ b/htdocs/langs/lt_LT/main.lang
@@ -141,6 +141,7 @@ Cancel=Atšaukti
Modify=Pakeisti
Edit=Redaguoti
Validate=Patvirtinti
+ValidateAndApprove=Validate and Approve
ToValidate=Patvirtinti
Save=Išsaugoti
SaveAs=Įšsaugoti kaip
@@ -158,6 +159,7 @@ Search=Ieškoti
SearchOf=Ieškoti
Valid=Galiojantis
Approve=Patvirtinti
+Disapprove=Disapprove
ReOpen=Atidaryti iš naujo
Upload=Siųsti failą
ToLink=Nuoroda
@@ -219,6 +221,7 @@ Cards=Kortelės
Card=Kortelė
Now=Dabar
Date=Data
+DateAndHour=Date and hour
DateStart=Pradžios data
DateEnd=Pabaigos data
DateCreation=Sukūrimo data
@@ -295,6 +298,7 @@ UnitPriceHT=Vieneto kaina (grynoji)
UnitPriceTTC=Vieneto kaina
PriceU=U.P.
PriceUHT=U.P. (grynasis)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Suma
AmountInvoice=Sąskaitos-faktūros suma
@@ -521,6 +525,7 @@ DateFromTo=Nuo %s į %s
DateFrom=Nuo %s
DateUntil=Iki %s
Check=Patikrinti
+Uncheck=Uncheck
Internal=Vidinis
External=Išorinis
Internals=Vidinis
@@ -688,6 +693,7 @@ PublicUrl=Viešas URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Pirmadienis
Tuesday=Antradienis
diff --git a/htdocs/langs/lt_LT/orders.lang b/htdocs/langs/lt_LT/orders.lang
index ddaf28f61ab..9ddb927bb6f 100644
--- a/htdocs/langs/lt_LT/orders.lang
+++ b/htdocs/langs/lt_LT/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Atšauktas
StatusOrderDraft=Projektas (turi būti patvirtintas)
StatusOrderValidated=Patvirtintas
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Apdorotas
StatusOrderToBill=Pristatyta
StatusOrderToBill2=Pateikti sąskaitą-faktūrą
@@ -58,6 +59,7 @@ MenuOrdersToBill=Pristatyti užsakymai
MenuOrdersToBill2=Billable orders
SearchOrder=Ieškoti užsakymo
SearchACustomerOrder=Ieškoti kliento užsakymo
+SearchASupplierOrder=Search a supplier order
ShipProduct=Gabenti produktą
Discount=Nuolaida
CreateOrder=Sukurti Užsakymą
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index 36fb7dd69b7..1a21722f710 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maksimalus dydis
AttachANewFile=Pridėti naują failą/dokumentą
LinkedObject=Susietas objektas
Miscellaneous=Įvairus
-NbOfActiveNotifications=Pranešimų skaičius
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Tai yra pašto bandymas.\nDvi eilutės yra atskirtos eilutės perkėlimo ženklu.\n\n __SIGNATURE__
PredefinedMailTestHtml=Tai yra pašto bandymas (žodis bandymas turi būti paryškintas)
Dvi eilutės yra atskirtos eilutės perkėlimo ženklu.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nNorime jus perspėti, kad sąskaita-faktūra __ FACREF__ atrodo yra neapmokėta. Todėl tai yra pakartotinis priminimas apmokėti sąskaitą-faktūrą ir pakartotinai prikabinta sąskaita-faktūra.\n\n__PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nČia rasite komercinį pasiūlymą __ PROPREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nČia rasite užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nČia rasite mūsų užsakymą __ ORDERREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nČia rasite sąskaitą-faktūrą __ FACREF__\n\n__ PERSONALIZED__Sincerely\n\n__ SIGNATURE__
diff --git a/htdocs/langs/lt_LT/productbatch.lang b/htdocs/langs/lt_LT/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/lt_LT/productbatch.lang
+++ b/htdocs/langs/lt_LT/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index 1b39c2adf11..119a17d71e2 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index 9ee14f63ec0..ad5077bc7b4 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Visi
PrivateProject=Kontaktai projekte
MyProjectsDesc=Šis vaizdas yra ribotas projektams, kuriems esate kontaktinis asmuo (koks bebūtų tipas).
ProjectsPublicDesc=Šis vaizdas rodo visus projektus, kuriuos yra Jums leidžiama skaityti.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Šis vaizdas rodo visus projektus (Jūsų vartotojo teisės leidžia matyti viską).
MyTasksDesc=Šis vaizdas yra ribotas projektams ar užduotims, kuriems Jūs esate kontaktinis asmuo (koks bebūtų tipas).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Šis vaizdas rodo visus projektus ir užduotis, kuriuos Jums leidžiama skaityti.
TasksDesc=Šis vaizdas rodo visus projektus ir užduotis (Jūsų vartotojo teisės leidžia matyti viską).
ProjectsArea=Projektų sritis
@@ -29,6 +31,8 @@ NoProject=Nėra apibrėžto ar turimo projekto
NbOpenTasks=Atidarytų užduočių skaičius
NbOfProjects=Projektų skaičius
TimeSpent=Praleistas laikas
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Praleistas laikas
RefTask=Užduoties nuoroda
LabelTask=Etiketės užduotis
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Tiekėjo užsakymų, susijusių su projektu,
ListSupplierInvoicesAssociatedProject=Tiekėjo sąskaitų-faktūrų, susijusių su projektu, sąrašas
ListContractAssociatedProject=Sudarytų sutarčių, susijusių su projektu, sąrašas
ListFichinterAssociatedProject=Intervencijų, susijusių su projektu, sąrašas
-ListTripAssociatedProject=Kelionių ir išlaidų, susijusių su projektų, sąrašas
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Įvykių, susijusių su projektu, sąrašas
ActivityOnProjectThisWeek=Projekto aktyvumas šią savaitę
ActivityOnProjectThisMonth=Projekto aktyvumas šį mėnesį
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/lt_LT/salaries.lang b/htdocs/langs/lt_LT/salaries.lang
index edca71a1829..a36e72679b2 100644
--- a/htdocs/langs/lt_LT/salaries.lang
+++ b/htdocs/langs/lt_LT/salaries.lang
@@ -1,8 +1,13 @@
# Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
+Salary=Atlyginimas
+Salaries=Atlyginimai
+Employee=Darbuotojas
+NewSalaryPayment=Naujas atlyginimo mokėjimas
+SalaryPayment=Atlyginimo mokėjimas
+SalariesPayments=Atlyginimų mokėjimai
+ShowSalaryPayment=Rodyti atlyginimo mokėjimą
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/lt_LT/sendings.lang b/htdocs/langs/lt_LT/sendings.lang
index 9c22f2b507a..15cf1916fcf 100644
--- a/htdocs/langs/lt_LT/sendings.lang
+++ b/htdocs/langs/lt_LT/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Užsakytas kiekis
QtyShipped=Išsiųstas kiekis
QtyToShip=Kiekis išsiuntimui
QtyReceived=Gautas kiekis
-KeepToShip=Laikyti siuntimui
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Kiti vežimai, skirti šiam užsakymui
DateSending=Užsakymo išsiuntimo data
DateSendingShort=Užsakymo išsiuntimo data
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 60c6bbe71e7..4f773f2b5b5 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Vidutinė svertinė kaina
PMPValueShort=WAP
EnhancedValueOfWarehouses=Sandėlių vertė
UserWarehouseAutoCreate=Kuriant vartotoją, sandėlį sukurti automatiškai
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Kiekis išsiųstas
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Sandėlis %s bus naudojamos atsargų sumažėji
WarehouseForStockIncrease=Sandėlis %s bus naudojamos atsargų padidėjimui
ForThisWarehouse=Šiam sandėliui
ReplenishmentStatusDesc=Tai sąrašas visų produktų, kurių atsargos mažesnės už pageidaujamą kiekį (arba mažesnės nei įspėjama kritinė riba, jei langelis "Tik įspėjimai" yra pažymėtas), ir siūlymas sukurti tiekėjo užsakymus skirtumo užpildymui.
-ReplenishmentOrdersDesc=Tai sąrašas visų atidarytų tiekėjo užsakymų
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Papildymai
NbOfProductBeforePeriod=Produkto %s kiekis atsargose iki pasirinkto periodo (< %s)
NbOfProductAfterPeriod=Produkto %s kiekis sandėlyje po pasirinkto periodo (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/lt_LT/suppliers.lang b/htdocs/langs/lt_LT/suppliers.lang
index f53d7984e4a..63a3de6a9e5 100644
--- a/htdocs/langs/lt_LT/suppliers.lang
+++ b/htdocs/langs/lt_LT/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Tiekėjai
-Supplier=Tiekėjas
AddSupplier=Create a supplier
SupplierRemoved=Tiekėjas pašalintas
SuppliersInvoice=Tiekėjo sąskaita-faktūra
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Tiekėjo sąskaitos-faktūros ir mokėjimai
ExportDataset_fournisseur_3=Tiekėjo užsakymai ir užsakymo eilutės
ApproveThisOrder=Patvirtinti šį užsakymą
ConfirmApproveThisOrder=Ar tikrai norite patvirtinti užsakymą %s ?
-DenyingThisOrder=Neigiantis šį užsakymą
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Ar tikrai norite atsisakyti šio užsakymo s?
ConfirmCancelThisOrder=Ar tikrai norite atšaukti šį užsakymą %s ?
AddCustomerOrder=Sukurti kliento užsakymą
diff --git a/htdocs/langs/lt_LT/trips.lang b/htdocs/langs/lt_LT/trips.lang
index 42c60e6a183..640346bb6f6 100644
--- a/htdocs/langs/lt_LT/trips.lang
+++ b/htdocs/langs/lt_LT/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Išjungimas
-Trips=Išjungimai
-TripsAndExpenses=Išjungimai ir išlaidos
-TripsAndExpensesStatistics=Išjungimų ir išlaidų statistika
-TripCard=Išjungimo kortelė
-AddTrip=Pridėti išjungimą
-ListOfTrips=Išjungimų sąrašas
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Įmokų sąrašas
-NewTrip=Naujas išjungimas
+NewTrip=New expense report
CompanyVisited=aplankyta įmonė/organizacija
Kilometers=Kilometrų
FeesKilometersOrAmout=Kilometrų kiekis
-DeleteTrip=Ištrinti išjungimą
-ConfirmDeleteTrip=Ar tikrai norite ištrinti šį išjungimą ?
-TF_OTHER=Kitas
-TF_LUNCH=Pietūs
-TF_TRIP=Išjungimas
-ListTripsAndExpenses=Išjungimų ir išlaidų sąrašas
-ExpensesArea=Išjungimų ir išlaidų sritis
-SearchATripAndExpense=Ieškoti išjungimo ir išlaidų
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Kitas
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Pietūs
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index 801ddcc484a..3f5828327f7 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -13,7 +13,7 @@ ConfigAccountingExpert=Configuration of the module accounting expert
Journaux=Žurnāli
JournalFinancial=Financial journals
Exports=Eksports
-Export=Export
+Export=Eksportēt
Modelcsv=Eksporta modulis
OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
Selectmodelcsv=Select a model of export
@@ -68,7 +68,7 @@ Lineofinvoice=Line of invoice
VentilatedinAccount=Ventilated successfully in the accounting account
NotVentilatedinAccount=Not ventilated in the accounting account
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Kolonu atdalītājs eksportējamā failā
ACCOUNTING_LIMIT_LIST_VENTILATION=Number of elements to be breakdown shown by page (maximum recommended : 50)
ACCOUNTING_LIST_SORT_VENTILATION_TODO=Begin the sorting of the breakdown pages "Has to breakdown" by the most recent elements
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index 44dd8ffd72a..b1e121979c8 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperimentāls
VersionDevelopment=Attīstība
VersionUnknown=Nezināms
VersionRecommanded=Ieteicams
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sesijas ID
SessionSaveHandler=Handler, lai saglabātu sesijas
SessionSavePath=Atmiņas sesija lokalizācija
@@ -294,7 +299,7 @@ DoNotUseInProduction=Neizmantot produkcijā
ThisIsProcessToFollow=Tas ir setup, lai process:
StepNb=Solis %s
FindPackageFromWebSite=Atrast paketi, kas nodrošina iespēju, jūs vēlaties (piemēram, par oficiālo tīmekļa vietnes %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Lejupielādēt paku %s
UnpackPackageInDolibarrRoot=Izkravāt paketi failu Dolibarr saknes direktorijā %s
SetupIsReadyForUse=Instalēšana ir pabeigta, un Dolibarr ir gatavs lietošanai ar šo jauno komponentu.
NotExistsDirect=Alternatīva saknes direktorijs nav definēta.
@@ -388,7 +393,7 @@ ExtrafieldParamHelpselect=Parameters list have to be like key,value
for
ExtrafieldParamHelpcheckbox=Parameters list have to be like key,value
for example :
1,value1
2,value2
3,value3
...
ExtrafieldParamHelpradio=Parameters list have to be like key,value
for example :
1,value1
2,value2
3,value3
...
ExtrafieldParamHelpsellist=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
LibraryToBuildPDF=Bibliotēka, lai izveidotu PDF
WarningUsingFPDF=Uzmanību: Jūsu conf.php satur direktīvu dolibarr_pdf_force_fpdf = 1. Tas nozīmē, ka jūs izmantojat FPDF bibliotēku, lai radītu PDF failus. Šī bibliotēka ir vecs un neatbalsta daudz funkcijām (Unicode, attēlu pārredzamība, kirilicas, arābu un Āzijas valodās, ...), tāpēc var rasties kļūdas laikā PDF paaudzes.
Lai atrisinātu šo problēmu, un ir pilnībā atbalsta PDF paaudzes, lūdzu, lejupielādējiet TCPDF bibliotēka , tad komentēt vai noņemt līnijas $ dolibarr_pdf_force_fpdf = 1, un pievienojiet vietā $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'
LocalTaxDesc=Dažas valstis piemēro 2 vai 3 nodokļus par katru PVN rēķinu rindā. Ja tas ir gadījums, izvēlieties veidu otrajā un trešajā nodokli un tā likmi. Iespējamais veids ir:
1: vietējais nodoklis attiecas uz produktiem un pakalpojumiem, bez PVN (PVN netiek piemērots vietējiem nodokļiem)
2: vietējais nodoklis attiecas uz produktiem un pakalpojumiem, bez PVN (PVN aprēķina summas + localtax)
3: vietējais nodoklis attiecas uz produktiem, bez PVN (PVN netiek piemērots vietējiem nodokļiem)
4: vietējais nodoklis attiecas uz produktiem, bez PVN (PVN aprēķina summas + localtax)
5: vietējais nodoklis attiecas uz pakalpojumiem, bez PVN (PVN netiek piemērots vietējiem nodokļiem)
6: vietējais nodoklis attiecas uz pakalpojumiem, bez PVN (PVN aprēķina summas + localtax)
@@ -493,10 +498,16 @@ Module600Name=Paziņojumi
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Ziedojumi
Module700Desc=Ziedojumu pārvaldība
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Dievlūdzējs
Module1200Desc=Mantis integrācija
Module1400Name=Grāmatvedība
Module1400Desc=Grāmatvedības vadība (dubultā partijas)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Sadaļas
Module1780Desc=Kategoriju vadība (produktiem, piegādātājiem un klientiem)
Module2000Name=WYSIWYG redaktors
@@ -631,7 +642,7 @@ Permission181=Lasīt piegādātāju pasūtījumus
Permission182=Izveidot/mainīt piegādātāju pasūtījumus
Permission183=Apstiprināt piegādātāju pasūtījumus
Permission184=Apstiprināt piegādātāja pasūtījumus
-Permission185=Pasūtīt piegādātājs pasūtījumi
+Permission185=Order or cancel supplier orders
Permission186=Saņemt piegādātāju pasūtījumus
Permission187=Aizvērt piegādātāja pasūtījumus
Permission188=Atcelt piegādātāja pasūtījumus
@@ -711,6 +722,13 @@ Permission538=Eksportēt pakalpojumus
Permission701=Lasīt ziedojumus
Permission702=Izveidot/mainīt ziedojumus
Permission703=Dzēst ziedojumus
+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
Permission1001=Lasīt krājumus
Permission1002=Assign service/subscription to contract
Permission1003=Dzēst noliktavas
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Parole, lai izmantotu starpniekserveri
DefineHereComplementaryAttributes=Definēt šeit visi atribūti, jau nav pieejama pēc noklusējuma, un, ka jūs vēlaties būt atbalstīta %s.
ExtraFields=Papildbarība atribūti
ExtraFieldsLines=Papildinošas atribūti (līnijas)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Papildinošas atribūti (thirdparty)
ExtraFieldsContacts=Papildinošas atribūti (kontaktpersona / adrese)
ExtraFieldsMember=Papildinošas atribūti (biedrs)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Produkta / pakalpojuma ar nulles summu līnija tiek uz
FreeLegalTextOnProposal=Brīvais teksts komerciālajos priekšlikumos
WatermarkOnDraftProposal=Ūdenszīme projektu komerciālo priekšlikumu (none ja tukšs)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Pasūtījumu vadības iestatīšana
OrdersNumberingModules=Pasūtījumu numerācijas modeļi
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Svītrkoda veids UPC
BarcodeDescISBN=Svītrkoda veids ISBN
BarcodeDescC39=Svītrkoda veids C39
BarcodeDescC128=Svītrkoda veids C128
-GenbarcodeLocation=Svītru kodu ģenerēšanas komandrindas rīks (ko izmanto iekšējo dzinēju dažiem svītrkodu veidiem)
+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
BarcodeInternalEngine=Iekšējais dzinējs
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1420,7 +1447,7 @@ AdvancedEditor=Uzlabotais redaktors
ActivateFCKeditor=Aktivizēt uzlabotos redaktoru:
FCKeditorForCompany=WYSIWYG izveidi / izdevums no elementiem apraksta un piezīmi (izņemot produktu / pakalpojumu)
FCKeditorForProduct=WYSIWYG radīšana / izdevums produktu / pakalpojumu apraksts un atzīmēt
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.\n
FCKeditorForMailing= WYSIWYG izveide/ izdevums masveida emailings (Tools-> e-pastu)
FCKeditorForUserSignature=WYSIWYG izveide/labošana lietotāja paraksta
FCKeditorForMail=WYSIWYG izveidi / izdevums visām vēstulēm (izņemot Outils-> e-pastu)
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Noklusējuma konts, lai izmantotu, lai saņemtu naudas maksājumus
CashDeskBankAccountForCheque= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar čeku
CashDeskBankAccountForCB= Noklusējuma konts, lai izmantotu, lai saņemtu maksājumus ar kredītkarti
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Grāmatzīme modulis iestatīšanu
@@ -1569,3 +1597,7 @@ SortOrder=Kārtošanas secība
Format=Formāts
TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids
IncludePath=Include path (defined into variable %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.
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index a301f51c95e..9cca7068840 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -59,7 +59,7 @@ InvoiceSentByEMail=Klienta rēķins %s nosūtīts pa e-pastu
SupplierOrderSentByEMail=Piegādātāja pasūtījums %s nosūtīts pa e-pastu
SupplierInvoiceSentByEMail=Piegādātāja rēķins %s nosūtīts pa e-pastu
ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
+ShippingValidated= Sūtījums %s apstiprināts
InterventionSentByEMail=Intervention %s sent by EMail
NewCompanyToDolibarr= Trešā puses izveidota
DateActionPlannedStart= Plānotais sākuma datums
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index 501b8adc1e0..3c7dfa65ec1 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Konts
FinancialAccounts=Konti
BankAccount=Bankas konts
BankAccounts=Banku konti
-ShowAccount=Show Account
+ShowAccount=Rādīt kontu
AccountRef=Finanšu konta ref
AccountLabel=Finanšu konts nosaukums
CashAccount=Skaidras naudas konts
@@ -33,7 +33,11 @@ AllTime=No sākuma
Reconciliation=Samierināšanās
RIB=Bankas konta numurs
IBAN=IBAN numurs
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT numurs
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Regulārie maksājumi
StandingOrder=Regulārais maksājums
Withdrawals=Izņemts
@@ -148,7 +152,7 @@ BackToAccount=Atpakaļ uz kontu
ShowAllAccounts=Parādīt visiem kontiem
FutureTransaction=Darījumi ar Futur. Nav veids, kā samierināt.
SelectChequeTransactionAndGenerate=Izvēlieties / filtru pārbaudes, lai iekļautu uz pārbaudes depozīta saņemšanas un noklikšķiniet uz "Izveidot".
-InputReceiptNumber=Izvēlieties konta izrakstu, kas saistīti ar izlīgumu. Izmantojiet sortable skaitlisku vērtību (piemēram, GGGGMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Galu galā, norādiet kategoriju, kurā klasificēt ierakstus
ToConciliate=Samierināt?
ThenCheckLinesAndConciliate=Tad pārbaudiet līnijas, kas atrodas bankas izrakstā, un noklikšķiniet
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 3813f4f5db7..4216d9f6a05 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -1,16 +1,16 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Pavadzīme
Bills=Pavadzīmes
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Klientu rēķini
+BillsCustomer=Klientu rēķins
+BillsSuppliers=Piegādātāju rēķini
+BillsCustomersUnpaid=Neapmaksātie klientu rēķini
BillsCustomersUnpaidForCompany=Neapmaksātie klientu rēķini %s
BillsSuppliersUnpaid=Neapmaksātie piegādātāja -u rēķini
BillsSuppliersUnpaidForCompany=Neapmaksātie piegādātāja -u rēķini %s
BillsLate=Kavētie maksājumi
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Klientu rēķinu statistika
+BillsStatisticsSuppliers=Piegādātāju rēķinu statistika
DisabledBecauseNotErasable=Bloķēts, jo nedrīkst dzēst
InvoiceStandard=Standarta rēķins
InvoiceStandardAsk=Standarta rēķins
@@ -420,8 +420,8 @@ InvoiceSituationDesc=Create a new situation following an already existing one
SituationAmount=Situation invoice amount(net)
SituationDeduction=Situation subtraction
Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
+ModifyAllLines=Labot visas līnijas
+CreateNextSituationInvoice=Izveidot nākošo situāciju
NotLastInCycle=This invoice in not the last in cycle and must not be modified.
DisabledBecauseNotLastInCycle=The next situation already exists.
DisabledBecauseFinal=This situation is final.
diff --git a/htdocs/langs/lv_LV/commercial.lang b/htdocs/langs/lv_LV/commercial.lang
index 9d5f0f83f94..cd11fb1be26 100644
--- a/htdocs/langs/lv_LV/commercial.lang
+++ b/htdocs/langs/lv_LV/commercial.lang
@@ -9,12 +9,12 @@ Prospect=Perspektīva
Prospects=Perspektīvas
DeleteAction=Dzēst notikumu/uzdevumu
NewAction=Jauns notikums/uzdevums
-AddAction=Pievienot notikumu/uzdevumu
-AddAnAction=Pievienot notikumu/uzdevumu
-AddActionRendezVous=Pievienot Rendez-vous notikumu
+AddAction=Izveidot notikumu/uzdevumu
+AddAnAction=Izveidot notikumu/uzdevumu
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Satikšanās
ConfirmDeleteAction=Vai tiešām vēlaties dzēst šo notikumu / uzdevumu?
-CardAction=Notikumu karte
+CardAction=Notikumu kartiņa
PercentDone=Procentuāli pabeigts
ActionOnCompany=Uzdevums par uzņēmumu
ActionOnContact=Uzdevums par kontaktu
@@ -33,7 +33,7 @@ ErrorWrongCode=Nepareizs kods
NoSalesRepresentativeAffected=Nav īpaši tirdzniecības piešķirts pārstāvis
ShowCustomer=Rādīt klientu
ShowProspect=Rādīt izredzes
-ListOfProspects=Saraksts perspektīvas
+ListOfProspects=Perspektīvu saraksts
ListOfCustomers=Klientu saraksts
LastDoneTasks=Pēdējie %s pabeigtie uzdevumi
LastRecordedTasks=Pēdējās ierakstītie uzdevumi
@@ -44,8 +44,8 @@ DoneActions=Īstenotie pasākumi
DoneActionsFor=Pabeigtie notikumi %s
ToDoActions=Nepabeigtie notikumi
ToDoActionsFor=Nepilnīgi notikumi %s
-SendPropalRef=Sūtīt komerciālu priekšlikumu, %s
-SendOrderRef=Nosūtīt pasūtījumu %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Nav piemērojams
StatusActionToDo=Jāizdara
StatusActionDone=Pabeigts
@@ -60,9 +60,9 @@ LastProspectToContact=Jāsazinās
LastProspectContactInProcess=Sazināšanās procesā
LastProspectContactDone=Sazinājāmies
DateActionPlanned=Datums, kad pasākums plānots
-DateActionDone=Datums notikums darīts
+DateActionDone=Datums, kad notikums pabeigts
ActionAskedBy=Par notikumu ziņoja
-ActionAffectedTo=Notikums piešķirts
+ActionAffectedTo=Event assigned to
ActionDoneBy=Notikumu veic
ActionUserAsk=Ziņoja
ErrorStatusCantBeZeroIfStarted=Ja lauks "Datums darīts" tiek aizpildīta, darbība tiek uzsākts (vai pabeigts), lai lauka "Statuss" nevar būt 0%%.
diff --git a/htdocs/langs/lv_LV/contracts.lang b/htdocs/langs/lv_LV/contracts.lang
index 811966b56c3..f72655e0e14 100644
--- a/htdocs/langs/lv_LV/contracts.lang
+++ b/htdocs/langs/lv_LV/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Beidzies
ServiceStatusClosed=Slēgts
ServicesLegend=Pakalpojumu apraksts
Contracts=Līgumi
+ContractsAndLine=Contracts and line of contracts
Contract=Līgums
NoContracts=Nav līgumi
MenuServices=Pakalpojumi
diff --git a/htdocs/langs/lv_LV/cron.lang b/htdocs/langs/lv_LV/cron.lang
index bc571e1860a..d75495175ef 100644
--- a/htdocs/langs/lv_LV/cron.lang
+++ b/htdocs/langs/lv_LV/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell komandu
CronMenu=Cron
CronCannotLoadClass=Nevar ielādēt klases %s vai objektu %s
UseMenuModuleToolsToAddCronJobs=Iet uz izvēlni "Home - moduļi instrumenti - Darbs sarakstu", lai redzētu un rediģēt plānoto darbu.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index b34b89c418a..c3f12157435 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Avots un mērķiem banku kontiem jābūt atšķir
ErrorBadThirdPartyName=Nepareiza vērtība trešo personu nosaukumā
ErrorProdIdIsMandatory=%s ir obligāti
ErrorBadCustomerCodeSyntax=Nepareiza klienta koda sintakse
-ErrorBadBarCodeSyntax=Nepareiza sintakse svītrukodam
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Klienta kods nepieciešams
ErrorBarCodeRequired=Svītrkods nepieciešams
ErrorCustomerCodeAlreadyUsed=Klienta kods jau tiek izmantots
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript nedrīkst tikt izslēgti, ka šī funkci
ErrorPasswordsMustMatch=Abām ievadītām parolēm jāsakrīt
ErrorContactEMail=Tehniska kļūda. Lūdzu, sazinieties ar administratoru pa sekojošu e-pastu %s, lai iesniegtu kļūdas kodu %s jūsu ziņojumā, vai labāk, pievienojot šīs lapas ekrāna.
ErrorWrongValueForField=Nepareiza vērtība lauka numuru %s (vērtība '%s' nesakrīt regex noteikums %s)
-ErrorFieldValueNotIn=Nepareiza vērtība lauka numura %s (vērtība "%s" nav vērtība, pieejams uz lauka %s galda %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Nepareiza vērtība lauka numuru %s (vērtība "%s" nav %s esošo ref)
ErrorsOnXLines=Kļūdas %s avota ierakstu (-s)
ErrorFileIsInfectedWithAVirus=Antivīrusu programma nevarēja apstiprināt failu (fails varētu būt inficēti ar vīrusu)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Iekšēja kļūda '%s'
ErrorPriceExpressionUnknown=Nezināma kļūda '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Obligātie uzstādīšanas parametri vēl nav definētas
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index e2881caf007..3936294e463 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -155,7 +155,8 @@ MigrationFinished=Migrācija pabeigta
LastStepDesc=Pēdējais solis: Noteikt šeit pieteikumvārdu un paroli, jūs plānojat izmantot, lai izveidotu savienojumu ar programmatūru. Nepalaidiet garām šo, jo tas ir konts, lai administrētu visus pārējos.
ActivateModule=Aktivizēt moduli %s
ShowEditTechnicalParameters=Noklikšķiniet šeit, lai parādītu / rediģēt papildu parametrus (ekspertu režīmā)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index 4dfbe5b3e41..edc3343f1be 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/main.lang
@@ -141,6 +141,7 @@ Cancel=Atcelt
Modify=Modificēt
Edit=Rediģēt
Validate=Pārbaudīt
+ValidateAndApprove=Validate and Approve
ToValidate=Jāpārbauda
Save=Saglabāt
SaveAs=Saglabāt kā
@@ -158,6 +159,7 @@ Search=Meklēšana
SearchOf=Meklēšana
Valid=Derīgs
Approve=Apstiprināt
+Disapprove=Disapprove
ReOpen=Atvērt par jaunu
Upload=Augšupielādēt failu
ToLink=Saite
@@ -219,6 +221,7 @@ Cards=Kartes
Card=Karte
Now=Tagad
Date=Datums
+DateAndHour=Date and hour
DateStart=Sākuma datums
DateEnd=Beigu datums
DateCreation=Izveidošanas datums
@@ -295,6 +298,7 @@ UnitPriceHT=Vienības cena (neto)
UnitPriceTTC=Vienības cena
PriceU=UP
PriceUHT=UP (neto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Summa
AmountInvoice=Rēķina summa
@@ -521,6 +525,7 @@ DateFromTo=No %s līdz %s
DateFrom=No %s
DateUntil=Līdz %s
Check=Pārbaudīt
+Uncheck=Uncheck
Internal=Iekšējs
External=Ārējs
Internals=Iekšējs
@@ -688,6 +693,7 @@ PublicUrl=Publiskā saite
AddBox=Pievienot info logu
SelectElementAndClickRefresh=Izvēlieties elementu un nospiediet atjaunot
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Pirmdiena
Tuesday=Otrdiena
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 32f63671aa0..abed9fe2985 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -16,7 +16,7 @@ SupplierOrder=Piegādātājs rīkojums
SuppliersOrders=Piegādātāji pasūtījumi
SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi
CustomerOrder=Klienta rīkojums
-CustomersOrders=Customers orders
+CustomersOrders=Klientu pasūtījumi
CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi
CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas
OrdersToValid=Customers orders to validate
@@ -29,7 +29,7 @@ StatusOrderDraftShort=Projekts
StatusOrderValidatedShort=Apstiprināts
StatusOrderSentShort=Procesā
StatusOrderSent=Sūtījuma procesā
-StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcessShort=Pasūtīts
StatusOrderProcessedShort=Apstrādāti
StatusOrderToBillShort=Pasludināts
StatusOrderToBill2Short=Lai likumprojektu
@@ -42,6 +42,7 @@ StatusOrderCanceled=Atcelts
StatusOrderDraft=Projekts (ir jāapstiprina)
StatusOrderValidated=Apstiprināts
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Apstrādāts
StatusOrderToBill=Piegādāts
StatusOrderToBill2=Lai likumprojektu
@@ -58,6 +59,7 @@ MenuOrdersToBill=Pasūtījumi piegādāti
MenuOrdersToBill2=Billable orders
SearchOrder=Meklēšanas kārtība
SearchACustomerOrder=Meklēt klienta pasūtījumu
+SearchASupplierOrder=Search a supplier order
ShipProduct=Sūtīt produktu
Discount=Atlaide
CreateOrder=Izveidot pasūtījumu
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 875d92a9d5e..731b200e05d 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maksimālais izmērs
AttachANewFile=Pievienot jaunu failu / dokumentu
LinkedObject=Saistītais objekts
Miscellaneous=Dažādi
-NbOfActiveNotifications=Paziņojumu skaits
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Šis ir testa e-pasts \\ nthe divas līnijas ir atdalīti ar rakstatgriezi.. \n\n __ SIGNATURE__
PredefinedMailTestHtml=Tas ir tests pasts (vārds testam jābūt treknrakstā).
Abas līnijas ir atdalīti ar rakstatgriezi.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\n\nYou will find here the invoice __FACREF__\n\n\n__PERSONALIZED__Sincerely\n\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n\n__PERSONALIZED__Sincerely\n\n\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nJums tiek nosūtīts komerciālais piedāvājums __PROPREF__\n\n__PERSONALIZED__Ar cieņu\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/lv_LV/productbatch.lang b/htdocs/langs/lv_LV/productbatch.lang
index ebb97632566..97e10b129ff 100644
--- a/htdocs/langs/lv_LV/productbatch.lang
+++ b/htdocs/langs/lv_LV/productbatch.lang
@@ -2,15 +2,15 @@
ManageLotSerial=Use batch/serial number
ProductStatusOnBatch=Yes (Batch/serial required)
ProductStatusNotOnBatch=No (Batch/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
+ProductStatusOnBatchShort=Jā
+ProductStatusNotOnBatchShort=Nē
Batch=Batch/Serial
atleast1batchfield=Eat-by date or Sell-by date or Batch number
batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index af56d19cd34..0a00746d8e3 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Numurs
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 1a098a76360..bc4ff4c3057 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Visi
PrivateProject=Kontakti Projekta
MyProjectsDesc=Šis skats ir tikai uz projektiem, jums ir kontakts (kāds ir tipa).
ProjectsPublicDesc=Šo viedokli iepazīstina visus projektus jums ir atļauts lasīt.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Šo viedokli iepazīstina visus projektus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
MyTasksDesc=Šis skats ir tikai uz projektiem vai uzdevumus, jums ir kontakts (kāds ir tipa).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Šo viedokli iepazīstina visus projektus un uzdevumus, jums ir atļauts lasīt.
TasksDesc=Šo viedokli iepazīstina visus projektus un uzdevumus (jūsu lietotāja atļaujas piešķirt jums atļauju skatīt visu).
ProjectsArea=Projektu sadaļa
@@ -29,6 +31,8 @@ NoProject=Neviens projekts nosaka, vai īpašumā
NbOpenTasks=Nb atvērto uzdevumu
NbOfProjects=Nb projektu
TimeSpent=Laiks, kas pavadīts
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Laiks, kas patērēts
RefTask=Ref. uzdevums
LabelTask=Label uzdevums
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Saraksts piegādātāja pasūtījumu saistī
ListSupplierInvoicesAssociatedProject=Saraksts no piegādātāja rēķinus saistīts ar projekta
ListContractAssociatedProject=Līgumu sarakstu kas saistīti ar projektu
ListFichinterAssociatedProject=Saraksts iejaukšanās saistīts ar projektu
-ListTripAssociatedProject=Saraksts braucieniem un izdevumus, kas saistīti ar projektu
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Saraksts ar notikumiem, kas saistīti ar projektu
ActivityOnProjectThisWeek=Aktivitāte projektu šonedēļ
ActivityOnProjectThisMonth=Aktivitāte projektu šomēnes
@@ -133,3 +137,6 @@ SearchAProject=Meklēt projektu
ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
ProjectDraft=Melnraksta projekts
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/lv_LV/salaries.lang b/htdocs/langs/lv_LV/salaries.lang
index 18b4acbec94..a08e7eca9b2 100644
--- a/htdocs/langs/lv_LV/salaries.lang
+++ b/htdocs/langs/lv_LV/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Alga
Salaries=Algas
Employee=Darbinieks
@@ -6,3 +8,6 @@ NewSalaryPayment=Jauna algas izmaksa
SalaryPayment=Algas maksājums
SalariesPayments=Algu maksājumi
ShowSalaryPayment=Rādīt algu maksājumus
+THM=Vidējā stundas cena
+TJM=Vidējā dienas cena
+CurrentSalary=Current salary
diff --git a/htdocs/langs/lv_LV/sendings.lang b/htdocs/langs/lv_LV/sendings.lang
index c2533cccfc9..3816af9db35 100644
--- a/htdocs/langs/lv_LV/sendings.lang
+++ b/htdocs/langs/lv_LV/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Pasūtītais daudzums
QtyShipped=Daudzums kas nosūtīts
QtyToShip=Daudzums, kas jānosūta
QtyReceived=Saņemtais daudzums
-KeepToShip=Glabāt uz kuģa
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Citas sūtījumiem uz šo rīkojumu
DateSending=Datums nosūtot kārtība
DateSendingShort=Datums nosūtot kārtība
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 739152d7728..dc0003b69dd 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Vidējā svērtā cena
PMPValueShort=VSC
EnhancedValueOfWarehouses=Noliktavas vērtība
UserWarehouseAutoCreate=Izveidot noliktavu automātiski, veidojot lietotāju
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Nosūtītais daudzums
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Noliktava %s tiks izmantota krājumu samazinā
WarehouseForStockIncrease=Noliktava %s tiks izmantota krājumu palielināšanai
ForThisWarehouse=Šai noliktavai
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=Šis ir saraksts ar visiem atvērtajiem piegādātāju pasūtījumiem
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Papildinājumus
NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
NbOfProductAfterPeriod=Daudzums produktu %s krājumā pēc izvēlētā perioda (> %s)
@@ -127,6 +128,7 @@ StockMustBeEnoughForShipment= Stock level must be enough to add product/service
MovementLabel=Label of movement
InventoryCode=Movement or inventory code
IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
+ShowWarehouse=Rādīt noliktavu
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 2e943b50b46..5d278bd1f7a 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Piegādātāji
-Supplier=Piegādātājs
AddSupplier=Izveidot piegādātāju
SupplierRemoved=Piegādātājs izņem
SuppliersInvoice=Piegādātāji rēķins
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Piegādātāju rēķiniem un maksājumiem
ExportDataset_fournisseur_3=Piegādātājs pasūtījumus un pasūtījumu līnijas
ApproveThisOrder=Apstiprināt šo pasūtījumu
ConfirmApproveThisOrder=Vai jūs tiešām vēlaties apstiprināt pasūtījumu %s?
-DenyingThisOrder=Liedzot šo pasūtījumu
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Vai jūs tiešām vēlaties aizliegt šo pasūtījumu %s ?
ConfirmCancelThisOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu %s ?
AddCustomerOrder=Izveidot klienta pasūtījumu
@@ -42,5 +41,5 @@ NoneOrBatchFileNeverRan=Neviens vai partijas %s ne skrēja nesen
SentToSuppliers=Nosūtīti uz piegādātājiem
ListOfSupplierOrders=Saraksts ar piegādātāju pasūtījumiem
MenuOrdersSupplierToBill=Supplier orders to invoice
-NbDaysToDelivery=Delivery delay in days
+NbDaysToDelivery=Piegādes kavēšanās dienās
DescNbDaysToDelivery=The biggest delay is display among order product list
diff --git a/htdocs/langs/lv_LV/trips.lang b/htdocs/langs/lv_LV/trips.lang
index 6fa2983bfa0..27f569e1b83 100644
--- a/htdocs/langs/lv_LV/trips.lang
+++ b/htdocs/langs/lv_LV/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Brauciens
-Trips=Braucieni
-TripsAndExpenses=Trips un izdevumi
-TripsAndExpensesStatistics=Trips un izdevumi statistika
-TripCard=Ceļojuma kartiņa
-AddTrip=Pievienot ceļojumu
-ListOfTrips=Saraksts braucieniem
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Saraksts maksu
-NewTrip=Jauns brauciens
+NewTrip=New expense report
CompanyVisited=Kompānija / organizācija apmeklēta
Kilometers=Kilometri
FeesKilometersOrAmout=Summa vai kilometri
-DeleteTrip=Dzēst ceļojumu
-ConfirmDeleteTrip=Vai tiešām vēlaties dzēst šo braucienu?
-TF_OTHER=Cits
-TF_LUNCH=Pusdienas
-TF_TRIP=Brauciens
-ListTripsAndExpenses=Saraksts braucienu un izdevumu
-ExpensesArea=Trips un izdevumi zona
-SearchATripAndExpense=Meklēt ceļojumu un izdevumiem
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Cits
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Pusdienas
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 38634cbd497..9782c2ea27f 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
VersionRecommanded=Recommended
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/mk_MK/banks.lang b/htdocs/langs/mk_MK/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/mk_MK/banks.lang
+++ b/htdocs/langs/mk_MK/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/mk_MK/commercial.lang b/htdocs/langs/mk_MK/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/mk_MK/commercial.lang
+++ b/htdocs/langs/mk_MK/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/mk_MK/contracts.lang b/htdocs/langs/mk_MK/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/mk_MK/contracts.lang
+++ b/htdocs/langs/mk_MK/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/mk_MK/cron.lang b/htdocs/langs/mk_MK/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/mk_MK/cron.lang
+++ b/htdocs/langs/mk_MK/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/mk_MK/install.lang b/htdocs/langs/mk_MK/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/mk_MK/install.lang
+++ b/htdocs/langs/mk_MK/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/mk_MK/main.lang b/htdocs/langs/mk_MK/main.lang
index 62adb884547..81deb7c28f0 100644
--- a/htdocs/langs/mk_MK/main.lang
+++ b/htdocs/langs/mk_MK/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/mk_MK/orders.lang b/htdocs/langs/mk_MK/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/mk_MK/orders.lang
+++ b/htdocs/langs/mk_MK/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/mk_MK/productbatch.lang b/htdocs/langs/mk_MK/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/mk_MK/productbatch.lang
+++ b/htdocs/langs/mk_MK/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/mk_MK/salaries.lang b/htdocs/langs/mk_MK/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/mk_MK/salaries.lang
+++ b/htdocs/langs/mk_MK/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/mk_MK/sendings.lang b/htdocs/langs/mk_MK/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/mk_MK/sendings.lang
+++ b/htdocs/langs/mk_MK/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/mk_MK/stocks.lang b/htdocs/langs/mk_MK/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/mk_MK/stocks.lang
+++ b/htdocs/langs/mk_MK/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/mk_MK/suppliers.lang b/htdocs/langs/mk_MK/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/mk_MK/suppliers.lang
+++ b/htdocs/langs/mk_MK/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/mk_MK/trips.lang b/htdocs/langs/mk_MK/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/mk_MK/trips.lang
+++ b/htdocs/langs/mk_MK/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index 238fc3708dd..a094028679b 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperimentell
VersionDevelopment=Utviklingsversjon
VersionUnknown=Ukjent
VersionRecommanded=Anbefalt
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Økt ID
SessionSaveHandler=Handler for å lagre sessions
SessionSavePath=Lagring økt lokalisering
@@ -46,7 +51,7 @@ ErrorDecimalLargerThanAreForbidden=Feil: Presisjon over %s støttes ikke.
DictionarySetup=Dictionary setup
Dictionary=Dictionaries
Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Fiscalyear=Regnskapsår
ErrorReservedTypeSystemSystemAuto=Value 'system' og 'systemauto' for type er reservert. Du kan bruke 'user' som verdi å legge til din egen oppføring
ErrorCodeCantContainZero=Koden kan ikke inneholde verdien 0
DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -80,7 +85,7 @@ NextValue=Neste verdi
NextValueForInvoices=Neste verdi (fakturaer)
NextValueForCreditNotes=Neste verdi (kreditnotaer)
NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForReplacements=Neste verdi (erstatninger)
MustBeLowerThanPHPLimit=OBS: PHP begrenser hver filopplastning til %s %s, uansett hva som er angitt her
NoMaxSizeByPHPLimit=OBS: Det er ikke satt noen øvre grense i PHP på denne serveren
MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting)
@@ -493,10 +498,16 @@ Module600Name=Varselmeldinger
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donasjoner
Module700Desc=Behandling av donasjoner
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantisintegrasjon
Module1400Name=Regnskapsekspert
Module1400Desc=Behandling av regnskapssopplysninger for eksperter (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorier
Module1780Desc=Behandling av kategorier (varer, leverandører og kunder)
Module2000Name=Fckeditor
@@ -522,7 +533,7 @@ Module3100Name=Skype
Module3100Desc=Add a Skype button into card of adherents / third parties / contacts
Module5000Name=Multi-selskap
Module5000Desc=Lar deg administrere flere selskaper
-Module6000Name=Workflow
+Module6000Name=Arbeidsflyt
Module6000Desc=Workflow management
Module20000Name=Leave Requests management
Module20000Desc=Declare and follow employees leaves requests
@@ -631,7 +642,7 @@ Permission181=Vise leverandøreorde
Permission182=Lage/endre leverandørordre
Permission183=Godkjenne leverandørordre
Permission184=Bekrefte leverandørerordre
-Permission185=Bestille leverandørordre
+Permission185=Order or cancel supplier orders
Permission186=Motta leverandørordre
Permission187=Lukke leverandørordre
Permission188=Avbryte leverandørordre
@@ -711,6 +722,13 @@ Permission538=Eksporter tjenester
Permission701=Vise donasjoner
Permission702=Lage/endre donasjoner
Permission703=Slette donasjoner
+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
Permission1001=Vise beholdning
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Passord for å bruke proxy-server
DefineHereComplementaryAttributes=Definer her alle atributes, ikke allerede er tilgjengelig som standard, og at du ønsker å bli støttet for %s.
ExtraFields=Komplementære attributter
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Komplementære attributter (thirdparty)
ExtraFieldsContacts=Komplementære attributter (kontakt / adresse)
ExtraFieldsMember=Komplementære attributter (medlem)
@@ -1059,8 +1079,8 @@ SearchOptim=Search optimization
YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+XDebugInstalled=XDebug er lastet
+XCacheInstalled=XCache er lastet
AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
FieldEdition=Edition of field %s
FixTZ=TimeZone fix
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=En produkt/tjeneste med med null i kvantum blir betrak
FreeLegalTextOnProposal=Fritekst på tilbud
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Innstillinger for ordre
OrdersNumberingModules=Nummereringsmodul for ordre
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Kommandolinjeverktøy for generering av strekkode (brukes av phpbarcode til noen strekkodetyper)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Kassekonto som skal brukes til kontantsalg
CashDeskBankAccountForCheque= Konto som skal brukes til å motta utbetalinger via sjekk
CashDeskBankAccountForCB= Konto som skal brukes til å motta kontant betaling med kredittkort
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Legg modul oppsett
@@ -1540,7 +1568,7 @@ TestGeoIPResult=Test av en konvertering IP -> landet
ProjectsNumberingModules=Prosjekter nummerering modulen
ProjectsSetup=Prosjekt modul oppsett
ProjectsModelModule=Prosjektets rapport dokument modellen
-TasksNumberingModules=Tasks numbering module
+TasksNumberingModules=Modul for oppgavenummerering
TaskModelModule=Tasks reports document model
##### ECM (GED) #####
ECMSetup = GED Setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index 33d73a70db1..dfddfc2b3e6 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -58,9 +58,9 @@ OrderSentByEMail=Kundeordrer %s på e-post
InvoiceSentByEMail=Faktura %s på e-post
SupplierOrderSentByEMail=Leverandør bestill %s på e-post
SupplierInvoiceSentByEMail=Leverandørfaktura %s på e-post
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingSentByEMail=Forsendelse %s sendt på epost
+ShippingValidated= Forsendelse %s godkjent
+InterventionSentByEMail=Intervensjon %s sendt på epost
NewCompanyToDolibarr= Tredjepart opprettet
DateActionPlannedStart= Planlagt startdato
DateActionPlannedEnd= Planlagt sluttdato
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 6c09ee45ac6..754164a0f69 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Hovedbokskonto
FinancialAccounts=Hovebokskonti
BankAccount=Bankkonto
BankAccounts=Bankkonti
-ShowAccount=Show Account
+ShowAccount=Vis konto
AccountRef=Kontonummer hovedbokskonto
AccountLabel=Kontonavn hovedbokskonto
CashAccount=Kassekonto
@@ -33,7 +33,11 @@ AllTime=Fra start
Reconciliation=Bankavstemming
RIB=Bankkontonummer
IBAN=IBAN-nummer
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT-nummer
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Åpne ordre
StandingOrder=Åpne ordre
Withdrawals=Uttak
@@ -148,7 +152,7 @@ BackToAccount=Tilbake til kontoen
ShowAllAccounts=Vis for alle kontoer
FutureTransaction=Transaksjon i Futur. Ingen måte å forsone.
SelectChequeTransactionAndGenerate=Velg / filter sjekker for å inkludere inn sjekken innskudd kvitteringen og klikk på "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 69715443816..db2883bb788 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -1,16 +1,16 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Faktura
Bills=Fakturaer
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Kundens fakturaer
+BillsCustomer=Kundens faktura
+BillsSuppliers=Leverandørens fakturaer
+BillsCustomersUnpaid=Ubetalte kundefakturaer
BillsCustomersUnpaidForCompany=Ubetalte kundefakturaer for %s
BillsSuppliersUnpaid=Ubetalte leverandørfakturaer
BillsSuppliersUnpaidForCompany=Ubetalt leverandørens fakturaer for %s
BillsLate=Sene betalinger
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Kundens fakturastatistikk
+BillsStatisticsSuppliers=Leverandørens fakturastatistikk
DisabledBecauseNotErasable=Deaktivert fordi kan ikke slettes
InvoiceStandard=Standardfaktura
InvoiceStandardAsk=Standardfaktura
@@ -66,12 +66,12 @@ ConfirmConvertToReduc=Ønsker du å konvertere denne kreditnotaen til absolutt r
SupplierPayments=Leverandørbetalinger
ReceivedPayments=Mottatte betalinger
ReceivedCustomersPayments=Betalinger mottatt fra kunder
-PayedSuppliersPayments=Payments payed to suppliers
+PayedSuppliersPayments=Betalinger til leverandører
ReceivedCustomersPaymentsToValid=Mottatte kundebetalinger som trenger godkjenning
PaymentsReportsForYear=Betalingsrapport for %s
PaymentsReports=Betalingsrapporter
PaymentsAlreadyDone=Betalinger allerede utført
-PaymentsBackAlreadyDone=Payments back already done
+PaymentsBackAlreadyDone=Tilbakebetalinger allerede utført
PaymentRule=Betalingsregel
PaymentMode=Betalingsmåte
PaymentConditions=Betalingsbetingelser
@@ -87,7 +87,7 @@ ClassifyCanceled=Merk 'Tapsført'
ClassifyClosed=Merk 'Lukket'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Lag faktura
-AddBill=Create invoice or credit note
+AddBill=Legg til faktura eller kreditnota
AddToDraftInvoices=Add to draft invoice
DeleteBill=Slett faktura
SearchACustomerInvoice=Finn kundefaktura
@@ -99,7 +99,7 @@ DoPaymentBack=Utfør tilbakebetaling
ConvertToReduc=Konverter til framtidig rabatt
EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
EnterPaymentDueToCustomer=Lag purring til kunde
-DisabledBecauseRemainderToPayIsZero=Disabled because remaining unpaid is zero
+DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
Amount=Beløp
PriceBase=Prisgrunnlag
BillStatus=Fakturastatus
@@ -186,7 +186,7 @@ ShowInvoiceDeposit=Vis depositum faktura
ShowPayment=Vis betaling
File=Fil
AlreadyPaid=Allerede betalt
-AlreadyPaidBack=Already paid back
+AlreadyPaidBack=Allerede tilbakebetalt
AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
Abandoned=Tapsført
RemainderToPay=Remaining unpaid
@@ -202,7 +202,7 @@ StandingOrders=Utestående ordre
StandingOrder=Utestående ordre
NoDraftBills=Ingen fakturakladder
NoOtherDraftBills=Ingen andre fakturakladder
-NoDraftInvoices=No draft invoices
+NoDraftInvoices=Ingen fakturakladder
RefBill=Fakturareferanse
ToBill=Til fakturering
RemainderToBill=Resterende til fakturering
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index ec23fa05e30..91a6b66cb78 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -1,63 +1,67 @@
# Dolibarr language file - Source file is en_US - boxes
BoxLastRssInfos=Rss informasjon
BoxLastProducts=Siste produkter/tjenester
-# BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Varsel om produkter på lager
BoxLastProductsInContract=Siste kontraktsinngåtte produkter/tjenester
BoxLastSupplierBills=Siste leverandørfakturaer
BoxLastCustomerBills=Siste kundefakturaer
BoxOldestUnpaidCustomerBills=Eldste ubetalte kundefakturaer
BoxOldestUnpaidSupplierBills=Eldste ubetalte leverandørfakturaer
-BoxLastProposals=Siste tilbuder
-BoxLastProspects=Siste prospekter
-BoxLastCustomers=Siste kunder
-BoxLastSuppliers=Siste leverandører
+BoxLastProposals=Siste tilbud
+BoxLastProspects=Siste endrede prospekter
+BoxLastCustomers=Siste endrede kunder
+BoxLastSuppliers=Siste endrede leverandører
BoxLastCustomerOrders=Siste kundeordre
+BoxLastValidatedCustomerOrders=Siste godkjente kundeordrer
BoxLastBooks=Siste bøker
BoxLastActions=Siste handlinger
BoxLastContracts=Siste kontrakter
BoxLastContacts=Siste kontakter / adresser
BoxLastMembers=Siste medlemmer
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
+BoxFicheInter=Siste intervensjoner
+BoxCurrentAccounts=Åpnet kontobalanse
BoxSalesTurnover=Omsetning
-BoxTotalUnpaidCustomerBills=Totalt utestående kunder
-BoxTotalUnpaidSuppliersBills=Totalt utestående leverandører
+BoxTotalUnpaidCustomerBills=Totalt utestående kundefakturaer
+BoxTotalUnpaidSuppliersBills=Totalt utestående leverandørfakturaer
BoxTitleLastBooks=Siste %s registrerte bøker
BoxTitleNbOfCustomers=Antall kunder
BoxTitleLastRssInfos=Siste %s nyheter fra %s
BoxTitleLastProducts=Siste %s endrede produkter/tjenester
-# BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Siste %s endrede kundeordre
+BoxTitleProductsAlertStock=Varsel om produkter på lager
+BoxTitleLastCustomerOrders=Siste %s kundeordre
+BoxTitleLastModifiedCustomerOrders=Siste %s endrede kundeordrer
BoxTitleLastSuppliers=Siste %s registrerte leverandører
BoxTitleLastCustomers=Siste %s registrerte kunder
-BoxTitleLastModifiedSuppliers=Sist endret %s leverandører
-BoxTitleLastModifiedCustomers=Sist endret %s kunder
+BoxTitleLastModifiedSuppliers=Sist endrede %s leverandører
+BoxTitleLastModifiedCustomers=Sist endrede %s kunder
BoxTitleLastCustomersOrProspects=Siste %s registrerte kunder eller prospekter
BoxTitleLastPropals=Siste %s registrerte tilbud
+BoxTitleLastModifiedPropals=Siste %s endrede tilbud
BoxTitleLastCustomerBills=Siste %s kundefakturaer
+BoxTitleLastModifiedCustomerBills=Siste %s endrede kundefakturaer
BoxTitleLastSupplierBills=Siste %s leverandørfakturaer
-BoxTitleLastProspects=Siste %s registrerte prospekter
-BoxTitleLastModifiedProspects=Sist %s endret utsiktene
-BoxTitleLastProductsInContract=Siste %s produkter/tjenerster i kontraketer
-BoxTitleLastModifiedMembers=Siste %s endret medlemmer
-# BoxTitleLastFicheInter=Last %s modified intervention
+BoxTitleLastModifiedSupplierBills=Siste %s endrede leverandørfakturaer
+BoxTitleLastModifiedProspects=Sist %s endrede prospekter
+BoxTitleLastProductsInContract=Siste %s produkter/tjenerster i kontrakter
+BoxTitleLastModifiedMembers=Siste %s endrede medlemmer
+BoxTitleLastFicheInter=Siste %s endrede intervensjon
BoxTitleOldestUnpaidCustomerBills=Eldste %s ubetalte kundefakturaer
BoxTitleOldestUnpaidSupplierBills=Eldste %s ubetalte leverandørfakturaer
-# BoxTitleCurrentAccounts=Opened account's balances
+BoxTitleCurrentAccounts=Åpnede kontobalanser
BoxTitleSalesTurnover=Omsetning
BoxTitleTotalUnpaidCustomerBills=Ubetalte kundefakturaer
BoxTitleTotalUnpaidSuppliersBills=Ubetalte leverandørfakturaer
-BoxTitleLastModifiedContacts=Siste %s endret kontakter / adresser
+BoxTitleLastModifiedContacts=Siste %s endrede kontakter/adresser
BoxMyLastBookmarks=Mine siste %s bokmerker
BoxOldestExpiredServices=Eldste aktive utløpte tjenester
BoxLastExpiredServices=Siste %s eldste kontakter med aktive utløpte tjenester
BoxTitleLastActionsToDo=Siste %s åpne handlinger
BoxTitleLastContracts=Siste %s kontrakter
-BoxTitleLastModifiedDonations=Siste %s endret donasjoner
-BoxTitleLastModifiedExpenses=Siste %s endret utgifter
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
+BoxTitleLastModifiedDonations=Siste %s endrede donasjoner
+BoxTitleLastModifiedExpenses=Siste %s endrede utgifter
+BoxGlobalActivity=Global aktivitet (fakturaer, tilbud, ordrer)
FailedToRefreshDataInfoNotUpToDate=Klarte ikke å oppdatere RSS-strøm. Siste vellykkede oppdatering: %s
-LastRefreshDate=Siste oppdatering dato
+LastRefreshDate=Siste oppdateringsdato
NoRecordedBookmarks=Ingen bokmerker definert. Trykk her for å legge til bokmerker.
ClickToAdd=Klikk her for å legge til.
NoRecordedCustomers=Ingen registrerte kunder
@@ -69,23 +73,24 @@ NoRecordedInvoices=Ingen registrerte kundefakturaer
NoUnpaidCustomerBills=Ingen ubetalte kundefakturaer
NoRecordedSupplierInvoices=Ingen registrte leverandørfakturaer
NoUnpaidSupplierBills=Ingen ubetalte leverandørfakturaer
-NoModifiedSupplierBills=Ingen registrert leverandørens faktura
-NoRecordedProducts=Ingen registrert produkter / tjenester
-NoRecordedProspects=Ingen registrert utsikter
-NoContractedProducts=Ingen produkter / tjenester innleide
-NoRecordedContracts=Ingen registrert kontrakter
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
-# BoxCustomersInvoicesPerMonth=Customer invoices per month
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
+NoModifiedSupplierBills=Ingen registrerte leverandørfakturaer
+NoRecordedProducts=Ingen registrerte produkter/tjenester
+NoRecordedProspects=Ingen registrerte prospekter
+NoContractedProducts=Ingen innleide produkter/tjenester
+NoRecordedContracts=Ingen registrerte kontrakter
+NoRecordedInterventions=Ingen registrerte intervensjoner
+BoxLatestSupplierOrders=Siste leverandørordrer
+BoxTitleLatestSupplierOrders=Siste %s leverandørordrer
+BoxTitleLatestModifiedSupplierOrders=Siste %s endrede leverandørordrer
+NoSupplierOrder=Ingen registrerte leveradørordrer
+BoxCustomersInvoicesPerMonth=Kundefakturaer pr. mnd.
+BoxSuppliersInvoicesPerMonth=Leverandørfakturaer pr. mnd.
+BoxCustomersOrdersPerMonth=Kundeordrer pr. mnd.
+BoxSuppliersOrdersPerMonth=Leverandørordrer pr. mnd.
+BoxProposalsPerMonth=Tilbud pr. mnd.
+NoTooLowStockProducts=Ingen produkter med for lav beholdning
+BoxProductDistribution=Fordeling produkter/tjenester
+BoxProductDistributionFor=Fordeling av %s for %s
ForCustomersInvoices=Kundens fakturaer
-# ForCustomersOrders=Customers orders
+ForCustomersOrders=Kundeordrer
ForProposals=Tilbud
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 0e0b168257c..c01ee45a2c7 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -1,40 +1,40 @@
# Language file - Source file is en_US - cashdesk
-CashDeskMenu=Point of sale
-CashDesk=Point of sale
-CashDesks=Point of salg
+CashDeskMenu=Utsalgssted
+CashDesk=Utsalgssted
+CashDesks=Utsalgssted
CashDeskBank=Bankkonto
CashDeskBankCash=Bankkonto (kontanter)
CashDeskBankCB=Bankkonto (kort)
CashDeskBankCheque=Bankkonto (sjekk)
-CashDeskWarehouse=Warehouse
-CashdeskShowServices=Selge tjenester
+CashDeskWarehouse=Varehus
+CashdeskShowServices=Selgende tjenester
CashDeskProducts=Produkter
CashDeskStock=Lager
CashDeskOn=på
CashDeskThirdParty=Tredjepart
-# CashdeskDashboard=Point of sale access
+CashdeskDashboard=Adgang utsalgssted
ShoppingCart=Handlekurv
-NewSell=Ny selger
-BackOffice=Tilbake kontor
-AddThisArticle=Legg denne artikkelen
-RestartSelling=Gå tilbake på selger
-SellFinished=Selg ferdig
+NewSell=Nytt salg
+BackOffice=Administrasjonen
+AddThisArticle=Legg til denne artikkelen
+RestartSelling=Gå tilbake på salg
+SellFinished=Salg avsluttet
PrintTicket=Skriv billett
-NoProductFound=Ingen artikkelen funnet
-ProductFound=Produktet funnet
+NoProductFound=Ingen artikler funnet
+ProductFound=produktet funnet
ProductsFound=produkter funnet
-NoArticle=Ingen artikkelen
+NoArticle=Ingen artikkel
Identification=Identifisering
Article=Artikkel
Difference=Forskjell
TotalTicket=Totalt billett
-NoVAT=Ingen moms for dette salget
-Change=Overflødig mottatt
+NoVAT=Ingen mva for dette salget
+Change=For mye mottatt
CalTip=Klikk for å vise kalenderen
-CashDeskSetupStock=Du spør for å redusere beholdningen faktura etableringen, men lager for dette er ikke ble definert
Endre lager modul oppsett, eller velge en lagerbygning
+CashDeskSetupStock=Forespørsel om å redusere varebeholdning ved opprettelse av faktura uten at varehus er definert
Endre lagermodul oppsettet, eller velg et annet varehus
BankToPay=Debiteringskonto
ShowCompany=Vis selskap
ShowStock=Vis lager
DeleteArticle=Klikk for å fjerne denne artikkelen
-# FilterRefOrLabelOrBC=Search (Ref/Label)
-# UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that use POS need to have permission to edit stock.
+FilterRefOrLabelOrBC=Søk (Referanse/Etikett)
+UserNeedPermissionToEditStockToUsePos=Forespørsel om å redusere varebeholdning ved opprettelse av faktura. POS bruker må ha adgang til å endre varebeholdning
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 2458dff2fb9..d03d3f0aa7b 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -15,12 +15,12 @@ ProductsCategoriesArea=Område for kategorier : produkter/tjenester
SuppliersCategoriesArea=Område for kategorier : Leverandører
CustomersCategoriesArea=Område for kategorier : Kunder
ThirdPartyCategoriesArea=Område for kategorier : Tredjeparter
-MembersCategoriesArea=Medlemmer kategorier området
+MembersCategoriesArea=Medlemmers kategoriområder
ContactsCategoriesArea=Kontaktkategorier
MainCats=Hovedkategorier
SubCats=Underkategorier
CatStatistics=Statistikk
-CatList=Oversikt over kategorier
+CatList=Liste over kategorier
AllCats=Alle kategorier
ViewCat=Vis kategori
NewCat=Legg til kategori
@@ -39,7 +39,7 @@ ErrSameCatSelected=Du har valgt samme kategori flere ganger
ErrForgotCat=Du glemte å velge kategorien
ErrForgotField=Du glemte feltene
ErrCatAlreadyExists=Dette navnet er allerede i bruk
-AddProductToCat=Legg dette produktet til en kategori?
+AddProductToCat=Legg til dette produktet i en kategori?
ImpossibleAddCat=Umulig å legge til kategorien
ImpossibleAssociateCategory=Umulig å knytte kategorien til
WasAddedSuccessfully=%s ble lagt til.
@@ -49,7 +49,7 @@ ProductIsInCategories=Dette produktet/tjenesten hører til følgende kategorier
SupplierIsInCategories=Denne tredjeparten hører til følgende leverandørkategorier
CompanyIsInCustomersCategories=Denne tredjeparten hører til følgende kunder/prospektkategorier
CompanyIsInSuppliersCategories=Denne tredjeparten hører til følgende leverandørkategorier
-MemberIsInCategories=Dette medlemmet eier til følgende medlemmer kategorier
+MemberIsInCategories=Dette medlemmet hører til følgende medlemmeskategorier
ContactIsInCategories=Denne kontakten hører til følgende kontaktkategorier
ProductHasNoCategory=Dette produktet/tjenesten er ikke i noen kategorier
SupplierHasNoCategory=Denne leverandøren er ikke i noen kategorier
@@ -59,10 +59,10 @@ ContactHasNoCategory=Denne kontakten er ikke i noen kategorier
ClassifyInCategory=Klassifiser i kategori
NoneCategory=Ingen
NotCategorized=Uten kategori
-CategoryExistsAtSameLevel=Denne kategorien eksisterer allerede på samme sted
-ReturnInProduct=Tilbake til produkt/tjeneste-kort
+CategoryExistsAtSameLevel=Denne kategorien finnes allerede med denne referansen
+ReturnInProduct=Tilbake til produkt-/tjenestekort
ReturnInSupplier=Tilbake til leverandørkort
-ReturnInCompany=Tilbake til kunde/prospekt-kort
+ReturnInCompany=Tilbake til kunde-/prospektkort
ContentsVisibleByAll=Inneholdet vil være synlig for alle
ContentsVisibleByAllShort=Innhold synlig for alle
ContentsNotVisibleByAllShort=Innhold ikke synlig for alle
@@ -70,17 +70,17 @@ CategoriesTree=Kategori-tre
DeleteCategory=Slett kategori
ConfirmDeleteCategory=Er du sikker på at du vil slette denne kategorien?
RemoveFromCategory=Fjern lenke med kategori
-RemoveFromCategoryConfirm=Er di sikker på at du vil fjerne lenken mellom transaksjonen og kategorien?
+RemoveFromCategoryConfirm=Er du sikker på at du vil fjerne lenken mellom transaksjonen og kategorien?
NoCategoriesDefined=Ingen kategori definert
SuppliersCategoryShort=Leverandøkategori
CustomersCategoryShort=Kundekategori
ProductsCategoryShort=Produktkategori
-MembersCategoryShort=Medlemmer kategori
+MembersCategoryShort=Medlemskategori
SuppliersCategoriesShort=Leverandøkategorier
CustomersCategoriesShort=Kundekategorier
-CustomersProspectsCategoriesShort=Kunde/prospektkategorier
+CustomersProspectsCategoriesShort=Kunde-/prospektkategorier
ProductsCategoriesShort=Produktkategorier
-MembersCategoriesShort=Medlemmer kategorier
+MembersCategoriesShort=Medlemskategorier
ContactCategoriesShort=Kontaktkategorier
ThisCategoryHasNoProduct=Denne kategorien inneholder ingen produkter.
ThisCategoryHasNoSupplier=Denne kategorien inneholder ingen leverandører.
@@ -92,21 +92,21 @@ AssignedToTheCustomer=Knyttet til kunden
InternalCategory=Intern kategori
CategoryContents=Innhold i kategori
CategId=Kategori-ID
-CatSupList=Liste av leverandør kategorier
-CatCusList=Liste over kunde / prospektet kategorier
-CatProdList=Liste over produkter kategorier
-CatMemberList=Liste over medlemmer kategorier
-CatContactList=Liste over kontakt kategorier og kontakt
+CatSupList=Liste av leverandørkategorier
+CatCusList=Liste over kunde-/prospektkategorier
+CatProdList=Liste over produktkategorier
+CatMemberList=Liste over medlemskategorier
+CatContactList=Liste over kontaktkategorier og kontakt
CatSupLinks=Koblinger mellom leverandører og kategorier
-CatCusLinks=Koblinger mellom kunder / prospekter og kategorier
-CatProdLinks=Koblinger mellom produkter / tjenester og kategorier
+CatCusLinks=Koblinger mellom kunder/prospekter og kategorier
+CatProdLinks=Koblinger mellom produkter/tjenester og kategorier
CatMemberLinks=Koblinger mellom medlemmer og kategorier
DeleteFromCat=Fjern fra kategori
DeletePicture=Slette bilde
ConfirmDeletePicture=Bekreft bildesletting?
ExtraFieldsCategories=Komplementære attributter
CategoriesSetup=Kategori-oppsett
-CategorieRecursiv=Link med overordnet kategori automatisk
+CategorieRecursiv=Link automatisk med overordnet kategori
CategorieRecursivHelp=Hvis aktivert, vil produktet også knyttes til overordnet kategori når du legger inn en underkategori
AddProductServiceIntoCategory=Legg til følgende produkt/tjeneste
ShowCategory=Vis kategori
diff --git a/htdocs/langs/nb_NO/commercial.lang b/htdocs/langs/nb_NO/commercial.lang
index 92b090a74bf..5ce686e3b3c 100644
--- a/htdocs/langs/nb_NO/commercial.lang
+++ b/htdocs/langs/nb_NO/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospekt
Prospects=Prospekter
DeleteAction=Slett handling/oppgave
NewAction=Ny handling/oppgave
-AddAction=Legg til handling/oppgave
-AddAnAction=Legg til en handling/oppgave
-AddActionRendezVous=Legg til møte
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Er du sikker på at du vil slette denne oppgaven?
CardAction=Handlingskort
@@ -44,8 +44,8 @@ DoneActions=Utførte handlinger
DoneActionsFor=Utførte handlinger for %s
ToDoActions=Ikke fullførte handlinger
ToDoActionsFor=Ikke fullførte handlinger for %s
-SendPropalRef=Send tilbud %s
-SendOrderRef=Send ordre %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Ikke aktuelt
StatusActionToDo=To Do
StatusActionDone=Utført
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt utført
DateActionPlanned=Dato for planlagt handling
DateActionDone=Dato for utført handling
ActionAskedBy=Handling ønsket av
-ActionAffectedTo=Handling knyttet til
+ActionAffectedTo=Event assigned to
ActionDoneBy=Handling utført av
ActionUserAsk=Registrert av
ErrorStatusCantBeZeroIfStarted=Hvis feltet 'Dato utført' er fylt ut er handlingen startet (eller utført), defor kan ikke feltet 'Status' være 0%%.
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index 02ad3315d63..a111e8f1b6a 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - companies
ErrorCompanyNameAlreadyExists=Firmanavnet %s finnes allerede. Velg et annet!
-ErrorPrefixAlreadyExists=Prefix %s finnes allered. Velg et annet!
+ErrorPrefixAlreadyExists=Prefiks %s finnes allerede. Velg et annet!
ErrorSetACountryFirst=Angi land først
SelectThirdParty=Velg en tredjepart
DeleteThirdParty=Slett en tredjepart
@@ -25,13 +25,13 @@ IdThirdParty=Tredjepart-ID
IdCompany=Firma-ID
IdContact=Kontaktperson-ID
Contacts=Kontakter
-ThirdPartyContacts=Tredjepart kontakter
-ThirdPartyContact=Tredjepart kontakt
+ThirdPartyContacts=Tredjepartskontakter
+ThirdPartyContact=Tredjepartskontakt
StatusContactValidated=Status for kontakt
Company=Bedrift
CompanyName=Firmanavn
Companies=Bedrifter
-CountryIsInEEC=Landet er en del av Det europeiske fellesskap
+CountryIsInEEC=Landet er en del av det europeiske økonomiske fellesskap
ThirdPartyName=Tredjepart navn
ThirdParty=Tredjepart
ThirdParties=Tredjeparter
@@ -40,7 +40,7 @@ ThirdPartyProspects=Prospekter
ThirdPartyProspectsStats=Prospekter
ThirdPartyCustomers=Kunder
ThirdPartyCustomersStats=Kunder
-ThirdPartyCustomersWithIdProf12=Kunder ned %s eller %s
+ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
ThirdPartySuppliers=Leverandører
ThirdPartyType=Type tredjepart
Company/Fundation=Firma/Organisasjon
@@ -51,7 +51,7 @@ Subsidiary=Datterselskap
Subsidiaries=Datterselskaper
NoSubsidiary=Ingen datterselskap
ReportByCustomers=Rapporter pr kunde
-ReportByQuarter=Rapporter pr kvartal
+ReportByQuarter=Rapporter pr sats
CivilityCode=Civility code (ikke i Norge)
RegisteredOffice=Registered office (ikke i Norge)
Name=Navn
@@ -64,7 +64,7 @@ Address=Adresse
State=Fylke(delstat)
Region=Region
Country=Land
-CountryCode=Landkode
+CountryCode=Landskode
CountryId=Land id
Phone=Telefon
Skype=Skype
@@ -73,13 +73,13 @@ Chat=Chat
PhonePro=Tlf. arbeid
PhonePerso=Tlf. privat
PhoneMobile=Tlf. mobil
-No_Email=Ikke send masse-epost-utsendelser
-Fax=Fax
+No_Email=Ikke send masse-epost
+Fax=Faks
Zip=Postnummer
Town=Poststed
Web=Web
Poste= Posisjon
-DefaultLang=Språk som standard
+DefaultLang=Standardspråk
VATIsUsed=MVA skal beregnes
VATIsNotUsed=MVA skal ikke beregnes
CopyAddressFromSoc=Fyll adresse med tredjeparts adresse
@@ -113,8 +113,8 @@ ProfId3=Professional ID 3
ProfId4=Professional ID 4
ProfId5=Profesjonell ID 5
ProfId6=Profesjonell ID 6
-ProfId1AR=Prof Id 1 (CUIL)
-ProfId2AR=Prof ID 2 (inntekter på brutes)
+ProfId1AR=Prof Id 1 (CUIT/CUIL)
+ProfId2AR=Prof ID 2 (bruttoinntekter)
ProfId3AR=-
ProfId4AR=-
ProfId5AR=-
@@ -125,7 +125,7 @@ ProfId3AU=-
ProfId4AU=-
ProfId5AU=-
ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professionnel number)
+ProfId1BE=Prof Id 1 (Profesjonelt nummer)
ProfId2BE=-
ProfId3BE=-
ProfId4BE=-
@@ -139,7 +139,7 @@ ProfId4BR=CPF
#ProfId6BR=INSS
ProfId1CH=-
ProfId2CH=-
-ProfId3CH=Prof Id 1 (Federal number)
+ProfId3CH=Prof Id 1 (Føderalt nummer)
ProfId4CH=Prof Id 2 (Commercial Record number)
ProfId5CH=-
ProfId6CH=-
@@ -169,11 +169,11 @@ ProfId5ES=-
ProfId6ES=-
ProfId1FR=Prof Id 1 (SIREN)
ProfId2FR=Prof Id 2 (SIRET)
-ProfId3FR=Prof Id 3 (NAF, old APE)
+ProfId3FR=Prof Id 3 (NAF, gammel APE)
ProfId4FR=Prof Id 4 (RCS/RM)
ProfId5FR=Prof Id 5
ProfId6FR=-
-ProfId1GB=Prof Id 1 (Registration Number)
+ProfId1GB=Prof Id 1 (Registreringsnummer)
ProfId2GB=-
ProfId3GB=Prof Id 3 (SIC)
ProfId4GB=-
@@ -186,31 +186,31 @@ ProfId4HN=-
ProfId5HN=-
ProfId6HN=-
ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof ID 2
-ProfId3IN=Prof ID 3
+ProfId2IN=Prof ID 2 (PAN)
+ProfId3IN=Prof ID 3 (SRVC TAX)
ProfId4IN=Prof ID 4
ProfId5IN=Prof Id 5
ProfId6IN=-
ProfId1MA=Id prof. 1 (RC)
-ProfId2MA=Id prof. 2 (patente)
+ProfId2MA=Id prof. 2 (patent)
ProfId3MA=Id prof. 3 (IF)
ProfId4MA=Id prof. 4 (CNSS)
ProfId5MA=-
ProfId6MA=-
ProfId1MX=Prof Id 1 (RFC).
ProfId2MX=Prof Id 2 (R.. P. IMSS)
-ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId3MX=Prof Id 3 (Profesjonell lisens)
ProfId4MX=-
ProfId5MX=-
ProfId6MX=-
ProfId1NL=KVK nummer
ProfId2NL=-
ProfId3NL=-
-ProfId4NL=-
+ProfId4NL=Burgerservicenummer (BSN)
ProfId5NL=-
ProfId6NL=-
ProfId1PT=Prof Id 1 (NIPC)
-ProfId2PT=Prof Id 2 (Social security number)
+ProfId2PT=Prof Id 2 (Personnummer)
ProfId3PT=Prof Id 3 (Commercial Record number)
ProfId4PT=Prof Id 4 (Conservatory)
ProfId5PT=-
@@ -234,9 +234,9 @@ ProfId4RU=Prof Id 4 (OKPO)
ProfId5RU=-
ProfId6RU=-
VATIntra=Organisasjonsnummer
-VATIntraShort=Org.nr.
-VATIntraVeryShort=ORG
-VATIntraSyntaxIsValid=Gyldig syntax
+VATIntraShort=Organisasjonsnummer
+VATIntraVeryShort=MVA
+VATIntraSyntaxIsValid=Gyldig syntaks
VATIntraValueIsValid=Gyldig verdi
ProspectCustomer=Prospekt/Kunde
Prospect=Prospekt
@@ -261,13 +261,13 @@ Supplier=Leverandør
CompanyList=Firmaoversikt
AddContact=Opprett kontakt
AddContactAddress=Opprett kontakt/adresse
-EditContact=Endre kontakt / adresse
-EditContactAddress=Endre kontakt / adresse
+EditContact=Endre kontakt
+EditContactAddress=Endre kontakt/adresse
Contact=Kontaktperson
ContactsAddresses=Kontakter / Adresser
NoContactDefinedForThirdParty=Ingen kontakt definert for denne tredjepart
-NoContactDefined=Denne tredjeparten har ingen kontaktpersoner registrert
-DefaultContact=Gjeldende kontakt
+NoContactDefined=Ingen kontaktpersoner definert
+DefaultContact=Standardkontakt
AddCompany=Opprett firma
AddThirdParty=Opprett tredjepart
DeleteACompany=Slett et firma
@@ -290,23 +290,23 @@ ListOfContacts=Oversikt over kontaktpersoner
ListOfContactsAddresses=Liste over kontakter / adresser
ListOfProspectsContacts=Oversikt over prospekters kontaktpersoner
ListOfCustomersContacts=Oversikt over kunders kontaktpersoner
-ListOfSuppliersContacts=Oversikt over leverandøeres kontaktpersoner
+ListOfSuppliersContacts=Oversikt over leverandørkontakter
ListOfCompanies=Oversikt over firmaer
ListOfThirdParties=Oversikt over tredjeparter
ShowCompany=Vis firma
ShowContact=Vis kontaktperson
ContactsAllShort=Alle (ingen filter)
ContactType=Kontaktperson type
-ContactForOrders=Relaterte ordre
-ContactForProposals=Relaterte tilbud
-ContactForContracts=Relaterte kontrakter
-ContactForInvoices=Relaterte fakturaer
+ContactForOrders=Ordrekontakt
+ContactForProposals=Tilbudskontakt
+ContactForContracts=Kontraktkontakt
+ContactForInvoices=Fakturakontakt
NoContactForAnyOrder=Kontaktpersonen er ikke tilknyttet noen ordre
NoContactForAnyProposal=Kontaktpersonen er ikke tilknyttet noen tilbud
NoContactForAnyContract=Kontaktpersonen er ikke tilknyttet noen kontrakt
NoContactForAnyInvoice=Kontaktpersonen er ikke tilknyttet noen faktura
NewContact=Ny kontaktperson
-NewContactAddress=Ny kontakt / adresse
+NewContactAddress=Ny kontakt/adresse
LastContacts=Siste kontaktpersoner
MyContacts=Mine kontaktpersoner
Phones=Telefoner
@@ -320,12 +320,12 @@ VATIntraCheckDesc=Lenken %s slår opp i den europeiske kontrolltjenesten
VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
VATIntraCheckableOnEUSite=Slå opp i Intracomunnautary VAT på EU-kommisjonens nettsted
VATIntraManualCheck=Du kan også sjekke manuelt på %s
-ErrorVATCheckMS_UNAVAILABLE=Kontollrn er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
+ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
NorProspectNorCustomer=Hverken prospekt eller kunde
JuridicalStatus=Juridsk status
Staff=Ansatte
ProspectLevelShort=Potensiell
-ProspectLevel=Potensiell prospekt
+ProspectLevel=Prospektpotensiale
ContactPrivate=Privat
ContactPublic=Delt
ContactVisibility=Synlighet
@@ -348,29 +348,29 @@ TE_PRIVATE=Privatperson
TE_OTHER=Annet
StatusProspect-1=Kontaktes ikke
StatusProspect0=Aldri kontaktet
-StatusProspect1=Bør kontaktes
+StatusProspect1=Skal kontaktes
StatusProspect2=Kontakt pågår
StatusProspect3=Kontakt utført
ChangeDoNotContact=Endre status til 'Kontaktes ikke'
ChangeNeverContacted=Endre status til 'Aldri kontaktet'
-ChangeToContact=Endre status til 'Bør kontaktes'
+ChangeToContact=Endre status til 'Skal kontaktes'
ChangeContactInProcess=Endre status til 'Kontakt pågår'
ChangeContactDone=Endre status til 'Kontakt utført'
ProspectsByStatus=Prospekter etter status
BillingContact=Fakturakontakt
NbOfAttachedFiles=Antall vedlagte filer
-AttachANewFile=Legg ved fil
-NoRIB=Ingen konto registrert
+AttachANewFile=Legg ved ny fil
+NoRIB=Ingen bankkonto registrert
NoParentCompany=Ingen
ExportImport=Import-Eksport
-ExportCardToFormat=Eksportkort til format
+ExportCardToFormat=Eksporter kort til format
ContactNotLinkedToCompany=Kontaktpersonen er ikke lenket til noen tredjepart
DolibarrLogin=Dolibarr innlogging
NoDolibarrAccess=Ingen tilgang til Dolibarr
ExportDataset_company_1=Tredjeparter (Selskaper / stiftelser / fysiske personer) og egenskaper
-ExportDataset_company_2=Kontaktpersoner med opplysninger
-ImportDataset_company_1=Tredjeparter (Selskaper / stiftelser / fysiske personer) og egenskaper
-ImportDataset_company_2=Kontakter / adresser (av tredjeparter eller ikke) og attributter
+ExportDataset_company_2=Kontaktpersoner og egenskaper
+ImportDataset_company_1=Tredjeparter (Selskaper/stiftelser/fysiske personer) og egenskaper
+ImportDataset_company_2=Kontakter/adresser (av tredjeparter eller ikke) og attributter
ImportDataset_company_3=Bankopplysninger
PriceLevel=Prisnivå
DeliveriesAddress=Leveringsadresser
@@ -382,33 +382,33 @@ NewDeliveryAddress=Ny leveringsadresse
AddDeliveryAddress=Opprett adresse
AddAddress=Opprett adresse
NoOtherDeliveryAddress=Ingen alternativ leveringsadresse lagt inn
-SupplierCategory=Leverandør kategori
+SupplierCategory=Leverandørkategori
JuridicalStatus200=Uavhengig
DeleteFile=Slett fil
ConfirmDeleteFile=Er du sikker på at du vil slette denne filen?
-AllocateCommercial=Tildelt til salg representant
+AllocateCommercial=Tildelt til salgsrepresentant
SelectCountry=Velg land
SelectCompany=Velg tredjepart
Organization=Organisasjon
AutomaticallyGenerated=Automatisk opprettet
FiscalYearInformation=Informasjon om regnskapsåret
FiscalMonthStart=Første måned i regnskapsåret
-YouMustCreateContactFirst=Du må opprette e-postmeldinger kontakter for tredjepart første for å kunne legge til e-post meldinger.
+YouMustCreateContactFirst=Du må opprette e-postkontakter for tredjepart først, for å kunne legge til e-post meldinger.
ListSuppliersShort=Liste over leverandører
-ListProspectsShort=Liste av prospekter
+ListProspectsShort=Liste over prospekter
ListCustomersShort=Liste over kunder
ThirdPartiesArea=Tredjepart og kontaktområde
-LastModifiedThirdParties=Siste %s endret tredjeparter
-UniqueThirdParties=Totalt unike tredjeparter
-InActivity=Åpent
+LastModifiedThirdParties=Siste %s endrede tredjeparter
+UniqueThirdParties=Totalt antall unike tredjeparter
+InActivity=Åpen
ActivityCeased=Stengt
-ActivityStateFilter=Aktivitet status
+ActivityStateFilter=Aktivitetstatus
ProductsIntoElements=Produktliste i %s
CurrentOutstandingBill=Gjeldende utestående regning
OutstandingBill=Max. utestående beløp
OutstandingBillReached=Nådd maks. for utestående regning
-MonkeyNumRefModelDesc=Tilbake numero med format %syymm-nnnn for kunden koden og %syymm-nnnn for leverandør koden der åå er året, er mm måned og nnnn er en sekvens uten pause og ingen retur til 0.
-LeopardNumRefModelDesc=Kunde / leverandør-koden er gratis. Denne koden kan endres når som helst.
+MonkeyNumRefModelDesc=Returnerer nummer med format %syymm-nnnn for kundekode og %syymm-nnnn for leverandørkode, der åå er året, er mm måned og nnnn er et løpenummer som starter på 0+1.
+LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
ManagingDirectors=(E) navn (CEO, direktør, president ...)
SearchThirdparty=Søk etter tredjepart
SearchContact=Søk etter kontakt
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index e8fe7fe9637..e09b5e6c173 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Utløpt
ServiceStatusClosed=Lukket
ServicesLegend=Tjeneste legend
Contracts=Kontrakter
+ContractsAndLine=Contracts and line of contracts
Contract=Kontrakt
NoContracts=Ingen kontrakter
MenuServices=Tjenester
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index 933ec2647b4..e15b4232a60 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index 7fa9524b08f..7f06fb6e0fa 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kilde og målkonto må være forskjellig.
ErrorBadThirdPartyName=Ugyldig verdi for tredjepartens navn
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Ugyldig syntaks for kundekode
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Kundekode påkrevet
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Kundekoden er allerede benyttet
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript må ikke deaktiveres å ha denne funksjo
ErrorPasswordsMustMatch=Begge har skrevet passord må samsvare med hverandre
ErrorContactEMail=En teknisk feil oppsto. Vennligst kontakt administrator for å følge e %s no gi feilmeldingsnumrene %s i meldingen, eller enda bedre ved å legge til en skjerm kopi av denne siden.
ErrorWrongValueForField=Feil verdi for feltet tall %s (verdien «%s" samsvarer ikke med regex regel %s)
-ErrorFieldValueNotIn=Feil verdi for feltnummer %s (verdien «%s" er ikke en verdi tilgjengelig i felten %s av tabellen %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Feil verdi for feltnummer %s (verdi '%s "er ikke en %s eksisterende ref)
ErrorsOnXLines=Feil på %s kilde linjer
ErrorFileIsInfectedWithAVirus=Det antivirus programmet var ikke i stand til å validere filen (filen kan være infisert av et virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 78bd25f24c3..e087efd5896 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -155,7 +155,8 @@ MigrationFinished=Migrasjon ferdig
LastStepDesc=Siste trinn: Definer her login og passord du har tenkt å bruke til å koble til programvare. Ikke mist dette som det er kontoen for å administrere alle andre.
ActivateModule=Aktiver modulen %s
ShowEditTechnicalParameters=Klikk her for å vise/endre avanserte parametre (expert mode)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Advarsel!\nTok du en backup av databasen først?\nDette anbefales på det sterkeste! F.eks: Pga. feil/bugs i databasesystemer (f.eks. Mysql versjon 5.5.40), kan data eller tabeller gå tapt i denne prosessen. Det er sterkt anbefalt å ha en komplett kopi av databasen før du starter overføringen.\n\n\nKlikk OK for å starte overføringsprosessen...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
@@ -207,7 +208,7 @@ MigrationProjectTaskTime=Oppdater tid i sekunder
MigrationActioncommElement=Oppdatering data på handlinger
MigrationPaymentMode=Datamigrering for betaling modus
MigrationCategorieAssociation=Migrer kategorier
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Overføring av hendelser for å legge hendelseseier inn i oppdragstabellen
ShowNotAvailableOptions=Vis utilgjengelige opsjoner
HideNotAvailableOptions=Gjem utilgjengelige opsjoner
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 8281c41b469..6fc76ac7a89 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -141,6 +141,7 @@ Cancel=Avbryt
Modify=Endre
Edit=Rediger
Validate=Godkjenn
+ValidateAndApprove=Validate and Approve
ToValidate=Å godkjenne
Save=Lagre
SaveAs=Lagre som
@@ -158,6 +159,7 @@ Search=Søk
SearchOf=Søk
Valid=Gyldig
Approve=Godkjenn
+Disapprove=Disapprove
ReOpen=Gjenåpne
Upload=Send fil
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Kort
Card=Kort
Now=Nå
Date=Dato
+DateAndHour=Date and hour
DateStart=Startdato
DateEnd=Sluttdato
DateCreation=Opprettet den
@@ -295,6 +298,7 @@ UnitPriceHT=Enhetspris (netto)
UnitPriceTTC=Enhetspris
PriceU=Pris
PriceUHT=Pris (netto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=Pris
Amount=Beløp
AmountInvoice=Fakturabeløp
@@ -521,6 +525,7 @@ DateFromTo=Fra %s til %s
DateFrom=Fra %s
DateUntil=Til og med %s
Check=Sjekk
+Uncheck=Uncheck
Internal=Intern
External=Ekstern
Internals=Intern
@@ -688,6 +693,7 @@ PublicUrl=Offentlig URL
AddBox=Legg til boks
SelectElementAndClickRefresh=Velg et element og klikk Oppfrisk
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Mandag
Tuesday=Tirsdag
diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang
index 0290f3f467f..b6c393f99fa 100644
--- a/htdocs/langs/nb_NO/opensurvey.lang
+++ b/htdocs/langs/nb_NO/opensurvey.lang
@@ -1,66 +1,66 @@
# Dolibarr language file - Source file is en_US - opensurvey
-# Survey=Poll
-# Surveys=Polls
-# OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
-# NewSurvey=New poll
-# NoSurveysInDatabase=%s poll(s) into database.
-# OpenSurveyArea=Polls area
-# AddACommentForPoll=You can add a comment into poll...
-# AddComment=Add comment
-# CreatePoll=Create poll
-# PollTitle=Poll title
-# ToReceiveEMailForEachVote=Receive an email for each vote
-# TypeDate=Type date
-# TypeClassic=Type standard
-# OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
-# RemoveAllDays=Remove all days
-# CopyHoursOfFirstDay=Copy hours of first day
-# RemoveAllHours=Remove all hours
-# SelectedDays=Selected days
-# TheBestChoice=The best choice currently is
-# TheBestChoices=The best choices currently are
-# with=with
-# OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
-# CommentsOfVoters=Comments of voters
-# ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
-# RemovePoll=Remove poll
-# UrlForSurvey=URL to communicate to get a direct access to poll
-# PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
-# CreateSurveyDate=Create a date poll
-# CreateSurveyStandard=Create a standard poll
-# CheckBox=Simple checkbox
-# YesNoList=List (empty/yes/no)
-# PourContreList=List (empty/for/against)
-# AddNewColumn=Add new column
-# TitleChoice=Choice label
-# ExportSpreadsheet=Export result spreadsheet
+Survey=Poll
+Surveys=Polls
+OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select type of poll...
+NewSurvey=New poll
+NoSurveysInDatabase=%s poll(s) into database.
+OpenSurveyArea=Polls area
+AddACommentForPoll=You can add a comment into poll...
+AddComment=Add comment
+CreatePoll=Create poll
+PollTitle=Poll title
+ToReceiveEMailForEachVote=Receive an email for each vote
+TypeDate=Type date
+TypeClassic=Type standard
+OpenSurveyStep2=Select your dates amoung the free days (grey). The selected days are green. You can unselect a day previously selected by clicking again on it
+RemoveAllDays=Remove all days
+CopyHoursOfFirstDay=Copy hours of first day
+RemoveAllHours=Remove all hours
+SelectedDays=Valgte dager
+TheBestChoice=The best choice currently is
+TheBestChoices=The best choices currently are
+with=with
+OpenSurveyHowTo=If you agree to vote in this poll, you have to give your name, choose the values that fit best for you and validate with the plus button at the end of the line.
+CommentsOfVoters=Comments of voters
+ConfirmRemovalOfPoll=Are you sure you want to remove this poll (and all votes)
+RemovePoll=Remove poll
+UrlForSurvey=URL to communicate to get a direct access to poll
+PollOnChoice=You are creating a poll to make a multi-choice for a poll. First enter all possible choices for your poll:
+CreateSurveyDate=Create a date poll
+CreateSurveyStandard=Create a standard poll
+CheckBox=Simple checkbox
+YesNoList=List (empty/yes/no)
+PourContreList=List (empty/for/against)
+AddNewColumn=Add new column
+TitleChoice=Choice label
+ExportSpreadsheet=Export result spreadsheet
ExpireDate=Limit date
-# NbOfSurveys=Number of polls
-# NbOfVoters=Nb of voters
-# SurveyResults=Results
-# PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
-# 5MoreChoices=5 more choices
-# Abstention=Abstention
-# Against=Against
-# YouAreInivitedToVote=You are invited to vote for this poll
-# VoteNameAlreadyExists=This name was already used for this poll
-# ErrorPollDoesNotExists=Error, poll %s does not exists.
-# OpenSurveyNothingToSetup=There is no specific setup to do.
-# PollWillExpire=Your poll will expire automatically %s days after the last date of your poll.
-# AddADate=Add a date
-# AddStartHour=Add start hour
-# AddEndHour=Add end hour
-# votes=vote(s)
-# NoCommentYet=No comments have been posted for this poll yet
-# CanEditVotes=Can change vote of others
-# CanComment=Voters can comment in the poll
-# CanSeeOthersVote=Voters can see other people's vote
-# SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
-# BackToCurrentMonth=Back to current month
-# ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
-# ErrorOpenSurveyOneChoice=Enter at least one choice
-# ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
-# ErrorInsertingComment=There was an error while inserting your comment
-# MoreChoices=Enter more choices for the voters
-# SurveyExpiredInfo=The voting time of this poll has expired.
-# EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
+NbOfSurveys=Number of polls
+NbOfVoters=Nb of voters
+SurveyResults=Results
+PollAdminDesc=You are allowed to change all vote lines of this poll with button "Edit". You can, as well, remove a column or a line with %s. You can also add a new column with %s.
+5MoreChoices=5 more choices
+Abstention=Abstention
+Against=Against
+YouAreInivitedToVote=You are invited to vote for this poll
+VoteNameAlreadyExists=This name was already used for this poll
+ErrorPollDoesNotExists=Error, poll %s does not exists.
+OpenSurveyNothingToSetup=There is no specific setup to do.
+PollWillExpire=Your poll will expire automatically %s days after the last date of your poll.
+AddADate=Add a date
+AddStartHour=Add start hour
+AddEndHour=Add end hour
+votes=vote(s)
+NoCommentYet=No comments have been posted for this poll yet
+CanEditVotes=Can change vote of others
+CanComment=Voters can comment in the poll
+CanSeeOthersVote=Voters can see other people's vote
+SelectDayDesc=For each selected day, you can choose, or not, meeting hours in the following format :
- empty,
- "8h", "8H" or "8:00" to give a meeting's start hour,
- "8-11", "8h-11h", "8H-11H" or "8:00-11:00" to give a meeting's start and end hour,
- "8h15-11h15", "8H15-11H15" or "8:15-11:15" for the same thing but with minutes.
+BackToCurrentMonth=Back to current month
+ErrorOpenSurveyFillFirstSection=You haven't filled the first section of the poll creation
+ErrorOpenSurveyOneChoice=Enter at least one choice
+ErrorOpenSurveyDateFormat=Date must have the format YYYY-MM-DD
+ErrorInsertingComment=There was an error while inserting your comment
+MoreChoices=Enter more choices for the voters
+SurveyExpiredInfo=The voting time of this poll has expired.
+EmailSomeoneVoted=%s has filled a line.\nYou can find your poll at the link: \n%s
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 11c92b04ada..8aea126a9c1 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Kansellert
StatusOrderDraft=Kladd (trenger godkjenning)
StatusOrderValidated=Godkjent
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Behandlet
StatusOrderToBill=Levert
StatusOrderToBill2=Til fakturering
@@ -58,6 +59,7 @@ MenuOrdersToBill=Ordre levert
MenuOrdersToBill2=Fakturerbare ordre
SearchOrder=Søk i ordre
SearchACustomerOrder=Søk etter kundeordre
+SearchASupplierOrder=Search a supplier order
ShipProduct=Lever produkt
Discount=Rabatt
CreateOrder=Lag ordre
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index d634da4b41f..57beeca7610 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maksimal størrelse
AttachANewFile=Legg ved ny fil/dokument
LinkedObject=Lenkede objekter
Miscellaneous=Diverse
-NbOfActiveNotifications=Antall påminnelser
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift).
De to linjene er skilt med en vognretur.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 7b77f870cdf..1a443f724cd 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 1d656410bad..86f6159f0fa 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Alle
PrivateProject=Kontaktpersoner for prosjektet
MyProjectsDesc=Denne visningen er begrenset til prosjekter du er en kontakt for (hva er den type).
ProjectsPublicDesc=Denne visningen presenterer alle prosjektene du har lov til å lese.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Denne visningen presenterer alle prosjekter (dine brukertillatelser gi deg tillatelse til å vise alt).
MyTasksDesc=Denne visningen er begrenset til prosjekter eller oppgaver du er en kontakt for (hva er den type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Denne visningen presenterer alle prosjekter og oppgaver du har lov til å lese.
TasksDesc=Denne visningen presenterer alle prosjekter og oppgaver (dine brukertillatelser gi deg tillatelse til å vise alt).
ProjectsArea=Prosjektområde
@@ -29,6 +31,8 @@ NoProject=Ingen prosjekter definert
NbOpenTasks=Ant. åpne oppgaver
NbOfProjects=Ant. prosjekter
TimeSpent=Tid brukt
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tid brukt
RefTask=Ref. oppgave
LabelTask=Oppgave
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Liste over leverandørens ordre knyttet til
ListSupplierInvoicesAssociatedProject=Liste over leverandørens fakturaer knyttet til prosjektet
ListContractAssociatedProject=Liste over kontrakter knyttet til prosjektet
ListFichinterAssociatedProject=Liste over tiltak knyttet til prosjektet
-ListTripAssociatedProject=Liste over turer og utgifter knyttet til prosjektet
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Liste over tiltak knyttet til prosjektet
ActivityOnProjectThisWeek=Aktiviteter i prosjektet denne uke
ActivityOnProjectThisMonth=Aktiviteter i prosjektet denne måned
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 69f7e0739b4..c2e8b0514b6 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Ant. bestilt
QtyShipped=Ant. levert
QtyToShip=Ant. å levere
QtyReceived=Ant. mottatt
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Andre leveringer på denne ordren
DateSending=Leveringsdato
DateSendingShort=Leveringsdato
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index d784469d779..988c8729d87 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Veid gjennomsnittlig pris
PMPValueShort=WAP
EnhancedValueOfWarehouses=Lagerverdi
UserWarehouseAutoCreate=Opprett lager automatisk når en bruker opprettes
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Antall sendt
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index d6457622bf2..219237d952d 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Leverandører
-Supplier=Leverandør
AddSupplier=Create a supplier
SupplierRemoved=Leverandør slettet
SuppliersInvoice=Leverandørfaktura
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leverandørfakturaer og betalinger
ExportDataset_fournisseur_3=Leverandør ordrer og ordrelinjer
ApproveThisOrder=Godkjenn denne innkjøpsordren
ConfirmApproveThisOrder=Er du sikker på at du vil godkjenne denne innkjøpsordren?
-DenyingThisOrder=Avvis denne innkjøpsordren
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Er du sikker på at du vil avvise denne innkjøpsordren?
ConfirmCancelThisOrder=Er du sikker på at du vil avbryte denne innkjøpsordren?
AddCustomerOrder=Opprett kundeordre
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index c96afd01553..03337d82ee6 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Reise
-Trips=Reiser
-TripsAndExpenses=Reiser og utgifter
-TripsAndExpensesStatistics=Turer og utgifter statistikk
-TripCard=Reisekort
-AddTrip=Legg til reise
-ListOfTrips=Oversikt over reiser
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Oversikt over avgifter
-NewTrip=Ny reise
+NewTrip=New expense report
CompanyVisited=Firma/organiasjon besøkt
Kilometers=Kilometer
FeesKilometersOrAmout=Beløp eller kilometer
-DeleteTrip=Slett reise
-ConfirmDeleteTrip=Er du sikker på at du vil slette denne reisen?
-TF_OTHER=Annet
-TF_LUNCH=Lunsj
-TF_TRIP=Reise
-ListTripsAndExpenses=Liste over turer og utgifter
-ExpensesArea=Turer og utgifter området
-SearchATripAndExpense=Søk etter tur og regning
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Annet
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunsj
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index e417a4ffc01..f7c21052fa8 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd/MM/yyyy
FormatDateShortJavaInput=dd/MM/yyyy
FormatDateShortJQuery=dd/mm/yy
FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
@@ -154,7 +155,6 @@ DolibarrWorkBoard=Werktaken overzicht
to=tot
Other=Ander
Others=Anderen
-ReCalculate=Herbouw
Draft=Ontwerp
Drafts=Ontwerpen
Rejects=Verwerpen
diff --git a/htdocs/langs/nl_BE/trips.lang b/htdocs/langs/nl_BE/trips.lang
index c0ecfb50dec..3496c7748fe 100644
--- a/htdocs/langs/nl_BE/trips.lang
+++ b/htdocs/langs/nl_BE/trips.lang
@@ -10,4 +10,3 @@ CompanyVisited=Bedrijf / partikulier bezocht
FeesKilometersOrAmout=Bedrag of kilometers
DeleteTrip=Verwijderen verplaatsing
ConfirmDeleteTrip=Weet u zeker dat u deze verplaatsing wilt verwijderen?
-TF_TRIP=Verplaatsing
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index ee574b01753..c961b2450f3 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimenteel
VersionDevelopment=Ontwikkeling
VersionUnknown=Onbekend
VersionRecommanded=Aanbevolen
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Sessie-ID
SessionSaveHandler=Wijze van sessieopslag
SessionSavePath=Sessie opslaglocatie
@@ -493,10 +498,16 @@ Module600Name=Kennisgevingen
Module600Desc=Stuur EMail notificaties van bepaalde Dolibarr zakelijke gebeurtenissen naar derde-partijen contacten (setup gedefinieerd in iedere derde-partij)
Module700Name=Giften
Module700Desc=Donatiebeheer
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integratie
Module1400Name=Boekhouden
Module1400Desc=Boekhoudkundig beheer van deskundigen (dubbel partijen)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categorieën
Module1780Desc=Categoriebeheer (producten, leveranciers en afnemers)
Module2000Name=Fckeditor
@@ -631,7 +642,7 @@ Permission181=Bekijk leverancier opdrachten
Permission182=Creëren / wijzigen leverancier opdrachten
Permission183=Valideer leveranciersopdrachten
Permission184=Goedkeuren leveranciersopdrachten
-Permission185=Bestel leverancieropdrachten
+Permission185=Order or cancel supplier orders
Permission186=Ontvang leveranciersopdrachten
Permission187=Sluiten leverancieropdrachten
Permission188=Annuleren leverancieropdrachten
@@ -711,6 +722,13 @@ Permission538=Diensten exporteren
Permission701=Bekijk donaties
Permission702=Creëren / wijzigen donaties
Permission703=Verwijderen donaties
+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
Permission1001=Bekijk voorraden
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Wachtwoord voor de proxy-server te gebruiken
DefineHereComplementaryAttributes=Definieer hier alle attributen, niet reeds standaard beschikbaar, en dat je wilt worden ondersteund voor %s.
ExtraFields=Aanvullende attributen
ExtraFieldsLines=Aanvullende kenmerken (lijnen)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Aanvullende kenmerken (relaties)
ExtraFieldsContacts=Aanvullende kenmerken (contact / adres)
ExtraFieldsMember=Aanvullende kenmerken (lid)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Product- / dienstregels met een waarde van 0 gebruiken
FreeLegalTextOnProposal=Vrije tekst op Offertes
WatermarkOnDraftProposal=Watermerk op ontwerp offertes (geen indien leeg)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Opdrachtenbeheerinstellingen
OrdersNumberingModules=Opdrachtennummeringmodules
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Streepjescodetype UPC
BarcodeDescISBN=Streepjescodetype ISBN
BarcodeDescC39=Streepjescodetype C39
BarcodeDescC128=Streepjescodetype C128
-GenbarcodeLocation=Opdrachtregelprogramma voor streepjescodegeneratie (gebruikt door phpbarcode voor enkele streepjescode typen)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Beheerder om automatisch barcode nummers te bepalen.
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Te gebruiken rekening voor ontvangst van contacte betalingen
CashDeskBankAccountForCheque= Te gebruiken rekening voor ontvangst van betalingen per cheque
CashDeskBankAccountForCB= Te gebruiken rekening voor ontvangst van betalingen per CreditCard
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Weblinkmoduleinstellingen
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Formaat
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 78926b0359c..8e8b94df0d2 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -33,7 +33,11 @@ AllTime=Vanaf het begin
Reconciliation=Overeenstemming
RIB=Bankrekeningnummer
IBAN=IBAN-nummer
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC- / SWIFT-nummer
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Periodieke overboekingen
StandingOrder=Periodieke overboeking
Withdrawals=Opnames
@@ -148,7 +152,7 @@ BackToAccount=Terug naar rekening
ShowAllAccounts=Toon alle rekeningen
FutureTransaction=Overboeking in de toekomst. Geen manier mogelijk om af te stemmen
SelectChequeTransactionAndGenerate=Select / filter controleert op te nemen in het controleren stortingsbewijs en op "Create" klikken.
-InputReceiptNumber=Kies het bankafschrift in verband met de bemiddeling. Gebruik een sorteerbaar numerieke waarde (zoals YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Tenslotte een categorie opgeven waarin de gegevens bewaard kunnen worden
ToConciliate=Te bemiddelen?
ThenCheckLinesAndConciliate=Duid dan de lijnen aan van het bankafschrift en klik
diff --git a/htdocs/langs/nl_NL/commercial.lang b/htdocs/langs/nl_NL/commercial.lang
index 807bdccd23b..8302407576c 100644
--- a/htdocs/langs/nl_NL/commercial.lang
+++ b/htdocs/langs/nl_NL/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Contact opgevolgd
DateActionPlanned=Datum actie gepland voor
DateActionDone=Datum actie uitgevoerd
ActionAskedBy=Actie gevraagd door
-ActionAffectedTo=Gebeurtenis is eigendom van
+ActionAffectedTo=Event assigned to
ActionDoneBy=Actie gedaan door
ActionUserAsk=Geregistreerd door
ErrorStatusCantBeZeroIfStarted=Als veld 'Datum uitgevoerd' is gevuld, is de actie gestart (of afgelopen), dus veld 'Status' kan niet 0%% worden.
diff --git a/htdocs/langs/nl_NL/contracts.lang b/htdocs/langs/nl_NL/contracts.lang
index 80c0173ed8d..88aab0ea14d 100644
--- a/htdocs/langs/nl_NL/contracts.lang
+++ b/htdocs/langs/nl_NL/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=verlopen
ServiceStatusClosed=Gesloten
ServicesLegend=Dienstenlegenda
Contracts=Contracten
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=Geen contracten
MenuServices=Diensten
diff --git a/htdocs/langs/nl_NL/cron.lang b/htdocs/langs/nl_NL/cron.lang
index bcd3b1c774f..509725038ef 100644
--- a/htdocs/langs/nl_NL/cron.lang
+++ b/htdocs/langs/nl_NL/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell commando
CronMenu=Cron
CronCannotLoadClass=Kan klasse %s of object %s niet laden
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 9d16482afa5..0a8f7093045 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=De bron- en doelrekening mogen niet dezelfde zijn
ErrorBadThirdPartyName=Onjuiste waarde voor naam derde partij
ErrorProdIdIsMandatory=De %s is verplicht
ErrorBadCustomerCodeSyntax=Verkeerde syntaxis voor afnemerscode
-ErrorBadBarCodeSyntax=Slechte syntax voor barcode
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Afnemerscode nodig
ErrorBarCodeRequired=Bar code nodig
ErrorCustomerCodeAlreadyUsed=Afnemerscode al gebruikt
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript dient niet uitgeschakeld te zijn voor de
ErrorPasswordsMustMatch=De twee ingevoerde wachtwoorden komen niet overeen.
ErrorContactEMail=Er is een technische fout opgetreden. Neemt u alstublieft contact op met de beheerder via het e-mailadres %s en vermeld de volgende foutcode %s in uw bericht, of nog beter voeg een schermafbeelding van de pagina toe.
ErrorWrongValueForField=Foutiefe waarde voor het veld nummer %s (waarde %s voldoet niet aan de reguliere expressieregel %s)
-ErrorFieldValueNotIn=Verkeerde waarde voor het veld nummer %s (Waarde '%s' is geen waarde beschikbaar in het veld %s van de tabel %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Verkeerde waarde voor veldnummer %s (waarde '%s' is geen %s bestaande ref)
ErrorsOnXLines=Fouten op bronregels %s
ErrorFileIsInfectedWithAVirus=Het antivirusprogramma kon dit bestand niet valideren (het zou met een virus geïnfecteerd kunnen zijn)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Verplichte setup parameters zijn nog niet gedefinieerd
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index a0f1f51790b..5575250b112 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Laatste stap: Definieer hier de login en het wacht
ActivateModule=Activeer module %s
ShowEditTechnicalParameters=Klik hier om verder gevorderde parameters te zien of aan te passen. (expert instellingen)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 104be6c74de..e2029732446 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -141,6 +141,7 @@ Cancel=Annuleren
Modify=Wijzigen
Edit=Bewerken
Validate=Valideer
+ValidateAndApprove=Validate and Approve
ToValidate=Te valideren
Save=Opslaan
SaveAs=Opslaan als
@@ -158,6 +159,7 @@ Search=Zoeken
SearchOf=Zoeken
Valid=Geldig
Approve=Goedkeuren
+Disapprove=Disapprove
ReOpen=Heropenen
Upload=Upload
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Kaarten
Card=Kaart
Now=Nu
Date=Datum
+DateAndHour=Date and hour
DateStart=Begindatum
DateEnd=Einddatum
DateCreation=Aanmaakdatum
@@ -295,6 +298,7 @@ UnitPriceHT=Eenheidsprijs (netto)
UnitPriceTTC=Eenheidsprijs (bruto)
PriceU=E.P.
PriceUHT=EP (netto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=EP (bruto)
Amount=Hoeveelheid
AmountInvoice=Factuurbedrag
@@ -521,6 +525,7 @@ DateFromTo=Van %s naar %s
DateFrom=Vanaf %s
DateUntil=Tot %s
Check=Controleren
+Uncheck=Uncheck
Internal=Interne
External=Extern
Internals=Internen
@@ -688,6 +693,7 @@ PublicUrl=Openbare URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Maandag
Tuesday=Dinsdag
diff --git a/htdocs/langs/nl_NL/orders.lang b/htdocs/langs/nl_NL/orders.lang
index 4d220f6bb16..83f76d2ab97 100644
--- a/htdocs/langs/nl_NL/orders.lang
+++ b/htdocs/langs/nl_NL/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Geannuleerd
StatusOrderDraft=Concept (moet worden gevalideerd)
StatusOrderValidated=Gevalideerd
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Verwerkt
StatusOrderToBill=Te factureren
StatusOrderToBill2=Te factureren
@@ -58,6 +59,7 @@ MenuOrdersToBill=Te factureren opdrachten
MenuOrdersToBill2=Billable orders
SearchOrder=Zoekopdracht
SearchACustomerOrder=Zoek een klant bestelling
+SearchASupplierOrder=Search a supplier order
ShipProduct=Verzend product
Discount=Korting
CreateOrder=Creeer opdracht
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index ff034237d4b..4445dfcb6ca 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximale grootte
AttachANewFile=Voeg een nieuw bestand / document bij
LinkedObject=Gekoppeld object
Miscellaneous=Diversen
-NbOfActiveNotifications=Aantal kennisgevingen
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Dit is een test e-mail.\nDe twee lijnen worden gescheiden door een harde return.
PredefinedMailTestHtml=Dit is een test e-mail (het woord test moet vetgedrukt worden weergegeven).
De twee lijnen worden gescheiden door een harde return.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index bdfc6083c66..784314a472c 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index 319c71c72dc..e242d88716f 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Iedereen
PrivateProject=Contacten van het project
MyProjectsDesc=Deze weergave is beperkt tot projecten waarvoor u een contactpersoon bent (ongeacht het type).
ProjectsPublicDesc=Deze weergave toont alle projecten waarvoor u gerechtigd bent deze in te zien.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Deze weergave toont alle projecten (Uw gebruikersrechten staan het u toe alles in te zien).
MyTasksDesc=Deze weergave is beperkt tot projecten en taken waarvoor u een contactpersoon bent (ongeacht het type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Deze weergave toont alle projecten en taken die u mag inzien.
TasksDesc=Deze weergave toont alle projecten en taken (Uw gebruikersrechten staan het u toe alles in te zien).
ProjectsArea=Projectenoverzicht
@@ -29,6 +31,8 @@ NoProject=Geen enkel project gedefinieerd of in eigendom
NbOpenTasks=Aantal geopende taken
NbOfProjects=Aantal projecten
TimeSpent=Bestede tijd
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Bestede tijd
RefTask=Ref. taak
LabelTask=Label taak
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lijst van aan het project verbonden leveranc
ListSupplierInvoicesAssociatedProject=Lijst van aan het project verbonden leveranciersfacturen
ListContractAssociatedProject=Lijst van aan het project verbonden contracten
ListFichinterAssociatedProject=Lijst van aan het project verbonden interventies
-ListTripAssociatedProject=Lijst van aan het project verbonden kosten
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Lijst van aan het project verbonden acties
ActivityOnProjectThisWeek=Projectactiviteit in deze week
ActivityOnProjectThisMonth=Projectactiviteit in deze maand
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/nl_NL/salaries.lang b/htdocs/langs/nl_NL/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/nl_NL/salaries.lang
+++ b/htdocs/langs/nl_NL/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/nl_NL/sendings.lang b/htdocs/langs/nl_NL/sendings.lang
index b754a4dca1c..72a94edeec1 100644
--- a/htdocs/langs/nl_NL/sendings.lang
+++ b/htdocs/langs/nl_NL/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Aantal besteld
QtyShipped=Aantal verzonden
QtyToShip=Aantal te verzenden
QtyReceived=Aantal ontvangen
-KeepToShip=Houd verzendklaar
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Andere verzendingen voor deze opdracht
DateSending=Datum versturing opdracht
DateSendingShort=Datum versturing opdracht
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index d8019eb9d0d..8dec2f9aca9 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Waardering (PMP)
PMPValueShort=Waarde
EnhancedValueOfWarehouses=Voorraadwaardering
UserWarehouseAutoCreate=Creëer automatisch een magazijn bij het aanmaken van een gebruiker
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Hoeveelheid verzonden
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=De voorraad van magazijn %s zal verminderd word
WarehouseForStockIncrease=De voorraad van magazijn %s zal verhoogd worden
ForThisWarehouse=Voor dit magazijn
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=Lijst van alle open leveranciersbestellingen
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Bevoorradingen
NbOfProductBeforePeriod=Aantal op voorraad van product %s voor de gekozen periode (<%s)
NbOfProductAfterPeriod=Aantal op voorraad van product %s na de gekozen periode (<%s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/nl_NL/suppliers.lang b/htdocs/langs/nl_NL/suppliers.lang
index d468bff689e..e38970a6513 100644
--- a/htdocs/langs/nl_NL/suppliers.lang
+++ b/htdocs/langs/nl_NL/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Leveranciers
-Supplier=Leverancier
AddSupplier=Create a supplier
SupplierRemoved=Leverancier verwijderd
SuppliersInvoice=Leveranciersfactuur
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leveranciersfacturen en -betalingen
ExportDataset_fournisseur_3=Leveranciersorders en orderlijnen
ApproveThisOrder=Opdracht goedkeuren
ConfirmApproveThisOrder=Weet u zeker dat u de Opdracht %s wilt goedkeuren?
-DenyingThisOrder=Opdracht weigeren
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Weet u zeker dat u deze Opdracht %s wilt weigeren?
ConfirmCancelThisOrder=Weet u zeker dat u deze Opdracht %s wilt annuleren?
AddCustomerOrder=Voeg afnemersopdracht toe
diff --git a/htdocs/langs/nl_NL/trips.lang b/htdocs/langs/nl_NL/trips.lang
index 9496bc1e921..789566f3214 100644
--- a/htdocs/langs/nl_NL/trips.lang
+++ b/htdocs/langs/nl_NL/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Reis
-Trips=Reizen
-TripsAndExpenses=Reizen en uitgaven
-TripsAndExpensesStatistics=Reizen en uitgaven statistieken
-TripCard=Reizenkaart
-AddTrip=Reis toevoegen
-ListOfTrips=Reizenlijst
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Vergoedingenlijst
-NewTrip=Nieuwe reis
+NewTrip=New expense report
CompanyVisited=Bedrijf / stichting bezocht
Kilometers=Kilometers
FeesKilometersOrAmout=Kilometerskosten
-DeleteTrip=Verwijder reis
-ConfirmDeleteTrip=Weet u zeker dat u deze reis wilt verwijderen?
-TF_OTHER=Ander
-TF_LUNCH=Lunch
-TF_TRIP=Reis
-ListTripsAndExpenses=Lijst van de reis- en onkosten
-ExpensesArea=Trips en uitgaven gebied
-SearchATripAndExpense=Zoek een reis en kosten
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Ander
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index 05f40c55bd3..d048aa3a61b 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Eksperymentalny
VersionDevelopment=Rozwój
VersionUnknown=Nieznany
VersionRecommanded=Zalecana
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID sesji
SessionSaveHandler=Asystent zapisu sesji
SessionSavePath=Lokalizacja sesji danych
@@ -17,32 +22,32 @@ NoSessionListWithThisHandler=Asystent zapisu sesji skonfigurowany w PHP nie zezw
LockNewSessions=Zablokuj nowe połączenia
ConfirmLockNewSessions=Czy na pewno chcesz ograniczyć wszelkie nowe połączenie Dolibarr do siebie. Tylko %s użytkownik będzie mógł się połączyć po tym.
UnlockNewSessions=Usuwanie blokady połączeń
-YourSession=Sesji
-Sessions=Użytkownicy sesji
+YourSession=Twoja sesja
+Sessions=Sesja użytkowników
WebUserGroup=Serwer sieci Web użytkownik / grupa
NoSessionFound=PHP wydaje się nie dopuścić do listy aktywnych sesji. Katalog używany do zapisywania sesji (%s) mogą być chronione (np. przez uprawnienia OS dyrektywy open_basedir lub PHP).
-HTMLCharset=Charset dla generowanych stron HTML
-DBStoringCharset=Charset bazy danych do przechowywania danych
-DBSortingCharset=Database charset sortowanie danych
+HTMLCharset=Kodowanie dla generowanych stron HTML
+DBStoringCharset=Kodowanie bazy danych do przechowywania danych
+DBSortingCharset=Kodowanie bazy danych by sortować dane
WarningModuleNotActive=Moduł %s musi być aktywny
-WarningOnlyPermissionOfActivatedModules=Tylko uprawnienia związane z aktywowane moduły pokazane są tutaj. Możesz uaktywnić inne moduły w instalacji - moduł strony.
-DolibarrSetup=Dolibarr konfiguracji
-DolibarrUser=Dolibarr użytkownika
+WarningOnlyPermissionOfActivatedModules=Tylko uprawnienia związane z funkcją aktywowania modułów pokazane są tutaj. Możesz uaktywnić inne moduły w instalacji - moduł strony.
+DolibarrSetup=Instalacja lub ulepszenie Dollibar'a
+DolibarrUser=Użytkownik Dolibarr
InternalUser=Wewnętrzny użytkownik
-ExternalUser=Zewnętrzne użytkownika
-InternalUsers=Użytkownicy wewnętrzni
-ExternalUsers=Użytkowników zewnętrznych
-GlobalSetup=Global konfiguracji
+ExternalUser=Zewnętrzny użytkownik
+InternalUsers=Wewnętrzni użytkownicy
+ExternalUsers=Zewnetrzni użytkownicy
+GlobalSetup=Globalna konfiguracja
GUISetup=Wyświetlanie
-SetupArea=Ustawienia obszaru
-FormToTestFileUploadForm=Formularz do wysyłania pliku test (w zależności od konfiguracji)
-IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy modułu %s jest aktywny
-RemoveLock=Usuwanie pliku %s, jeśli istnieje, aby umożliwić aktualizację narzędzia.
-RestoreLock=Zastąp plik %s odczytu z uprawnień jedynie na plik wyłączyć wszelkie korzystanie z aktualizacji narzędzia.
+SetupArea=Dział konfiguracji
+FormToTestFileUploadForm=Formularz do wysyłania pliku testowego (według konfiguracji)
+IfModuleEnabled=Uwaga: tak jest skuteczne tylko wtedy, gdy moduł %s jest aktywny
+RemoveLock=Usuń plik %s, jeśli istnieje, aby umożliwić aktualizację narzędzia.
+RestoreLock=Zastąp plik %s tylko z uprawnieniami do odczytu, by wyłączyć wszelkie korzystanie z aktualizacji narzędzia.
SecuritySetup=Ustawienia bezpieczeństwa
-ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większy
-ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większy
-ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwany.
+ErrorModuleRequirePHPVersion=Błąd ten moduł wymaga PHP w wersji %s lub większej
+ErrorModuleRequireDolibarrVersion=Błąd ten moduł wymaga Dolibarr wersji %s lub większej
+ErrorDecimalLargerThanAreForbidden=Błąd, dokładność większa niż %s nie jest obsługiwana
DictionarySetup=Dictionary setup
Dictionary=Dictionaries
Chartofaccounts=Chart of accounts
@@ -50,7 +55,7 @@ Fiscalyear=Fiscal years
ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
ErrorCodeCantContainZero=Kod nie może zawierać wartości "0"
DisableJavascript=Wyłącz funkcje JavaScript i Ajax (rekomendowane dla osób niewidomych oraz przeglądarek tekstowych)
-ConfirmAjax=Wykorzystanie Ajax potwierdzenie pop
+ConfirmAjax=Wykorzystanie potwierdzeń Ajax popups
UseSearchToSelectCompanyTooltip=Also if you have a large number of third parties (> 100 000), you can increase speed by setting constant COMPANY_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
UseSearchToSelectCompany=Use autocompletion fields to choose third parties instead of using a list box.
ActivityStateToSelectCompany= Dodaj filtr opcję aby pokazać / ukryć thirdparties, które są aktualnie w działalności lub przestał go
@@ -137,7 +142,7 @@ Box=Box
Boxes=Pulpity informacyjne
MaxNbOfLinesForBoxes=Maksymalna liczba linii na polach
PositionByDefault=Domyślna kolejność
-Position=Position
+Position=Pozycja
MenusDesc=Menu menedżerów określić zawartość menu 2 bary (prętem poziomym i pionowym pasku).
MenusEditorDesc=W menu edytora pozwala określić indywidualną pozycje w menu. Używaj go ostrożnie, aby uniknąć podejmowania dolibarr niestabilne i stałe pozycje menu nieosiągalny.
Niektóre moduły dodać pozycje w menu (w menu Wszystkie w większości przypadków). Jeśli usunęliśmy niektóre z tych zapisów przez pomyłkę, możesz przywrócić im przez wyłączenie i reenabling modułu.
MenuForUsers=Menu dla użytkowników
@@ -294,7 +299,7 @@ DoNotUseInProduction=Nie używaj w produkcji
ThisIsProcessToFollow=Jest to proces konfiguracji do:
StepNb=Krok %s
FindPackageFromWebSite=Znaleźć pakiet, który zapewnia funkcję chcesz (np. na oficjalnej stronie internetowej %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Pobieram paczke %s
UnpackPackageInDolibarrRoot=Rozpakuj pakiet plików do katalogu głównego Dolibarr %s
SetupIsReadyForUse=Instalacja jest zakończona i Dolibarr jest gotowy do użycia z tym nowym elementem.
NotExistsDirect=Alternatywna ścieżka root nie została zdefiniowana.
@@ -394,10 +399,10 @@ WarningUsingFPDF=Warning: Your conf.php contains directive dolibarr_pd
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 (vat is not applied on local tax)
2 : local tax apply on products and services before vat (vat is calculated on amount + localtax)
3 : local tax apply on products without vat (vat is not applied on local tax)
4 : local tax apply on products before vat (vat is calculated on amount + localtax)
5 : local tax apply on services without vat (vat is not applied on local tax)
6 : local tax apply on services before vat (vat is calculated on amount + localtax)
SMS=SMS
LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user %s
-RefreshPhoneLink=Refresh link
+RefreshPhoneLink=Odśwież link
LinkToTest=Clickable link generated for user %s (click phone number to test)
-KeepEmptyToUseDefault=Keep empty to use default value
-DefaultLink=Default link
+KeepEmptyToUseDefault=Zostaw puste by używać domyślnych wartości
+DefaultLink=Domyślny link
ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
ExternalModule=External module - Installed into directory %s
BarcodeInitForThirdparties=Mass barcode init for thirdparties
@@ -443,7 +448,7 @@ Module52Name=Zapasy
Module52Desc=Zapasy zarządzania produktów
Module53Name=Usługi
Module53Desc=Usługi zarządzania
-Module54Name=Contracts/Subscriptions
+Module54Name=Kontakty/Subskrypcje
Module54Desc=Management of contracts (services or reccuring subscriptions)
Module55Name=Kody kreskowe
Module55Desc=Kody kreskowe zarządzania
@@ -493,10 +498,16 @@ Module600Name=Powiadomienia
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Darowizny
Module700Desc=Darowizny zarządzania
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integracji
Module1400Name=Księgowość ekspertów
Module1400Desc=Księgowość zarządzania dla ekspertów (double stron)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorie
Module1780Desc=Kategorie zarządzania (produktów, dostawców i klientów)
Module2000Name=FCKeditor
@@ -623,7 +634,7 @@ Permission164=Disable a service/subscription of a contract
Permission165=Delete contracts/subscriptions
Permission171=Read trips and expenses (own and his subordinates)
Permission172=Create/modify trips and expenses
-Permission173=Delete trips and expenses
+Permission173=Usuń wyjazdy i wydatki
Permission174=Read all trips and expenses
Permission178=Export trips and expenses
Permission180=Czytaj dostawców
@@ -631,7 +642,7 @@ Permission181=Czytaj dostawcy zamówienia
Permission182=Tworzenie / zmodyfikować dostawcy zamówienia
Permission183=Validate dostawcy zamówienia
Permission184=Zatwierdź dostawcy zamówienia
-Permission185=Postanowienie dostawcy zamówienia
+Permission185=Order or cancel supplier orders
Permission186=Odbiór dostawcy zamówienia
Permission187=Zamknij dostawcy zamówienia
Permission188=Zrezygnuj dostawcy zamówienia
@@ -711,6 +722,13 @@ Permission538=Eksport usług
Permission701=Czytaj darowizn
Permission702=Tworzenie / zmodyfikować darowizn
Permission703=Usuń darowizn
+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
Permission1001=Czytaj zapasów
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Hasło do korzystania z serwera proxy
DefineHereComplementaryAttributes=Określ tutaj wszystkie ATUTY, nie są już dostępne domyślnie i że chcesz być obsługiwane przez %s.
ExtraFields=Uzupełniające atrybuty
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Linia produktów / usług z zerową ilość jest trakt
FreeLegalTextOnProposal=Darmowy tekstu propozycji
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Zamówienia zarządzania konfiguracją
OrdersNumberingModules=Zamówienia numeracji modules
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Kod kreskowy typu UPC
BarcodeDescISBN=Kod kreskowy typu ISBN
BarcodeDescC39=Kod kreskowy typu C39
BarcodeDescC128=Kod kreskowy typu C128
-GenbarcodeLocation=Kod kreskowy generowania narzędzie wiersza polecenia (używanego przez phpbarcode silników dla niektórych typów kodów kreskowych)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Środki pieniężne na rachunku do korzystania sprzedaje
CashDeskBankAccountForCheque= Chcesz używać do otrzymywania płatności w formie czeku
CashDeskBankAccountForCB= Chcesz używać do przyjmowania płatności gotówkowych za pomocą kart kredytowych
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Zakładka konfiguracji modułu
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index 612aab42806..bbb51193375 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Pojednanie
RIB=Numer konta bankowego
IBAN=Numer IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Numer BIC / SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Zlecenia stałe
StandingOrder=Zlecenie stałe
Withdrawals=Wypłaty
@@ -148,7 +152,7 @@ BackToAccount=Powrót do konta
ShowAllAccounts=Pokaż wszystkich rachunków
FutureTransaction=Transakcja w futur. Nie da się pogodzić.
SelectChequeTransactionAndGenerate=Wybierz / filtr sprawdza, to do otrzymania depozytu wyboru i kliknij przycisk "Utwórz".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index 9e72e149a44..0d11b2c8bf0 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -1,10 +1,10 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Faktura
Bills=Faktury
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Faktury klientów
+BillsCustomer=Faktura klientów
+BillsSuppliers=Faktury dostawców
+BillsCustomersUnpaid=Niezapłacone faktury klientów
BillsCustomersUnpaidForCompany=Należne wpłaty klientów faktur dla %s
BillsSuppliersUnpaid=Należne wpłaty dostawców faktur
BillsSuppliersUnpaidForCompany=Nieodpłatnej dostawcy faktury za %s
diff --git a/htdocs/langs/pl_PL/bookmarks.lang b/htdocs/langs/pl_PL/bookmarks.lang
index 05ca4530e66..e3bfe9ad09e 100644
--- a/htdocs/langs/pl_PL/bookmarks.lang
+++ b/htdocs/langs/pl_PL/bookmarks.lang
@@ -10,10 +10,10 @@ BookmarkTargetNewWindowShort=Nowe okno
BookmarkTargetReplaceWindowShort=Aktualne okno
BookmarkTitle=Tytuł zakładki
UrlOrLink=URL
-BehaviourOnClick=Zachowanie po kliknięciu na adres URL
+BehaviourOnClick=Zachowaj po kliknięciu na adres URL
CreateBookmark=Stwórz zakładkę
SetHereATitleForLink=Zdefiniuj nazwę zakładki
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Użyj zewnętrznego adresu http lub względnego URL Dolibarr
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Użyj zewnętrznego adresu http lub względnego adresu URL Dolibarr
ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Wybierz czy strona ma się otwierać w bieżącym czy w nowym oknie
BookmarksManagement=Zarządzanie zakładkami
ListOfBookmarks=Lista zakładek
diff --git a/htdocs/langs/pl_PL/commercial.lang b/htdocs/langs/pl_PL/commercial.lang
index 8e18d15fa0a..5e8c6f36a04 100644
--- a/htdocs/langs/pl_PL/commercial.lang
+++ b/htdocs/langs/pl_PL/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Potencjalni klienci
DeleteAction=Usuń działania / zadania
NewAction=Nowe działania / zadania
-AddAction=Dodaj działania / zadania
-AddAnAction=Dodaj działania / zadania
-AddActionRendezVous=Dodać zadanie Rendezvous
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Spotkanie
ConfirmDeleteAction=Czy na pewno chcesz usunąć to zadanie?
CardAction=Działanie karty
@@ -44,8 +44,8 @@ DoneActions=Sporządzono działania
DoneActionsFor=Sporządzono działań dla %s
ToDoActions=Niekompletne działań
ToDoActionsFor=Niekompletne działań na rzecz %s
-SendPropalRef=Wyślij handlowych wniosku %s
-SendOrderRef=Wyślij zamówienie %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Nie dotyczy
StatusActionToDo=Aby to zrobić
StatusActionDone=Zrobione
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt zrobić
DateActionPlanned=Data działania planowane na
DateActionDone=Data zrobienia działania
ActionAskedBy=Działanie zadawane przez
-ActionAffectedTo=Wpływ na działanie
+ActionAffectedTo=Event assigned to
ActionDoneBy=Działania wykonywane przez
ActionUserAsk=Zarejestrowane przez
ErrorStatusCantBeZeroIfStarted=Jeżeli pole 'Data zrobienia "jest wypełniona, rozpoczęto działania (lub gotowy), więc pole" Status "nie może być 0%%.
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index c38e732a362..460076d7f8e 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -91,9 +91,9 @@ LocalTax2IsUsedES= IRPF jest używany
LocalTax2IsNotUsedES= IRPF nie jest używany
LocalTax1ES=RE
LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeLocaltax1ES=Typ Re
+TypeLocaltax2ES=Typ IRPF
+TypeES=Typ
ThirdPartyEMail=%s
WrongCustomerCode=Nieprawidłowy kod Klienta
WrongSupplierCode=Nieprawidłowy kod Dostawcy
@@ -259,8 +259,8 @@ AvailableGlobalDiscounts=Bezwzględne rabaty dostępne
DiscountNone=Żaden
Supplier=Dostawca
CompanyList=Lista firm
-AddContact=Dodaj kontakt
-AddContactAddress=Dodaj kontakt / adres
+AddContact=Stwórz konktakt
+AddContactAddress=Stwórz kontakt/adres
EditContact=Edytuj kontakt
EditContactAddress=Edytuj kontakt / adres
Contact=Kontakt
@@ -268,8 +268,8 @@ ContactsAddresses=Kontakty / Adresy
NoContactDefinedForThirdParty=Brak zdefiniowanych kontaktów dla tego kontrahenta
NoContactDefined=Brak zdefinowanych kontaktów
DefaultContact=Domyślny kontakt/adres
-AddCompany=Dodaj firmę
-AddThirdParty=Dodaj kontrahenta
+AddCompany=Stwórz firmę
+AddThirdParty=Dodaj stronę trzecią
DeleteACompany=Usuń firmę
PersonalInformations=Prywatne dane osobowe
AccountancyCode=Kod księgowy
@@ -343,7 +343,7 @@ TE_MEDIUM=Średnia firma
TE_ADMIN=Rządowy
TE_SMALL=Mała firma
TE_RETAIL=Klient detaliczny
-TE_WHOLE=Wholetailer
+TE_WHOLE=Całościowy
TE_PRIVATE=Osoba prywatna
TE_OTHER=Inny
StatusProspect-1=Nie kontaktować się
@@ -397,18 +397,18 @@ YouMustCreateContactFirst=Musisz stworzyć e-maile, kontakty dla trzeciej pierws
ListSuppliersShort=Lista dostawców
ListProspectsShort=Lista potencjalnych klientów
ListCustomersShort=Lista klientów
-ThirdPartiesArea=Third parties and contact area
+ThirdPartiesArea=Zamówienie i konktakt
LastModifiedThirdParties=%s ostatnio modyfikowanych kontrahentów
UniqueThirdParties=Łącznie unikatowych kontrahentów
InActivity=Otwarte
ActivityCeased=Zamknięte
ActivityStateFilter=Status aktywności
-ProductsIntoElements=List of products into %s
+ProductsIntoElements=Lista produktów w %s
CurrentOutstandingBill=Biężący, niezapłacony rachunek
OutstandingBill=Maksymalna kwota niezapłaconego rachunku
OutstandingBillReached=Osiągnieto maksimum niezapłaconych rachunków
MonkeyNumRefModelDesc=Wróć NUMERO z formatu %syymm-nnnn klienta i kod %syymm-nnnn dla dostawcy kod yy gdzie jest rok, mm miesiąc i nnnn jest ciągiem bez przerwy i nie ma powrotu do 0.\nZwraca numer w formacie %syymm-nnnn dla kodu klienta i %syymm-nnnn dla kodu dostawcy, gdzie yy to rok, mm to miesiąc i nnnn jest sekwencją bez przerwy, bez powrotu do 0.
LeopardNumRefModelDesc=Dowolny kod Klienta / Dostawcy. Ten kod może być modyfikowany w dowolnym momencie.
ManagingDirectors=Funkcja(e) managera (prezes, dyrektor generalny...)
-SearchThirdparty=Search thirdparty
-SearchContact=Search contact
+SearchThirdparty=Szukaj zamówienia
+SearchContact=Znajdz kontakt
diff --git a/htdocs/langs/pl_PL/contracts.lang b/htdocs/langs/pl_PL/contracts.lang
index 04e1d26974d..138ce5b91c7 100644
--- a/htdocs/langs/pl_PL/contracts.lang
+++ b/htdocs/langs/pl_PL/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Minął
ServiceStatusClosed=Zamknięte
ServicesLegend=Usługi legendy
Contracts=Kontrakty
+ContractsAndLine=Contracts and line of contracts
Contract=Kontrakt
NoContracts=Nr umowy
MenuServices=Usługi
diff --git a/htdocs/langs/pl_PL/cron.lang b/htdocs/langs/pl_PL/cron.lang
index a1a4ba56588..d9628c890ea 100644
--- a/htdocs/langs/pl_PL/cron.lang
+++ b/htdocs/langs/pl_PL/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index a97ed635e4d..2cf540a0d8d 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Źródło i celów rachunków bankowych muszą by
ErrorBadThirdPartyName=Zła wartość w trzeciej imię
ErrorProdIdIsMandatory=%s jest obowiązkowy
ErrorBadCustomerCodeSyntax=Bad składni kodu klienta
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Klient kod wymagane
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Klient kod już używane
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=JavaScript nie musi być wyłączona do tej pracy f
ErrorPasswordsMustMatch=Zarówno wpisane hasło musi się zgadzać się
ErrorContactEMail=Techniczny błąd. Proszę skontaktować się z administratorem, aby po %s email pl zapewnić %s kod błędu w wiadomości, a nawet lepsze, dodając kopię ekranu strony.
ErrorWrongValueForField=Nieprawidłowa wartość dla %s numer pola (wartość "%s" nie pasuje regex %s zasady)
-ErrorFieldValueNotIn=Nieprawidłowa wartość dla %s liczba terenowych (value '%s "nie wartość dostępna w %s terenowych %s deserowe)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Nieprawidłowa wartość dla %s liczba pól (wartość '%s "nie jest %s istniejących ref)
ErrorsOnXLines=Błędów na linii źródło %s
ErrorFileIsInfectedWithAVirus=Program antywirusowy nie był w stanie potwierdzić (plik może być zainfekowany przez wirusa)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 474e25cf13d..2361a900a14 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -1,11 +1,11 @@
# Dolibarr language file - Source file is en_US - install
-InstallEasy=Staraliśmy się by instalacja Dolibarra była tak prosta jak to możliwe. Postępuj wg instrukcji krok po kroku.
+InstallEasy=Postępuj według instrukcji krok po kroku.
MiscellaneousChecks=Sprawdzenie wymagań
DolibarrWelcome=Witaj w Dolibarrze
ConfFileExists=Plik konfiguracyjny %s istnieje.
ConfFileDoesNotExists=Plik konfiguracyjny %s nie istnieje!
ConfFileDoesNotExistsAndCouldNotBeCreated=Plik konfiguracyjny %s nie istnieje i nie mógł zostać utworzony!
-ConfFileCouldBeCreated=Plik konfiguracyjny %s mógł zostać utworzony.
+ConfFileCouldBeCreated=Plik konfiguracyjny %s został lub mógł zostać utworzony.
ConfFileIsNotWritable=Plik konfiguracyjny %s nie ma uprawnień do zapisu. Sprawdź uprawnienia. Przy pierwszej instalacji Twój serwer WWW musi posiadać uprawnienia do zapisu tego pliku podczas procesu konfiguracji (Dla systemów uniksowych wystarczy wykonać polecenie "chmod 666").
ConfFileIsWritable=Plik konfiguracyjny %s ma uprawnienia do zapisu.
ConfFileReload=Odśwież wszystkie informacje z pliku konfiguracyjnego.
@@ -13,21 +13,21 @@ PHPSupportSessions=PHP obsługuje sesje.
PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
PHPSupportPOSTGETKo=Możliwe, że PHP nie obsługuje zmiennych POST i/lub GET. Sprawdź parametr variables_order w php.ini.
PHPSupportGD=PHP obsługuje graficzne funkcje GD.
-PHPSupportUTF8=To wsparcie PHP UTF8 funkcji.
-PHPMemoryOK=Maksymalna ilość pamięci sesji PHP to %s. Powinno wystarczyć.
+PHPSupportUTF8=Ta wersja PHP oferuje wsparcie funkcji UTF8.
+PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na %s. Powinno wystarczyć.
PHPMemoryTooLow=Maksymalna ilość pamięci sesji PHP %s bajtów. To może nie wystarczyć. Zmień w php.ini parametr memory_limit na przynajmniej %s bajtów.
-Recheck=Bardziej dokładny test
+Recheck=Potwierdz w celu dokładniejszego testu
ErrorPHPDoesNotSupportSessions=Instalacja PHP nie obsługuje sesji. Taka funkcjonalność jest wymagana do działania Dolibarra. Sprawdź swoje ustawienia PHP.
-ErrorPHPDoesNotSupportGD=Twoja instalacji PHP nie obsługuje funkcji graficznych GD. Nr wykresie będą dostępne.
-ErrorPHPDoesNotSupportUTF8=Twoja instalacji PHP nie obsługuje funkcji UTF8. Dolibarr może nie działać poprawnie. Rozwiązać ten problem przed instalacją Dolibarr.
+ErrorPHPDoesNotSupportGD=Twoja instalacji PHP nie obsługuje funkcji graficznych GD. wykresy nie będą dostępne.
+ErrorPHPDoesNotSupportUTF8=Twoja instalacji PHP nie obsługuje funkcji UTF8. Dolibarr może nie działać poprawnie. Rozwiązać ten problem przed instalacją Dolibarr'a.
ErrorDirDoesNotExists=Katalog %s nie istnieje.
-ErrorGoBackAndCorrectParameters=Cofnij się i popraw parametry.
-ErrorWrongValueForParameter=Wprowadzono nieprawidłową wartość dla parametru '%s'.
+ErrorGoBackAndCorrectParameters=Cofnij się i popraw złe parametry.
+ErrorWrongValueForParameter=Możliwe, że wprowadzono nieprawidłową wartość dla parametru '%s'.
ErrorFailedToCreateDatabase=Utworzenie bazy danych '%s' nie powiodło się.
ErrorFailedToConnectToDatabase=Połączenie z bazą danych '%s' nie powiodło się.
ErrorDatabaseVersionTooLow=Wersja (%s) bazy danych jest zbyt stara. Wymagana jest wersja %s lub wyższa.
ErrorPHPVersionTooLow=Wersja PHP zbyt stara. Wymagana wersja to przynajmniej %s.
-WarningPHPVersionTooLow=Wersja PHP jest zbyt stara. %s wersji lub więcej oczekuje. Wersja ta powinna umożliwić zainstalowanie ale nie jest obsługiwany.
+WarningPHPVersionTooLow=Wersja PHP jest zbyt stara. Oczekiwana wersja %s lub większa. Wersja, którą posiadasz powinna umożliwić instalcję ale nie będzie obsługiwana.
ErrorConnectedButDatabaseNotFound=Połączenie z serwerem powiodło się, ale nie znaleziony bazy '%s'.
ErrorDatabaseAlreadyExists=Baza danych '%s' już istnieje.
IfDatabaseNotExistsGoBackAndUncheckCreate=Jeśli baza danych nie istnieje, w poprzednim kroku zaznacz opcję "Utwórz bazę danych".
@@ -38,13 +38,13 @@ YouCanContinue=Możesz kontynuować...
PleaseBePatient=Proszę o cierpliwość...
License=Użyta licencja
ConfigurationFile=Plik konfiguracyjny
-WebPagesDirectory=Katalog na strony WWW
+WebPagesDirectory=Katalog, gdzie przechowywana jest strona WWW
DocumentsDirectory=Katalog na przesłane i wygenerowane dokumenty
URLRoot=Główny (Root) URL
ForceHttps=Wymuś połączenia bezpieczne (HTTPS)
CheckToForceHttps=Zaznacz tę opcję, aby wymusić połączenia bezpieczne (HTTPS).
Wymaga to, aby serwer WWW był skonfigurowany z certyfikatem SSL.
-DolibarrDatabase=Baza danych Dolibarr
-DatabaseChoice=Wybrana baza danych
+DolibarrDatabase=Baza danych Dolibarr'a
+DatabaseChoice=Wybór bazy danych
DatabaseType=Rodzaj bazy danych
DriverType=Rodzaj sterownika
Server=Serwer
@@ -54,16 +54,16 @@ DatabaseServer=Serwer baz danych
DatabaseName=Nazwa bazy danych
DatabasePrefix=Tabela prefiksów bazy danych
Login=Login
-AdminLogin=Login do bazy danych. Zostaw puste jeśli korzystasz z połączeń anonimowych
+AdminLogin=Login do administratora bazy danych
Password=Hasło
PasswordAgain=Powtórz hasło
-AdminPassword=Hasło do bazy danych. Zostaw puste jeśli korzystasz z połączeń anonimowych
+AdminPassword=Hasło do bazy danych
CreateDatabase=Utwórz bazę danych
CreateUser=Utwórz użytkownika
DatabaseSuperUserAccess=Baza danych z dostępem na prawach superużytkownika
-CheckToCreateDatabase=Zaznacz jeśli baza danych nie istnieje i musi zostać utworzona.
W takim przypadku na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
-CheckToCreateUser=Zaznacz jeśli użytkownik nie istnieje i musi zostać utworzony.
W takim przypadku na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
-Experimental=(eksperymentalne, nie działające)
+CheckToCreateDatabase=Zaznacz jeśli baza danych nie istnieje i musi zostać utworzona.
W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
+CheckToCreateUser=Zaznacz jeśli użytkownik nie istnieje i musi zostać utworzony.
W przypadku takim na dole tej strony musisz podać użytkownika/hasło do konta superużytkownika.
+Experimental=(eksperymentalnie, na własną odpowiedzialność)
DatabaseRootLoginDescription=Login użytkownika mogącego tworzyć nowe bazy lub nowych użytkowników, wymagane jeśli baza danych oraz jej właściciel nie istnieją.
KeepEmptyIfNoPassword=Zostaw puste jeśli użytkownik nie posiada hasła (unikaj takiej sytuacji)
SaveConfigurationFile=Zapis wartości
@@ -88,17 +88,17 @@ SystemIsInstalled=Instalacja zakończona.
SystemIsUpgraded=Dolibarr został zaktualizowany pomyślnie.
YouNeedToPersonalizeSetup=Teraz należy ustawić Dolibarra tak by spełniał Twoje wymagania (wygląd, możliwości, ...). Kliknij w poniższy link by przejść do ustawień:
AdminLoginCreatedSuccessfuly=Użytkownik administracyjny Dolibarra '%s' utworzony pomyślnie.
-GoToDolibarr=Idź do Dolibarr
+GoToDolibarr=Idź do Dolibarr'a
GoToSetupArea=Przejdź do ustawień Dolibarra
-MigrationNotFinished=Wersja bazy danych nie jest w pełni aktualna, więc musisz uruchomić proces aktualizacji ponownie.
+MigrationNotFinished=Wersja bazy danych nie jest w pełni aktualna. Musisz uruchomić proces aktualizacji ponownie.
GoToUpgradePage=Wejdź na stronę aktualizacji ponownie
Examples=Przykłady
WithNoSlashAtTheEnd=Bez znaku ukośnika "/" na końcu
DirectoryRecommendation=Zalecane jest by umieścić ten katalog poza katalogiem ze stronami WWW.
LoginAlreadyExists=Już istnieje
DolibarrAdminLogin=Użytkownik administracyjny Dolibarra
-AdminLoginAlreadyExists=Konto administracyjne Dolibarra '%s' już istnieje.
-WarningRemoveInstallDir=Ostrzeżenie: ze względów bezpieczeństwa po instalacji lub aktualizacji powinno się usunąć katalog install lub zmienić jego nazwę na install.lock by zapobiec jego nieuprawnionemu użyciu.
+AdminLoginAlreadyExists=Konto administracyjne Dolibarra '%s' już istnieje. Cofnij się jeśli chcesz utworzyć kolejne.
+WarningRemoveInstallDir=Ostrzeżenie: ze względów bezpieczeństwa by zapobiec nieuprawnionemu użyciu po instalacji lub aktualizacji powinno się usunąć katalog install lub zmienić jego nazwę na install.lock.
ThisPHPDoesNotSupportTypeBase=Ta wersja PHP nie obsługuje żadnego interfejsu dostępu do baz danych typu %s
FunctionNotAvailableInThisPHP=Niedostępne w tej wersji PHP
MigrateScript=Skrypt migracyjny
@@ -107,21 +107,21 @@ DataMigration=Migracja danych
DatabaseMigration=Migracja struktur baz danych
ProcessMigrateScript=Przetwarzanie skryptów
ChooseYourSetupMode=Wybierz tryb instalacji i potwierdź przyciskiem "Start"...
-FreshInstall=Świeża instalacja
-FreshInstallDesc=Użyj tego trybu jeśli to pierwsza instalacja. Jeśli nie to w tym trybie można naprawić poprzednią niepełną instalację, ale w przypadku aktualizacji skorzystaj z trybu "Aktualizacja".
+FreshInstall=Nowa instalacja
+FreshInstallDesc=Użyj tego trybu jeśli to pierwsza instalacja. Jeśli nie, to w tym trybie można naprawić poprzednią niepełną instalację. W przypadku aktualizacji skorzystaj z trybu "Aktualizacja".
Upgrade=Aktualizacja
UpgradeDesc=Użyj tego trybu jeśli podmieniono stare pliki Dolibarra plikami z nowszej wersji. Ten tryb uaktualni bazę danych i poprzednie dane.
Start=Start
InstallNotAllowed=Ustawienie niedostępne przez uprawnienia conf.php
NotAvailable=Niedostępne
YouMustCreateWithPermission=Musisz utworzyć plik %s i ustawić mu prawa zapisu dla serwera WWW podczas procesu instalacyjnego.
-CorrectProblemAndReloadPage=Proszę poprawić te ustawienia i odświeżyć stronę.
+CorrectProblemAndReloadPage=Proszę poprawić te ustawienia i odświeżyć stronę (domyślnie F5).
AlreadyDone=Migracja już przeprowadzona.
DatabaseVersion=Wersja bazy danych
ServerVersion=Wersja serwera baz danych
YouMustCreateItAndAllowServerToWrite=Musisz utworzyć ten katalog i zezwolić serwerowi WWW na zapis w nim.
CharsetChoice=Wybór zestawu kodowania
-CharacterSetClient=Zestaw kodowania dla wygenerowanych stron HTML
+CharacterSetClient=Zestaw kodowania użyty dla wygenerowanych stron HTML
CharacterSetClientComment=Wybierz zestaw kodowania znaków dla stron HTML.
Domyślnym wyborem zestawu znaków jest ten zastosowany w bazie danych.
DBSortingCollation=Sposób sortowania znaków
DBSortingCollationComment=Wybierz stronę kodową, która definiuje sposób sortowania znaków używany przez bazę danych. Ten parametr jest często nazywany 'collation'.
Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru.
@@ -129,45 +129,46 @@ CharacterSetDatabase=Zestaw znaków dla bazy danych
CharacterSetDatabaseComment=Wybierz zesta znaków, który zostanie użyty do utworzenia bazy danych.
Jeśli baza już istnieje, nie ma możliwości zdefiniowania tego parametru.
YouAskDatabaseCreationSoDolibarrNeedToConnect=Wybrano by utworzyć bazę danych %s, ale by tego dokonać Dolibarr musi połączyć się z serwerem %s na prawach superużytkownika %s.
YouAskLoginCreationSoDolibarrNeedToConnect=Wybrano by utworzyć użytkownika %s, ale by tego dokonać Dolibarr musi połączyć się z serwerem %s na prawach superużytkownika %s.
-BecauseConnectionFailedParametersMayBeWrong=Połączenie nie powiodło się, więc adres serwera lub parametry superużytkownika musiały być nieprawidłowe.
+BecauseConnectionFailedParametersMayBeWrong=Połączenie nie powiodło się. Adres serwera lub parametry superużytkownika musiały być nieprawidłowe.
OrphelinsPaymentsDetectedByMethod=Osierocona płatność wykryta przez metodę %s
-RemoveItManuallyAndPressF5ToContinue=Usuń go ręcznie i odśwież stronę by kontynuować.
+RemoveItManuallyAndPressF5ToContinue=Usuń go ręcznie i odśwież stronę (domyślnie F5) by kontynuować.
KeepDefaultValuesWamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
-KeepDefaultValuesDeb=Du bruker Dolibarr konfigurasjonsveiviseren fra en Ubuntu eller Debian-pakke, så verdiene foreslått her allerede er optimalisert. Bare passordet til databasen eieren til å opprette må fullføres. Endre andre parametere bare hvis du vet hva du gjør.
+KeepDefaultValuesDeb=Uzywasz kreatora instalacji dla Linuxa (Ubutu, Debian, Fedora..), więc zaproponowane wartości są zoptymalizowane. Tylko hasło właściciela bazy danych do stworzenia musi być kompletne. Inne parametry zmieniaj TYLKO jeśli wiesz co robisz.
KeepDefaultValuesMamp=Używasz kreatora instalacji, więc zaproponowane wartości są zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
-KeepDefaultValuesProxmox=Możesz skorzystać z kreatora konfiguracji Dolibarr z urządzeniem wirtualnym Proxmox, więc wartościami zaproponowanymi tutaj są już zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
+KeepDefaultValuesProxmox=Możesz skorzystać z kreatora konfiguracji Dolibarr z urządzeniem wirtualnym Proxmox, więc wartości zaproponowane tutaj są już zoptymalizowane. Zmieniaj je tylko jeśli wiesz co robisz.
FieldRenamed=Nazwa pola zmieniona
-IfLoginDoesNotExistsCheckCreateUser=Jeśli logowania jeszcze nie istnieje, należy sprawdzić opcję "Utwórz użytkownika"
-ErrorConnection=Serwer " %s", nazwa bazy danych " %s" login " %s" lub hasło bazy danych mogą być złe lub PHP wersji klienckiej może być zbyt stare porównaniu do wersji bazy danych.
-InstallChoiceRecommanded=Zaleciły wybór zainstalować wersję %s od aktualnej wersji %s
+IfLoginDoesNotExistsCheckCreateUser=Jeśli login jeszcze nie istnieje, sprawdzić opcję "Utwórz użytkownika"
+ErrorConnection=Serwer " %s", nazwa bazy danych " %s" login " %s" lub hasło bazy danych mogą być złe lub PHP wersji klienckiej może być zbyt stare w porównaniu do wersji bazy danych.
+InstallChoiceRecommanded=Zalecany wybór: zainstalować wersję %s od aktualnej wersji %s
InstallChoiceSuggested=Wybór sugerowany przez instalator.
-MigrateIsDoneStepByStep=Ukierunkowane wersja (%s) ma lukę w kilku wersjach, tak zainstalować kreator powróci do sugerować kolejną migrację raz ten jeden będzie gotowy.
-CheckThatDatabasenameIsCorrect=Sjekk at database navn "%s" er korrekt.
-IfAlreadyExistsCheckOption=Hvis dette navnet er riktig, og at databasen ikke eksisterer ennå, du må sjekke alternativet "Opprett database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Du merket "Opprett database". For dette, må du oppgi brukernavn / passord av superbruker (nederst på skjemaet).
-YouAskToCreateDatabaseUserSoRootRequired=Du merket "Opprett database eier". For dette, må du oppgi brukernavn / passord av superbruker (nederst på skjemaet).
-NextStepMightLastALongTime=Gjeldende trinn kan vare i flere minutter. Vennligst vent til neste skjermbildet vises helt før du fortsetter.
-MigrationCustomerOrderShipping=Migrer frakt for kundeordrer oppbevaring
-MigrationShippingDelivery=Oppgrader lagring av shipping
-MigrationShippingDelivery2=Oppgrader lagring av shipping 2
+MigrateIsDoneStepByStep=Konkretna wersja (%s) ma lukę w kilku wersjach, kreator powróci do sugerowawanej kolejnej migracji, kiedy aktualna będzie gotowa.
+CheckThatDatabasenameIsCorrect=Sprawdz czy nazwa bazy danych "%s" jest poprawna.
+IfAlreadyExistsCheckOption=Jeśli ta nazwa jest poprawna i baza danych jeszcze nie istnieje, sprawdz opcję "utwórz bazę danych"
+OpenBaseDir=PHP parametr otwarcia katalogu bazy danych
+YouAskToCreateDatabaseSoRootRequired=Zaznaczyłeś opcje "Stwórz baze danych". Wprowadz proszę nazwę i hasło Super Użytkownika
+YouAskToCreateDatabaseUserSoRootRequired=Zaznaczyłeś opcje "Stwórz właściciela bazy danych". Wprowadz proszę nazwę i hasło Super Użytkownika.
+NextStepMightLastALongTime=Aktulany krok potrwa chwilę. By kontynuować, proszę czekać, aż kolejny krok będzie dostępny.
+MigrationCustomerOrderShipping=Migracja danych przesyłek zamówień odbiorców
+MigrationShippingDelivery=Aktualizacja stanu do wysyłki
+MigrationShippingDelivery2=Aktualizacja stanu do wysyłki 2
MigrationFinished=Migracja zakończona
-LastStepDesc=Ostatni krok: Zdefiniuj tutaj login i hasło masz zamiar użyć do połączenia z oprogramowaniem. Nie trać tego, ponieważ jest to konto do administrowania wszystkimi innymi.
+LastStepDesc=Ostatni krok: Zdefiniuj tutaj nazwę i hasło, które masz zamiar użyć do połączenia z oprogramowaniem. Zapamiętaj je, ponieważ jest to konto do administrowania wszystkimi innymi ustawieniami.
ActivateModule=Aktywuj moduł %s
ShowEditTechnicalParameters=Kliknij tutaj, aby pokazać / edytować zaawansowane parametry (tryb ekspert)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Uwaga:\nPamiętaj o zrobieniu kopi zapasowej bazy!\nWysoko rekomendowane: dla przykładu, podczas wystąpienia błędu w bazie danych systemu (dla przykładu w wersji 5.5.40 mySQL), niektóre dane lub tabele mogą zostać stracone podczas tego procesu. Rekomendowane jest by zrobic kopię swojej bazy przed migracją.\n\nNaciśnij OK by zacząć migrację...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
-MigrationFixData=Fastsette for denormalized data
+MigrationFixData=Napraw nieznormalizowane dane
MigrationOrder=Migracja danych zamówień odbiorców
MigrationSupplierOrder=Migracja danych zamówień dostawców
MigrationProposal=Migracja danych propozycji handlowych
-MigrationInvoice=Migracja danych faktur odbiorców
+MigrationInvoice=Migracja dla danych faktur odbiorców
MigrationContract=Migracja danych kontraktów
MigrationSuccessfullUpdate=Aktualizacja powiodła się
MigrationUpdateFailed=Aktualizacja nie powiodła się
-MigrationRelationshipTables=Data migrering for forholdet tabeller (%s)
+MigrationRelationshipTables=Migracja dla danych propozycji handlowych (%s)
MigrationPaymentsUpdate=Korekta danych płatności
MigrationPaymentsNumberToUpdate=%s płatności do aktualizacji
MigrationProcessPaymentUpdate=Aktualizacja płatności %s
@@ -187,7 +188,7 @@ MigrationContractsInvalidDateFix=Korekta kontraktu %s (Data kontraktu=%s, Minima
MigrationContractsInvalidDatesNumber=%s kontraktów zmodyfikowano
MigrationContractsInvalidDatesNothingToUpdate=Brak dat z nieprawidłową wartością do korekty
MigrationContractsIncoherentCreationDateUpdate=Nieprawidłowa wartość daty początkowej kontraktu do korekty
-MigrationContractsIncoherentCreationDateUpdateSuccess=Nieprawidłowa wartość początkowej daty kontraktu skorygowana poprawnie
+MigrationContractsIncoherentCreationDateUpdateSuccess=Nieprawidłowa wartość początkowej daty kontraktu. Skorygowana poprawnie
MigrationContractsIncoherentCreationDateNothingToUpdate=Brak nieprawidłowych wartości początkowej daty kontraktu do korekty
MigrationReopeningContracts=Otwarte kontrakty zamknięte z przyczyny błędu
MigrationReopenThisContract=Ponownie otwórz kontrakt %s
@@ -199,15 +200,15 @@ MigrationShipmentOrderMatching=Aktualizacja rachunków za wysyłki
MigrationDeliveryOrderMatching=Aktualizacja rachunków za dostawy
MigrationDeliveryDetail=Aktualizacja dostawy
MigrationStockDetail=Aktualizacja wartości zapasów produktów
-MigrationMenusDetail=Aktualizacja dynamiczne menu tabele
+MigrationMenusDetail=Aktualizacja dynamicznego meni tabeli
MigrationDeliveryAddress=Aktualizacja adresu dostarczenia przesyłki
-MigrationProjectTaskActors=Data migrering for llx_projet_task_actors bord
-MigrationProjectUserResp=Data migrering feltet fk_user_resp av llx_projet å llx_element_contact
-MigrationProjectTaskTime=Oppdater tid i sekunder
+MigrationProjectTaskActors=Migracja danych z tabeli llx_projet_task_actors
+MigrationProjectUserResp=Migracja danych pola fk_user_resp z llx_projet do llx_element_contact
+MigrationProjectTaskTime=Pokonany czas uaktualnienia w sekundach
MigrationActioncommElement=Aktualizacja danych na temat działań
MigrationPaymentMode=Migracji danych w trybie płatności
MigrationCategorieAssociation=Migracja kategorii
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Przenieś wydarzenie by dodać nowego właściciela do przypisanej tabeli.
-ShowNotAvailableOptions=Show not available options
-HideNotAvailableOptions=Hide not available options
+ShowNotAvailableOptions=Pokaż niedostępne opcje.
+HideNotAvailableOptions=Ukryj niedostępne opcje.
diff --git a/htdocs/langs/pl_PL/ldap.lang b/htdocs/langs/pl_PL/ldap.lang
index af146a42d6e..5ab82adba70 100644
--- a/htdocs/langs/pl_PL/ldap.lang
+++ b/htdocs/langs/pl_PL/ldap.lang
@@ -17,13 +17,13 @@ LDAPUsers=Użytkowników w bazie danych LDAP
LDAPGroups=Grupy w bazie danych LDAP
LDAPFieldStatus=Stan
LDAPFieldFirstSubscriptionDate=Pierwsze subskrypcji daty
-LDAPFieldFirstSubscriptionAmount=Fist kwoty abonamentu
+LDAPFieldFirstSubscriptionAmount=Pierwsza subskrypcja kwoty
LDAPFieldLastSubscriptionDate=Ostatnia data subskrypcji
LDAPFieldLastSubscriptionAmount=Ostatnia kwota subskrypcji
SynchronizeDolibarr2Ldap=Synchronizacja użytkownika (Dolibarr -> LDAP)
-UserSynchronized=Użytkownik zsynchronizowane
-GroupSynchronized=Grupa zsynchronizowane
+UserSynchronized=Użytkownik zsynchronizowany
+GroupSynchronized=Grupa zsynchronizowana
MemberSynchronized=Państwa zsynchronizowane
-ContactSynchronized=Kontakt zsynchronizowane
-ForceSynchronize=Siły synchronizujące Dolibarr -> LDAP
+ContactSynchronized=Kontakt zsynchronizowany
+ForceSynchronize=Synchronizacja użytkownika (Dolibarr -> LDAP)
ErrorFailedToReadLDAP=Nie można odczytać bazy danych LDAP. Sprawdź LDAP moduł konfiguracji bazy danych i dostępności.
diff --git a/htdocs/langs/pl_PL/link.lang b/htdocs/langs/pl_PL/link.lang
index 8b1efb75ef3..81c4c7b4ffd 100644
--- a/htdocs/langs/pl_PL/link.lang
+++ b/htdocs/langs/pl_PL/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '%s'
-ErrorFailedToUpdateLink= Failed to update link '%s'
+LinkANewFile=Podepnij nowy plik/dokument
+LinkedFiles=Podepnij plik i dokument
+NoLinkFound=Brak zarejestrowanych linków
+LinkComplete=Plik został podlinkowany poprawnie
+ErrorFileNotLinked=Plik nie mógł zostać podlinkowany
+LinkRemoved=Link %s został usunięty
+ErrorFailedToDeleteLink= Niemożna usunąc linku '%s'
+ErrorFailedToUpdateLink= Niemożna uaktualnić linku '%s'
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index ddad87dc664..edc327913a3 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -5,104 +5,104 @@ DIRECTION=ltr
# stsongstdlight or cid0cs are for simplified Chinese
# To read Chinese pdf with Linux: sudo apt-get install poppler-data
FONTFORPDF=DejaVuSans
-FONTSIZEFORPDF=8
+FONTSIZEFORPDF=10
SeparatorDecimal=,
SeparatorThousand=Space
-FormatDateShort=%d-%m-%Y
-FormatDateShortInput=%d-%m-%Y
-FormatDateShortJava=dd-MM-yyyy
-FormatDateShortJavaInput=dd-MM-yyyy
-FormatDateShortJQuery=dd-mm-yy
-FormatDateShortJQueryInput=dd-mm-yy
-FormatHourShortJQuery=HH:MI
-FormatHourShort=%H:%M
+FormatDateShort=%d-%m-%r
+FormatDateShortInput=%d-%m-%r
+FormatDateShortJava=dd-MM-rrrr
+FormatDateShortJavaInput=dd-MM-rrrr
+FormatDateShortJQuery=dd-mm-rr
+FormatDateShortJQueryInput=dd-mm-rr
+FormatHourShortJQuery=HH:MM
+FormatHourShort=%I:%M %p
FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d-%m-%Y %H:%M
+FormatDateTextShort=%d %b %R
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%m/%d/%Y %I:%M %p
FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
DatabaseConnection=Połączenia z bazą danych
NoTranslation=Brak tłumaczenia
-NoRecordFound=No record found
+NoRecordFound=Rekord nie został znaleziony.
NoError=Brak błędów
Error=Błąd
ErrorFieldRequired=Pole ' %s' jest wymagane
ErrorFieldFormat=Pole ' %s' ma złe wartości
ErrorFileDoesNotExists=Plik %s nie istnieje
ErrorFailedToOpenFile=Nie można otworzyć pliku %s
-ErrorCanNotCreateDir=Nie można utworzyć %s reż
-ErrorCanNotReadDir=Nie można odczytać %s reż
-ErrorConstantNotDefined=Parametr %s nie zostało zdefiniowane
-ErrorUnknown=Unknown error
+ErrorCanNotCreateDir=Nie można utworzyć folderu %s
+ErrorCanNotReadDir=Nie można odczytać folderu %s
+ErrorConstantNotDefined=Parametr %s nie został zdefiniowany
+ErrorUnknown=Nieznany błąd
ErrorSQL=Błąd SQL
-ErrorLogoFileNotFound=Logo file ' %s' nie został odnaleziony
-ErrorGoToGlobalSetup=Idź do "Firma / Fundacja" Aby rozwiązać ten problem z konfiguracją
-ErrorGoToModuleSetup=Przejdź do modułu konfiguracji Aby rozwiązać ten
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=Nie można wysłać mail (nadawcy= %s, odbiornik= %s)
-ErrorAttachedFilesDisabled=Podłączanie plików funkcja jest wyłączona na tym serveur
-ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej, że wolnego miejsca jest dostępna na dysku i że nie ma już plik o takiej samej nazwie w tym katalogu.
+ErrorLogoFileNotFound=Logo pliku ' %s' nie zostało odnalezione
+ErrorGoToGlobalSetup=Idź do "Firma / Fundacja" Aby rozwiązać problem
+ErrorGoToModuleSetup=Przejdź do modułu konfiguracji aby naprawić
+ErrorFailedToSendMail=Próba wysłania maila nie udana (nadawca=%s, odbiorca=%s)
+ErrorAttachedFilesDisabled=Na tym serwerze funkcja łączania plików jest wyłączona
+ErrorFileNotUploaded=Plik nie został załadowany. Sprawdź, czy rozmiar nie przekracza maksymalnej dopuszczalnej wagi, lub czy wolne miejsce jest dostępne na dysku. Sprawdz czy nie ma już pliku o takiej samej nazwie w tym katalogu.
ErrorInternalErrorDetected=Wykryto błąd
-ErrorNoRequestRan=Nr wniosek prowadził
-ErrorWrongHostParameter=Niewłaściwy hosta parametr
-ErrorYourCountryIsNotDefined=Twój kraj nie jest zdefiniowane. Przejdź do Start-setup-Edycja i po raz kolejny formularz.
-ErrorRecordIsUsedByChild=Nie można usunąć rekordu. Ten zapis jest używany przez co najmniej na dziecko rekordy.
+ErrorNoRequestRan=Brak aktywnych zapytań
+ErrorWrongHostParameter=Niewłaściwy parametr hosta
+ErrorYourCountryIsNotDefined=Twój kraj nie został zdefiniowany. Przejdź do Start-setup-Edycja i wypełnij poprawnie formularz.
+ErrorRecordIsUsedByChild=Nie można usunąć rekordu. Ten zapis jest używany przez co najmniej jeden pokrewny rekord.
ErrorWrongValue=Błędna wartość
ErrorWrongValueForParameterX=Nieprawidłowa wartość dla parametru %s
-ErrorNoRequestInError=Żadne życzenie nie jest w błędzie
+ErrorNoRequestInError=Nie wykryto żadneog błednego zapytania.
ErrorServiceUnavailableTryLater=Usługa nie jest dostępna w tej chwili. Spróbuj ponownie później.
ErrorDuplicateField=Zduplikuj niepowtarzalną wartość w polu
-ErrorSomeErrorWereFoundRollbackIsDone=Niektóre błędy znaleziono. Mamy cofnąć zmiany.
-ErrorConfigParameterNotDefined=Parametr %s nie jest zdefiniowany wewnątrz Dolibarr plik konfiguracyjny conf.php.
-ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć użytkownika %s Dolibarr w bazie danych.
+ErrorSomeErrorWereFoundRollbackIsDone=Znaleziono błedy. Cofam zmiany
+ErrorConfigParameterNotDefined=Parametr %s nie jest zdefiniowany wewnątrz pliku konfiguracyjnego conf.php. Dollibara
+ErrorCantLoadUserFromDolibarrDatabase=Nie można znaleźć użytkownika %s Dolibarra w bazie danych.
ErrorNoVATRateDefinedForSellerCountry=Błąd, nie określono stawki VAT dla kraju " %s".
-ErrorNoSocialContributionForSellerCountry=Błąd, nie typ społeczny wkład określone dla kraju "%s".
+ErrorNoSocialContributionForSellerCountry=Błąd, społeczny wkład określony dla kraju %s niezdefiniowany.
ErrorFailedToSaveFile=Błąd, nie udało się zapisać pliku.
-SetDate=Set date
-SelectDate=Select a date
-SeeAlso=See also %s
-SeeHere=See here
+SetDate=Ustaw datę
+SelectDate=Wybierz datę
+SeeAlso=Zobacz także %s
+SeeHere=Zobacz tutaj
BackgroundColorByDefault=domyślny kolor tła
-FileNotUploaded=The file was not uploaded
-FileUploaded=The file was successfully uploaded
-FileWasNotUploaded=Wybraniu pliku do zamocowania, ale jeszcze nie wysłał. Kliknij na "Dołącz plik" w tej sprawie.
-NbOfEntries=Uwaga wpisów
-GoToWikiHelpPage=Przeczytaj pomoc online (potrzeba dostępu do Internetu)
+FileNotUploaded=Plik nie został wysłany
+FileUploaded=Plik został pomyślnie przesłany
+FileWasNotUploaded=Wybrano pliku do zamontowaia, ale jeszcze nie wysłano. W tym celu wybierz opcję "dołącz plik".
+NbOfEntries=Liczba wejść
+GoToWikiHelpPage=Przeczytaj pomoc online
GoToHelpPage=Przeczytaj pomoc
-RecordSaved=Zapis zapisane
-RecordDeleted=Record deleted
-LevelOfFeature=Poziom funkcje
+RecordSaved=Rekord zapisany
+RecordDeleted=Rekord usunięty
+LevelOfFeature=możliwości funkcji
NotDefined=Nie zdefiniowany
-DefinedAndHasThisValue=Zdefiniowane i wartości
-IsNotDefined=undefined
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr uwierzytelniania w trybie %s do konfiguracji w pliku konfiguracyjnym conf.php.
Oznacza to, że hasło do bazy danych jest extern Dolibarr, więc zmianę tej dziedzinie może mieć skutki.
+DefinedAndHasThisValue=Zdefiniowao i przeliczono
+IsNotDefined=Nie zdefiniowano
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr uwierzytelnia w trybie %s do konfiguracji w pliku konfiguracyjnym conf.php.
Oznacza to, że hasło do bazy danych jest zewnętrzne Dolibarr, więc zmiany w tej dziedzinie mogą nie mieć skutków.
Administrator=Administrator
-Undefined=Niezdefiniowana
+Undefined=Niezdefiniowano
PasswordForgotten=Zapomniałeś hasła?
SeeAbove=Patrz wyżej
HomeArea=Strona Startowa
LastConnexion=Ostatnie połączenia
PreviousConnexion=Poprzednie połączenia
-ConnectedOnMultiCompany=Połączenie na podmiot
-ConnectedSince=Połączenie od
-AuthenticationMode=Autentyczności trybie
-RequestedUrl=Żądanego adresu
-DatabaseTypeManager=Database Type Manager
-RequestLastAccess=Wniosek o ostatnim dostępu do baz danych
-RequestLastAccessInError=Wniosek o ostatnim dostępu do baz danych w wyniku błędu
-ReturnCodeLastAccessInError=Kod powrotu do ostatniego dostępu do baz danych w błąd
-InformationLastAccessInError=Informacje dla ostatniego dostępu do baz danych w błąd
-DolibarrHasDetectedError=Dolibarr wykrył błędu technicznego
-InformationToHelpDiagnose=To informacje, które mogą pomóc w diagnozowaniu
+ConnectedOnMultiCompany=Podłączono do środowiska
+ConnectedSince=Połączeno od
+AuthenticationMode=Tryb autentycznośći
+RequestedUrl=Zażądano adresu URL
+DatabaseTypeManager=Typ managera bazy danych
+RequestLastAccess=Zapytanie o ostatni dostęp do baz danych
+RequestLastAccessInError=Zapytanie o ostatni dostęp do baz danych w wyniku błędu
+ReturnCodeLastAccessInError=Kod powrotu ostatniego dostępu do baz danych w błędzie
+InformationLastAccessInError=Informacje ostatniego dostępu do baz danych w błędzie
+DolibarrHasDetectedError=Dolibarr wykrył błąd techniczny
+InformationToHelpDiagnose=Informacje, które mogą pomóc w diagnozowaniu
MoreInformation=Więcej informacji
-TechnicalInformation=Technical information
-NotePublic=Uwaga (publiczne)
-NotePrivate=Uwaga (prywatne)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr był konfiguracji do ograniczenia dokładności cen jednostkowych do %s miejsc po przecinku.
+TechnicalInformation=Informację techniczne
+NotePublic=Uwaga (publiczna)
+NotePrivate=Uwaga (prywatna)
+PrecisionUnitIsLimitedToXDecimals=Dolibarr ustawił ograniczenia dokładności cen jednostkowych do %s miejsc po przecinku.
DoTest=Test
ToFilter=Filtr
-WarningYouHaveAtLeastOneTaskLate=Ostrzeżenie, masz co najmniej jeden element, który przekroczył tolerancji zwłoki.
+WarningYouHaveAtLeastOneTaskLate=Ostrzeżenie! masz co najmniej jeden element, który przekroczył tolerancje zwłoki.
yes=tak
Yes=Tak
no=nie
@@ -116,41 +116,42 @@ Always=Zawsze
Never=Nigdy
Under=pod
Period=Okres
-PeriodEndDate=Datę zakończenia okresu
+PeriodEndDate=Data zakończenia okresu
Activate=Uaktywnij
Activated=Aktywowany
Closed=Zamknięte
Closed2=Zamknięte
-Enabled=Włączone
-Deprecated=Deprecated
-Disable=Wyłączyć
-Disabled=Niepełnosprawnych
+Enabled=Dostępne
+Deprecated=Nieaktualne
+Disable=Niedostępne
+Disabled=Niedostępne/Wyłączone
Add=Dodać
AddLink=Dodaj link
Update=Uaktualnić
-AddActionToDo=Dodaj do działania
-AddActionDone=Dodaj działania zrobienia
-Close=Blisko
-Close2=Blisko
+AddActionToDo=Dodaj działanie do
+AddActionDone=Dodaj działania zrobiene
+Close=Zamknij
+Close2=Zamknij
Confirm=Potwierdź
-ConfirmSendCardByMail=Czy na pewno chcesz wysłać tę kartę pocztą?
-Delete=Usunąć
+ConfirmSendCardByMail=Czy na pewno chcesz wysłać tą treść mailem do %s?
+Delete=Skasować
Remove=Usunąć
-Resiliate=Resiliate
+Resiliate=Wypowiedzenie
Cancel=Zrezygnuj
Modify=Modyfikuj
Edit=Edytuj
-Validate=Validate
+Validate=Potwierdz
+ValidateAndApprove=Validate and Approve
ToValidate=Aby potwierdzić
Save=Zapisać
SaveAs=Zapisz jako
TestConnection=Test połączenia
-ToClone=Clone
-ConfirmClone=Wybierz dane, które chcesz klon:
-NoCloneOptionsSpecified=Brak danych na klon zdefiniowane.
+ToClone=Duplikuj
+ConfirmClone=Wybierz dane, które chcesz zduplikować
+NoCloneOptionsSpecified=Brak zdefiniowanych danych do zduplikowania.
Of=z
-Go=Go
-Run=Run
+Go=Idź
+Run=Uruchom
CopyOf=Kopia
Show=Pokazać
ShowCardHere=Pokaż kartę
@@ -158,20 +159,21 @@ Search=Wyszukaj
SearchOf=Szukaj
Valid=Aktualny
Approve=Zatwierdź
-ReOpen=Re-Open
+Disapprove=Disapprove
+ReOpen=Otwórz ponownie
Upload=Wyślij plik
-ToLink=Link
+ToLink=Łącze
Select=Wybierz
Choose=Wybrać
ChooseLangage=Proszę wybrać język
Resize=Zmiana rozmiaru
-Recenter=Recenter
+Recenter=Wyśrodkuj
Author=Autor
User=Użytkownik
Users=Użytkownicy
Group=Grupa
Groups=Grupy
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Niezdefiniowano grup użytkowników
Password=Hasło
PasswordRetype=Powtórz hasło
NoteSomeFeaturesAreDisabled=Należy pamiętać, że wiele funkcji / modułów są wyłączone w tej demonstracji.
@@ -180,36 +182,36 @@ Person=Osoba
Parameter=Parametr
Parameters=Parametry
Value=Wartość
-GlobalValue=Global Value
+GlobalValue=Globalna wartość
PersonalValue=Osobiste wartości
NewValue=Nowa wartość
CurrentValue=Aktualna wartość
Code=Kod
Type=Typ
Language=Język
-MultiLanguage=Multi-language
+MultiLanguage=Wielo-językowość
Note=Uwaga
CurrentNote=Aktualna uwaga
Title=Tytuł
Label=Etykieta
RefOrLabel=Nr ref. lub etykieta
-Info=Zaloguj
+Info=Log
Family=Rodzina
Description=Opis
Designation=Opis
Model=Model
-DefaultModel=Domyślne modelu
+DefaultModel=Domyślny model
Action=Działanie
About=O
Number=Liczba
NumberByMonth=Ilość na miesiąc
-AmountByMonth=Kwota, o miesiąc
-Numero=Numero
+AmountByMonth=Kwota na miesiąc
+Numero=Numer
Limit=Limit
Limits=Limity
DevelopmentTeam=Development Team
Logout=Wyloguj
-NoLogoutProcessWithAuthMode=No applicative disconnect feature with authentication mode %s
+NoLogoutProcessWithAuthMode=żadna aplikacja nierozłączona w skutek uwierzytelniania trybu %s
Connection=Połączenie
Setup=Konfiguracja
Alert=Sygnał
@@ -219,60 +221,61 @@ Cards=Kartki
Card=Karta
Now=Teraz
Date=Data
+DateAndHour=Date and hour
DateStart=Data rozpoczęcia
DateEnd=Data zakończenia
DateCreation=Data utworzenia
DateModification=Zmiana daty
-DateModificationShort=Modif. data
+DateModificationShort=Modyfik. daty
DateLastModification=Ostatnia zmiana daty
-DateValidation=Walidacja daty
+DateValidation=Zatwierdzenie daty
DateClosing=Ostateczny termin
-DateDue=Termin
+DateDue=W trakcie terminu
DateValue=Wartość daty
DateValueShort=Wartość daty
DateOperation=Data operacji
-DateOperationShort=OPE. Data
+DateOperationShort=Data operacji
DateLimit=Limit daty
-DateRequest=Wniosek daty
+DateRequest=Żądanie daty
DateProcess=Proces daty
-DatePlanShort=Data strugane
-DateRealShort=Data rzeczywistym.
-DateBuild=Sprawozdanie budować daty
+DatePlanShort=Planowana data
+DateRealShort=Rzeczywista data
+DateBuild=Raport stworzenia daty
DatePayment=Data płatności
DurationYear=rok
DurationMonth=miesiąc
DurationWeek=tydzień
DurationDay=dzień
DurationYears=lat
-DurationMonths=miesiąc
-DurationWeeks=tydzień
-DurationDays=dzień
+DurationMonths=miesięcy
+DurationWeeks=tygodni
+DurationDays=dni
Year=Rok
Month=Miesiąc
Week=Tydzień
Day=Dzień
Hour=Godzina
Minute=Minute
-Second=Po drugie
+Second=Sekund
Years=Lata
Months=Miesiące
Days=Dni
-days=dzień
+days=dni
Hours=Godziny
-Minutes=Protokoły
+Minutes=Minut
Seconds=Sekund
-Weeks=Weeks
+Weeks=Tygodnie
Today=Dzisiaj
Yesterday=Wczoraj
Tomorrow=Jutro
-Morning=Morning
-Afternoon=Afternoon
-Quadri=Quadri
-MonthOfDay=Miesiąc dzień
-HourShort=O
+Morning=Rano
+Afternoon=Popołudniu
+Quadri=Kwadrans
+MonthOfDay=Dzień miesiąca
+HourShort=H
MinuteShort=mn
-Rate=Tempo
-UseLocalTax=Include tax
+Rate=Stawka
+UseLocalTax=Zawiera podatek
Bytes=Bajty
KiloBytes=Kilobajtów
MegaBytes=MB
@@ -283,55 +286,56 @@ Kb=Kb
Mb=Mb
Gb=Gb
Tb=Tb
-Cut=Ciąć
+Cut=Wytnij
Copy=Kopiowanie
Paste=Wklej
Default=Domyślny
DefaultValue=Wartość domyślna
-DefaultGlobalValue=Global Value
+DefaultGlobalValue=Wartość globalna
Price=Cena
UnitPrice=Cena jednostkowa
UnitPriceHT=Cena jednostkowa (netto)
UnitPriceTTC=Cena jednostkowa
-PriceU=UP
-PriceUHT=UP (netto)
-PriceUTTC=UP
+PriceU=cen/szt.
+PriceUHT=cen/szt (netto)
+AskPriceSupplierUHT=P.U. HT Requested
+PriceUTTC=cena/szt.
Amount=Ilość
AmountInvoice=Kwota faktury
AmountPayment=Kwota płatności
AmountHTShort=Kwota (netto)
-AmountTTCShort=Kwota (Inc podatkowych)
-AmountHT=Kwoty (po odliczeniu podatku)
-AmountTTC=Kwota (Inc podatkowych)
+AmountTTCShort=Kwota (zawierająca VAT)
+AmountHT=Kwota (netto bez podatku)
+AmountTTC=Kwota (zawierająca VAT)
AmountVAT=Kwota podatku VAT
-AmountLT1=Amount tax 2
-AmountLT2=Amount tax 3
-AmountLT1ES=Kwoty RE
+AmountLT1=Wartość podatku 2
+AmountLT2=Wartość podatku 3
+AmountLT1ES=Kwota RE
AmountLT2ES=Kwota IRPF
AmountTotal=Całkowita kwota
AmountAverage=Średnia kwota
-PriceQtyHT=Cena za tę ilość (po odliczeniu podatku)
-PriceQtyMinHT=Cena ilości min. (po odliczeniu podatku)
-PriceQtyTTC=Cena za tę ilość (Inc podatkowych)
-PriceQtyMinTTC=Cena ilości min. (Inc podatkowych)
-Percentage=Pourcentage
+PriceQtyHT=Cena za tę ilość (netto)
+PriceQtyMinHT=Cena ilości min. (netto)
+PriceQtyTTC=Cena za tę ilość (z VAT)
+PriceQtyMinTTC=Cena ilości min. (z VAT)
+Percentage=Procentowo
Total=Razem
-SubTotal=Razem
+SubTotal=Po podliczeniu
TotalHTShort=Ogółem (netto)
-TotalTTCShort=Ogółem (Inc podatkowych)
+TotalTTCShort=Ogółem (z VAT)
TotalHT=Razem (po odliczeniu podatku)
-TotalHTforthispage=Total (net of tax) for this page
-TotalTTC=Ogółem (Inc podatkowych)
-TotalTTCToYourCredit=Ogółem (Inc podatku) na konto kredytowe
-TotalVAT=Razem z VAT
-TotalLT1=Total tax 2
-TotalLT2=Total tax 3
+TotalHTforthispage=Razem (po odliczeniu podatku) dla tej strony
+TotalTTC=Ogółem (z VAT)
+TotalTTCToYourCredit=Ogółem (z VAT) na twoje konto
+TotalVAT=Razem VAT
+TotalLT1=Podatek całkowity 2
+TotalLT2=Podatek całkowity 3
TotalLT1ES=Razem RE
TotalLT2ES=Razem IRPF
-IncludedVAT=Zaliczenie podatku VAT
-HT=Bez podatku
-TTC=Inc VAT
-VAT=VAT
+IncludedVAT=Zawiera VAT
+HT=Bez VAT
+TTC=z VAT
+VAT=Sprzedaż opodatkowana VAT
LT1ES=RE
LT2ES=IRPF
VATRate=Stawka VAT
@@ -345,47 +349,47 @@ FullList=Pełna lista
Statistics=Statystyki
OtherStatistics=Inne statystyki
Status=Stan
-Favorite=Favorite
+Favorite=Ulubiony
ShortInfo=Info.
Ref=Nr ref.
RefSupplier=Nr ref. Dostawca
RefPayment=Nr ref. płatności
-CommercialProposalsShort=Commercial propozycje
+CommercialProposalsShort=Propozycje komercyjne
Comment=Komentarz
Comments=Komentarze
-ActionsToDo=Działania mające na celu nie
-ActionsDone=Działania zrobić
-ActionsToDoShort=Aby to zrobić
-ActionsRunningshort=Rozpoczęcie
+ActionsToDo=Działania do zrobienia
+ActionsDone=Działania zrobione
+ActionsToDoShort=Do zrobienia
+ActionsRunningshort=Rozpoczęto
ActionsDoneShort=Zrobione
ActionNotApplicable=Nie dotyczy
-ActionRunningNotStarted=Nie rozpoczęto
-ActionRunningShort=Rozpoczęcie
+ActionRunningNotStarted=By rozpocząć
+ActionRunningShort=Rozpoczęte
ActionDoneShort=Zakończone
-ActionUncomplete=Uncomplete
+ActionUncomplete=Niekompletne
CompanyFoundation=Firma / Fundacja
-ContactsForCompany=Kontakty na ten trzeciej
-ContactsAddressesForCompany=Contacts/addresses for this third party
-AddressesForCompany=Addresses for this third party
-ActionsOnCompany=Działania na temat tej osoby trzeciej
-ActionsOnMember=Wydarzenia O tego użytkownika
-NActions=%s działania
+ContactsForCompany=Kontakty dla tego zamówienia
+ContactsAddressesForCompany=Kontakt/adres dla tej części/zamówienia/
+AddressesForCompany=Adressy dla części trzeciej
+ActionsOnCompany=Działania na temat tego zamówienia
+ActionsOnMember=Informacje o wydarzeniach dla tego uzytkownika
+NActions=%s wydarzeń
NActionsLate=%s późno
-RequestAlreadyDone=Request already recorded
+RequestAlreadyDone=Żądanie już wysłane
Filter=Filtr
RemoveFilter=Usuń filtr
-ChartGenerated=Wykres generowany
-ChartNotGenerated=Wykres nie powstały
-GeneratedOn=Budować na %s
+ChartGenerated=Wykres wygenerowany
+ChartNotGenerated=Wykres niewygenerowany
+GeneratedOn=Zbuduj na %s
Generate=Wygeneruj
Duration=Czas trwania
TotalDuration=Łączny czas trwania
Summary=Podsumowanie
MyBookmarks=Moje zakładki
OtherInformationsBoxes=Inne informacje
-DolibarrBoard=Dolibarr pokładzie
+DolibarrBoard=Załoga Dollibara
DolibarrStateBoard=Statystyki
-DolibarrWorkBoard=Pracy zadań pokładzie
+DolibarrWorkBoard=Zadania załogi
Available=Dostępny
NotYetAvailable=Nie są jeszcze dostępne
NotAvailable=Niedostępne
@@ -394,7 +398,7 @@ Categories=Kategorie
Category=Kategoria
By=Przez
From=Od
-to=by
+to=do
and=i
or=lub
Other=Inny
@@ -403,11 +407,11 @@ OtherInformations=Inne informacje
Quantity=Ilość
Qty=Ilosc
ChangedBy=Zmieniona przez
-ReCalculate=Recalculate
+ReCalculate=Przelicz
ResultOk=Sukces
ResultKo=Porażka
-Reporting=Sprawozdawczość
-Reportings=Sprawozdawczość
+Reporting=Raportowanie
+Reportings=Raportowanie
Draft=Szkic
Drafts=Robocze
Validated=Zatwierdzona
@@ -418,26 +422,26 @@ Unknown=Nieznany
General=Ogólne
Size=Rozmiar
Received=Odebrane
-Paid=Paid
-Topic=SUJET
-ByCompanies=Według firm
-ByUsers=Przez użytkowników
+Paid=Zapłacone
+Topic=Temat
+ByCompanies=Według zamówień
+ByUsers=Według użytkowników
Links=Linki
-Link=Łącze
+Link=Link
Receipts=Wpływy
-Rejects=Odrzuca
+Rejects=Odrzucone
Preview=Podgląd
NextStep=Następny krok
PreviousStep=Poprzedni krok
-Datas=Danych
+Datas=Dane
None=Żaden
NoneF=Żaden
Late=Późno
-Photo=Obrazek
-Photos=Foto
-AddPhoto=Dodaj zdjęcie
+Photo=Obraz
+Photos=Obrazy
+AddPhoto=Dodaj obraz
Login=Login
-CurrentLogin=Aktualna logowania
+CurrentLogin=Aktualny login
January=Styczeń
February=Luty
March=Marzec
@@ -450,23 +454,23 @@ September=Wrzesień
October=Październik
November=Listopad
December=Grudzień
-JanuaryMin=Jan
-FebruaryMin=Luty
+JanuaryMin=Sty
+FebruaryMin=Lut
MarchMin=Mar
-AprilMin=Kwietnia
+AprilMin=Kwi
MayMin=Maj
-JuneMin=Czerwca
-JulyMin=Lipca
-AugustMin=Sierpnia
-SeptemberMin=Września
-OctoberMin=Października
-NovemberMin=Listopada
-DecemberMin=Grudzień
+JuneMin=Cze
+JulyMin=Lip
+AugustMin=Sier
+SeptemberMin=Wrz
+OctoberMin=Paź
+NovemberMin=Lis
+DecemberMin=Gru
Month01=styczeń
Month02=luty
Month03=marzec
Month04=kwiecień
-Month05=może
+Month05=maj
Month06=cze
Month07=lipiec
Month08=sierpień
@@ -474,53 +478,54 @@ Month09=wrzesień
Month10=październik
Month11=listopad
Month12=grudzień
-MonthShort01=styczeń
-MonthShort02=luty
+MonthShort01=sty
+MonthShort02=lut
MonthShort03=mar
-MonthShort04=kwiecień
-MonthShort05=może
+MonthShort04=kwi
+MonthShort05=maj
MonthShort06=cze
-MonthShort07=lipiec
-MonthShort08=sierpień
-MonthShort09=sep
-MonthShort10=październik
-MonthShort11=listopad
-MonthShort12=grudzień
+MonthShort07=lip
+MonthShort08=sier
+MonthShort09=wrz
+MonthShort10=paź
+MonthShort11=lis
+MonthShort12=gru
AttachedFiles=Dołączone pliki i dokumenty
-FileTransferComplete=Plik został przesłany successfuly
+FileTransferComplete=Plik został przesłany poprawnie
DateFormatYYYYMM=RRRR-MM
DateFormatYYYYMMDD=RRRR-MM-DD
DateFormatYYYYMMDDHHMM=RRRR-MM-DD GG: SS
ReportName=Nazwa raportu
-ReportPeriod=Okresu sprawozdawczego
+ReportPeriod=Raport z okresu
ReportDescription=Opis
Report=Sprawozdanie
-Keyword=Mot cl
+Keyword=brak odpowiednika/ cant be translated.
Legend=Legenda
-FillTownFromZip=Wypełnij miasta zip
-Fill=Fill
-Reset=Reset
+FillTownFromZip=Wypełnij miasta po kodzie
+Fill=Wypełnij
+Reset=Wyczyść
ShowLog=Pokaż dziennik
File=Plik
Files=Pliki
NotAllowed=Niedozwolone
-ReadPermissionNotAllowed=Czytaj zgody nie wolno
+ReadPermissionNotAllowed=brak uprawnień odczytu
AmountInCurrency=Kwota w walucie %s
Example=Przykład
Examples=Przykłady
-NoExample=Nr przykład
+NoExample=brak przykładu
FindBug=Zgłoś błąd
-NbOfThirdParties=Liczba osób trzecich
+NbOfThirdParties=Liczba zamówień
NbOfCustomers=Liczba klientów
NbOfLines=Liczba linii
NbOfObjects=Liczba obiektów
NbOfReferers=Liczba stron odsyłających
-Referers=Refering objects
+Referers=Liczba objektów
TotalQuantity=Całkowita ilość
DateFromTo=Z %s do %s
DateFrom=Z %s
-DateUntil=Do %s
+DateUntil=Dopuki %s
Check=Sprawdzić
+Uncheck=Uncheck
Internal=Wewnętrzne
External=Zewnętrzne
Internals=Wewnętrzne
@@ -528,19 +533,19 @@ Externals=Zewnętrzne
Warning=Ostrzeżenie
Warnings=Ostrzeżenia
BuildPDF=Zbuduj PDF
-RebuildPDF=Rebuild PDF
+RebuildPDF=Popraw PDF
BuildDoc=Zbuduj Doc
-RebuildDoc=Rebuild Doc
+RebuildDoc=Popraw Doc
Entity=Podmiot
Entities=Podmioty
EventLogs=Logi
-CustomerPreview=Klient podglądu
-SupplierPreview=Dostawca podglądu
-AccountancyPreview=Księgowość podglądu
+CustomerPreview=Podgląd klienta
+SupplierPreview=Podgląd dostawcy
+AccountancyPreview=Podgląd księgowości
ShowCustomerPreview=Pokaż podgląd klienta
-ShowSupplierPreview=Pokaż dostawcy podglądu
-ShowAccountancyPreview=Pokaż podgląd rachunkowych
-ShowProspectPreview=Pokaż perspektywa podglądu
+ShowSupplierPreview=Pokaż podląd dostawcy
+ShowAccountancyPreview=Pokaż podgląd rachunkowy
+ShowProspectPreview=Pokaż podgląd prospektu
RefCustomer=Nr ref. klient
Currency=Waluta
InfoAdmin=Informacje dla administratorów
@@ -556,57 +561,57 @@ Response=Odpowiedź
Priority=Priorytet
SendByMail=Wyślij przez email
MailSentBy=E-mail został wysłany przez
-TextUsedInTheMessageBody=Email ciała
-SendAcknowledgementByMail=Wyślij Ack. przez e-mail
+TextUsedInTheMessageBody=Zawartość emaila
+SendAcknowledgementByMail=Wyślij potwierdzenie przez e-mail
NoEMail=Brak e-mail
-NoMobilePhone=No mobile phone
+NoMobilePhone=Brak telefonu komórkowego
Owner=Właściciel
-DetectedVersion=Wykryto wersji
-FollowingConstantsWillBeSubstituted=Po stałych będzie zastąpić o odpowiedniej wartości.
+DetectedVersion=Wykryto wersje
+FollowingConstantsWillBeSubstituted=Kolejna zawartość będzie zastąpiona wartością z korespondencji.
Refresh=Odśwież
BackToList=Powrót do listy
GoBack=Wróć
-CanBeModifiedIfOk=Mogą być zmienione, jeśli ważnych
-CanBeModifiedIfKo=Mogą być zmienione, jeśli nie obowiązuje
+CanBeModifiedIfOk=Mogą być zmienione jeśli ważne
+CanBeModifiedIfKo=Mogą być zmienione, jeśli nie ważne
RecordModifiedSuccessfully=Zapis zmodyfikowany pomyślnie
-RecordsModified=%s records modified
-AutomaticCode=Automatyczne kod
-NotManaged=Nie udało
+RecordsModified=%s zmodyfikowanych rekordów
+AutomaticCode=Automatyczny kod
+NotManaged=Nie zarządzono
FeatureDisabled=Funkcja wyłączona
MoveBox=Przenieś pole %s
-Offered=Bezpłatny
+Offered=Oferowany
NotEnoughPermissions=Nie masz uprawnień do tego działania
-SessionName=Sesja nazwa
+SessionName=Nazwa sesji
Method=Metoda
Receive=Odbiór
-PartialWoman=Częściowe
-PartialMan=Częściowe
+PartialWoman=Część
+PartialMan=Część
TotalWoman=Razem
TotalMan=Razem
NeverReceived=Nigdy nie otrzymała
-Canceled=Odwołany
-YouCanChangeValuesForThisListFromDictionarySetup=You can change values for this list from menu setup - dictionary
+Canceled=Anulowany
+YouCanChangeValuesForThisListFromDictionarySetup=Możesz zmieniać wartości dla tej listy z menu setup - słownik
Color=Kolor
-Documents=Związany plików
-DocumentsNb=Dołączonych plików (%s)
+Documents=Związanych plików
+DocumentsNb=Związanych plików (%s)
Documents2=Dokumenty
BuildDocuments=Wygenerowano dokumentów
-UploadDisabled=Prześlij niepełnosprawnych
+UploadDisabled=Prześlij nieaktywne
MenuECM=Dokumenty
MenuAWStats=AWStats
MenuMembers=Członkowie
-MenuAgendaGoogle=Google porządku
-ThisLimitIsDefinedInSetup=Dolibarr limit (Menu Start-setup-bezpieczeństwa): %s KB, PHP, limit: %s KB
-NoFileFound=Żadnych dokumentów zapisanych w tym katalogu
+MenuAgendaGoogle=Google agenda
+ThisLimitIsDefinedInSetup=Limit Dollibara (Menu główne-setup-bezpieczeństwo): %s KB, PHP, limit: %s KB
+NoFileFound=Brak dokumentów zapisanych w tym katalogu
CurrentUserLanguage=Język bieżący
CurrentTheme=Aktualny temat
-CurrentMenuManager=Current menu manager
-DisabledModules=Niepełnosprawnych modules
+CurrentMenuManager=Aktualny Menu menager
+DisabledModules=Nieaktywnych modułów
For=Dla
ForCustomer=Dla klienta
Signature=Podpis
-HidePassword=Pokaż polecenie hasłem ukryte
-UnHidePassword=Pokaż prawdziwe polecenia z jasnymi hasło
+HidePassword=Pokaż polecenie z ukrytym hasłem
+UnHidePassword=Pokaż prawdziwe polecenie z otwartym hasłem
Root=Root
Informations=Informacje
Page=Strona
@@ -614,20 +619,20 @@ Notes=Uwagi
AddNewLine=Dodaj nowy wiersz
AddFile=Dodaj plik
ListOfFiles=Lista dostępnych plików
-FreeZone=Free entry
-FreeLineOfType=Free entry of type
-CloneMainAttributes=Clone obiektu z jej głównych atrybutów
-PDFMerge=PDF Merge
-Merge=Scalanie
+FreeZone=wolność wyboru
+FreeLineOfType=Wolność wyboru typu
+CloneMainAttributes=Skopiuj obiekt z jego głównymi atrybutami
+PDFMerge=Scalanie/ dzielenie PDF
+Merge=Scalanie/ dzielenie
PrintContentArea=Pokaż stronę do wydruku głównej treści
-MenuManager=Menu manager
-NoMenu=Nie podmenu
-WarningYouAreInMaintenanceMode=Uwaga, jesteś w trybie konserwacji, więc tylko logowanie %s może używać aplikacji w danym momencie.
+MenuManager=Menu menager
+NoMenu=Brak podmenu
+WarningYouAreInMaintenanceMode=Uwaga, jesteś w trybie konserwacji, więc tylko zalogowani %s mogą używać aplikacji w danym momencie.
CoreErrorTitle=Błąd systemu
-CoreErrorMessage=Przepraszamy, wystąpił błąd. Sprawdź dzienniki lub skontaktuj się z administratorem systemu.
-CreditCard=kart kredytowych
-FieldsWithAreMandatory=%s pola są obowiązkowe
-FieldsWithIsForPublic=Pola %s są wyświetlane na publiczną listę członków. Jeśli nie chcesz, zaznacz opcję "publicznych" polu.
+CoreErrorMessage=Przepraszamy, wystąpił błąd. Sprawdź dzienniki błedu lub skontaktuj się z administratorem systemu.
+CreditCard=Karta kredytowa
+FieldsWithAreMandatory=Pola %s są obowiązkowe
+FieldsWithIsForPublic=Pola %s są wyświetlane na publiczną listę członków. Jeśli nie chcesz, odznacz opcję "publiczny".
AccordingToGeoIPDatabase=(Zgodnie z konwersji GeoIP)
Line=Linia
NotSupported=Nie są obsługiwane
@@ -645,49 +650,50 @@ Before=Przed
After=Po
IPAddress=Adres IP
Frequency=Częstotliwość
-IM=Komunikatory
+IM=Ciągła wiadomość
NewAttribute=Nowy atrybut
AttributeCode=Kod atrybut
OptionalFieldsSetup=Dodatkowa konfiguracja atrybutów
-URLPhoto=Url zdjęciem / logo
-SetLinkToThirdParty=Link do innych stron trzecich
-CreateDraft=Utwórz projekt
-SetToDraft=Back to draft
-ClickToEdit=Kliknij, aby edytować
+URLPhoto=Url ze zdjęciem / logo
+SetLinkToThirdParty=Link do zamówień
+CreateDraft=Utwórz Szic
+SetToDraft=Wróć do szkicu
+ClickToEdit=Kliknij by edytować
ObjectDeleted=%s obiekt usunięty
ByCountry=Według kraju
-ByTown=Przez miasto
+ByTown=Według miasta
ByDate=Według daty
-ByMonthYear=Przez miesiąc / rok
-ByYear=Przez rok
-ByMonth=przez miesiąc
-ByDay=Na dzień
-BySalesRepresentative=Przez przedstawiciela handlowego
-LinkedToSpecificUsers=Linked to a particular user contact
-DeleteAFile=Delete a file
-ConfirmDeleteAFile=Are you sure you want to delete file
-NoResults=No results
-ModulesSystemTools=Modules tools
+ByMonthYear=Według miesiąc / rok
+ByYear=Według roku
+ByMonth=Według miesiąca
+ByDay=Według dnia
+BySalesRepresentative=Według przedstawiciela handlowego
+LinkedToSpecificUsers=Podpięty do kontaktu współużytkownika
+DeleteAFile=Usuń plik
+ConfirmDeleteAFile=Czy na pewno chcesz usunąć ten plik?
+NoResults=Brak wyników
+ModulesSystemTools=Narzędzia modułów
Test=Test
Element=Element
-NoPhotoYet=No pictures available yet
-HomeDashboard=Home summary
-Deductible=Deductible
-from=from
-toward=toward
-Access=Access
-HelpCopyToClipboard=Use Ctrl+C to copy to clipboard
-SaveUploadedFileWithMask=Save file on server with name "%s" (otherwise "%s")
-OriginFileName=Original filename
-SetDemandReason=Set source
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
-ViewPrivateNote=View notes
-XMoreLines=%s line(s) hidden
-PublicUrl=Public URL
-AddBox=Add box
-SelectElementAndClickRefresh=Select an element and click Refresh
-PrintFile=Print File %s
+NoPhotoYet=Brak obrazów
+HomeDashboard=Podsumowanie całościowe
+Deductible=Odliczenie
+from=od
+toward=kierunek
+Access=Dostęp
+HelpCopyToClipboard=Użyj Ctrl+C by skopiować
+SaveUploadedFileWithMask=Zapisz plik na serwerze z nazwą "%s" (w innym wypadku "%s")
+OriginFileName=Oryginalna nazwa pliku
+SetDemandReason=Wybierz źródło
+SetBankAccount=Przypisz konto bankowe
+AccountCurrency=Waluta konta
+ViewPrivateNote=Wyświetl notatki
+XMoreLines=%s lini(e) ukryte
+PublicUrl=Publiczny URL
+AddBox=Dodaj skrzynke
+SelectElementAndClickRefresh=Zaznacz element i kliknij Odśwież
+PrintFile=Wydrukuj plik %s
+ShowTransaction=Show transaction
# Week day
Monday=Poniedziałek
Tuesday=Wtorek
@@ -696,13 +702,13 @@ Thursday=Czwartek
Friday=Piątek
Saturday=Sobota
Sunday=Niedziela
-MondayMin=Mo
-TuesdayMin=Tu
-WednesdayMin=My
-ThursdayMin=Th
-FridayMin=O.
-SaturdayMin=Sa
-SundayMin=Ni
+MondayMin=Pon
+TuesdayMin=Wt
+WednesdayMin=Śr
+ThursdayMin=Czw
+FridayMin=Pią
+SaturdayMin=Sob
+SundayMin=Nie
Day1=Poniedziałek
Day2=Wtorek
Day3=Środa
@@ -710,10 +716,10 @@ Day4=Czwartek
Day5=Piątek
Day6=Sobota
Day0=Niedziela
-ShortMonday=M
-ShortTuesday=T
-ShortWednesday=W
-ShortThursday=T
-ShortFriday=F
-ShortSaturday=S
-ShortSunday=S
+ShortMonday=Po
+ShortTuesday=W
+ShortWednesday=Śr
+ShortThursday=Cz
+ShortFriday=Pi
+ShortSaturday=So
+ShortSunday=Ni
diff --git a/htdocs/langs/pl_PL/orders.lang b/htdocs/langs/pl_PL/orders.lang
index 235096ce352..86ff6886783 100644
--- a/htdocs/langs/pl_PL/orders.lang
+++ b/htdocs/langs/pl_PL/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Odwołany
StatusOrderDraft=Projekt (musi zostać zatwierdzone)
StatusOrderValidated=Zatwierdzona
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Przetworzone
StatusOrderToBill=Do rachunku
StatusOrderToBill2=Do rachunku
@@ -58,6 +59,7 @@ MenuOrdersToBill=Zamówienia na rachunku
MenuOrdersToBill2=Billable orders
SearchOrder=Szukaj celu
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Statek produktu
Discount=Rabat
CreateOrder=Tworzenie Zamówienie
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index fe2b5107356..fb8f7bab39f 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maksymalny rozmiar
AttachANewFile=Załącz nowy plik / dokument
LinkedObject=Związany obiektu
Miscellaneous=Różne
-NbOfActiveNotifications=Liczba zgłoszeń
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift).
De to linjene er skilt med en vognretur.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/pl_PL/paybox.lang b/htdocs/langs/pl_PL/paybox.lang
index 9d629ea7e16..a23a037fc83 100644
--- a/htdocs/langs/pl_PL/paybox.lang
+++ b/htdocs/langs/pl_PL/paybox.lang
@@ -1,40 +1,40 @@
# Dolibarr language file - Source file is en_US - paybox
PayBoxSetup=PayBox konfiguracji modułu
-PayBoxDesc=Moduł ten oferują strony, aby umożliwić płatności na Paybox przez klientów. Może to być wykorzystane do swobodnego zapłatę lub płatność w szczególności Dolibarr obiektu (faktury, zamówienia, ...)
-FollowingUrlAreAvailableToMakePayments=Po adresy są dostępne na stronie ofertę do klienta, aby dokonać płatności na Dolibarr obiektów
+PayBoxDesc=Moduł ten oferują strony, umożliwiające płatności na Paybox przez klientów. Może to być wykorzystane do swobodnej zapłaty lub płatności w szczególności obiektu Dolibara np za faktury, zamówienia, ...
+FollowingUrlAreAvailableToMakePayments=Nastepujące adresy są dostępne dla klienta, by mógł dokonać płatności za faktury zamówienia
PaymentForm=Forma płatności
-WelcomeOnPaymentPage=Witamy na naszej usługi płatności online
+WelcomeOnPaymentPage=Witamy w naszej usłudze płatności online
ThisScreenAllowsYouToPay=Ten ekran pozwala na dokonanie płatności on-line do %s.
-ThisIsInformationOnPayment=To jest informacja o płatności do
+ThisIsInformationOnPayment=To jest informacja o płatności do zrobienia
ToComplete=Aby zakończyć
-YourEMail=E-mail z potwierdzeniem zapłaty
+YourEMail=E-mail by otrzymać potwierdzenie zapłaty
Creditor=Wierzyciel
-PaymentCode=Płatność kod
-PayBoxDoPayment=Przejdź na płatności
-YouWillBeRedirectedOnPayBox=Zostaniesz przekierowany na zabezpieczone Paybox stronę wejścia ci karty kredytowej informacje
+PaymentCode=Kod płatności
+PayBoxDoPayment=Przejdź do płatności
+YouWillBeRedirectedOnPayBox=Zostaniesz przekierowany na zabezpieczoną stronę Paybox bys mógł podać informację z karty kredytowej.
PleaseBePatient=Proszę, bądź cierpliwy
-Continue=Następny
+Continue=Dalej
ToOfferALinkForOnlinePayment=URL %s płatności
-ToOfferALinkForOnlinePaymentOnOrder=URL zaoferowania %s płatności online interfejsu użytkownika na zamówienie
-ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online interfejsu użytkownika na fakturze
-ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferować płatności online %s interfejs użytkownika do umowy linii
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferować płatności online %s interfejs użytkownika w celu utworzenia bezpłatnego kwotę
+ToOfferALinkForOnlinePaymentOnOrder=URL zaoferowania %s płatności online interfejsu użytkownika za zamówienie
+ToOfferALinkForOnlinePaymentOnInvoice=URL zaoferowania %s płatności online interfejsu użytkownika za fakture
+ToOfferALinkForOnlinePaymentOnContractLine=URL zaoferowania płatności online %s interfejsu użytkownika do umowy
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL zaoferowania płatności online %s interfejsu użytkownika w celu utworzenia dowolnej kwoty.
ToOfferALinkForOnlinePaymentOnMemberSubscription=Adres URL do zaoferowania płatności online %s interfejs użytkownika jest członkiem subskrypcji
-YouCanAddTagOnUrl=Możesz również dodać parametr & url = wartość tagu do żadnej z tych adresów URL (wymagany tylko za darmo płatności), aby dodać swój komentarz płatności tag.
-SetupPayBoxToHavePaymentCreatedAutomatically=Skonfiguruj PayBox url z %s do zapłaty tworzone automatycznie, gdy zatwierdzone przez paybox.
-YourPaymentHasBeenRecorded=Ta strona potwierdza, że płatność została nagrana. Dziękuję.
-YourPaymentHasNotBeenRecorded=Jesteś płatność nie została nagrana i transakcja została anulowana. Dziękuję.
+YouCanAddTagOnUrl=Możesz również dodać parametr & url = wartość tagu do żadnej z tych adresów URL (wymagany tylko dla bezpłatnych), aby dodać swój komentarz płatności tag.
+SetupPayBoxToHavePaymentCreatedAutomatically=Skonfiguruj PayBox url z %s do opłay stworzonych automatycznie, gdy są zatwierdzone przez paybox.
+YourPaymentHasBeenRecorded=Ta strona potwierdza, że płatność została wprowadzona. Dziękuję.
+YourPaymentHasNotBeenRecorded=Twoja płatność nie została wprowadzona i transakcja została anulowana. Dziękuję.
AccountParameter=Parametry konta
UsageParameter=Parametry serwera
-InformationToFindParameters=Pomoc znaleźć %s informacje o koncie
+InformationToFindParameters=Pomóż znaleźć %s informacje o koncie
PAYBOX_CGI_URL_V2=Url Paybox moduł CGI płatności
VendorName=Nazwa dostawcy
-CSSUrlForPaymentForm=CSS url arkusz dla formy płatności
-MessageOK=Wiadomość na zatwierdzonych strony powrót płatności
-MessageKO=Wiadomość na odwołana strony powrotnej płatności
-NewPayboxPaymentReceived=New Paybox payment received
-NewPayboxPaymentFailed=New Paybox payment tried but failed
-PAYBOX_PAYONLINE_SENDEMAIL=EMail to warn after a payment (success or failed)
-PAYBOX_PBX_SITE=Value for PBX SITE
-PAYBOX_PBX_RANG=Value for PBX Rang
-PAYBOX_PBX_IDENTIFIANT=Value for PBX ID
+CSSUrlForPaymentForm=Styl CSS arkuszy dla form płatności
+MessageOK=Wiadomość dla zatwierdzonych stron. Powrót do płatności
+MessageKO=Wiadomość dla odwołanych stron. Powrót do płatności
+NewPayboxPaymentReceived=Nowa płatnośc Paybox otrzymana
+NewPayboxPaymentFailed=Nowa płatnośc Paybox - próba nie udana.
+PAYBOX_PAYONLINE_SENDEMAIL=Mail ostrzegający po płatności (sukces lub porażka)
+PAYBOX_PBX_SITE=Wartośc dla strony PBX
+PAYBOX_PBX_RANG=Wartość dla zasięgu PBX
+PAYBOX_PBX_IDENTIFIANT=Wartośc dla PBX ID
diff --git a/htdocs/langs/pl_PL/productbatch.lang b/htdocs/langs/pl_PL/productbatch.lang
index 864782023a0..4455da495cd 100644
--- a/htdocs/langs/pl_PL/productbatch.lang
+++ b/htdocs/langs/pl_PL/productbatch.lang
@@ -1,21 +1,21 @@
# ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
-Batch=Batch/Serial
-atleast1batchfield=Eat-by date or Sell-by date or Batch number
-batch_number=Batch/Serial number
-l_eatby=Eat-by date
-l_sellby=Sell-by date
-DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
-printBatch=Batch: %s
-printEatby=Eat-by: %s
-printSellby=Sell-by: %s
-printQty=Qty: %d
-AddDispatchBatchLine=Add a line for Shelf Life dispatching
-BatchDefaultNumber=Undefined
-WhenProductBatchModuleOnOptionAreForced=When module Batch/Serial is on, increase/decrease stock mode is forced to last choice and can't be edited. Other options can be defined as you want.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ManageLotSerial=Użyj plik/wsad/numer seryjny
+ProductStatusOnBatch=Tak ('plik/wsad//nr seryjny' wymagany)
+ProductStatusNotOnBatch=Nie ('plik/wsad//nr seryjny' nie użyty)
+ProductStatusOnBatchShort=Tak
+ProductStatusNotOnBatchShort=Nie
+Batch=plik/wsad//numer seryjny
+atleast1batchfield=Data wykorzystania lub data sprzedaży lub numer pliku/wsadu
+batch_number=Plik/wsad/numer seryjny
+l_eatby=Wykorzystaj - po dacie
+l_sellby=Sprzedaj - po dacie
+DetailBatchNumber=Detale pliku/wsadu/ nr seryjnego
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
+printBatch=Plik/Wsad: %s
+printEatby=Wykorzystaj po: %s
+printSellby=Sprzedaj po: %s
+printQty=Ilość: %d
+AddDispatchBatchLine=Dodaj linię dla przedłużenia wysyłki
+BatchDefaultNumber=Niezdefiniowano
+WhenProductBatchModuleOnOptionAreForced=Gdy moduł Batch / Serial jest , zwiększony/ zmniejszony Tryb czasu jest zmuszony do ostatniego wyboru i nie może być edytowany . Inne opcje można określić jak chcesz .
+ProductDoesNotUseBatchSerial=Ten produkt nie używa pliku/wsadu/numeru seryjnego
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index 3db6a921c2d..aadbe802a8f 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 08e1f21fcd9..2c0a3ee7470 100644
--- a/htdocs/langs/pl_PL/projects.lang
+++ b/htdocs/langs/pl_PL/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Współużytkowane projektu
PrivateProject=Kontakt z projektu
MyProjectsDesc=Ten widok jest ograniczony do projektów jesteś kontaktu (cokolwiek to typ).
ProjectsPublicDesc=Ten widok przedstawia wszystkie projekty, które możesz przeczytać.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Ten widok przedstawia wszystkie projekty (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko).
MyTasksDesc=Ten widok jest ograniczony do projektów i zadań, które są do kontaktu (cokolwiek to typ).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Ten widok przedstawia wszystkich projektów i zadań, które możesz przeczytać.
TasksDesc=Ten widok przedstawia wszystkich projektów i zadań (uprawnień użytkownika przyznać uprawnienia do wyświetlania wszystko).
ProjectsArea=Projekty obszaru
@@ -29,6 +31,8 @@ NoProject=Projekt zdefiniowane
NbOpenTasks=Nb otwartych zadań
NbOfProjects=Nb projektów
TimeSpent=Czas spędzony
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Czas spędzony
RefTask=Nr ref. zadanie
LabelTask=Wytwórnia zadanie
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista dostawców zamówień związanych z pr
ListSupplierInvoicesAssociatedProject=Lista dostawców faktur związanych z projektem
ListContractAssociatedProject=Wykaz umów związanych z projektem
ListFichinterAssociatedProject=Wykaz interwencji związanych z projektem
-ListTripAssociatedProject=Lista wycieczek i wydatków związanych z projektem
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Wykaz działań związanych z projektem
ActivityOnProjectThisWeek=Aktywność na projekt w tym tygodniu
ActivityOnProjectThisMonth=Aktywność w sprawie projektu w tym miesiącu
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index ad137b77146..ac6d41946be 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -16,7 +16,7 @@ Prospect=Prospect
ProspectList=Prospect listy
DeleteProp=Usuń handlowych wniosku
ValidateProp=Validate handlowych wniosku
-AddProp=Dodaj projekt
+AddProp=Utwórz wniosek
ConfirmDeleteProp=Czy na pewno chcesz usunąć tę propozycję handlową?
ConfirmValidateProp=Czy na pewno chcesz, aby potwierdzić tę propozycję handlową?
LastPropals=Ostatnia %s propozycje
@@ -55,8 +55,6 @@ NoOpenedPropals=Nie otworzył propozycji
NoOtherOpenedPropals=Żadne inne otwarte propozycji
RefProposal=Commercial wniosku ref
SendPropalByMail=Wyślij handlowych wniosku pocztą
-FileNotUploaded=Plik nie został wysłany
-FileUploaded=Plik został pomyślnie przesłany
AssociatedDocuments=Dokumenty związane z projektem:
ErrorCantOpenDir=Nie można otworzyć katalogu
DatePropal=Data wniosku
@@ -70,8 +68,8 @@ ErrorPropalNotFound=Propal %s nie znaleziono
Estimate=Prognoza:
EstimateShort=Prognoza
OtherPropals=Inne propozycje
-# AddToDraftProposals=Add to draft proposal
-# NoDraftProposals=No draft proposals
+AddToDraftProposals=Dodaj do szkicu wniosku
+NoDraftProposals=Brak szkiców wniosku
CopyPropalFrom=Tworzenie komercyjnych wniosek kopiowanie istniejących wniosku
CreateEmptyPropal=Utwórz pusty propozycji Vierge lub z wykazu produktów / usług
DefaultProposalDurationValidity=Domyślny czas ważności wniosku handlowych (w dniach)
@@ -97,6 +95,6 @@ TypeContact_propal_external_CUSTOMER=kontakt klienta w ślad za wniosek
# Document models
DocModelAzurDescription=Kompletny wniosek modelu (logo. ..)
DocModelJauneDescription=Jaune propozycję modelu
-# DefaultModelPropalCreate=Default model creation
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalCreate=Domyślny model kreacji.
+DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania)
+DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane )
diff --git a/htdocs/langs/pl_PL/resource.lang b/htdocs/langs/pl_PL/resource.lang
index 32bdd92f884..ce83505c83c 100644
--- a/htdocs/langs/pl_PL/resource.lang
+++ b/htdocs/langs/pl_PL/resource.lang
@@ -1,34 +1,34 @@
-MenuResourceIndex=Resources
-MenuResourceAdd=New resource
-MenuResourcePlanning=Resource planning
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=Zasoby
+MenuResourceAdd=Nowe zasoby
+MenuResourcePlanning=Planowane Zasoby
+DeleteResource=Usuń zasoby
+ConfirmDeleteResourceElement=Potwierdz usunięcie zasobów dla tego elementu
+NoResourceInDatabase=Brak zasobów w bazie danych
+NoResourceLinked=Brak podliknowanych zasobów
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcePageIndex=Lista zasobów
+ResourceSingular=Zasoby
+ResourceCard=Karta zasobów
+AddResource=Utwórz zasoby
+ResourceFormLabel_ref=Nazwa zasobów
+ResourceType=Typ zasobów
+ResourceFormLabel_description=Opis zasobów
-ResourcesLinkedToElement=Resources linked to element
+ResourcesLinkedToElement=Zasaby połączone z elementem
-ShowResourcePlanning=Show resource planning
-GotoDate=Go to date
+ShowResourcePlanning=Pokaż zasoby planowane
+GotoDate=Idz do daty
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ResourceElementPage=Element zasobów
+ResourceCreatedWithSuccess=Zasoby poprawnie utworzone
+RessourceLineSuccessfullyDeleted=Linia zasobów poprawnie usunięta
+RessourceLineSuccessfullyUpdated=Linia zasobów poprawnie uaktualniona
+ResourceLinkedWithSuccess=Zasoby podlinkowane poprawnie
-TitleResourceCard=Resource card
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+TitleResourceCard=Karta zasobów
+ConfirmDeleteResource=Potwierdz by usunąc te zasoby
+RessourceSuccessfullyDeleted=Zasoby usunięte poprawnie
+DictionaryResourceType=Typ zasobów
-SelectResource=Select resource
+SelectResource=Wybierz zasoby
diff --git a/htdocs/langs/pl_PL/salaries.lang b/htdocs/langs/pl_PL/salaries.lang
index edca71a1829..43b8413af9a 100644
--- a/htdocs/langs/pl_PL/salaries.lang
+++ b/htdocs/langs/pl_PL/salaries.lang
@@ -1,8 +1,13 @@
# Dolibarr language file - Source file is en_US - users
-Salary=Salary
-Salaries=Salaries
-Employee=Employee
-NewSalaryPayment=New salary payment
-SalaryPayment=Salary payment
-SalariesPayments=Salaries payments
-ShowSalaryPayment=Show salary payment
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Kod rachunkowości dla wypłat
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Kod rachunkowości dla obciązeń finansowych
+Salary=Wypłata
+Salaries=Wypłaty
+Employee=Zatrudnienie
+NewSalaryPayment=Nowa wypłata
+SalaryPayment=Wypłata wynagrodzenia
+SalariesPayments=Wypłaty wynagordzeń
+ShowSalaryPayment=Pokaż wypłaty wynagrodzeń
+THM=Średnia cena za godzine
+TJM=Średnia cena za dzień
+CurrentSalary=Current salary
diff --git a/htdocs/langs/pl_PL/sendings.lang b/htdocs/langs/pl_PL/sendings.lang
index a93c41f5c23..4626b302570 100644
--- a/htdocs/langs/pl_PL/sendings.lang
+++ b/htdocs/langs/pl_PL/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Ilosc sortowane
QtyShipped=Ilosc wysłane
QtyToShip=Ilosc do statku
QtyReceived=Ilość otrzymanych
-KeepToShip=Lek na statku
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Inne sendings do tego celu
DateSending=Data wysłania porządku
DateSendingShort=Data wysłania porządku
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index e1d1314519c..9ce3327dd7d 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Wartość
PMPValueShort=WAP
EnhancedValueOfWarehouses=Magazyny wartości
UserWarehouseAutoCreate=Tworzenie stanie automatycznie podczas tworzenia użytkownika
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Ilość wysyłanych
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/pl_PL/suppliers.lang b/htdocs/langs/pl_PL/suppliers.lang
index 0ae0e045149..bcf12754ec4 100644
--- a/htdocs/langs/pl_PL/suppliers.lang
+++ b/htdocs/langs/pl_PL/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Dostawcy
-Supplier=Dostawca
AddSupplier=Create a supplier
SupplierRemoved=Dostawca usunięty
SuppliersInvoice=Faktury dostawców
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Faktury i płatności dostawcy
ExportDataset_fournisseur_3=Zamówienia dostawcy i pozycje na zamówieniu
ApproveThisOrder=Zatwierdź to zamówienie
ConfirmApproveThisOrder=Czy na pewno chcesz zatwierdzić zamówienie %s ?
-DenyingThisOrder=Odrzuć to zamówienie
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Czy na pewno chcesz odrzucić zamówienie %s ?
ConfirmCancelThisOrder=Czy na pewno chcesz anulować zamówienie %s ?
AddCustomerOrder=Stwórz zamówienie Klienta
diff --git a/htdocs/langs/pl_PL/trips.lang b/htdocs/langs/pl_PL/trips.lang
index 526bdf77d25..126fe2dda63 100644
--- a/htdocs/langs/pl_PL/trips.lang
+++ b/htdocs/langs/pl_PL/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Wycieczka
-Trips=Wycieczki
-TripsAndExpenses=Wycieczki i koszty
-TripsAndExpensesStatistics=Koszty podróży i statystyki
-TripCard=Wycieczka karty
-AddTrip=Dodaj podróż
-ListOfTrips=Lista wyjazdów
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Wykaz opłat
-NewTrip=Nowa podróż
-CompanyVisited=Firma / fundacji odwiedzili
-Kilometers=Kilometers
-FeesKilometersOrAmout=Kwota lub km
-DeleteTrip=Usuń podróży
-ConfirmDeleteTrip=Czy na pewno chcesz usunąć tę wycieczkę?
+NewTrip=New expense report
+CompanyVisited=Firm / fundacji odwiedzonych
+Kilometers=Kilometrów
+FeesKilometersOrAmout=Kwota lub kilometry
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
+ClassifyRefunded=Zakfalifikowano do refundacji.
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
TF_OTHER=Inny
-TF_LUNCH=Lunch
-TF_TRIP=Wycieczka
-ListTripsAndExpenses=Lista wycieczek i wydatków
-ExpensesArea=Wycieczki i obszar wydatki
-SearchATripAndExpense=Szukaj w podróż i wydatki
-ClassifyRefunded=Classify 'Refunded'
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Obiad
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 82d5c26f1bd..0a86251af87 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -73,7 +73,6 @@ Activation=Ativação
SetupShort=Configuracao
OtherSetup=Outras configuracoes
CurrentValueSeparatorThousand=Separador milhar
-Destination=Destino
IdModule=Módulo ID
IdPermissions=Permissão ID
ModulesCommon=Módulos Principais
@@ -346,7 +345,6 @@ Module200Desc=sincronização com um anuário LDAP
Module310Desc=Administração de Membros de uma associação
Module330Desc=Administração de Favoritos
Module410Desc=Interface com calendário Webcalendar
-Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos)
Module500Desc=Gestão de despesas especiais, como impostos, contribuição social, dividendos e salários
Module510Desc=Gestão de funcionários salários e pagamentos
Module600Desc=Enviar notificação via EMail para terceiros sobre algums eventos do Dolibarr ( configurado para cada terceiro)
@@ -542,7 +540,6 @@ LocalTax2IsUsed=Use terceiro imposto
LocalTax2IsNotUsed=Não use terceiro imposto
LocalTax2IsUsedDesc=Use um terceiro tipo de impostos (excepto o VAT)
LocalTax2IsNotUsedDesc=Não use outro tipo de impostos (excepto o VAT)
-LocalTax2Management=Terceiro tipo de imposto
LocalTax1IsUsedDescES=A taxa de RE por padrão ao criar perspectivas, notas fiscais, ordens etc seguir a regra padrão ativo:
Se te comprador não está sujeito a RE, RP por default = 0. Fim da regra.
Se o comprador está sujeito a RE então o RE por padrão. Fim da regra.
LocalTax1IsUsedExampleES=Na Espanha, eles são profissionais sujeitos a algumas seções específicas do IAE espanhol.
LocalTax1IsNotUsedExampleES=Na Espanha, eles são profissionais e sociedades e sujeito a determinadas seções do IAE espanhol.
@@ -552,11 +549,8 @@ LocalTax2IsNotUsedDescES=Por padrão, o IRPF proposta é 0. Fim da regra.
LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que prestam serviços e empresas que escolheram o sistema fiscal de módulos.
LocalTax2IsNotUsedExampleES=Na Espanha, eles são bussines não sujeitas ao regime fiscal dos módulos.
CalcLocaltax=Relatorio
-CalcLocaltax1ES=Vendas - Compras
CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra
-CalcLocaltax2ES=Compras
CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras
-CalcLocaltax3ES=Vendas
CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
NbOfDays=N� de Dias
AlwaysActive=Sempre Ativo
@@ -893,7 +887,6 @@ FilesOfTypeNotCached=Arquivos do tipo não são armazenados em cache pelo servid
FilesOfTypeCompressed=Arquivos do tipo são comprimidas pelo servidor HTTP
FilesOfTypeNotCompressed=Arquivos do tipo não são compactados pelo servidor HTTP
CacheByServer=Cache por servidor
-CacheByClient=Cache pelo navegador
CompressionOfResources=A compressão das respostas HTTP
ProductSetup=configuração do módulo produtos
ServiceSetup=Configuração do módulo Serviços
@@ -1029,10 +1022,6 @@ ECMAutoTree =Pasta árvore automática e documento
FiscalYears=Anos fiscais
FiscalYear=Ano fiscal
FiscalYearCard=Ficha ano fiscal
-EditFiscalYear=Editar ano fiscal
-OpenFiscalYear=Abrir ano fiscal
-CloseFiscalYear=Fechar ano fiscal
DeleteFiscalYear=Remover ano fiscal
ConfirmDeleteFiscalYear=Voçê tem certeza que quer deleitar este ano fical ?
-Format=Formato
TypePaymentDesc=0: Pagamento para Cliente, 1: Pagamento para Fornecedor, 2: Pagamentos para Clientes e Fornecedores
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 730cdb1ee6d..a807b965562 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -196,8 +196,6 @@ SetMode=Definir Modo de Pagamento
Billed=Faturado
RepeatableInvoice=Modelo fatura
RepeatableInvoices=Modelos da fatura
-Repeatable=Modelo
-Repeatables=Modelos
ChangeIntoRepeatableInvoice=Converter para modelo de fatura
CreateRepeatableInvoice=Criar modelo de fatura
CreateFromRepeatableInvoice=Criar da fatura modelo
@@ -212,7 +210,6 @@ EditRelativeDiscount=Alterar Desconto Relativo
AddGlobalDiscount=Adicionar Desconto Fixo
EditGlobalDiscounts=Alterar Descontos Globais
ShowDiscount=Ver o Desconto
-ShowReduc=Mostrar a dedução
RelativeDiscount=Desconto Relativo
GlobalDiscount=Desconto Fixo
CreditNote=Depósito
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index d59bdbfeb77..064c999d7fd 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -34,7 +34,6 @@ LT1CustomerES=RE vendas
LT1SupplierES=RE compras
VATCollected=ICMS Recuperado
ToGet=Para restituir
-SpecialExpensesArea=Área para todos os pagamentos especiais
MenuSpecialExpenses=Despesas especiais
PaymentCustomerInvoice=Pagamento de fatura do cliente
PaymentSupplierInvoice=Pagamento de fatura do fornecedor
@@ -125,7 +124,6 @@ Pcg_subtype=PCG subtipo
InvoiceLinesToDispatch=Linhas de nota fiscal para envio
InvoiceDispatched=Faturas remetidas
AccountancyDashboard=Resumo Contabilidade
-ByProductsAndServices=Por produtos e serviços
RefExt=Ref externo
ToCreateAPredefinedInvoice=Para criar uma Fatura predefinida, criar uma fatura padrão, em seguida, sem validá-la, clique no botão "Converter para fatura pré-definida".
LinkedOrder=Atalho para ordem
diff --git a/htdocs/langs/pt_BR/donations.lang b/htdocs/langs/pt_BR/donations.lang
index 60c851b3eaf..2d8c7d33d13 100644
--- a/htdocs/langs/pt_BR/donations.lang
+++ b/htdocs/langs/pt_BR/donations.lang
@@ -7,7 +7,6 @@ Donors=Dadores
ShowDonation=Mostrar doaçaõ
DonationsPaid=Doações pagas
DonationStatusPaid=Doaçaõ recebida
-DonationStatusPaidShort=Recebido
DonationReceipt=Recibo doaçaõ
LastModifiedDonations=As ultimas %s doações modificadaas
SearchADonation=Buscar doaçaõ
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 8b8a231b494..1b32494e7c8 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -32,7 +32,6 @@ ProgressDeclared=o progresso declarado
ProgressCalculated=calculado do progresso
ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projeto
ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedor Associados ao Projeto
-ListTripAssociatedProject=Lista de viagens e despesas associadas com o projeto
ActivityOnProjectThisWeek=Atividade ao Projeto esta Semana
ActivityOnProjectThisMonth=Atividade ao Projeto este Mês
ActivityOnProjectThisYear=Atividade ao Projeto este Ano
@@ -63,7 +62,6 @@ CloneNotes=Copiar notas
CloneProjectFiles=Copiar arquivos do projetos
CloneTaskFiles=Copia(s) do(s) arquivo(s) do projeto(s) finalizado
ConfirmCloneProject=Tem certeza que deseja copiar este projeto?
-ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto
ErrorShiftTaskDate=Impossível mudar data da tarefa de acordo com a nova data de início do projeto
TaskCreatedInDolibarr=Tarefa %s criada
TaskModifiedInDolibarr=Tarefa %s alterada
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 306b940d879..4822d5d1436 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Desenvolvimento
VersionUnknown=Desconhecida
VersionRecommanded=Recomendada
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Id. da Sessão
SessionSaveHandler=Gestor para guardar as sessões
SessionSavePath=Localização para guardar a sessão
@@ -45,8 +50,8 @@ ErrorModuleRequireDolibarrVersion=Erro, este módulo requer a versão %s ou supe
ErrorDecimalLargerThanAreForbidden=Erro, as casas decimais superiores a %s não são suportadas.
DictionarySetup=Configurar Dicionário
Dictionary=Dicionários
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Chartofaccounts=Gráfico de contas
+Fiscalyear=Anos fiscais
ErrorReservedTypeSystemSystemAuto=Value 'system' and 'systemauto' for type is reserved. You can use 'user' as value to add your own record
ErrorCodeCantContainZero=O código não pode conter o valor 0
DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -69,7 +74,7 @@ ShowPreview=Ver Vista Prévia
PreviewNotAvailable=Visualização não disponível
ThemeCurrentlyActive=Tema Actualmente Activo
CurrentTimeZone=Zona Horaria Actual
-MySQLTimeZone=TimeZone MySql (database)
+MySQLTimeZone=Zona Horária MySql (database)
TZHasNoEffect=Dates are stored and returned by database server as if they were kept as submited string. The timezone has effect only when using UNIX_TIMESTAMP function (that should not be used by Dolibarr, so database TZ should have no effect, even if changed after data was entered).
Space=Área
Table=Tabela
@@ -79,8 +84,8 @@ Mask=Máscara
NextValue=Próximo Valor
NextValueForInvoices=Próximo Valor (Facturas)
NextValueForCreditNotes=Próximo Valor (Notas de Entregas)
-NextValueForDeposit=Next value (deposit)
-NextValueForReplacements=Next value (replacements)
+NextValueForDeposit=Valor seguinte (depósito)
+NextValueForReplacements=Valor seguinte (restituições)
MustBeLowerThanPHPLimit=Observação: Parametros PHP limita o tamanho a %s %s de máximo, qualquer que seja o valor deste parametro
NoMaxSizeByPHPLimit=Nenhuma limitação interna no servidor PHP
MaxSizeForUploadedFiles=Tamanho máximo dos documentos a carregar (0 para proibir o carregamento)
@@ -108,9 +113,9 @@ OtherOptions=Outras Opções
OtherSetup=Várias Configurações
CurrentValueSeparatorDecimal=Separador decimal
CurrentValueSeparatorThousand=Separador dos milhares
-Destination=Destination
-IdModule=Module ID
-IdPermissions=Permissions ID
+Destination=Destino
+IdModule=Id. do Módulo
+IdPermissions=Id. das Autorizações
Modules=Módulos
ModulesCommon=Módulos standard
ModulesOther=Outros módulos
@@ -242,7 +247,7 @@ OfficialWiki=Wiki ERP
OfficialDemo=Demo em linha ERP/CRM
OfficialMarketPlace=Mercado Oficial externo para os módulos / addons
OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+ReferencedPreferredPartners=Parceiros Preferidos
OtherResources=Autres ressources
ForDocumentationSeeWiki=Para a documentação de utilizador, programador ou Perguntas Frequentes (FAQ), consulte o wiki do ERP:
%s
SetupIsReadyForUse=A Instalação está finalizada e o ERP/CRM está disponivel com o novo componente.
NotExistsDirect=A diretoria raiz alternativa não está definida.
@@ -399,7 +404,7 @@ LinkToTest=Clickable link generated for user %s (click phone nu
KeepEmptyToUseDefault=Deixar em branco para usar o valor por omissão
DefaultLink=Hiperligação predefinida
ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
-ExternalModule=External module - Installed into directory %s
+ExternalModule=Módulo externo - Instalado na diretoria %s
BarcodeInitForThirdparties=Mass barcode init for thirdparties
BarcodeInitForProductsOrServices=Mass barcode init or reset for products or services
CurrentlyNWithoutBarCode=Atualmente, tem %s registos em %s %s sem código de barras definido.
@@ -485,7 +490,7 @@ Module400Name=Projetos/Oportunidades/Chefias
Module400Desc=Management of projects, opportunities or leads. You can then assign any element (invoice, order, proposal, intervention, ...) to a project and get a transversal view from the project view.
Module410Name=Webcalendar
Module410Desc=Interface com calendario Webcalendar
-Module500Name=Special expenses (tax, social contributions, dividends)
+Module500Name=Despesas especiais (impostos, contribuições sociais, dividendos)
Module500Desc=Management of special expenses like taxes, social contribution, dividends and salaries
Module510Name=Salários
Module510Desc=Management of employees salaries and payments
@@ -493,10 +498,16 @@ Module600Name=Notificações
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Bolsas
Module700Desc=Gestão de Bolsas
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Interface com o sistema de seguimento de incidencias Mantis
Module1400Name=Perito de Contabilidade
Module1400Desc=Perido de gestão da Contabilidade (dupla posição)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categorías
Module1780Desc=Gestão de categorías (produtos, Fornecedores e clientes)
Module2000Name=FCKeditor
@@ -524,7 +535,7 @@ Module5000Name=Multi-empresa
Module5000Desc=Permite-lhe gerir várias empresas
Module6000Name=Fluxo de Trabalho
Module6000Desc=Gestão do fluxo de trabalho
-Module20000Name=Leave Requests management
+Module20000Name=Deixar gestão de Pedidos
Module20000Desc=Declare and follow employees leaves requests
Module39000Name=Product batch
Module39000Desc=Batch or serial number, eat-by and sell-by date management on products
@@ -575,7 +586,7 @@ Permission67=Exportar Intervenções
Permission71=Consultar Membros
Permission72=Criar/Modificar Membros
Permission74=Eliminar Membros
-Permission75=Setup types of membership
+Permission75=Configure os tipos de membros
Permission76=Exportar Bolsas
Permission78=Consultar honorários
Permission79=Criar/Modificar honorários
@@ -599,7 +610,7 @@ Permission109=Eliminar envios
Permission111=Consultar contas financeiras (contas bancarias, caixas)
Permission112=Criar/Modificar quantidade/eliminar registos bancarios
Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission114=Reconciliar transações
Permission115=Exportar transacções e extractos
Permission116=Captar transferencias entre contas
Permission117=Gerir envío de cheques
@@ -624,14 +635,14 @@ Permission165=Apagar contractos/subscrições
Permission171=Read trips and expenses (own and his subordinates)
Permission172=Criar/modificar viagens e despesas
Permission173=Apagar viagens e despesas
-Permission174=Read all trips and expenses
+Permission174=Ler todas as viagens e despesas
Permission178=Exportar viagens e despesas
Permission180=Consultar Fornecedores
Permission181=Consultar pedidos a Fornecedores
Permission182=Criar/Modificar pedidos a Fornecedores
Permission183=Confirmar pedidos a Fornecedores
Permission184=Aprovar pedidos a Fornecedores
-Permission185=Enviar pedidos a Fornecedores
+Permission185=Order or cancel supplier orders
Permission186=Receber pedidos de Fornecedores
Permission187=Fechar pedidos a Fornecedores
Permission188=Anular pedidos a Fornecedores
@@ -653,8 +664,8 @@ Permission222=Criar/Modificar E-Mails (assunto, destinatarios, etc.)
Permission223=Confirmar E-Mails (permite o envío)
Permission229=Eliminar E-Mails
Permission237=Ver destinatários e informação
-Permission238=Manually send mailings
-Permission239=Delete mailings after validation or sent
+Permission238=Envie correio manualmente
+Permission239=Apagar o correio depois da validação ou envio
Permission241=Consultar categorías
Permission242=Criar/Modificar categorías
Permission243=Eliminar categorías
@@ -700,9 +711,9 @@ Permission402=Criar/Modificar activos
Permission403=Confirmar activos
Permission404=Eliminar activos
Permission510=Read Salaries
-Permission512=Create/modify salaries
-Permission514=Delete salaries
-Permission517=Export salaries
+Permission512=Criar/modificar salários
+Permission514=Apagar salários
+Permission517=Exportar salários
Permission531=Ler serviços
Permission532=Criar / modificar serviços
Permission534=Apagar serviços
@@ -711,6 +722,13 @@ Permission538=Exportação de serviços
Permission701=Consultar Bolsas
Permission702=Criar/Modificar Bolsas
Permission703=Eliminar Bolsas
+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
Permission1001=Consultar stocks
Permission1002=Criar/modificar armazéns
Permission1003=Apagar armazéns
@@ -774,7 +792,7 @@ DictionaryCountry=Países
DictionaryCurrency=Moedas
DictionaryCivility=Civility title
DictionaryActions=Type of agenda events
-DictionarySocialContributions=Social contributions types
+DictionarySocialContributions=Tipos de contribuições sociais
DictionaryVAT=VAT Rates or Sales Tax Rates
DictionaryRevenueStamp=Amount of revenue stamps
DictionaryPaymentConditions=Condições de Pagamento
@@ -788,9 +806,9 @@ DictionaryStaff=Empregados
DictionaryAvailability=Atraso na entrega
DictionaryOrderMethods=Métodos de encomenda
DictionarySource=Origem das propostas/ordens
-DictionaryAccountancyplan=Chart of accounts
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryEMailTemplates=Emails templates
+DictionaryAccountancyplan=Gráfico de contas
+DictionaryAccountancysystem=Modelos para o gráfíco de contas
+DictionaryEMailTemplates=Modelos de Mensagens
SetupSaved=Configuração guardada
BackToModuleList=Voltar à lista de módulos
BackToDictionaryList=Voltar à lista de dicionários
@@ -813,7 +831,7 @@ LocalTax2IsUsed=Utilizar um terceiro imposto
LocalTax2IsNotUsed=Não utilizar um terceiro imposto
LocalTax2IsUsedDesc=Use a third type of tax (other than VAT)
LocalTax2IsNotUsedDesc=Do not use other type of tax (other than VAT)
-LocalTax2Management=Third type of tax
+LocalTax2Management=Terceiro tipo de imposto
LocalTax2IsUsedExample=
LocalTax2IsNotUsedExample=
LocalTax1ManagementES= RE Gestão
@@ -826,12 +844,12 @@ LocalTax2IsUsedDescES= A taxa de RE por padrão, quando as perspectivas de cria
LocalTax2IsNotUsedDescES= Por padrão, o IRPF proposto é 0. Fim da regra.
LocalTax2IsUsedExampleES= Em Espanha, os freelancers e profissionais liberais que prestam serviços e empresas que escolheram o regime fiscal dos módulos.
LocalTax2IsNotUsedExampleES= Em Espanha, eles não são negócios sujeitas ao regime fiscal dos módulos.
-CalcLocaltax=Reports
-CalcLocaltax1ES=Sales - Purchases
+CalcLocaltax=Relatórios
+CalcLocaltax1ES=Vendas - Compras
CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
-CalcLocaltax2ES=Purchases
+CalcLocaltax2ES=Compras
CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
-CalcLocaltax3ES=Sales
+CalcLocaltax3ES=Vendas
CalcLocaltax3Desc=Local Taxes reports are the total of localtaxes sales
LabelUsedByDefault=Etiqueta que se utilizará se não se encontra tradução para este código
LabelOnDocuments=Etiqueta sobre documentos
@@ -951,7 +969,7 @@ InfoWebServer=Detalhes do servidor web
InfoDatabase=Detalhes da base de dados
InfoPHP=Detalhes do PHP
InfoPerf=Detalhes de Performance
-BrowserName=Browser name
+BrowserName=Nome do Navegador
BrowserOS=Browser OS
ListEvents=Auditoría de eventos
ListOfSecurityEvents=Listagem de eventos de segurança ERP/CRM
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Senha para usar o servidor proxy
DefineHereComplementaryAttributes=Defina aqui todos os atributos complementares, que não estejam disponiveis por padrão, e que deseja ser suporte para %s.
ExtraFields=Atributos complementares
ExtraFieldsLines=Atributos complementares (linhas)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Atributos complementares (terceiro)
ExtraFieldsContacts=Atributos complementares (contato/morada)
ExtraFieldsMember=Atributos complementares (membro)
@@ -1035,7 +1055,7 @@ ExtraFieldsSupplierOrders=Atributos complementares (encomendas)
ExtraFieldsSupplierInvoices=Atributos complementares (faturas)
ExtraFieldsProject=Atributos complementares (projetos)
ExtraFieldsProjectTask=Atributos complementares (tarefas)
-ExtraFieldHasWrongValue=Attribute %s has a wrong value.
+ExtraFieldHasWrongValue=O atributo %s tem um valor errado.
AlphaNumOnlyCharsAndNoSpace=apenas caracteres alfanuméricos sem espaços
AlphaNumOnlyLowerCharsAndNoSpace=only alphanumericals and lower case characters without space
SendingMailSetup=Configuração de envios por correio eletrónico
@@ -1047,11 +1067,11 @@ TranslationSetup=Configuração da tradução
TranslationDesc=Choice of language visible on screen can be modified:
* Globally from menu Home - Setup - Display
* For user only from tab User display of user card (click on login on top of screen).
TotalNumberOfActivatedModules=Total de módulos de funcionalidades ativos: %s
YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
-ClassNotFoundIntoPathWarning=Class %s not found into PHP path
+ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho PHP
YesInSummer=Sim no verão
OnlyFollowingModulesAreOpenedToExternalUsers=Note, only following modules are opened to external users (whatever are permission of such users):
SuhosinSessionEncrypt=Session storage encrypted by Suhosin
-ConditionIsCurrently=Condition is currently %s
+ConditionIsCurrently=A condição está atualmente %s
YouUseBestDriver=You use driver %s that is best driver available currently.
YouDoNotUseBestDriver=You use drive %s but driver %s is recommended.
NbOfProductIsLowerThanNoPb=You have only %s products/services into database. This does not required any particular optimization.
@@ -1059,10 +1079,10 @@ SearchOptim=Optimização da pesquisa
YouHaveXProductUseSearchOptim=You have %s product into database. You should add the constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 into Home-Setup-Other, you limit the search to the beginning of strings making possible for database to use index and you should get an immediate response.
BrowserIsOK=You are using the web browser %s. This browser is ok for security and performance.
BrowserIsKO=You are using the web browser %s. This browser is known to be a bad choice for security, performance and reliability. We recommand you to use Firefox, Chrome, Opera or Safari.
-XDebugInstalled=XDebug is loaded.
-XCacheInstalled=XCache is loaded.
+XDebugInstalled=XDebug está carregado.
+XCacheInstalled=XCache está carregada.
AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
-FieldEdition=Edition of field %s
+FieldEdition=Edição do campo %s
FixTZ=Corrigir Fuso Horário
FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
GetBarCode=Obter código de barras
@@ -1089,7 +1109,7 @@ ModuleCompanyCodeDigitaria=Devolve um código contabilistico composto por o cód
UseNotifications=Usar Notificações
NotificationsDesc=EMails notifications feature allows you to silently send automatic mail, for some Dolibarr events. Targets of notifications can be defined:
* per third parties contacts (customers or suppliers), one third party at time.
* or by setting a global target email address on module setup page.
ModelModules=Documentos modelos
-DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT or .ODS files for OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Crie documentos a partir dos modelos OpenDocuments (ficheiros .ODT ou .ODS para o KOffice, OpenOffice, TextEdit,...)
WatermarkOnDraft=Marca d'
JSOnPaimentBill=Activate feature to autofill payment lines on payment form
CompanyIdProfChecker=Identidade profissional única
@@ -1137,7 +1157,7 @@ EnableEditDeleteValidInvoice=Activar a possibilidade de editar/eliminar uma fact
SuggestPaymentByRIBOnAccount=Sugerir o pagamento por transfência para a conta
SuggestPaymentByChequeToAddress=Sugerir o pagamento por cheque a
FreeLegalTextOnInvoices=Texto livre em facturas
-WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
+WatermarkOnDraftInvoices=Marca d'água nas faturas provisórias (nenhuma se em branco)
##### Proposals #####
PropalSetup=Configuração do módulo Orçamentos
CreateForm=Criação formulario
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Uma linha de producto/serviço que tem uma quantidade
FreeLegalTextOnProposal=Texto livre em Orçamentos
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Configuração do módulo pedidos
OrdersNumberingModules=Módulos de numeração dos pedidos
@@ -1159,7 +1186,7 @@ OrdersModelModule=Modelos de documentos dos pedidos
HideTreadedOrders=Hide the treated or cancelled orders in the list
ValidOrderAfterPropalClosed=Confirmar o pedido depois de fechar o orçamento, permite não passar por um pedido provisório
FreeLegalTextOnOrders=Texto livre em pedidos
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+WatermarkOnDraftOrders=Marca d'água nas encomendas provisórias (nenhuma se em branco)
ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
##### Clicktodial #####
@@ -1174,7 +1201,7 @@ FicheinterNumberingModules=Módulos de numeração das fichas de intervenção
TemplatePDFInterventions=Modelo de documentos das fichas de intervenção
WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Configurar módulo de Contractos/Subscricões
ContractsNumberingModules=Contratos de numeração módulos
TemplatePDFContracts=Contracts documents models
FreeLegalTextOnContracts=Free text on contracts
@@ -1255,7 +1282,7 @@ LDAPTCPConnectOK=Ligação TCP ao servidor LDAP efectuada (Servidor
LDAPTCPConnectKO=Falha de ligação TCP ao servidor LDAP (Servidor
LDAPBindOK=Connect/Authentificate to LDAP server successful (Server=%s, Port=%s, Admin=%s, Password=%s)
LDAPBindKO=Fallo de ligação/autenticação ao servidor LDAP (Servidor
-LDAPUnbindSuccessfull=Disconnect successful
+LDAPUnbindSuccessfull=Desligado com sucesso
LDAPUnbindFailed=Saida falhada
LDAPConnectToDNSuccessfull=Ligação a DN (%s) realizada
LDAPConnectToDNFailed=Conecção ao DN (%s) falhada
@@ -1324,19 +1351,19 @@ ForANonAnonymousAccess=Para um acesso autentificado
PerfDolibarr=Performance setup/optimizing report
YouMayFindPerfAdviceHere=You will find on this page some checks or advices related to performance.
NotInstalled=Não instalado, o servidor não está mais lento por isso.
-ApplicativeCache=Applicative cache
+ApplicativeCache=Cache aplicativa
MemcachedNotAvailable=No applicative cache found. You can enhance performance by installing a cache server Memcached and a module able to use this cache server.
More information here http://wiki.dolibarr.org/index.php/Module_MemCached_EN.
Note that a lot of web hosting provider does not provide such cache server.
MemcachedModuleAvailableButNotSetup=Module memcached for applicative cache found but setup of module is not complete.
MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled.
-OPCodeCache=OPCode cache
+OPCodeCache=Cache de OPCode
NoOPCodeCacheFound=No OPCode cache found. May be you use another OPCode cache than XCache or eAccelerator (good), may be you don't have OPCode cache (very bad).
HTTPCacheStaticResources=Cache HTTP para recursos estáticos (css, img, javascript)
FilesOfTypeCached=Ficheiros do tipo %s são guardados na cache do servidor HTTP
FilesOfTypeNotCached=Ficheiros do tipo %s não são guardados na cache do servidor HTTP
FilesOfTypeCompressed=Ficheiros do tipo %s são comprimidos pelo servidor HTTP
FilesOfTypeNotCompressed=Ficheiros do tipo %s não são comprimidos pelo servidor HTTP
-CacheByServer=Cache by server
-CacheByClient=Cache by browser
+CacheByServer=Cache pelo servidor
+CacheByClient=Cache pelo navegador
CompressionOfResources=Compressão das respostas HTTP
TestNotPossibleWithCurrentBrowsers=Such an automatic detection is not possible with current browsers
##### Products #####
@@ -1365,7 +1392,7 @@ SyslogSimpleFile=Ficheiro
SyslogFilename=Nome e caminho do Ficheiro
YouCanUseDOL_DATA_ROOT=Pode utilizar DOL_DATA_ROOT/dolibarr.log para um log na pasta 'documentos' de Dolibarr.
ErrorUnknownSyslogConstant=A constante %s não é uma constante syslog conhecida
-OnlyWindowsLOG_USER=Windows only supports LOG_USER
+OnlyWindowsLOG_USER=O Windows suporta apenas LOG_USER
##### Donations #####
DonationsSetup=Configuração do módulo Bolsas
DonationsReceiptModel=Modelo de recibo de doação
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Códigos de barras tipo UPC
BarcodeDescISBN=Códigos de barras tipo ISBN
BarcodeDescC39=Códigos de barras tipo C39
BarcodeDescC128=Códigos de barras tipo C128
-GenbarcodeLocation=Ferramenta de geração de código de barras em linha de pedido (utilizado por o motor phpbar para determinados tipos de códigos barra)
+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
BarcodeInternalEngine=Motor interno
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1399,7 +1426,7 @@ MailingEMailFrom=E-Mail emissor (From) dos correios enviados por E-Mailing
MailingEMailError=Retorno EMail (Erros a) para e-mails com erros
MailingDelay=Seconds to wait after sending next message
##### Notification #####
-NotificationSetup=EMail notification module setup
+NotificationSetup=Configurar módulo da notificação de mensagem
NotificationEMailFrom=E-Mail emissor (From) dos correios enviados a traves de Notificações
ListOfAvailableNotifications=List of events you can set notification on, for each thirdparty (go into thirdparty card to setup) or by setting a fixed email (List depends on activated modules)
FixedEmailTarget=Fixed email target
@@ -1482,8 +1509,8 @@ Sell=Vender
InvoiceDateUsed=Data da factura usada
YourCompanyDoesNotUseVAT=Sua empresa não tem configuração definida para usar o IVA (Home - Setup - Empresa / Fundação), pelo que não há opções de configuração do IVA.
AccountancyCode=Código de Contabilidade
-AccountancyCodeSell=Sale account. code
-AccountancyCodeBuy=Purchase account. code
+AccountancyCodeSell=Código da conta de Vendas
+AccountancyCodeBuy=Código da conta de Compras
##### Agenda #####
AgendaSetup=Módulo configuração de acções e agenda
PasswordTogetVCalExport=Chave de autorização para exportação do link vcal.
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Conta de efectivo que se utilizará para as vendas
CashDeskBankAccountForCheque= Conta a ser usada para receber pagamentos através de cheques
CashDeskBankAccountForCB= Conta a ser usada para receber pagamentos em dinheiro ou por cartões de crédito
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Configuração do Modulo de Favoritos
@@ -1546,26 +1574,30 @@ TaskModelModule=Tasks reports document model
ECMSetup = Configuração GED
ECMAutoTree = Automatic tree folder and document
##### Fiscal Year #####
-FiscalYears=Fiscal years
-FiscalYear=Fiscal year
+FiscalYears=Anos Fiscais
+FiscalYear=Ano Fiscal
FiscalYearCard=Fiscal year card
-NewFiscalYear=New fiscal year
-EditFiscalYear=Edit fiscal year
-OpenFiscalYear=Open fiscal year
-CloseFiscalYear=Close fiscal year
-DeleteFiscalYear=Delete fiscal year
-ConfirmDeleteFiscalYear=Are you sure to delete this fiscal year ?
-Opened=Opened
-Closed=Closed
-AlwaysEditable=Can always be edited
+NewFiscalYear=Novo ano fiscal
+EditFiscalYear=Editar ano fiscal
+OpenFiscalYear=Abrir ano fiscal
+CloseFiscalYear=Fechar ano fiscal
+DeleteFiscalYear=Apagar ano fiscal
+ConfirmDeleteFiscalYear=Tem a certeza de que deseja apagar este ano fiscal?
+Opened=Aberto
+Closed=Fechado
+AlwaysEditable=Pode ser sempre editado
MAIN_APPLICATION_TITLE=Force visible name of application (warning: setting your own name here may break autofill login feature when using DoliDroid mobile application)
-NbMajMin=Minimum number of uppercase characters
-NbNumMin=Minimum number of numeric characters
-NbSpeMin=Minimum number of special characters
-NbIteConsecutive=Maximum number of repeating same characters
+NbMajMin=Número máximo de carateres maiúsculos
+NbNumMin=Número mínimod de carateres numéricos
+NbSpeMin=Número mínimo de carateres especiais
+NbIteConsecutive=Número máximo para repetir os mesmos carateres
NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
-SalariesSetup=Setup of module salaries
-SortOrder=Sort order
-Format=Format
+SalariesSetup=Configuração do módulo de salários
+SortOrder=Ordenação
+Format=Formato
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/pt_PT/banks.lang b/htdocs/langs/pt_PT/banks.lang
index 18e2a01c67f..aefc7e59618 100644
--- a/htdocs/langs/pt_PT/banks.lang
+++ b/htdocs/langs/pt_PT/banks.lang
@@ -33,7 +33,11 @@ AllTime=Do início
Reconciliation=Conciliação
RIB=Conta bancária
IBAN=Identificador IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Identificador BIC/SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Débitos Directos
StandingOrder=Domiciliação
Withdrawals=Reembolsos
@@ -148,7 +152,7 @@ BackToAccount=Voltar à Conta
ShowAllAccounts=Mostrar para todas as Contas
FutureTransaction=Transacção futura. Não há forma de conciliar.
SelectChequeTransactionAndGenerate=Selecione o que pretende incluir no recibo de depósito e clique em "Criar".
-InputReceiptNumber=Escolha o extrato bancário relacionadas com a conciliação. Use um valor numérico ordenável (como, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventualmente, especifique uma categoria que deseja classificar os movimentos
ToConciliate=Para conciliar?
ThenCheckLinesAndConciliate=Em seguida, verifique as linhas presentes no extrato bancário e clique
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index be47a167a5e..8a28a423f86 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -1,16 +1,16 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Factura
Bills=Facturas
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Facturas de Clientes
+BillsCustomer=Fatura do Cliente
+BillsSuppliers=Facturas de Fornecedores
+BillsCustomersUnpaid=Facturas de Clientes a Receber
BillsCustomersUnpaidForCompany=Facturas a Clientes Pendentes de Cobrança de %s
BillsSuppliersUnpaid=Facturas de Fornecedores Pendentes de Pagamento
BillsSuppliersUnpaidForCompany=Facturas de fornecedores não remunerado para a %s
BillsLate=Os pagamentos em atraso
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Estatísticas das faturas de clientes
+BillsStatisticsSuppliers=Estatísticas das faturas de fornecedores
DisabledBecauseNotErasable=Desactivada porque não podem ser apagados
InvoiceStandard=Factura Standard
InvoiceStandardAsk=Factura Standard
@@ -87,7 +87,7 @@ ClassifyCanceled=Classificar 'Abandonado'
ClassifyClosed=Classificar 'Fechado'
ClassifyUnBilled=Classify 'Unbilled'
CreateBill=Criar Factura
-AddBill=Create invoice or credit note
+AddBill=Criar Factura ou Nota de Crédito
AddToDraftInvoices=Adicionar à fatura rascunho
DeleteBill=Eliminar Factura
SearchACustomerInvoice=Procurar uma factura de cliente
@@ -189,15 +189,15 @@ AlreadyPaid=Já e
AlreadyPaidBack=Já reembolsado
AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos)
Abandoned=Abandonada
-RemainderToPay=Remaining unpaid
+RemainderToPay=Restante a receber
RemainderToTake=Remaining amount to take
RemainderToPayBack=Remaining amount to pay back
Rest=Pendente
AmountExpected=Montante reclamado
ExcessReceived=Recebido em excesso
EscompteOffered=Desconto (Pronto pagamento)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Submissão da fatura %s
+SendReminderBillRef=Submissão da fatura %s (lembrete)
StandingOrders=Débitos Directos
StandingOrder=Domiciliação
NoDraftBills=Nenhuma factura rascunho
@@ -222,13 +222,13 @@ NonPercuRecuperable=Não recuperável
SetConditions=Definir Condições de pagamento
SetMode=Definir modo de pagamento
Billed=Facturado
-RepeatableInvoice=Template invoice
-RepeatableInvoices=Template invoices
-Repeatable=Template
-Repeatables=Templates
-ChangeIntoRepeatableInvoice=Convert into template invoice
-CreateRepeatableInvoice=Create template invoice
-CreateFromRepeatableInvoice=Create from template invoice
+RepeatableInvoice=Fatura Modelo
+RepeatableInvoices=Faturas Modelo
+Repeatable=Modelo
+Repeatables=Modelos
+ChangeIntoRepeatableInvoice=Converter em fatura modelo
+CreateRepeatableInvoice=Criar fatura modelo
+CreateFromRepeatableInvoice=Criar a partir da fatura modelo
CustomersInvoicesAndInvoiceLines=Facturas a clientes e linhas de facturas
CustomersInvoicesAndPayments=Facturas a clientes e pagamentos
ExportDataset_invoice_1=Facturas a clientes e linhas de factura
@@ -247,7 +247,7 @@ AddGlobalDiscount=Adicionar Desconto fixo
EditGlobalDiscounts=Editar descontos absolutos
AddCreditNote=Criar nota de crédito
ShowDiscount=Ver o deposito
-ShowReduc=Show the deduction
+ShowReduc=Mostrar a dedução
RelativeDiscount=Desconto relativo
GlobalDiscount=Desconto fixo
CreditNote=Deposito
@@ -293,8 +293,8 @@ TotalOfTwoDiscountMustEqualsOriginal=Total de dois novos desconto deve ser igual
ConfirmRemoveDiscount=Tem certeza de que deseja remover este desconto?
RelatedBill=factura relacionados
RelatedBills=facturas relacionadas
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+LatestRelatedBill=Última fatura relacionada
+WarningBillExist=Aviso, já existe uma ou mais faturas
# PaymentConditions
PaymentConditionShortRECEP=Pronto Pagamento
@@ -313,7 +313,7 @@ PaymentConditionShortPT_ORDER=On order
PaymentConditionPT_ORDER=On order
PaymentConditionShortPT_5050=50-50
PaymentConditionPT_5050=50%% adiantado, 50%% na entrega
-FixAmount=Fix amount
+FixAmount=Valor fixo
VarAmount=Quantidade variável (%% total.)
# PaymentType
PaymentTypeVIR=Transferência bancaria
@@ -348,7 +348,7 @@ ChequeNumber=Cheque nº
ChequeOrTransferNumber=Cheque/Transferência nº
ChequeMaker=Emissor do cheque
ChequeBank=Banco do cheque
-CheckBank=Check
+CheckBank=Verificar
NetToBePaid=Neto a pagar
PhoneNumber=Tel.
FullPhoneNumber=telefone
@@ -419,12 +419,12 @@ InvoiceSituationAsk=Invoice following the situation
InvoiceSituationDesc=Create a new situation following an already existing one
SituationAmount=Situation invoice amount(net)
SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
+Progress=Progresso
+ModifyAllLines=Modificar todas as linhas
CreateNextSituationInvoice=Create next situation
NotLastInCycle=This invoice in not the last in cycle and must not be modified.
DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
+DisabledBecauseFinal=Esta situação é final.
CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceSituationLast=Fatura geral e final
diff --git a/htdocs/langs/pt_PT/boxes.lang b/htdocs/langs/pt_PT/boxes.lang
index 7bf37e00221..7c35e34c5e4 100644
--- a/htdocs/langs/pt_PT/boxes.lang
+++ b/htdocs/langs/pt_PT/boxes.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - boxes
BoxLastRssInfos=Informação RSS
BoxLastProducts=Últimos %s produtos/serviços
-BoxProductsAlertStock=Products in stock alert
+BoxProductsAlertStock=Produtos no alerta de stock
BoxLastProductsInContract=Últimos %s produtos/serviços contratados
BoxLastSupplierBills=Últimas faturas dos fornecedores
BoxLastCustomerBills=Últimas faturas a clientes
@@ -27,7 +27,7 @@ BoxTitleLastBooks=Os %s últimos Favoritos registados
BoxTitleNbOfCustomers=Número de clientes
BoxTitleLastRssInfos=As %s últimas notícias de %s
BoxTitleLastProducts=Os %s últimos produtos/serviços modificados
-BoxTitleProductsAlertStock=Products in stock alert
+BoxTitleProductsAlertStock=Produtos no alerta de stock
BoxTitleLastCustomerOrders=Last %s customer orders
BoxTitleLastModifiedCustomerOrders=Last %s modified customer orders
BoxTitleLastSuppliers=Os %s últimos Fornecedores modificados
@@ -88,7 +88,7 @@ BoxSuppliersInvoicesPerMonth=Facturas de fornecedores por mês
BoxCustomersOrdersPerMonth=Encomendas de clientes por mês
BoxSuppliersOrdersPerMonth=Encomendas de Fornecedores por mês
BoxProposalsPerMonth=Propostas por mês
-NoTooLowStockProducts=Nenhum produto abaixo do limite inferior de stock
+NoTooLowStockProducts=Nenhum produto abaixo do limite mínimo de stock
BoxProductDistribution=Distribuição de Produtos/Serviços
BoxProductDistributionFor=Distribuição de %s para %s
ForCustomersInvoices=Facturas de Clientes
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index 21fd2165145..4e3973d67b1 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Cliente Potencial
Prospects=Clientes Potenciais
DeleteAction=Eliminar uma Acção
NewAction=Nova Acção
-AddAction=Criar Acção
-AddAnAction=Criar uma Acção
-AddActionRendezVous=Criar uma Reunião
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Reunião
ConfirmDeleteAction=Está seguro de querer eliminar esta acção?
CardAction=Ficha da Acção
@@ -44,8 +44,8 @@ DoneActions=Lista de acções realizadas
DoneActionsFor=Lista de acções realizadas por %s
ToDoActions=Lista de acções incompletas
ToDoActionsFor=Lista de acções incompletas de %s
-SendPropalRef=Enviar orçamento %s
-SendOrderRef=Enviar pedido %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Não aplicável
StatusActionToDo=A realizar
StatusActionDone=Realizado
@@ -62,7 +62,7 @@ LastProspectContactDone=Clientes potenciais contactados
DateActionPlanned=Data planificação
DateActionDone=Data realização
ActionAskedBy=Acção questionada por
-ActionAffectedTo=Acção assignada a
+ActionAffectedTo=Event assigned to
ActionDoneBy=Acção realizada por
ActionUserAsk=Registada por
ErrorStatusCantBeZeroIfStarted=Se o campo 'Ficha de Realização' tiver dados a acção está em curso, por isso o campo 'Estado' não pode ser 0%%.
diff --git a/htdocs/langs/pt_PT/compta.lang b/htdocs/langs/pt_PT/compta.lang
index 8098ab7c1d5..c43f8cdc695 100644
--- a/htdocs/langs/pt_PT/compta.lang
+++ b/htdocs/langs/pt_PT/compta.lang
@@ -4,7 +4,7 @@ AccountancyCard=Ficha Contabilidade
Treasury=Tesouraria
MenuFinancial=Financeira
TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
-TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation
+TaxModuleSetupToModifyRulesLT=Ir para configurar Empresa para modificar as regras de cálculo
OptionMode=Opção de Gestão Contabilidade
OptionModeTrue=Opção Depósitos/Despesas
OptionModeVirtual=Opção Créditos/Dividas
@@ -19,8 +19,8 @@ AmountToBeCharged=Montante total a pagar:
AccountsGeneral=Contas Gerais
Account=Conta
Accounts=Contas
-Accountparent=Account parent
-Accountsparent=Accounts parent
+Accountparent=Conta original
+Accountsparent=Contas originais
BillsForSuppliers=Facturas de Fornecedores
Income=Depósitos
Outcome=Despesas
@@ -33,7 +33,7 @@ AccountingResult=Accounting result
Balance=Saldo
Debit=Débito
Credit=Crédito
-Piece=Accounting Doc.
+Piece=Doc. Contabilístico
Withdrawal=Retirada
Withdrawals=Retiradas
AmountHTVATRealReceived=Total Recebido
@@ -55,7 +55,7 @@ LT1SupplierES=RE purchases
VATCollected=IVA Recuperado
ToPay=A Pagar
ToGet=Para Voltar
-SpecialExpensesArea=Area for all special payments
+SpecialExpensesArea=Área para todos os pagamentos especiais
TaxAndDividendsArea=Área Impostos, gastos sociais e dividendos
SocialContribution=Gasto social
SocialContributions=Gastos sociais
@@ -131,13 +131,13 @@ CalcModeLT1Rec= Mode %sRE on suppliers invoices%s
CalcModeLT2= Mode %sIRPF on customer invoices - suppliers invoices%s
CalcModeLT2Debt=Mode %sIRPF on customer invoices%s
CalcModeLT2Rec= Mode %sIRPF on suppliers invoices%s
-AnnualSummaryDueDebtMode=Balance of income and expenses, annual summary
-AnnualSummaryInputOutputMode=Balance of income and expenses, annual summary
+AnnualSummaryDueDebtMode=Balanço da receita e despesas, resumo anual
+AnnualSummaryInputOutputMode=Balanço da receita e despesas, resumo anual
AnnualByCompaniesDueDebtMode=Balanço de depósitos e despesas, quebrado por Terceiros, em modo%sCréditos-dividas%s chamada Contabilidade de compromisso.
AnnualByCompaniesInputOutputMode=Balanço de depósitos e despesas, quebrado por Terceiros, em modo %sdepositos-despesas%s chamada Contabilidade de Caixa.
SeeReportInInputOutputMode=Ver o Relatório %sdepositos-despesas%s chamado Contabilidade de Caixa para um cálculo sobre as facturas pagas
SeeReportInDueDebtMode=Ver o Relatório %sCréditos-dividas%s chamada Contabilidade de compromisso para um cálculo das facturas Pendentes de pagamento
-RulesAmountWithTaxIncluded=- Amounts shown are with all taxes included
+RulesAmountWithTaxIncluded=- Os montantes exibidos contêm todas as taxas incluídas
RulesResultDue=- Os montantes mostrados são montantes totais
- Inclui as facturas, gastos e IVA devido, que estão pagas ou não.
- Se baseia na data de validação para as facturas e o IVA e na data de vencimento para as gastos.
RulesResultInOut=- It includes the real payments made on invoices, expenses and VAT.
- It is based on the payment dates of the invoices, expenses and VAT.
RulesCADue=- Inclui as facturas a clientes, estejam pagas ou não.
- Se baseia na data de validação das mesmas.
@@ -186,10 +186,10 @@ Pcg_subtype=Pcg subtype
InvoiceLinesToDispatch=Invoice lines to dispatch
InvoiceDispatched=Dispatched invoices
AccountancyDashboard=Accountancy summary
-ByProductsAndServices=By products and services
+ByProductsAndServices=Por produtos e serviços
RefExt=Ref externa
ToCreateAPredefinedInvoice=To create a predefined invoice, create a standard invoice then, without validating it, click onto button "Convert to predefined invoice".
-LinkedOrder=Link to order
+LinkedOrder=Hiperligação para encomendar
ReCalculate=Recalcular
Mode1=Método 1
Mode2=Método 2
@@ -202,6 +202,6 @@ ACCOUNTING_VAT_ACCOUNT=Default accountancy code for collecting VAT
ACCOUNTING_VAT_BUY_ACCOUNT=Default accountancy code for paying VAT
ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
-CloneTax=Clone a social contribution
-ConfirmCloneTax=Confirm the clone of a social contribution
-CloneTaxForNextMonth=Clone it for next month
+CloneTax=Clonar uma contribuição social
+ConfirmCloneTax=Confirme a clonagem de uma contribuição social
+CloneTaxForNextMonth=Cloná-la para o mês seguinte
diff --git a/htdocs/langs/pt_PT/contracts.lang b/htdocs/langs/pt_PT/contracts.lang
index 2c51fe50855..331cdf7a972 100644
--- a/htdocs/langs/pt_PT/contracts.lang
+++ b/htdocs/langs/pt_PT/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirado
ServiceStatusClosed=Fechado
ServicesLegend=Legenda para os serviços
Contracts=contractos
+ContractsAndLine=Contracts and line of contracts
Contract=Contrato
NoContracts=Sem contractos
MenuServices=Serviços
diff --git a/htdocs/langs/pt_PT/cron.lang b/htdocs/langs/pt_PT/cron.lang
index d3cf487ddd2..9c45da9a4da 100644
--- a/htdocs/langs/pt_PT/cron.lang
+++ b/htdocs/langs/pt_PT/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Aceda a "Home - Ferramentas dos Módulos" para visualizar e editar as tarefas agendadas.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/pt_PT/donations.lang b/htdocs/langs/pt_PT/donations.lang
index 7a31ae91628..0c3c915fb2f 100644
--- a/htdocs/langs/pt_PT/donations.lang
+++ b/htdocs/langs/pt_PT/donations.lang
@@ -4,35 +4,35 @@ Donations=Donativos
DonationRef=Ref. do donativo
Donor=Doador
Donors=Doadores
-AddDonation=Create a donation
-NewDonation=Nova Doação
+AddDonation=Crie uma donativo
+NewDonation=Novo Donativo
ShowDonation=Mostrar Donativo
DonationPromise=Promessa de Doação
PromisesNotValid=Promessas Não Validadas
PromisesValid=Promessas Validadas
-DonationsPaid=Doações Pagas
-DonationsReceived=Doações Recebidas
-PublicDonation=Doação Pública
-DonationsNumber=Número de Doações
-DonationsArea=Área de Doações
+DonationsPaid=Donativos Pagos
+DonationsReceived=Donativos Recebidos
+PublicDonation=Donativo Público
+DonationsNumber=Número de Donativos
+DonationsArea=Área de Donativos
DonationStatusPromiseNotValidated=Promessa Não Validada
DonationStatusPromiseValidated=Promessa Validada
-DonationStatusPaid=Doação Paga
+DonationStatusPaid=Donativo Recebido
DonationStatusPromiseNotValidatedShort=Não Validada
-DonationStatusPromiseValidatedShort=Validada
-DonationStatusPaidShort=Paga
+DonationStatusPromiseValidatedShort=Validado
+DonationStatusPaidShort=Recebido
ValidPromess=Validar promessa
-DonationReceipt=Recibo do donativo
+DonationReceipt=Recibo do Donativo
BuildDonationReceipt=Criar Recibo
-DonationsModels=Modelo de documento de recepção de Doação
-LastModifiedDonations=%s Última modificação doações
-SearchADonation=Procure uma doação
-DonationRecipient=Destinatário do donativo
+DonationsModels=Modelos de documentos dos recibos de donativos
+LastModifiedDonations=%s Última modificação de donativos
+SearchADonation=Procure um donativo
+DonationRecipient=Destinatário do Donativo
ThankYou=Obrigado
-IConfirmDonationReception=O destinatário acusou a recepção, como um donativo, do seguinte montante
-MinimumAmount=Minimum amount is %s
-FreeTextOnDonations=Free text to show in footer
-FrenchOptions=Options for France
+IConfirmDonationReception=O destinatário declarou a recepção, como um donativo, do seguinte montante
+MinimumAmount=O montante mínimo é %s
+FreeTextOnDonations=Texto livre para mostrar no rodapé
+FrenchOptions=Opções para França
DONATION_ART200=Show article 200 from CGI if you are concerned
DONATION_ART238=Show article 238 from CGI if you are concerned
DONATION_ART885=Show article 885 from CGI if you are concerned
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index d7d6a8f61f0..6ebfe918305 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=A conta origem e destino devem ser diferentes.
ErrorBadThirdPartyName=Nome de Terceiro incorrecto
ErrorProdIdIsMandatory=O %s é obrigatório
ErrorBadCustomerCodeSyntax=A sintaxis do código cliente é incorrecta
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Código cliente obrigatório
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Código de cliente já utilizado
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript não deve ser desativado para que este r
ErrorPasswordsMustMatch=Ambas as senhas digitadas devem corresponder entre si
ErrorContactEMail=Um erro técnico ocorreu. Por favor, contacte o administrador para seguir %s e-mail em fornecer os %s código de erro na sua mensagem, ou melhor ainda pela adição de uma cópia de tela da página.
ErrorWrongValueForField=Valor errado para o número %s campo (valor "%s" não coincide com %s regra regex)
-ErrorFieldValueNotIn=Valor errado para %s campo de número ("%s" de valor não é um valor disponível em %s %s campo de tabela)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Valor errado para %s número de campo ("%s" valor não é um ref %s existente)
ErrorsOnXLines=%s sobre as linhas das fontes de erros
ErrorFileIsInfectedWithAVirus=O programa antivírus não foi capaz de validar o arquivo (arquivo pode ser infectado por um vírus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Os parâmetros de configuração obrigatórios ainda não estão definidos
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index 2f8cd8f23f1..63bb32c1033 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -1,30 +1,30 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=RH
-Holidays=Folgas
-CPTitreMenu=Folgas
-MenuReportMonth=Monthly statement
-MenuAddCP=Faça uma requesição de folgas
-NotActiveModCP=Deve ativar o modulo de folgas para ver esta página
-NotConfigModCP=Você deve configurar o módulo de folgas para ver esta página. Para fazer isso, click here a>.
-NoCPforUser=Não tem nenhum dia disponivel
-AddCP=Faça uma requisição de folga
-Employe=Empregado
+Holidays=Licenças
+CPTitreMenu=Licenças
+MenuReportMonth=Comunicado mensal
+MenuAddCP=Efetue um pedido de licença
+NotActiveModCP=Deve ativar o módulo de Licenças para ver esta página.
+NotConfigModCP=Deve configurar o módulo de Licenças para ver esta página. Para o efetuar, clique aqui a>.
+NoCPforUser=Não tem nenhum dia disponivel.
+AddCP=Efetue um pedido de licença
+Employe=Funcionário
DateDebCP=Data de início
DateFinCP=Data de fim
DateCreateCP=Data de criação
DraftCP=Rascunho
ToReviewCP=Aguarda aprovação
-ApprovedCP=Aprovado
-CancelCP=Cancelado
-RefuseCP=Recusado
-ValidatorCP=Approbator
-ListeCP=Lista de folgas
-ReviewedByCP=Será analisado por
+ApprovedCP=Aprovada
+CancelCP=Cancelada
+RefuseCP=Recusada
+ValidatorCP=Autorizada por
+ListeCP=Lista de Licenças
+ReviewedByCP=Será revista por
DescCP=Descrição
-SendRequestCP=Criar requisição de folga
-DelayToRequestCP=Requisição de folga de ser feita pelo menos %s dia(s) antes de.
-MenuConfCP=Editar balanço de folgas
-UpdateAllCP=Atualisar folgas
+SendRequestCP=Criar requisição de licença
+DelayToRequestCP=Os pedidos de licença devem ser efetuados com pelo menos %s dia(s) de antecedência.
+MenuConfCP=Editar balanço das licenças
+UpdateAllCP=Atualize as licenças
SoldeCPUser=Balanço de folgas é %s dias
ErrorEndDateCP=You must select an end date greater than the start date.
ErrorSQLCreateCP=Ocorreu um erro de SQL durante a criação:
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 2a038935c53..e281ee14d50 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Último passo: Defina aqui o login ea senha que vo
ActivateModule=Ative o módulo %s
ShowEditTechnicalParameters=Clique aqui para mostrar/editar os parâmetros avançados (modo avançado)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/pt_PT/languages.lang b/htdocs/langs/pt_PT/languages.lang
index 473dd490106..67f384c4152 100644
--- a/htdocs/langs/pt_PT/languages.lang
+++ b/htdocs/langs/pt_PT/languages.lang
@@ -13,7 +13,7 @@ Language_de_AT=Alemão (Áustria)
Language_de_CH=Alemão (Suíça)
Language_el_GR=Grego
Language_en_AU=Inglês (Austrália)
-Language_en_CA=English (Canada)
+Language_en_CA=Inglês (Canadá)
Language_en_GB=Inglês (Reino Unido)
Language_en_IN=Inglês (Índia)
Language_en_NZ=Inglês (Nova Zelândia)
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 23c51af82a8..b017d2c856e 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancelar
Modify=Modificar
Edit=Editar
Validate=Validar
+ValidateAndApprove=Validate and Approve
ToValidate=Para validar
Save=Guardar
SaveAs=Guardar Como
@@ -158,6 +159,7 @@ Search=Procurar
SearchOf=Procurar
Valid=Confirmar
Approve=Aprovar
+Disapprove=Disapprove
ReOpen=Reabrir
Upload=Enviar Ficheiro
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Fichas
Card=Ficha
Now=Ahora
Date=Data
+DateAndHour=Date and hour
DateStart=Data de Início
DateEnd=Data de Fim
DateCreation=Data de Criação
@@ -295,6 +298,7 @@ UnitPriceHT=Preço Base (base)
UnitPriceTTC=Preço Unitário
PriceU=P.U.
PriceUHT=P.U. (base)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=P.U.
Amount=Montante
AmountInvoice=Montante da Fatura
@@ -521,6 +525,7 @@ DateFromTo=De %s a %s
DateFrom=A partir de %s
DateUntil=Até %s
Check=Verificar
+Uncheck=Uncheck
Internal=Interno
External=Externo
Internals=Internos
@@ -688,6 +693,7 @@ PublicUrl=URL público
AddBox=Adicionar Caixa
SelectElementAndClickRefresh=Selecione um elemento e actualize a pagina
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Segunda-feira
Tuesday=Terça-feira
diff --git a/htdocs/langs/pt_PT/orders.lang b/htdocs/langs/pt_PT/orders.lang
index 781be21e4db..31dde51f16a 100644
--- a/htdocs/langs/pt_PT/orders.lang
+++ b/htdocs/langs/pt_PT/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Anulado
StatusOrderDraft=Rascunho (a Confirmar)
StatusOrderValidated=Validado
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processado
StatusOrderToBill=A Facturar
StatusOrderToBill2=A facturar
@@ -58,6 +59,7 @@ MenuOrdersToBill=Pedidos por Facturar
MenuOrdersToBill2=Billable orders
SearchOrder=Procurar um Pedido
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Enviar Produto
Discount=Desconto
CreateOrder=Criar Pedido
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 6df1475eb17..764d37222a5 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -54,12 +54,13 @@ MaxSize=Tamanho Máximo
AttachANewFile=Adicionar Novo Ficheiro/documento
LinkedObject=Objecto adjudicado
Miscellaneous=Diversos
-NbOfActiveNotifications=Número Notificações
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Este é um email de teste. \\ NO duas linhas são separadas por um enter.
PredefinedMailTestHtml=Este é um email de teste (o teste de palavra deve ser em negrito).
As duas linhas são separadas por um enter.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/pt_PT/productbatch.lang b/htdocs/langs/pt_PT/productbatch.lang
index ff72b80058d..c65bb2b7247 100644
--- a/htdocs/langs/pt_PT/productbatch.lang
+++ b/htdocs/langs/pt_PT/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Número de Lote/Série
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Detalhes de Lote/Série
-DetailBatchFormat=Lote/Série: %s - E:%s - S: %s (Qt. : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Lote: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 15842116ed5..a543f3549d6 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index f969b074f3f..31d5119f907 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -3,13 +3,15 @@ RefProject=Ref. do projeto
ProjectId=Id. do Projeto
Project=Projeto
Projects=Projetos
-ProjectStatus=Project status
+ProjectStatus=Estado do projeto
SharedProject=Toda a Gente
PrivateProject=Contactos do projeto
MyProjectsDesc=Esta visualização está limitada a projetos onde é um contacto para (seja qual for o tipo).
ProjectsPublicDesc=Esta visualização apresenta todos os projetos que está autorizado a ler.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Esta visualização apresenta todos os projetos (as suas permissões de utilizador concedem-lhe a permissão para ver tudo).
MyTasksDesc=Esta visualização está limitada aos projetos ou tarefas em que é um contacto para (seja qual for o tipo).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Esta visualização apresenta todos os projetos e tarefas que está autorizado a ler.
TasksDesc=Esta visualização apresenta todos os projetos e tarefas (as suas permissões de utilizador concedem-lhe permissão para ver tudo).
ProjectsArea=Área de Projetos
@@ -29,6 +31,8 @@ NoProject=Nenhum projeto definido ou possuído
NbOpenTasks=Nr. de Tarefas Abertas
NbOfProjects=Nr. de Projetos
TimeSpent=Tempo Dispendido
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tempos Dispendidos
RefTask=Ref. da Tarefa
LabelTask=Etiqueta de Tarefa
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados a
ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associados ao Projeto
ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
-ListTripAssociatedProject=Lista de viagens e despesas associadas ao projeto
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Lista de eventos associados ao projeto
ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
@@ -87,7 +91,7 @@ ActionsOnProject=Ações sobre o projeto
YouAreNotContactOfProject=Não é um contato deste projeto privado
DeleteATimeSpent=Excluir o tempo gasto
ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado?
-DoNotShowMyTasksOnly=See also tasks not assigned to me
+DoNotShowMyTasksOnly=Ver também as tarefas não me atribuidas
ShowMyTasksOnly=Ver só as tarefas que me foram atribuídas
TaskRessourceLinks=Recursos
ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
@@ -103,9 +107,9 @@ CloneContacts=Clonar contactos
CloneNotes=Clonar notas
CloneProjectFiles=Clone project joined files
CloneTaskFiles=Clone task(s) joined files (if task(s) cloned)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=Atualizar as datas do projeto/tarefas a partir de agora?
ConfirmCloneProject=Tem a certeza para clonar este projeto?
-ProjectReportDate=Change task date according project start date
+ProjectReportDate=Alterar a data da tarefa de acordo com a data de início do projeto
ErrorShiftTaskDate=Impossible to shift task date according to new project start date
ProjectsAndTasksLines=Projetos e tarefas
ProjectCreatedInDolibarr=Projeto %s criado
@@ -130,6 +134,9 @@ PlannedWorkload = Carga de trabalho planeada
WorkloadOccupation= Afectação da carga de trabalho
ProjectReferers=Refering objects
SearchAProject=Procurar um projeto
-ProjectMustBeValidatedFirst=Project must be validated first
+ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
ProjectDraft=Esboço de projetos
FirstAddRessourceToAllocateTime=Associar um recuirso para alocar a hora
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/pt_PT/salaries.lang b/htdocs/langs/pt_PT/salaries.lang
index 5966b69f13b..9c699574cc0 100644
--- a/htdocs/langs/pt_PT/salaries.lang
+++ b/htdocs/langs/pt_PT/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Pagamentos de Salários
ShowSalaryPayment=Mostrar pagamento de salário
THM=Preço médio da hora
TJM=Preço médio diário
+CurrentSalary=Current salary
diff --git a/htdocs/langs/pt_PT/sendings.lang b/htdocs/langs/pt_PT/sendings.lang
index ad26c2228cd..ca9bf9bce91 100644
--- a/htdocs/langs/pt_PT/sendings.lang
+++ b/htdocs/langs/pt_PT/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Quant. Pedida
QtyShipped=Quant. Enviada
QtyToShip=Quant. a Enviar
QtyReceived=Quant. Recebida
-KeepToShip=Manter por Enviar
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Outros Envios deste Pedido
DateSending=Data de Expedição
DateSendingShort=Data de Expedição
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 7211c46b431..d3fda31b63e 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Valor (PMP)
PMPValueShort=PMP
EnhancedValueOfWarehouses=Valor de stocks
UserWarehouseAutoCreate=Criar existencias automáticamente na criação de um utilizador
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantidade desagregada
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=Para este armazém
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/pt_PT/suppliers.lang b/htdocs/langs/pt_PT/suppliers.lang
index 1e0e55d1422..b57b823e0fd 100644
--- a/htdocs/langs/pt_PT/suppliers.lang
+++ b/htdocs/langs/pt_PT/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Fornecedores
-Supplier=Fornecedor
AddSupplier=Create a supplier
SupplierRemoved=Fornecedor Eliminado
SuppliersInvoice=Facturas do Fornecedor
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Facturas Fornecedores e Pagamentos
ExportDataset_fournisseur_3=Pedidos a fornecedores e linhas de pedido
ApproveThisOrder=Aprovar este Pedido
ConfirmApproveThisOrder=Está seguro de querer aprovar este pedido?
-DenyingThisOrder=Negar este Pedido
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Está seguro de querer negar este pedido?
ConfirmCancelThisOrder=Está seguro de querer cancelar este pedido?
AddCustomerOrder=Criar Pedido do Cliente
diff --git a/htdocs/langs/pt_PT/trips.lang b/htdocs/langs/pt_PT/trips.lang
index 09f269a57e1..1733fe86dc2 100644
--- a/htdocs/langs/pt_PT/trips.lang
+++ b/htdocs/langs/pt_PT/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Deslocação
-Trips=Deslocações
-TripsAndExpenses=Deslocações e Despesas
-TripsAndExpensesStatistics=Viagens e estatísticas despesas
-TripCard=Ficha de Deslocação
-AddTrip=Adicionar Deslocação
-ListOfTrips=Lista de Deslocações
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Lista de Taxas
-NewTrip=Nova Deslocação
+NewTrip=New expense report
CompanyVisited=Empresa/Instituição Visitada
Kilometers=Quilómetros
FeesKilometersOrAmout=Quantidade de Quilómetros
-DeleteTrip=Eliminar Deslocação
-ConfirmDeleteTrip=Deseja mesmo eliminar esta deslocação?
-TF_OTHER=Outro
-TF_LUNCH=Alimentação
-TF_TRIP=Viagem
-ListTripsAndExpenses=Lista de viagens e despesas
-ExpensesArea=Viagens e área de despesas
-SearchATripAndExpense=Procure uma viagem e despesas
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Outro
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Alimentação
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index ed875d3ec11..d91192821e9 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Dezvoltare
VersionUnknown=Necunoscut
VersionRecommanded=Recomandat
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID Sesiune
SessionSaveHandler=Handler pentru a salva sesiunile
SessionSavePath=Storage sesiune localizare
@@ -294,7 +299,7 @@ DoNotUseInProduction=Nu utilizaţi în producţie
ThisIsProcessToFollow=Acesta este procesul de configurare pentru a:
StepNb=Pasul %s
FindPackageFromWebSite=Găsiţi un pachet care ofera facilitate dorit (de exemplu, pe site-ul web %s).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Descărcaţi pachetul %s.
UnpackPackageInDolibarrRoot=Unpack pachet de fişiere în directorul rădăcină Dolibarr lui %s
SetupIsReadyForUse=Instalarea este terminat şi Dolibarr este gata pentru a fi utilizate cu această nouă componentă.
NotExistsDirect=Nu este definit directorroot alternativ.
@@ -383,12 +388,12 @@ ExtrafieldSelectList = Select din tabel
ExtrafieldSeparator=Separator
ExtrafieldCheckBox=Checkbox
ExtrafieldRadio=Radio buton
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldCheckBoxFromList= Checkbox din tabel
ExtrafieldParamHelpselect=Lista de parametri trebuie să fie ca cheie, valoare
pentru exemplul:
1, valoare1
2, valoare2
3, value3
...
Pentru a avea listă în funcție de o alta:
1,value1|parent_list_code:parent_key
2,value2|parent_list_code:parent_key
ExtrafieldParamHelpcheckbox=Lista de parametri trebuie să fie de tip cheie, valoare
pentru exemplul:
1, valoare1
2, valoare2
3, value3
...
ExtrafieldParamHelpradio=Lista de parametri trebuie să fie de tip cheie, valoare
pentru exemplul:
1, valoare1
2, valoare2
3, value3
...
ExtrafieldParamHelpsellist=Lista de parametri a venit de la tabelul
Sintaxa: able_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă
dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)
În scopul de avea lista depinzând de alta :
c_typent:libelle:id:parent_list_code|parent_column:filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Lista de parametri a venit de la tabelul
Sintaxa: able_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filtru poate fi un test simplu (de exemplu, activ = 1), pentru a afișa doar valoare activă
dacă doriți să filtrați pe extracâmpuri folosi sintaxa extra.fieldcode=... (unde codul de câmp este codul de extracâmp)
În scopul de avea lista depinzând de alta :
c_typent:libelle:id:parent_list_code|parent_column:filter
LibraryToBuildPDF=Librairie utilizată la construirea PDF ului
WarningUsingFPDF=Atenție: conf.php contine Directiva dolibarr_pdf_force_fpdf = 1. Acest lucru înseamnă că utilizați biblioteca FPDF pentru a genera fișiere PDF. Această bibliotecă este vechi și nu suportă o mulțime de caracteristici (Unicode, transparența imagine, cu litere chirilice, limbi arabe și asiatice, ...), astfel încât este posibil să apară erori în timpul generație PDF.
Pentru a rezolva acest lucru și au un suport complet de generare PDF, vă rugăm să descărcați biblioteca TCPDF , atunci comentariu sau elimina linia $ dolibarr_pdf_force_fpdf = 1, și se adaugă în schimb $ dolibarr_lib_TCPDF_PATH = 'path_to_TCPDF_dir'
LocalTaxDesc=Unele țări aplică 2 sau 3 impozite la fiecare linie de factura. Dacă este cazul, alege tipul al doilea și al treilea de taxă și ratele lor. Tipuri posibile sunt:
1: Taxa hoteliera se aplică pe produse și servicii, fără TVA (TVA nu este aplicată la taxa locala)
2: taxa locala pe produse și servicii fără TVA (TVA-ul este calculat la suma + localtax)
3: Taxa locală se aplică la produsele fara TVA (TVA nu se aplică la taxa locala)
4: Taxa locală se aplică la produsele fără TVA (TVA-ul este calculat la suma + localtax)
5: Taxa locală se aplică pe servicii fara TVA (TVA nu este aplicată la taxa locala)
6: Taxa locală se aplică pe servicii fără TVA (TVA-ul este calculat la suma + localtax)
@@ -493,10 +498,16 @@ Module600Name=Notificări
Module600Desc=Trimite notificări prin email la unele evenimente de afaceri Dolibarr la contactele terților (configurare definită pe fiecare terţ)
Module700Name=Donatii
Module700Desc=MAnagementul Donaţiilor
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integrare
Module1400Name=Contabilitate
Module1400Desc=Management Contabilitate de gestiune (partidă dublă)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categorii
Module1780Desc=Categorii de "management (produse, furnizori şi clienţi)
Module2000Name=Fckeditor
@@ -575,7 +586,7 @@ Permission67=Export intervenţii
Permission71=Citeşte membrii
Permission72=Creare / Modificare membri
Permission74=Ştergere membri
-Permission75=Setup types of membership
+Permission75=Configurare tipuri membri
Permission76=Export Date
Permission78=Citeşte abonamente
Permission79=Creare / Modificare abonamente
@@ -598,8 +609,8 @@ Permission106=Export livrări
Permission109=Ştergere sendings
Permission111=Citeşte conturile financiare
Permission112=Crea / modifica / delete şi compara tranzacţiile
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Configurare conturi financiare( creare, gestionare categorii)
+Permission114=Tranzactii Reconciliate
Permission115=Tranzacţii de export şi în declaraţiile
Permission116=Transferuri între conturile
Permission117=Gestionare cecuri de expediţie
@@ -631,7 +642,7 @@ Permission181=Citeşte furnizor ordinelor
Permission182=Creare / Modificare furnizor ordinelor
Permission183=Validate furnizor ordinelor
Permission184=Aprobaţi furnizor ordinelor
-Permission185=Comanda furnizor ordinelor
+Permission185=Order or cancel supplier orders
Permission186=Furnizor de a primi comenzi
Permission187=Inchide furnizor ordinelor
Permission188=Anulare furnizor ordinelor
@@ -711,6 +722,13 @@ Permission538=Exportul de servicii
Permission701=Citiţi donaţii
Permission702=Creare / Modificare donaţii
Permission703=Ştergere donaţii
+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
Permission1001=Citeşte stocuri
Permission1002=Creare / modificare depozite
Permission1003=Ștergere depozite
@@ -764,7 +782,7 @@ Permission55001=Cieşte sondaje
Permission55002=Creare / Modificare sondaje
Permission59001=Citeşte marje comerciale
Permission59002=Defineşte marje comerciale
-Permission59003=Read every user margin
+Permission59003=Citeşte marjele fiecarui utilizator
DictionaryCompanyType=Tip Terţ
DictionaryCompanyJuridicalType=Tipuri juridice terţi
DictionaryProspectLevel=Nivel potenţial Prospect
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Parolă pentru a utiliza server proxy
DefineHereComplementaryAttributes=Definiţi aici toate atributele, care nu sunt deja disponibile în mod implicit, şi că doriţi să fie sprijinite pentru %s.
ExtraFields=Atribute complementare
ExtraFieldsLines=Atribute complementare (linii)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Atribute complementare ( terţi)
ExtraFieldsContacts=Atribute complementare (contact/addresă )
ExtraFieldsMember=Atribute complementare (membri)
@@ -1042,7 +1062,7 @@ SendingMailSetup=Setup de trimiteri prin e-mail
SendmailOptionNotComplete=Atenţie, pe unele sisteme Linux, pentru a trimite e-mail de la e-mail, sendmail configurare execuţie trebuie să conatins optiunea-ba (mail.force_extra_parameters parametri în fişierul php.ini). Dacă nu unor destinatari a primi e-mailuri, încercaţi să editaţi acest parametru PHP cu mail.force_extra_parameters =-BA).
PathToDocuments=Cale de acces documente
PathDirectory=Director
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Functionalitate pentru a trimite mesaje utilizând metoda "mail PHP direct" va genera un mesaj e-mail care nu s-ar putea să fie corect interpretat de către unele servere de e-mail . Rezultatul este că unele mail-uri nu pot fi citite de unele persoane . Este cazul unor furnizori de Internet (Ex: Orange în Franţa). Aceasta nu este o problemă în Dolibarr nici în PHP, dar primesc pe serverul de poştă electronică. Puteţi adăuga toate acestea, opţiunea MAIN_FIX_FOR_BUGGED_MTA la 1 în configurare - pentru a modifica alte Dolibarr pentru a evita acest lucru. Cu toate acestea, este posibil să aveţi probleme cu alte servere care sens strict standard SMTP. Altă soluţie (recommanded) este de a utiliza metoda "SMTP socket bibliotecă", care nu are dezavantaje.
TranslationSetup=Configurarea traducerii
TranslationDesc=Alegerea limbiilor vizibile pe ecran pot fi modificate:
* La nivel global din meniul Home - Configurare - Afişare
* Pe utilizator numai ,la Tabul Afișare utilizator al fişei de utilizator (click pe login din partea de sus a ecranului).
TotalNumberOfActivatedModules=Numărul total al modulelor funcţionale activate: %s
@@ -1061,7 +1081,7 @@ BrowserIsOK=Folosiţi navigatorul web %s. Acest navigator este ok pentru perform
BrowserIsKO=Folosiţi browser-ul % s. Acest browser-ul pare a fi o alegere proasta pentru securitate, performanță și fiabilitate. Noi recomandam sa folositi Firefox, Chrome, Opera sau Safari.
XDebugInstalled=XDebug este încărcat.
XCacheInstalled=XCache este încărcată.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
+AddRefInList=Afișează ref client / furnizor în lista (listă select sau combobox) și mai multe hyperlinkuri. Terții vor apare cu numele "CC12345 - SC45678 - The big company coorp", în loc de "The big company coorp".
FieldEdition=Editarea campului %s
FixTZ=Fixează TimeZone
FillThisOnlyIfRequired=Exemplu: +2 (completați numai dacă problemele decalajjului fusului orar sunt cunoscute)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=O linie de produse / servicii cu o suma de zero este c
FreeLegalTextOnProposal=Text liber pe ofertele comerciale
WatermarkOnDraftProposal=Filigranul pe ofertele comerciale schiţă (niciunul daca e gol)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Cere contul bancar destinație al ofertei
+##### 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
##### Orders #####
OrdersSetup=Ordinele de gestionare setup
OrdersNumberingModules=Ordinele de numerotare module
@@ -1161,7 +1188,7 @@ ValidOrderAfterPropalClosed=Pentru a valida comanda după închiderea ofertei,
FreeLegalTextOnOrders=Free text de pe ordinele de
WatermarkOnDraftOrders=Filigranul pe comenzile schiţă (niciunul daca e gol)
ShippableOrderIconInList=Adaugă un icon în lista Comenzilor care indica daca comanda este expediabilă
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Cere contul bancar destinație al comenzii
##### Clicktodial #####
ClickToDialSetup=Click pentru a Dial modul setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
__PHONETO__ qui sera remplac� par le t�l�phone de l'appel�
__PHONEFROM__ qui sera remplac� par le t�l�phone de l'appelant (le votre)
__LOGIN__ qui sera remplac� par votre login clicktodial (d�fini sur votre fiche utilisateur)
__PASS__ qui sera remplac� par votre mot de passe clicktodial (d�fini sur votre fiche utilisateur).
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Coduri de bare de tip UPC
BarcodeDescISBN=Coduri de bare de tip ISBN
BarcodeDescC39=Coduri de bare de tip C39
BarcodeDescC128=Coduri de bare de tip C128
-GenbarcodeLocation=Coduri de bare generaţie în linie de comandă (utilizat de către phpbarcode motor pentru anumite tipuri de coduri de bare)
+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
BarcodeInternalEngine=Motor intern
BarCodeNumberManager=Manager pentru autodefinire numere coduri bare
##### Prelevements #####
@@ -1397,7 +1424,7 @@ RSSUrlExample=Un interesant RSS feed
MailingSetup=Să trimiteţi un email la modul de instalare
MailingEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise prin email-uri de module
MailingEMailError=Întoarcere Email (Erori-a) pentru e-mailuri cu erori
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Secunde de asteptare pentru trimiterea urmatorului mesaj
##### Notification #####
NotificationSetup=Configurare Modul Notificări Email
NotificationEMailFrom=Expeditorul e-mail (la) pentru e-mail-uri trimise pentru notificări
@@ -1407,9 +1434,9 @@ FixedEmailTarget=Targhet email fixat
SendingsSetup=Trimiterea de modul de configurare
SendingsReceiptModel=Trimiterea primirea model
SendingsNumberingModules=Trimiteri de numerotare module
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Avize expediere suport pentru livrari clienti
NoNeedForDeliveryReceipts=În cele mai multe cazuri, sendings încasări sunt utilizate atât ca foi de client pentru livrări (lista de produse pentru a trimite) şi foi de faptul că este recevied şi semnat de către client. Deci, livrările de produse încasări este un duplicat caracteristică şi este rareori activat.
-FreeLegalTextOnShippings=Free text on shipments
+FreeLegalTextOnShippings=Text liber pe livrari
##### Deliveries #####
DeliveryOrderNumberingModules=Produse livrările primirea modul de numerotare
DeliveryOrderModel=Produse livrările primirea model
@@ -1420,7 +1447,7 @@ AdvancedEditor=Editor avansat
ActivateFCKeditor=Activaţi FCKeditor pentru:
FCKeditorForCompany=WYSIWIG crearea / editie a companiilor şi de note descriere
FCKeditorForProduct=WYSIWIG crearea / editie a produselor / serviciilor "descrierea şi nota
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
+FCKeditorForProductDetails=WYSIWIG creare / editare detalii linii de produse pentru toate entităţile (propuneri, comenzilor, facturilor, etc ..) Atenţie: Folosind această opţiune nu este recommanda deoarece astfel pot apare probleme la caracterele speciale şi paginare atunci când se creaza fişiere PDF.
FCKeditorForMailing= WYSIWIG crearea / ediţie de mailing
FCKeditorForUserSignature=Creare/editare WYSIWIG a semnăturii utilizatorilor
FCKeditorForMail=Creare/editare WYSIWIG a tuturor emailurilor (exceptând Outils->eMailing)
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Terț generic implicit utilizat pentru vânzări
CashDeskBankAccountForSell=Case de cont pentru a utiliza pentru vinde
CashDeskBankAccountForCheque= Cont pentru a utiliza pentru a primi plăţi prin cec
CashDeskBankAccountForCB= Cont pentru a folosi pentru a primi plăţi în numerar de carduri de credit
-CashDeskDoNotDecreaseStock=Dezactivați scădere stoc atunci când o vinzare se face de la Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Forţează și limitează depozitul să folosească scăderea stocului
StockDecreaseForPointOfSaleDisabled=Scădere stoc de la Point of Sale dezactivat
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=Nu ai dezactivați scăderea de stocului atunci când se face o vinzare de la Point Of Sale. Astfel, este necesar un depozit.
##### Bookmark #####
BookmarkSetup=Bookmark modul de configurare
@@ -1568,4 +1596,8 @@ SalariesSetup=Configurare modul salarii
SortOrder=Ordine sortare
Format=Format
TypePaymentDesc=0:Tip plata Client, 1:Tip plata Furnizor, 2:Ambele tipuri plata Client sau Furnizor
-IncludePath=Include path (defined into variable %s)
+IncludePath=Include calea (definita in variabila %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.
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 8f109cb5e98..50ca3ae994c 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -69,7 +69,7 @@ DateActionDoneEnd= Data reală a terminării
DateActionStart= Data începerii
DateActionEnd= Data terminării
AgendaUrlOptions1=Puteţi, de asemenea, să adăugaţi următorii parametri pentru filtrarea rezultatelor:
-AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s.
+AgendaUrlOptions2=login=%s pentru a limita exportul de acțiuni create de, sau atribuite utilizatorului%s.
AgendaUrlOptions3=logind=%s pentru a limita exportul de acțiuni deţinute de utilizatorul %s
AgendaUrlOptions4=logint=% s pentru a limita exportul de acțiuni atribuite utilizatorului % s.
AgendaUrlOptionsProject=project=PROJECT_ID pentru a limita exportul de acțiuni asociate la proiectul PROJECT_ID.
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index ce9ea8d39b4..c090ed31326 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Cont
FinancialAccounts=Conturi
BankAccount=Cont bancar
BankAccounts=Conturi bancare
-ShowAccount=Show Account
+ShowAccount=Arată Cont
AccountRef=Contul financiar ref
AccountLabel=Contul financiar etichetă
CashAccount=Cont Casa
@@ -33,7 +33,11 @@ AllTime=De la inceput
Reconciliation=Reconciliere
RIB=Număr Cont Bancă
IBAN=Cod IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=Cod BIC / SWIFT
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Ordine de plată
StandingOrder=Ordin plată
Withdrawals=Retrageri
@@ -148,7 +152,7 @@ BackToAccount=Inapoi la cont
ShowAllAccounts=Arată pentru toate conturile
FutureTransaction=Tranzacţie viitoare. In nici un caz de decontat.
SelectChequeTransactionAndGenerate=Selectaţi/ filtraţi cecurile pentru a le include în borderoul de remise şi faceţi clic pe "Crează".
-InputReceiptNumber=Alegeți extrasul de cont privitor la conciliere. Folosiţi o valoare numerică sortabile (cum ar fi, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=În cele din urmă, precizează o categorie în care să clasezi înregistrările
ToConciliate=De decontat ?
ThenCheckLinesAndConciliate=Apoi, verifică liniile prezente în extrasul de bancă şi click
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 5885b7a76a8..2365a67dac4 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -412,19 +412,19 @@ TypeContact_invoice_supplier_external_BILLING=Contact facturare furnizor
TypeContact_invoice_supplier_external_SHIPPING=Contact livrare furnizor
TypeContact_invoice_supplier_external_SERVICE=Contact service furnizor
# Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
+InvoiceFirstSituationAsk=Situatie initiala factura
+InvoiceFirstSituationDesc= Situația facturilor este legata de situații legate de o progresie, de exemplu progresia unei construcții. Fiecare situație este legată de o factură.
InvoiceSituation=Situatie factura
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
+InvoiceSituationAsk=Factura urmarind situatia
+InvoiceSituationDesc=Creaza o situatie noua urmarind una existenta deja
+SituationAmount=Situatie valoare(neta) factura
+SituationDeduction=Situatie scadere
Progress=Progres
ModifyAllLines=Modifica toate liniile
CreateNextSituationInvoice=Creaza urmatoarea situatie
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
+NotLastInCycle=Aceasta factura ce nu se afla in ultimul ciclu si nu poate fi modificata,
DisabledBecauseNotLastInCycle=URmatoarea situatie deja exista
DisabledBecauseFinal=Aceasta situatie este finala
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
+CantBeLessThanMinPercent=Progresul nu poate fi mai mic decat valoarea lui in precedenta situatie
NoSituations=Nicio situatie deschisa
InvoiceSituationLast=Factura finala si generala
diff --git a/htdocs/langs/ro_RO/commercial.lang b/htdocs/langs/ro_RO/commercial.lang
index 78eb9aecfc7..14370ebe680 100644
--- a/htdocs/langs/ro_RO/commercial.lang
+++ b/htdocs/langs/ro_RO/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Prospecte contactate
DateActionPlanned=Dată realizare prevăzută
DateActionDone=Dată realizare efectivă
ActionAskedBy=Eveniment înregistrat de
-ActionAffectedTo=Evenimente aparţinând de
+ActionAffectedTo=Event assigned to
ActionDoneBy=Eveniment realizat de către
ActionUserAsk=Raportat de
ErrorStatusCantBeZeroIfStarted=Dacă câmpul "Data reală debut realizare" este completat, acţiunea este începută (sau terminată), astfel câmpul "Status" nu poate fi 0%%.
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index e400f9eab79..71204246fb0 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -29,7 +29,7 @@ ReportTurnover=Cifra de afaceri
PaymentsNotLinkedToInvoice=Plăţile nu sunt legate de orice factură, astfel încât nu au legătură cu o terţă parte
PaymentsNotLinkedToUser=Plăţile nu sunt legate de orice utilizator
Profit=Profit
-AccountingResult=Accounting result
+AccountingResult=Rezultatl contabil
Balance=Sold
Debit=Debit
Credit=Credit
diff --git a/htdocs/langs/ro_RO/contracts.lang b/htdocs/langs/ro_RO/contracts.lang
index c90c961b9b9..7f300527533 100644
--- a/htdocs/langs/ro_RO/contracts.lang
+++ b/htdocs/langs/ro_RO/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expirat
ServiceStatusClosed=Închis
ServicesLegend=Legendă Servicii
Contracts=Contracte
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=Niciun contract
MenuServices=Servicii
diff --git a/htdocs/langs/ro_RO/cron.lang b/htdocs/langs/ro_RO/cron.lang
index 173adce646a..381d59c19bc 100644
--- a/htdocs/langs/ro_RO/cron.lang
+++ b/htdocs/langs/ro_RO/cron.lang
@@ -14,8 +14,8 @@ URLToLaunchCronJobs=URL-ul pentru a verifica și a lansa joburi cron, dacă este
OrToLaunchASpecificJob=Sau pentru a verifica și a lansa un anumit job
KeyForCronAccess=Cheie de securitate pentru URL de lansare a joburilor cron
FileToLaunchCronJobs=Linie de comandă pentru lansare joburi cron
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunUnix=Pe mediul Unix veţi utiliza instrumentul crontab pentru a rula urmatoarea linia de comanda la fiecare 5 minute
+CronExplainHowToRunWin=Pe mediul Microsoft(tm) Windows puteţi utiliza instrumentul Scheduled task pentru a rula linia de comanda la fiecare 5 minute
# Menu
CronJobs=Joburi programate
CronListActive=Lista activelor/programatelor joburi
@@ -84,3 +84,4 @@ CronType_command=Comandă shell
CronMenu=Cron
CronCannotLoadClass=Nu pot încărca clasa %s sau obiectul %s
UseMenuModuleToolsToAddCronJobs=Intrați în meniul ''Acasă - Instrumentele modulelor - Lista de job-uri'' pentru a vedea și edita job-urile programate.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 943cfbc57d5..8e73996c24d 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Sursa obiective şi conturi bancare trebuie să f
ErrorBadThirdPartyName=Bad valoarea de terţă parte nume
ErrorProdIdIsMandatory=%s este obligatoriu
ErrorBadCustomerCodeSyntax=Bad sintaxă pentru codul de client
-ErrorBadBarCodeSyntax=Bad sintaxă pentru furnizor cod
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Clientul codul necesar
ErrorBarCodeRequired=Cod de bare cerut
ErrorCustomerCodeAlreadyUsed=Clientul codul folosit deja
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivate pentru a
ErrorPasswordsMustMatch=Ambele parolele tastate trebuie să se potrivească reciproc
ErrorContactEMail=O eroare de tehnică avut loc. Vă rugăm, contactaţi administratorul de a urma %s de e-mail ro oferi %s cod de eroare în mesajul Dvs., sau chiar mai bine prin adăugarea o copie ecran a acestei pagini.
ErrorWrongValueForField=Valoarea greşit pentru %s numărul de câmp (valoarea "%s" nu se potriveste cu regula %s regex)
-ErrorFieldValueNotIn=Valoare greşită pentru %s numărul de câmp ("%s" valoare nu este o valoare disponibile în %s teren de %s de masă)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Valoare greşită pentru %s numărul de câmp ("%s" valoarea nu este o ref %s existente)
ErrorsOnXLines=Erori pe liniile sursă %s
ErrorFileIsInfectedWithAVirus=Programul antivirus nu a validet fisierul (fisierul ar putea fi infectat cu un virus)
@@ -159,7 +159,8 @@ ErrorPriceExpression22=Rezultat negativ '%s'
ErrorPriceExpressionInternal=Eroare internă '%s'
ErrorPriceExpressionUnknown=Eroare Necunoscută '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Depozitul sursă și țintă trebuie să difere
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=Eroare, se incerarca să se facă o mișcare de stoc, fără informații de lot / serie, pe un produs care necesită informații de lot /serie
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Parametri de setare obligatorii nu sunt încă definiţi
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index e74102c3b63..c4a8956bc4d 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -155,7 +155,8 @@ MigrationFinished=Migraţia terminată
LastStepDesc=Ultimul pas: Definirea aici nume de utilizator şi parola pe care intenţionaţi să îl utilizaţi pentru conectarea la software-ul. Nu pierde aceasta ca este cont pentru a administra toate celelalte.
ActivateModule=Activaţi modul %s
ShowEditTechnicalParameters=Click aici pentru a vedea / edita parametrii avansaţi (mod expert)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Avertisment:\nAti facut o copie de rezervă a bazei de date mai întâi? \nAcest lucru este foarte recomandat: de exemplu, din cauza unor bug-uri în sistemele de baze de date (de exemplu, mysql versiune 5.5.40), unele date sau tabele pot fi pierdute în timpul acestui proces, de aceea este foarte recomandat să aveți o copie completa a bazei de date înaintea pornirii migrariii.\n\nFaceți clic pe OK pentru a începe procesul de migrare ...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
@@ -207,7 +208,7 @@ MigrationProjectTaskTime=Actualizare de timp petrecut în secunde
MigrationActioncommElement=Actualizare date pe acţiuni
MigrationPaymentMode=Migrare de date pentru modul de plată
MigrationCategorieAssociation=Migrarea categoriilor
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Migrația evenimentelor pentru a adăuga proprietarului evenimentul în tabelul de atribuire
ShowNotAvailableOptions=Afişează opţiunile nedisponibile
HideNotAvailableOptions=Acunde opţiunile nedisponibile
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index d2edf76d388..483e5b1caa3 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -13,7 +13,7 @@ Language_de_AT=Germană (Austria)
Language_de_CH=Germană (Elveţia)
Language_el_GR=Greacă
Language_en_AU=Engleză (Australia)
-Language_en_CA=English (Canada)
+Language_en_CA=Engleză (Canada)
Language_en_GB=Engleză (Marea Britanie)
Language_en_IN=Engleză (India)
Language_en_NZ=Engleză (Noua Zeelandă)
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index c540d9d4dc2..0b2b2e1411c 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -141,6 +141,7 @@ Cancel=Anulează
Modify=Modifică
Edit=Editează
Validate=Validează
+ValidateAndApprove=Validate and Approve
ToValidate=De validat
Save=Salvează
SaveAs=Salvează ca
@@ -158,6 +159,7 @@ Search=Caută
SearchOf=Căutare
Valid=Validează
Approve=Aprobaţi
+Disapprove=Disapprove
ReOpen=Redeaschide
Upload=Trimite fişier
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Fişe
Card=Fişă
Now=Acum
Date=Dată
+DateAndHour=Date and hour
DateStart=Dată început
DateEnd=Dată sfârşit
DateCreation=Dată creare
@@ -295,6 +298,7 @@ UnitPriceHT=Preț unitar (net)
UnitPriceTTC=Preț unitar
PriceU=UP
PriceUHT=UP (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Valoare
AmountInvoice=Valoare Factură
@@ -521,6 +525,7 @@ DateFromTo=De la %s la %s
DateFrom=Începând cu %s
DateUntil=Până în %s
Check=Verifică
+Uncheck=Uncheck
Internal=Intern
External=Extern
Internals=Interne
@@ -688,6 +693,7 @@ PublicUrl=URL Public
AddBox=Adauga box
SelectElementAndClickRefresh=Selectează un element şi click Refresh
PrintFile=Printeaza Fisierul %s
+ShowTransaction=Show transaction
# Week day
Monday=Luni
Tuesday=Marţi
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index e1604cf5fd4..90ef9c964c1 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Anulată
StatusOrderDraft=Schiţă (de validat)
StatusOrderValidated=Validată
StatusOrderOnProcess=Comandate - receptie standby
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Procesată
StatusOrderToBill=Livrată
StatusOrderToBill2=De facturat
@@ -58,6 +59,7 @@ MenuOrdersToBill=Comenzi livrate
MenuOrdersToBill2=Comenzi facturabile
SearchOrder=Caută Comanda
SearchACustomerOrder=Caută o comandă client
+SearchASupplierOrder=Search a supplier order
ShipProduct=Expediază produs
Discount=Discount
CreateOrder=Crează Comanda
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index b5114764699..123684dfc4e 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -54,12 +54,13 @@ MaxSize=Mărimea maximă a
AttachANewFile=Ataşaţi un fişier nou / document
LinkedObject=Legate de obiectul
Miscellaneous=Diverse
-NbOfActiveNotifications=Număr de notificări
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Acesta este un e-mail de test. \\ NMesajul două linii sunt separate printr-un retur de car.
PredefinedMailTestHtml=Acesta este un e-mail de testare (test de cuvânt trebuie să fie în aldine).
Cele două linii sunt separate printr-un retur de car.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ \n\n Am dori să vă avertizăm că factura __FACREF__ pare a nu fi platită. Deci, vă ataşăm din nou factura, ca un memento. \n\n__PERSONALIZED__ Cu respect \n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nVeţi găsi aici oferta comercială__PROPREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nVeţi găsi aici comanda __ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYVeţi găsi aici comanda noastră__ORDERREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nVeţi găsi aici factura __FACREF__\n\n__PERSONALIZED__Cu respect\n\n__SIGNATURE__
diff --git a/htdocs/langs/ro_RO/productbatch.lang b/htdocs/langs/ro_RO/productbatch.lang
index 3adfd9dfc8d..0be80ae35d4 100644
--- a/htdocs/langs/ro_RO/productbatch.lang
+++ b/htdocs/langs/ro_RO/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Lot / Număr de serie
l_eatby=Data expirare
l_sellby=Data vânzare
DetailBatchNumber=Detalii Lot / Serie
-DetailBatchFormat=Lot / Serie:%s - E:%s - S:%s (Cant.: %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Lot: %s
printEatby=Expiră : %s
printSellby=Vanzare: %s
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index be764a715a5..35cd6613d46 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -22,16 +22,16 @@ ProductAccountancySellCode=Cont Contabilitate (vânzare)
ProductOrService=Produs sau serviciu
ProductsAndServices=Produse si Servicii
ProductsOrServices=Produse sau servicii
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesOnSell=Produse si Servicii supuse vânzării sau cumpărării
+ProductsAndServicesNotOnSell=Produse si Servicii neoferite
ProductsAndServicesStatistics=Statistici Produse si Servicii
ProductsStatistics=Statistici Produse
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Produs supus vânzării sau cumpărării
+ProductsNotOnSell=Produs nesupus vânzării sau cumpărării
+ProductsOnSellAndOnBuy=Produse supuse vânzării sau cumpărării
+ServicesOnSell=Servicii supuse vânzării sau cumpărării
+ServicesNotOnSell=Servicii neoferite prestarii
+ServicesOnSellAndOnBuy=Servicii supuse vânzării sau cumpărării
InternalRef=Referinţă internă
LastRecorded=Ultimele produse / servicii disponibile înregistrate
LastRecordedProductsAndServices=Ultimele %s produse / servicii înregistrate
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=Această opţiune vă permite să creaţi sau clonaţi un
CurrentProductPrice=Preţ curent
AlwaysUseNewPrice=Întotdeauna foloseşte preţul curent al produsului/serviciului
AlwaysUseFixedPrice=Foloseşte preţul fix
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Preţuri diferite pe cantitate
PriceByQuantityRange=Interval cantitate
ProductsDashboard=Sumar Produse/Servicii
UpdateOriginalProductLabel=Modifică eticheta originală
@@ -234,7 +234,7 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Definiția tipului sau valoarea codu
BarCodeDataForProduct=Informaţii cod bare al produsului %s :
BarCodeDataForThirdparty=Informaţii cod bare al terţului %s :
ResetBarcodeForAllRecords=Defineşte valoare coduri de bare pentru toate înregistrările (aceasta va reseta, de asemenea, valorile deja definite, cu valori noi)
-PriceByCustomer=Different price for each customer
+PriceByCustomer=Preţuri diferite pentru fiecare client
PriceCatalogue=Preţ unic pe produs/serviciu
PricingRule=Reguli pentru preţuri clienţi
AddCustomerPrice=Adaugă Preţ pe client
@@ -244,9 +244,13 @@ MinimumPriceLimit=Preţul minim nu poate fi mai mic decat %s
MinimumRecommendedPrice=Preţul minim recomandat este: %s
PriceExpressionEditor=Editor expresie preț
PriceExpressionSelected=Expresie preț selectatată
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
-PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp1="pret = 2 + 2" sau "2 + 2" pentru setarea pretului. Foloseste ; tpentru separarea expresiilor
+PriceExpressionEditorHelp2=Puteți accesa ExtraFields cu variabile, cum ar fi #options_myextrafieldkey#
+PriceExpressionEditorHelp3=In ambele preturi produs/serviciu si furnizori sunt disponibile variabilele:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
+PriceExpressionEditorHelp4=In pret produs/serviciu numai: #supplier_min_price#
In pret furnizor numai: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Mod preț
PriceNumeric=Număr
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 52938a5e6eb..143ed2e0a43 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -3,13 +3,15 @@ RefProject=Ref. proiect
ProjectId=ID proiect
Project=Proiect
Projects=Proiecte
-ProjectStatus=Project status
+ProjectStatus=Statut Proiect
SharedProject=Toată lumea
PrivateProject=Contacte proiect
MyProjectsDesc=Această vedere este limitată la proiecte sau sarcini pentru care sunteţi contact(indiferent de tip).
ProjectsPublicDesc=Această vedere prezintă toate proiectele la care aveţi permisiunea să le citiţi.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Această vedere prezintă toate proiectele (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
MyTasksDesc=Această vedere este limitată la proiecte sau sarcini pentru care sunteţi contact(indiferent de tip).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Această vedere prezintă toate proiectele şi activităţile care sunt permise să le citiţi.
TasksDesc=Această vedere prezintă toate proiectele şi sarcinile (permisiuni de utilizator va acorda permisiunea de a vizualiza totul).
ProjectsArea=Proiecte
@@ -29,6 +31,8 @@ NoProject=Niciun proiect definit sau responsabil
NbOpenTasks=Nr taskuri deschise
NbOfProjects=Nr proiecte
TimeSpent=Timp comsumat
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Timpi consumaţi
RefTask=Ref. Task
LabelTask=Eticheta Task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista comenzi furnizori asociate la proie
ListSupplierInvoicesAssociatedProject=Lista facturi furnizori asociate la proiect
ListContractAssociatedProject=Lista contracte asociate la proiect
ListFichinterAssociatedProject=Lista intervenţii asociate la proiectului
-ListTripAssociatedProject=Lista note de cheltuieli asociate la proiect
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Lista evenimentelor asociate la proiectului
ActivityOnProjectThisWeek=Activitatea de pe proiect în această săptămână
ActivityOnProjectThisMonth=Activitatea de pe proiect în această lună
@@ -103,7 +107,7 @@ CloneContacts=Clonează contacte
CloneNotes=Clonează note
CloneProjectFiles=Clonează proiect fişiere ataşate
CloneTaskFiles=Clonează task(uri) fişiere ataşate (dacă task (urile) clonate)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=Actualizeaza datele proiectului/ taskului din acest moment ?
ConfirmCloneProject=Sigur vreţi să clonaţi acest proiect?
ProjectReportDate=Schimbă data taskului conform cu data de debut a proiectului
ErrorShiftTaskDate=Imposibil de schimbat data taskului conform cu noua data de debut a proiectului
@@ -133,3 +137,6 @@ SearchAProject=Cauta proiect
ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
ProjectDraft=Proiecte schiţă
FirstAddRessourceToAllocateTime=Asociază o resursă la timpul alocat
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ro_RO/salaries.lang b/htdocs/langs/ro_RO/salaries.lang
index 3dde850405b..75c0b1969d3 100644
--- a/htdocs/langs/ro_RO/salaries.lang
+++ b/htdocs/langs/ro_RO/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Plati salarii
ShowSalaryPayment=Arata plata salariu
THM=Pret mediu pe ora
TJM=Pret mediu zilnic
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ro_RO/sendings.lang b/htdocs/langs/ro_RO/sendings.lang
index b023dbc1610..fd669e5577a 100644
--- a/htdocs/langs/ro_RO/sendings.lang
+++ b/htdocs/langs/ro_RO/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Cant. comandată
QtyShipped=Cant. livrată
QtyToShip=Cant. de livrat
QtyReceived=Cant. primită
-KeepToShip=Rest de livrat
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Alte livrări pentru această comandă
DateSending=Data dispoziţiei de livrare
DateSendingShort=Data disp. de livrare
@@ -62,12 +62,12 @@ ShipmentCreationIsDoneFromOrder=Pentru moment, crearea unei noi livrări se face
RelatedShippings=Livrări asociate
ShipmentLine=Linie de livrare
CarrierList=Lista transportatori
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+SendingRunning=Produs din comenzile clientului comandate
+SuppliersReceiptRunning=Produs din comenzile furnizorului comandate
+ProductQtyInCustomersOrdersRunning=Cantitate produs in comenzile clientilor deschise
+ProductQtyInSuppliersOrdersRunning=Cantitate produs in comenzile furnizorilor deschise
+ProductQtyInShipmentAlreadySent=Cantitate produs din comenzile clientilor deschise deja trimise
+ProductQtyInSuppliersShipmentAlreadyRecevied=Cantitate produs din comenzile furnizorilor deschise deja primite
# Sending methods
SendingMethodCATCH=Colectată de client
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 24a5083aae4..394853cb355 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Valoric PMP
PMPValueShort=WAP
EnhancedValueOfWarehouses=Stoc valoric
UserWarehouseAutoCreate=Creaţi un stoc în mod automat atunci când se creează un utilizator
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Cantitate dipecerizată
QtyDispatchedShort=Cant Expediate
QtyToDispatchShort=Cant de expediat
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Depozitul %s va fi utilizat pentru scăderea st
WarehouseForStockIncrease=Depozitul %s va fi utilizat pentru creşterea stocului
ForThisWarehouse=Pentru acest depozit
ReplenishmentStatusDesc=Aceasta este lista cu toate produsele având stocul mai mic decât stocul dorit (sau valoarea de alertă dacă casuţa "doar alertă " este bifată) și sugerăm să vă creaţi comenzi furnizor pentru a completa diferența.
-ReplenishmentOrdersDesc=Aceasta este lista cu toate comenzile furnizor deschise
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Reaprovizionări
NbOfProductBeforePeriod=Cantitatea de produs %s în stoc înainte de perioada selectată (< %s)
NbOfProductAfterPeriod=Cantitatea de produs %s în stoc după perioada selectată (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Continute in pachet
ShowWarehouse=Arată depozit
MovementCorrectStock=Corectie continut stoc pentru produsul %s
MovementTransferStock=Transfer stoc al produsului %s in alt depozit
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index 057f6dab55f..19ea854686f 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Furnizori
-Supplier=Furnizor
AddSupplier=Crează un furnizor
SupplierRemoved=Furnizor şters
SuppliersInvoice=Factură furnizor
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Facturi Furnizor şi plăţi
ExportDataset_fournisseur_3=Comenzi furnizori si lini comenzi
ApproveThisOrder=Aprobă această comandă
ConfirmApproveThisOrder=Sigur doriţi să aprobaţi această comandă %s?
-DenyingThisOrder=Refuză comanda
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Sigur doriţi să refuzaţi această comandă %s?
ConfirmCancelThisOrder=Sigur doriţi să anulaţi această comandă %s?
AddCustomerOrder=Crează comandă client
@@ -42,5 +41,5 @@ NoneOrBatchFileNeverRan=Nici una sau tratate %s ne executate recent
SentToSuppliers=Trimite la furnizori
ListOfSupplierOrders=Lista comenzi furnizori
MenuOrdersSupplierToBill=Comenzi Furnizor de facturat
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+NbDaysToDelivery= Intârziere Livrare in zile
+DescNbDaysToDelivery=Cea mai mare intarziere este afisata in lista produsului comandat
diff --git a/htdocs/langs/ro_RO/trips.lang b/htdocs/langs/ro_RO/trips.lang
index a606801617c..f32deae8693 100644
--- a/htdocs/langs/ro_RO/trips.lang
+++ b/htdocs/langs/ro_RO/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Deplasare
-Trips=Deplasări
-TripsAndExpenses=Deplasări şi cheltuieli
-TripsAndExpensesStatistics=Statistici Deplasări şi cheltuieli
-TripCard=Fişă Deplasare
-AddTrip=Creare deplasare
-ListOfTrips=Lista deplasări
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Lista note cheltuieli
-NewTrip=Deplasare nouă
+NewTrip=New expense report
CompanyVisited=Societatea / Instituţia vizitată
Kilometers=Kilometri
FeesKilometersOrAmout=Valoarea sau km
-DeleteTrip=Şterge Deplasare
-ConfirmDeleteTrip=Sigur doriţi să ştergeţi aceasăt Deplasarei ?
-TF_OTHER=Altele
-TF_LUNCH=Prânz
-TF_TRIP=Deplasare
-ListTripsAndExpenses=Lista Deplasări şi cheltuieli
-ExpensesArea=Deplasări şi cheltuieli
-SearchATripAndExpense=Caută o deplasare şi cheltuială
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Clasează "Rambursată"
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Altele
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Prânz
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 73cb1153bd5..28dd4d7d3c9 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -79,7 +79,7 @@ CreditDate=Credit pe
WithdrawalFileNotCapable=Imposibil de a genera fișierul chitanţă de retragere pentru țara dvs %s (Țara dvs. nu este acceptată)
ShowWithdraw=Arată Retragere
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Cu toate acestea, dacă factura are cel puțin o plată de retragere încă neprelucrată, aceasta nu va fi setată ca plătită permite în prealabil gestionarea retragerii.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Acest tab vă permite să solicitaţi un ordin de plată. Odată ce este dat intră în meniul Bancă-> Retragere pentru a gestiona ordinul de plată. Când ordinul de plată este închis, plata pe factura va fi înregistrată în mod automat, iar factura închisă dacă restul de plata este nul.
WithdrawalFile=Fişier Retragere
SetToStatusSent=Setează statusul "Fişier Trimis"
ThisWillAlsoAddPaymentOnInvoice=Aceasta se va aplica, de asemenea, plății facturilor și vor fi clasificate ca "Plătit"
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index 2f1ffaae228..4dc8c56927b 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - admin
WorkflowSetup=Configurare Modul Flux de Lucru
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
+WorkflowDesc=Acest modul vă permite modificarea comportamentului acțiunilor automate în aplicaţie. În mod implicit, fluxul de lucru este deschis (puteţi face ce doriţi în ordinea dorită). Puteți activa acțiunile automate de care sunteti interesat
ThereIsNoWorkflowToModify=Nu există nici un flux de lucru modificabil pentru modulele activate.
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează o comandă client automat, după ce o ofertă comercială este semnată
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează o factură client automat, după ce o ofertă comercială este semnată
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index 505b6b9dce2..9a7af148909 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Экспериментальная
VersionDevelopment=Разработка
VersionUnknown=Неизвестно
VersionRecommanded=Рекомендуемые
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID сессии
SessionSaveHandler=Обработчик для сохранения сессий
SessionSavePath=Хранение сессии локализации
@@ -493,10 +498,16 @@ Module600Name=Уведомления
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Пожертвования
Module700Desc=Пожертвования управления
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis интеграции
Module1400Name=Бухгалтерия эксперт
Module1400Desc=Бухгалтерия управления для экспертов (двойная сторон)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Категории
Module1780Desc=Категории управления (продукции, поставщиков и заказчиков)
Module2000Name=FCKeditor
@@ -631,7 +642,7 @@ Permission181=Читать поставщик заказов
Permission182=Создать / изменить поставщика заказы
Permission183=Проверка поставщиком заказов
Permission184=Одобрить поставщик заказов
-Permission185=Заказ поставщику заказов
+Permission185=Order or cancel supplier orders
Permission186=Прием заказов поставщику
Permission187=Закрыть поставщик заказов
Permission188=Отмена заказов поставщику
@@ -711,6 +722,13 @@ Permission538=Экспорт услуг
Permission701=Читать пожертвований
Permission702=Создать / изменить пожертвований
Permission703=Удалить пожертвований
+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
Permission1001=Читать запасов
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Пароль для использования прокси-се
DefineHereComplementaryAttributes=Определить здесь все атрибуты, а не уже доступны по умолчанию, и что вы хотите быть поддерживается %s.
ExtraFields=Дополнительные атрибуты
ExtraFieldsLines=Дополнительные атрибуты (строки)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Дополнительные атрибуты (контрагенты)
ExtraFieldsContacts=Дополнительные атрибуты (контакт/адрес)
ExtraFieldsMember=Дополнительные атрибуты (Участник)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Соответствие продукта / услуг
FreeLegalTextOnProposal=Свободный текст на коммерческие предложения
WatermarkOnDraftProposal=Водяные знаки на черновиках Коммерческих предложений ("Нет" если пусто)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Приказ 'Management Setup
OrdersNumberingModules=Приказы нумерации модулей
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Штрих-код типа СКП
BarcodeDescISBN=Штрих-код типа ISBN
BarcodeDescC39=Штрих-код типа C39
BarcodeDescC128=Штрих-код типа C128
-GenbarcodeLocation=Штрих-код поколения утилиту командной строки (используется phpbarcode двигателя для некоторых типов штрих-кодов)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Денежные счета, используемого для продает
CashDeskBankAccountForCheque= Счет будет использоваться для получения выплат чеком
CashDeskBankAccountForCB= Учетной записи для использования на получение денежных выплат по кредитным картам
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Закладка Настройка модуля
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Формат
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index a2601286314..7325c4e6538 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -33,7 +33,11 @@ AllTime=Сначала
Reconciliation=Примирение
RIB=Bank Account Number
IBAN=IBAN номера
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT число
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Постоянные заказы
StandingOrder=Постоянная порядка
Withdrawals=Снятие
@@ -148,7 +152,7 @@ BackToAccount=Перейти к ответу
ShowAllAccounts=Шоу для всех учетных записей
FutureTransaction=Сделки в Futur. Ни в коем случае к согласительной процедуре.
SelectChequeTransactionAndGenerate=Выбор / фильтр проверяет, включать в получении депозита проверки и нажмите кнопку "Создать".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/ru_RU/commercial.lang b/htdocs/langs/ru_RU/commercial.lang
index ff6852de0f2..f60182a8f80 100644
--- a/htdocs/langs/ru_RU/commercial.lang
+++ b/htdocs/langs/ru_RU/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Проспект
Prospects=Перспективы
DeleteAction=Удалить действия / задачи
NewAction=Новые меры / задачи
-AddAction=Добавить действия / задачи
-AddAnAction=Добавить меры / задачи
-AddActionRendezVous=Добавить рандеву задачи
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Свидание
ConfirmDeleteAction=Вы уверены, что хотите удалить эту задачу?
CardAction=Действия карточки
@@ -44,8 +44,8 @@ DoneActions=Совершено действия
DoneActionsFor=Совершено меры для %s
ToDoActions=Неполные действия
ToDoActionsFor=Неполные действия %s
-SendPropalRef=Отправить коммерческое предложение %s
-SendOrderRef=Отправить заказ %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Не применяется
StatusActionToDo=Чтобы сделать
StatusActionDone=Готово
@@ -62,7 +62,7 @@ LastProspectContactDone=Контакт сделали
DateActionPlanned=Сроки действия, запланированные на
DateActionDone=Сроки действия сделали
ActionAskedBy=Действий, заданных
-ActionAffectedTo=Действий для пострадавших
+ActionAffectedTo=Event assigned to
ActionDoneBy=Действий, проделанную
ActionUserAsk=Зарегистрировано
ErrorStatusCantBeZeroIfStarted=Если поле 'Дата сделали' заполнен, действие начинается (или закончили), так что поле "Статус" не может быть 0%%.
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index 16b0b7d4c85..d64ad647ab7 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Истек
ServiceStatusClosed=Закрытые
ServicesLegend=Услуги легенда
Contracts=Договоры
+ContractsAndLine=Contracts and line of contracts
Contract=Договор
NoContracts=Нет договоров
MenuServices=Услуги
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index 0646dce05fb..9cfdaf5e1d9 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 8b096b83105..839f620bd6c 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Источник и цели банковског
ErrorBadThirdPartyName=Неправильное значение для имени контрагента
ErrorProdIdIsMandatory=%s является обязательным
ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Требуется код клиента
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Код клиента уже используется
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript не должна быть отключ
ErrorPasswordsMustMatch=Оба введенных пароля должны совпадать друг с другом
ErrorContactEMail=Техническая ошибка. Пожалуйста, обратитесь к администратору следующую электронную почту %s ан обеспечить %s код ошибки в ваше сообщение, или даже лучше, добавив экран копию этой страницы.
ErrorWrongValueForField=Неверное значение для области количество %s (значение %s "не соответствует регулярное %s правило)
-ErrorFieldValueNotIn=Неверное значение для %s номер поля %s значение не является значением доступны в поле %s таблицы %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Неверное значение для %s номер поля («%s" значение не является %s существующих ссылка)
ErrorsOnXLines=Ошибки на источник %s линий
ErrorFileIsInfectedWithAVirus=Антивирусная программа не смогла проверить файл (файл может быть заражен вирусом)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Обязательные параметры не определены
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index a2512709918..2d2279104f8 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Последний шаг: Определить з
ActivateModule=Активировать модуль %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 8e120892b47..e98cf570ed8 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -141,6 +141,7 @@ Cancel=Отмена
Modify=Изменить
Edit=Редактировать
Validate=Проверить
+ValidateAndApprove=Validate and Approve
ToValidate=На проверке
Save=Сохранить
SaveAs=Сохранить как
@@ -158,6 +159,7 @@ Search=Поиск
SearchOf=Поиск
Valid=Действительный
Approve=Одобрить
+Disapprove=Disapprove
ReOpen=Переоткрыть
Upload=Отправить файл
ToLink=Ссылка
@@ -219,6 +221,7 @@ Cards=Карточки
Card=Карточка
Now=Сейчас
Date=Дата
+DateAndHour=Date and hour
DateStart=Дата начала
DateEnd=Дата окончания
DateCreation=Дата создания
@@ -295,6 +298,7 @@ UnitPriceHT=Цена за единицу (нетто)
UnitPriceTTC=Цена за единицу
PriceU=Цена ед.
PriceUHT=Цена ед. (нетто)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=Цена ед.
Amount=Сумма
AmountInvoice=Сумма счета-фактуры
@@ -521,6 +525,7 @@ DateFromTo=С %s по %s
DateFrom=С %s
DateUntil=До %s
Check=Проверить
+Uncheck=Uncheck
Internal=Внутренний
External=Внешний
Internals=Внутренние
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Понедельник
Tuesday=Вторник
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 41bf0b62e66..aec90dd9d16 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Отменен
StatusOrderDraft=Проект (должно быть подтверждено)
StatusOrderValidated=Подтвержденные
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Обработано
StatusOrderToBill=В законопроекте
StatusOrderToBill2=Для выставления
@@ -58,6 +59,7 @@ MenuOrdersToBill=Заказы на законопроект
MenuOrdersToBill2=Billable orders
SearchOrder=Поиск тем
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Судно продукта
Discount=Скидка
CreateOrder=Создать заказ
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 62d309beae8..867240f9b84 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -54,12 +54,13 @@ MaxSize=Максимальный размер
AttachANewFile=Присоединить новый файл / документ
LinkedObject=Связанные объект
Miscellaneous=Разное
-NbOfActiveNotifications=Количество уведомлений
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Dette er en test post. \\ NDe to linjer er atskilt med en vognretur.
PredefinedMailTestHtml=Dette er en test mail (ordet testen må være i fet skrift).
De to linjene er skilt med en vognretur.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/ru_RU/productbatch.lang b/htdocs/langs/ru_RU/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/ru_RU/productbatch.lang
+++ b/htdocs/langs/ru_RU/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index a8b06bf9c23..b777ee9ed23 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 23b620b3ce4..91a4da8d284 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Общий проект
PrivateProject=Контакты проекта
MyProjectsDesc=Эта точка зрения ограничена проекты, которые Вы контакте (что бы это тип).
ProjectsPublicDesc=Эта точка зрения представлены все проекты, которые Вы позволили читать.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Эта точка зрения представляет все проекты (разрешений пользователей предоставить вам разрешение для просмотра всего).
MyTasksDesc=Эта точка зрения ограничена на проекты или задачи, которые являются для контакта (что бы это тип).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Эта точка зрения представляет всех проектов и задач, которые могут читать.
TasksDesc=Эта точка зрения представляет всех проектов и задач (разрешений пользователей предоставить вам разрешение для просмотра всего).
ProjectsArea=Проекты области
@@ -29,6 +31,8 @@ NoProject=Нет проекта определена
NbOpenTasks=Nb открытых задач
NbOfProjects=Nb проектов
TimeSpent=Время, затраченное
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Время, проведенное
RefTask=Ref. задача
LabelTask=Этикетка задачи
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Список поставщиков зака
ListSupplierInvoicesAssociatedProject=Список поставщиков счетов-фактур, связанных с проектом
ListContractAssociatedProject=Перечень договоров, связанных с проектом
ListFichinterAssociatedProject=Список мероприятий, связанных с проектом
-ListTripAssociatedProject=Список поездки и расходы, связанные с проектом
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Список мероприятий, связанных с проектом
ActivityOnProjectThisWeek=Деятельность по проекту на этой неделе
ActivityOnProjectThisMonth=Деятельность по проектам в этом месяце
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/ru_RU/salaries.lang b/htdocs/langs/ru_RU/salaries.lang
index 88e94f1e024..6ec5eaae2fd 100644
--- a/htdocs/langs/ru_RU/salaries.lang
+++ b/htdocs/langs/ru_RU/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Зарплата
Salaries=Зарплаты
Employee=Сотрудник
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/ru_RU/sendings.lang b/htdocs/langs/ru_RU/sendings.lang
index 154a05a98d6..efb3246b409 100644
--- a/htdocs/langs/ru_RU/sendings.lang
+++ b/htdocs/langs/ru_RU/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Количество заказанных
QtyShipped=Количество отгружен
QtyToShip=Количество судов
QtyReceived=Количество получил
-KeepToShip=Держите на корабль
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Другие отправок с этой целью
DateSending=Дата отправки порядка
DateSendingShort=Дата отправки порядка
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 4a5e5c6071f..d89cb572fa1 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Значение
PMPValueShort=WAP
EnhancedValueOfWarehouses=Склады стоимости
UserWarehouseAutoCreate=Создать запас автоматически при создании пользователя
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Количество направил
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Склад %s будет использован
WarehouseForStockIncrease=Склад %s будет использован для увеличения остатка
ForThisWarehouse=Для этого склада
ReplenishmentStatusDesc=Это список всех продуктов с остатками меньше лимита (или меньше чем значение для оповещения если отмечен чекбокс "только оповещение"), и рекомендуем вам сформировать заказ поставщикам чтобы восполнить разницу
-ReplenishmentOrdersDesc=Это список всех открытых заказов Поставщикам
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Пополнения
NbOfProductBeforePeriod=Количество продукта %s в остатке на начало выбранного периода (< %s)
NbOfProductAfterPeriod=Количество продукта %s в остатке на конец выбранного периода (< %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/ru_RU/suppliers.lang b/htdocs/langs/ru_RU/suppliers.lang
index 02adddbc84c..cb0690f2bdf 100644
--- a/htdocs/langs/ru_RU/suppliers.lang
+++ b/htdocs/langs/ru_RU/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Поставщики
-Supplier=Поставщик
AddSupplier=Create a supplier
SupplierRemoved=Поставщик удален
SuppliersInvoice=Счета-фактуры от поставщиков
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Поставщиком счета-фактуры и
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Утвердить этот заказ
ConfirmApproveThisOrder=Вы уверены, что хотите утвердить этот порядок?
-DenyingThisOrder=Отказ в таком порядке
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Вы уверены, что хотите лишить этого заказа?
ConfirmCancelThisOrder=Вы уверены, что хотите отменить этот заказ?
AddCustomerOrder=Создать клиента порядка
diff --git a/htdocs/langs/ru_RU/trips.lang b/htdocs/langs/ru_RU/trips.lang
index f72d0e09b18..ceb0857662a 100644
--- a/htdocs/langs/ru_RU/trips.lang
+++ b/htdocs/langs/ru_RU/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Поездка
-Trips=Поездки
-TripsAndExpenses=Поездки и расходы
-TripsAndExpensesStatistics=Статистика поездок и расходов
-TripCard=Карточка поездки
-AddTrip=Добавить поездку
-ListOfTrips=Список поездок
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Список сборов
-NewTrip=Новая Поездка
+NewTrip=New expense report
CompanyVisited=Посещенная организация
Kilometers=Километры
FeesKilometersOrAmout=Сумма или километры
-DeleteTrip=Удалить поездку
-ConfirmDeleteTrip=Вы уверены, что хотите удалить эту поездку?
-TF_OTHER=Другое
-TF_LUNCH=Обед
-TF_TRIP=Поездка
-ListTripsAndExpenses=Список поездок и расходов
-ExpensesArea=Область поездок и расходов
-SearchATripAndExpense=Поиск поездок и расходов
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Другое
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Обед
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/ru_UA/contracts.lang b/htdocs/langs/ru_UA/contracts.lang
index 74b462d5a7b..47e2f92dae0 100644
--- a/htdocs/langs/ru_UA/contracts.lang
+++ b/htdocs/langs/ru_UA/contracts.lang
@@ -1,7 +1,6 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Контракты области
ListOfContracts=Список контрактов
-LastContracts=Последнее изменение %s контрактов
AllContracts=Все контракты
ContractCard=Договор карты
ContractStatus=Договор статус
@@ -23,6 +22,7 @@ ListOfInactiveServices=Список услуг не активны
ListOfExpiredServices=Список истек активные службы
ListOfClosedServices=Список закрытых услуг
ListOfRunningContractsLines=Список бегущие строки контракта
+LastContracts=Последнее изменение %s контрактов
NbOfServices=Кол-услуг
DeleteContractLine=Удалить контракт линии
ConfirmDeleteContractLine=Вы действительно хотите удалить этот контракт линии?
diff --git a/htdocs/langs/ru_UA/install.lang b/htdocs/langs/ru_UA/install.lang
index e097ba6161a..b4a3228f330 100644
--- a/htdocs/langs/ru_UA/install.lang
+++ b/htdocs/langs/ru_UA/install.lang
@@ -39,7 +39,6 @@ PasswordAgain=Введите пароль еще раз во второй раз
CheckToCreateUser=Флажок, если владелец базы данных не существует, и должен быть создан.
В этом случае, вы должны выбрать его Логин и пароль, а также заполнить Логин / пароль для суперпользователя в нижней части этой страницы. Если этот флажок не установлен, владелец базы данных и ее пароли должны существует.
Experimental=(Экспериментальная)
DatabaseRootLoginDescription=Войти на пользователя позволили создать новые базы данных или новых пользователей, бесполезны, если ваша база данных и база данных Войти уже существует (например, когда вы организовано провайдера веб-хостинг).
-SaveConfigurationFile=Сохранить значения
ServerConnection=Соединение с сервером
UserCreation=Пользователь создания
AdminAccountCreation=Администратор Войти создания
@@ -56,7 +55,6 @@ ThisPHPDoesNotSupportTypeBase=Эта система PHP не поддержив
FunctionNotAvailableInThisPHP=Не доступно для этого PHP
MigrateScript=Миграция сценариев
ChoosedMigrateScript=Выберите сценарий миграции
-DataMigration=Миграция данных
ChooseYourSetupMode=Выберите режим настройки и нажмите кнопку "Пуск" ...
FreshInstall=Свежая установка
FreshInstallDesc=Используйте этот режим, если это ваша первая установка. Если нет, то этот режим может восстановить неполной предыдущей версии, но если вы хотите обновить версию, выберите "Обновить" режиме.
diff --git a/htdocs/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang
index 9e92814a6a4..4d6b3876288 100644
--- a/htdocs/langs/ru_UA/main.lang
+++ b/htdocs/langs/ru_UA/main.lang
@@ -10,6 +10,7 @@ FormatDateShortJava=dd.MM.yyyy
FormatDateShortJavaInput=dd.MM.yyyy
FormatDateShortJQuery=dd.mm.yy
FormatDateShortJQueryInput=dd.mm.yy
+FormatHourShortJQuery=HH:MI
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index e1e17cfe342..93790b6a9c3 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimentálne
VersionDevelopment=Vývoj
VersionUnknown=Neznámy
VersionRecommanded=Odporúčané
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID relácie
SessionSaveHandler=Handler pre uloženie sedenia
SessionSavePath=Skladovanie zasadnutie lokalizácia
@@ -493,10 +498,16 @@ Module600Name=Upozornenie
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Dary
Module700Desc=Darovanie riadenie
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integrácia
Module1400Name=Účtovníctvo
Module1400Desc=Vedenie účtovníctva (dvojité strany)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategórie
Module1780Desc=Category management (produkty, dodávatelia a odberatelia)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Prečítajte si dodávateľských objednávok
Permission182=Vytvoriť / upraviť dodávateľskej objednávky
Permission183=Overiť dodávateľských objednávok
Permission184=Schváliť dodávateľských objednávok
-Permission185=Objednávky Objednať dodávateľ
+Permission185=Order or cancel supplier orders
Permission186=Príjem objednávok s dodávateľmi
Permission187=Zavrieť dodávateľské objednávky
Permission188=Zrušiť dodávateľských objednávok
@@ -711,6 +722,13 @@ Permission538=Export služieb
Permission701=Prečítajte si dary
Permission702=Vytvoriť / upraviť dary
Permission703=Odstrániť dary
+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
Permission1001=Prečítajte si zásoby
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Heslo používať proxy server
DefineHereComplementaryAttributes=Definujte tu všetky atribúty, ktoré ešte nie sú k dispozícii v predvolenom nastavení, a že chcete byť podporované %s.
ExtraFields=Doplnkové atribúty
ExtraFieldsLines=Doplnkové atribúty (linky)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Doplnkové atribúty (thirdparty)
ExtraFieldsContacts=Doplnkové atribúty (kontakt / adresa)
ExtraFieldsMember=Doplnkové atribúty (člen)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Rad výrobkov / služieb s nulovej hodnoty je považov
FreeLegalTextOnProposal=Voľný text o obchodných návrhov
WatermarkOnDraftProposal=Vodoznak na predlôh návrhov komerčných (none ak prázdny)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Objednať riadenie nastavenia
OrdersNumberingModules=Objednávky číslovanie modelov
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Čiarových kódov typu UPC
BarcodeDescISBN=Čiarový kód typu ISBN
BarcodeDescC39=Čiarový kód typu C39
BarcodeDescC128=Čiarový kód typu C128
-GenbarcodeLocation=Bar generovanie kódu nástroj pre príkazový riadok (používaný motorom s vnútorným u niektorých typov čiarových kódov)
+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
BarcodeInternalEngine=Vnútorná motor
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Predvolený účet použiť na príjem platieb v hotovosti
CashDeskBankAccountForCheque= Predvolený účet použiť pre príjem platieb šekom
CashDeskBankAccountForCB= Predvolený účet použiť pre príjem platieb prostredníctvom kreditnej karty
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Záložka Nastavenie modulu
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/sk_SK/banks.lang b/htdocs/langs/sk_SK/banks.lang
index ef5bfa2db54..b1c325a49e3 100644
--- a/htdocs/langs/sk_SK/banks.lang
+++ b/htdocs/langs/sk_SK/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Zmierenie
RIB=Číslo bankového účtu
IBAN=IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT číslo
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Trvalé príkazy
StandingOrder=Trvalý príkaz
Withdrawals=Výbery
@@ -148,7 +152,7 @@ BackToAccount=Späť na účte
ShowAllAccounts=Zobraziť pre všetky účty
FutureTransaction=Transakcie v Futur. Žiadny spôsob, ako sa zmieriť.
SelectChequeTransactionAndGenerate=Výber / filter, aby kontroly zahŕňali do obdržaní šeku vkladov a kliknite na "Vytvoriť".
-InputReceiptNumber=Vyberte si výpis z účtu súvisiace s zmierovacom konaní. Použite Sortable číselnú hodnotu (napríklad RRRRMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Nakoniec určiť kategóriu, v ktorej chcete klasifikovať záznamy
ToConciliate=Zmieriť?
ThenCheckLinesAndConciliate=Potom skontrolujte, či riadky, ktoré sú vo výpise z účtu a potom kliknite na tlačidlo
diff --git a/htdocs/langs/sk_SK/commercial.lang b/htdocs/langs/sk_SK/commercial.lang
index 4fe069876c1..7be1dd39c7f 100644
--- a/htdocs/langs/sk_SK/commercial.lang
+++ b/htdocs/langs/sk_SK/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Vyhliadka
Prospects=Vyhliadky
DeleteAction=Odstrániť udalosť / úlohu
NewAction=Nová udalosť / úlohu
-AddAction=Pridať udalosť / úlohu
-AddAnAction=Pridať udalosť / úlohu
-AddActionRendezVous=Pridať Rendez-vous udalosti
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Schôdzka
ConfirmDeleteAction=Ste si istí, že chcete zmazať túto udalosť / úlohu?
CardAction=Udalosť karty
@@ -44,8 +44,8 @@ DoneActions=Dokončenej akcie
DoneActionsFor=Dokončenej akcie pre %s
ToDoActions=Neúplné udalosti
ToDoActionsFor=Neúplné akcie pre %s
-SendPropalRef=Poslať komerčné návrhu %s
-SendOrderRef=Pošli objednávku %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Nevzťahuje sa
StatusActionToDo=Ak chcete
StatusActionDone=Dokončiť
@@ -62,7 +62,7 @@ LastProspectContactDone=Spojiť sa vykonáva
DateActionPlanned=Dátum Akcie plánované na
DateActionDone=Dátum Akcia vykonané
ActionAskedBy=Akcia hlásené
-ActionAffectedTo=Udalosť priradená
+ActionAffectedTo=Event assigned to
ActionDoneBy=Udalosť vykonáva
ActionUserAsk=Spracoval
ErrorStatusCantBeZeroIfStarted=Ak pole 'Dátum urobiť "je naplnený, je akcia zahájená (alebo hotový), tak pole" Stav "nemôže byť 0%%.
diff --git a/htdocs/langs/sk_SK/contracts.lang b/htdocs/langs/sk_SK/contracts.lang
index 9ed7ccf7da6..25cf7fc7e01 100644
--- a/htdocs/langs/sk_SK/contracts.lang
+++ b/htdocs/langs/sk_SK/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Vypršala
ServiceStatusClosed=Zatvorené
ServicesLegend=Služby legenda
Contracts=Zmluvy
+ContractsAndLine=Contracts and line of contracts
Contract=Zmluva
NoContracts=Žiadne zmluvy
MenuServices=Služby
diff --git a/htdocs/langs/sk_SK/cron.lang b/htdocs/langs/sk_SK/cron.lang
index 4e1717149a8..5161517c219 100644
--- a/htdocs/langs/sk_SK/cron.lang
+++ b/htdocs/langs/sk_SK/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell príkaz
CronMenu=Cron
CronCannotLoadClass=Nemožno načítať triedu alebo objekt %s %s
UseMenuModuleToolsToAddCronJobs=Choďte do menu "Home - Moduly náradie - Zoznam úloh" vidieť a upravovať naplánované úlohy.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index 17b73f827fd..dc5032cc33a 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Zdrojovej a cieľovej bankové účty musí byť
ErrorBadThirdPartyName=Nesprávna hodnota pre tretie strany menom
ErrorProdIdIsMandatory=%s je povinné
ErrorBadCustomerCodeSyntax=Bad syntaxe pre zákazníka kódu
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Zákazník požadoval kód
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Zákaznícky kód už používaný
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript musí byť vypnutá, že táto funkcia p
ErrorPasswordsMustMatch=Obaja napísaný hesla sa musia zhodovať sa navzájom
ErrorContactEMail=Technické chybe. Prosím, obráťte sa na správcu, aby e-mailovú %s en poskytovať %s kód chyby v správe, alebo ešte lepšie pridaním obrazovky kópiu tejto stránky.
ErrorWrongValueForField=Chybná hodnota %s číslo poľa (hodnota "%s 'nezodpovedá regex pravidiel %s)
-ErrorFieldValueNotIn=Chybná hodnota %s číslo poľa (hodnota "%s 'nie je dostupná hodnota do poľa %s stolových %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Chybná hodnota %s číslo poľa (hodnota "%s" nie je %s existujúce ref)
ErrorsOnXLines=Chyby na %s zdrojovom zázname (s)
ErrorFileIsInfectedWithAVirus=Antivírusový program nebol schopný overiť súbor (súbor môže byť napadnutý vírusom)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Povinné parametre sú doteraz stanovené
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 23665b14d23..f3ebf70457a 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Posledný krok: Definujte tu prihlasovacie meno a
ActivateModule=Aktivácia modulu %s
ShowEditTechnicalParameters=Kliknite tu pre zobrazenie / editovať pokročilé parametre (expertný režim)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/sk_SK/main.lang b/htdocs/langs/sk_SK/main.lang
index 9774b798099..12ea65a49b3 100644
--- a/htdocs/langs/sk_SK/main.lang
+++ b/htdocs/langs/sk_SK/main.lang
@@ -141,6 +141,7 @@ Cancel=Zrušiť
Modify=Upraviť
Edit=Upraviť
Validate=Potvrdiť
+ValidateAndApprove=Validate and Approve
ToValidate=Ak chcete overiť
Save=Uložiť
SaveAs=Uložiť ako
@@ -158,6 +159,7 @@ Search=Vyhľadávanie
SearchOf=Vyhľadávanie
Valid=Platný
Approve=Schvaľovať
+Disapprove=Disapprove
ReOpen=Znovu otvoriť
Upload=Odoslať súbor
ToLink=Odkaz
@@ -219,6 +221,7 @@ Cards=Karty
Card=Karta
Now=Teraz
Date=Dátum
+DateAndHour=Date and hour
DateStart=Dátum začiatku
DateEnd=Dátum ukončenia
DateCreation=Dátum vytvorenia
@@ -295,6 +298,7 @@ UnitPriceHT=Jednotková cena (bez DPH)
UnitPriceTTC=Jednotková cena
PriceU=UP
PriceUHT=UP (bez DPH)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Množstvo
AmountInvoice=Fakturovaná čiastka
@@ -521,6 +525,7 @@ DateFromTo=Od %s na %s
DateFrom=Od %s
DateUntil=Do %s
Check=Kontrola
+Uncheck=Uncheck
Internal=Vnútorné
External=Externé
Internals=Vnútorné
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Pondelok
Tuesday=Utorok
diff --git a/htdocs/langs/sk_SK/orders.lang b/htdocs/langs/sk_SK/orders.lang
index 519ef09d036..baa18258b8c 100644
--- a/htdocs/langs/sk_SK/orders.lang
+++ b/htdocs/langs/sk_SK/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Zrušený
StatusOrderDraft=Návrh (musí byť overená)
StatusOrderValidated=Overené
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Spracované
StatusOrderToBill=Dodáva sa
StatusOrderToBill2=K účtu
@@ -58,6 +59,7 @@ MenuOrdersToBill=Objednávky dodaný
MenuOrdersToBill2=Billable orders
SearchOrder=Hľadať účelom
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Loď produkt
Discount=Zľava
CreateOrder=Vytvoriť objednávku
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index 113f2d7dc2e..f89916a11c2 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximálny rozmer
AttachANewFile=Pripojte nový súbor / dokument
LinkedObject=Prepojený objekt
Miscellaneous=Zmiešaný
-NbOfActiveNotifications=Počet oznámení
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Toto je test e-mailom. \\ NAk dva riadky sú oddelené znakom konca riadku. \n\n __ SIGNATURE__
PredefinedMailTestHtml=Toto je test-mail (slovo test musí byť tučne).
Dva riadky sú oddelené znakom konca riadku.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/sk_SK/productbatch.lang b/htdocs/langs/sk_SK/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/sk_SK/productbatch.lang
+++ b/htdocs/langs/sk_SK/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 45d5006cb75..667875f4e17 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index ae27e1348b2..8963a13c602 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Všetci
PrivateProject=Kontakty na projekte
MyProjectsDesc=Tento pohľad je obmedzená na projekty, ste kontakt (nech je to typ).
ProjectsPublicDesc=Tento názor predstavuje všetky projekty, ktoré sú prístupné pre čítanie.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Tento názor predstavuje všetky projekty (užívateľského oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
MyTasksDesc=Tento pohľad je obmedzená na projekty alebo úlohy, ktoré sú pre kontakt (nech je to typ).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Tento názor predstavuje všetky projekty a úlohy, ktoré sú prístupné pre čítanie.
TasksDesc=Tento názor predstavuje všetky projekty a úlohy (vaše užívateľské oprávnenia udeliť oprávnenie k nahliadnutiu všetko).
ProjectsArea=Projekty oblasť
@@ -29,6 +31,8 @@ NoProject=Žiadny projekt definovaný alebo vlastné
NbOpenTasks=Nb otvorených úloh
NbOfProjects=Nb projektov
TimeSpent=Čas strávený
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Čas strávený
RefTask=Ref úloha
LabelTask=Label úloha
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Zoznam dodávateľa zákaziek súvisiace s p
ListSupplierInvoicesAssociatedProject=Zoznam dodávateľských faktúr súvisiace s projektom
ListContractAssociatedProject=Zoznam zákaziek súvisiacich s projektom
ListFichinterAssociatedProject=Zoznam výkonov spojených s projektom
-ListTripAssociatedProject=Zoznam ciest a nákladov spojených s projektom
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Zoznam udalostí spojených s projektom
ActivityOnProjectThisWeek=Aktivita na projekte tento týždeň
ActivityOnProjectThisMonth=Aktivita na projekte tento mesiac
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sk_SK/salaries.lang b/htdocs/langs/sk_SK/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/sk_SK/salaries.lang
+++ b/htdocs/langs/sk_SK/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/sk_SK/sendings.lang b/htdocs/langs/sk_SK/sendings.lang
index a28b7441b89..1d57822a222 100644
--- a/htdocs/langs/sk_SK/sendings.lang
+++ b/htdocs/langs/sk_SK/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Množstvo objednať
QtyShipped=Množstvo odoslané
QtyToShip=Množstvo na loď
QtyReceived=Množstvo prijatej
-KeepToShip=Majte na loď
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Ďalšie zásielky pre túto objednávku
DateSending=Dátum odoslania, aby
DateSendingShort=Dátum odoslania, aby
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 80d09deb48a..80cf13a58f0 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Vážená priemerná cena
PMPValueShort=WAP
EnhancedValueOfWarehouses=Sklady hodnota
UserWarehouseAutoCreate=Vytvorte sklad automaticky pri vytváraní užívateľa
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Množstvo odoslané
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladová %s budú použité pre zníženie skl
WarehouseForStockIncrease=Skladová %s budú použité pre zvýšenie stavu zásob
ForThisWarehouse=Z tohto skladu
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=Toto je zoznam všetkých otvorených dodávateľských objednávok
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Splátky
NbOfProductBeforePeriod=Množstvo produktov %s na sklade, než zvolené obdobie (<%s)
NbOfProductAfterPeriod=Množstvo produktov %s na sklade po zvolené obdobie (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/sk_SK/suppliers.lang b/htdocs/langs/sk_SK/suppliers.lang
index 5d04f2d96fd..8917cbe8b4e 100644
--- a/htdocs/langs/sk_SK/suppliers.lang
+++ b/htdocs/langs/sk_SK/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Dodávatelia
-Supplier=Dodávateľ
AddSupplier=Create a supplier
SupplierRemoved=Dodávateľ odstráni
SuppliersInvoice=Dodávatelia faktúra
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Dodávateľ faktúry a platby
ExportDataset_fournisseur_3=Dodávateľ objednávky a objednávka linky
ApproveThisOrder=Schváliť túto objednávku
ConfirmApproveThisOrder=Ste si istí, že chcete schváliť poradí %s?
-DenyingThisOrder=Popierať túto objednávku
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Ste si istí, že chcete popierať objednávky %s?
ConfirmCancelThisOrder=Ste si istí, že chcete zrušiť túto objednávku %s?
AddCustomerOrder=Vytvorenie objednávky zákazníka
diff --git a/htdocs/langs/sk_SK/trips.lang b/htdocs/langs/sk_SK/trips.lang
index 1367186b021..aa91658f502 100644
--- a/htdocs/langs/sk_SK/trips.lang
+++ b/htdocs/langs/sk_SK/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Výlet
-Trips=Výlety
-TripsAndExpenses=Výlety a výdavky
-TripsAndExpensesStatistics=Výlety a výdavky štatistiky
-TripCard=Výlet karty
-AddTrip=Pridať výlet
-ListOfTrips=Zoznam ciest
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Sadzobník poplatkov
-NewTrip=Nová cesta
+NewTrip=New expense report
CompanyVisited=Firma / nadácie navštívil
Kilometers=Kilometre
FeesKilometersOrAmout=Množstvo alebo kilometrov
-DeleteTrip=Odstrániť výlet
-ConfirmDeleteTrip=Ste si istí, že chcete zmazať túto cestu?
-TF_OTHER=Ostatné
-TF_LUNCH=Obed
-TF_TRIP=Výlet
-ListTripsAndExpenses=Zoznam ciest a nákladov
-ExpensesArea=Výlety a náklady oblasť
-SearchATripAndExpense=Hľadať na výlet a náklady
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Ostatné
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Obed
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 74e7506e000..e214389ecea 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Preizkusna
VersionDevelopment=Razvojna
VersionUnknown=Neznana
VersionRecommanded=Priporočena
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID seje
SessionSaveHandler=Rutina za shranjevanje seje
SessionSavePath=Lokalizacija shranjevanja seje
@@ -493,10 +498,16 @@ Module600Name=Obvestila
Module600Desc=Pošiljanje obvestil o nekaterih Dolibarr dogodkih po e-mailu kontaktom pri partnerjih (nastavitev je določena za vsakega partnerja)
Module700Name=Donacije
Module700Desc=Upravljanje donacij
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integracija
Module1400Name=Računovodstvo
Module1400Desc=Upravljanje računovodstva (dvostavno)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorije
Module1780Desc=Upravljanje kategorij (proizvodi, dobavitelji in kupci)
Module2000Name=Fck urejevalnik
@@ -631,7 +642,7 @@ Permission181=Branje naročil pri dobaviteljih
Permission182=Kreiranje/spreminjanje naročil pri dobaviteljih
Permission183=Potrjevanje naročil pri dobaviteljih
Permission184=Odobritev naročil pri dobaviteljih
-Permission185=Naročanje naročil pri dobaviteljih
+Permission185=Order or cancel supplier orders
Permission186=Prejem naročil pri dobaviteljih
Permission187=Zaključek naročil pri dobaviteljih
Permission188=Preklic naročil pri dobaviteljih
@@ -711,6 +722,13 @@ Permission538=Izvoz storitev
Permission701=Branje donacij
Permission702=Kreiranje/spreminjanje donacij
Permission703=Delete donacij
+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
Permission1001=Branje zalog
Permission1002=Kreiranje/spreminjanje skladišč
Permission1003=Brisanje skladišč
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Geslo za uporabo proxy strežnika
DefineHereComplementaryAttributes=Tukaj doloćite vse atribute, ki niso na voljo kot privzeti, vendar želite da so podprti za %s.
ExtraFields=Koplementarni atributi
ExtraFieldsLines=Koplementarni atributi (postavke)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Koplementarni atributi (partner)
ExtraFieldsContacts=Koplementarni atributi (kontakt/naslov)
ExtraFieldsMember=Koplementarni atributi (član)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Vrstica proizvoda/storitve z vrednostjo 0 se smatra ko
FreeLegalTextOnProposal=Poljubno besedilo na komercialni ponudbi
WatermarkOnDraftProposal=Vodni tisk na osnutkih komercialnih ponudb (brez, če je prazno)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Vprašajte za ciljni bančni račun ponudbe
+##### 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
##### Orders #####
OrdersSetup=Nastavitve upravljanja z naročili
OrdersNumberingModules=Moduli za številčenje naročil
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Črtna koda tipa UPC
BarcodeDescISBN=Črtna koda tipa ISBN
BarcodeDescC39=Črtna koda tipa C39
BarcodeDescC128=Črtna koda tipa C128
-GenbarcodeLocation=Orodje za generiranje črtne kode preko komandne vrstice (uporablja ga 'phpbarcode engine' za nekatere tipe črtnih kod)
+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
BarcodeInternalEngine=Interno orodje
BarCodeNumberManager=Upravljanje avtomatskega določanja številk črtnih kod
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Privzet generični partner, ki se uporabi za prodajo
CashDeskBankAccountForSell=Račun, ki se uporabi za prejem gotovinskih plačil
CashDeskBankAccountForCheque= Račun, ki se uporabi za prejem plačil s čeki
CashDeskBankAccountForCB= Račun, ki se uporabi za prejem plačil s kreditnimi karticami
-CashDeskDoNotDecreaseStock=Onemogoči zmanjšanje zaloge, če je prodaja izvršena s prodajnega mesta POS
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Prisilite ali blokirajte skladišče, uporabljeno za zmanjšanje zalog
StockDecreaseForPointOfSaleDisabled=Onemogočeno zmanjševanje zaloge s prodajnega mesta POS
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=Niste omogočili zmanjšanje zaloge ob prodaji na prodajnem mestu POS. Potrebno je skladišče.
##### Bookmark #####
BookmarkSetup=Nastavitev modula za zaznamke
@@ -1569,3 +1597,7 @@ SortOrder=Sortiraj naročilo
Format=Format
TypePaymentDesc=0:Tip plačila stranke, 1:Tip plačila dobavitelju, 2:Tip plačila stranke in dobavitelju
IncludePath=Vključi pot (definirana v spremenljivki %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.
diff --git a/htdocs/langs/sl_SI/banks.lang b/htdocs/langs/sl_SI/banks.lang
index fdf87b11e54..a74dde0ed85 100644
--- a/htdocs/langs/sl_SI/banks.lang
+++ b/htdocs/langs/sl_SI/banks.lang
@@ -33,7 +33,11 @@ AllTime=Od začetka
Reconciliation=Usklajevanje
RIB=Transakcijski račun
IBAN=IBAN številka
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT številka
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Trajni nalogi
StandingOrder=Trajni nalog
Withdrawals=Dvigi
@@ -148,7 +152,7 @@ BackToAccount=Nazaj na račun
ShowAllAccounts=Prikaži vse račune
FutureTransaction=Bodoča transakcija. Ni možna uskladitev.
SelectChequeTransactionAndGenerate=Izberi/filtriraj čeke za vključitev v prevzemnico čekovnih nakazil in klikni na "Ustvari"
-InputReceiptNumber=Izberi bančni izpisek, povezan s posredovanjem. Uporabi numerično vrednost, ki se lahko sortira (npr.: YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventuelno določi kategorijo, v katero se razvrsti zapis
ToConciliate=Za posredovanje?
ThenCheckLinesAndConciliate=Nato preveri vrstice na bančnem izpisku in klikni
diff --git a/htdocs/langs/sl_SI/commercial.lang b/htdocs/langs/sl_SI/commercial.lang
index b5ffccdb1e1..d69651c6025 100644
--- a/htdocs/langs/sl_SI/commercial.lang
+++ b/htdocs/langs/sl_SI/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Možna stranka
Prospects=Možne stranke
DeleteAction=Brisanje aktivnosti/naloge
NewAction=Nova aktivnost/naloga
-AddAction=Dodaj aktivnost/nalogo
-AddAnAction=Dodajanje aktivnosti/naloge
-AddActionRendezVous=Dodaj nalogo/srečanje
+AddAction=Ustvari dogodek/nalogo
+AddAnAction=Ustvari dogodek/nalogo
+AddActionRendezVous=Ustvari srečanje
Rendez-Vous=Srečanje
ConfirmDeleteAction=Ali zares želite izbrisati to nalogo?
CardAction=Kartica aktivnosti
@@ -44,8 +44,8 @@ DoneActions=Dokončane aktivnosti
DoneActionsFor=Dokončane aktivnosti za %s
ToDoActions=Nedokončane aktivnosti
ToDoActionsFor=Nedokončane aktivnosti za %s
-SendPropalRef=Poslana komercialna ponudba %s
-SendOrderRef=Poslano naročilo %s
+SendPropalRef=Oddaja komercialne ponudbe %s
+SendOrderRef=Oddaja naročila %s
StatusNotApplicable=Ni veljaven
StatusActionToDo=Odprto
StatusActionDone=Dokončano
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakt izveden
DateActionPlanned=Datum planirane aktivnosti za
DateActionDone=Datum izvedene aktivnosti
ActionAskedBy=Aktivnost zahteval
-ActionAffectedTo=Aktivnost, ki se tiče
+ActionAffectedTo=Event assigned to
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%%.
diff --git a/htdocs/langs/sl_SI/contracts.lang b/htdocs/langs/sl_SI/contracts.lang
index 8f74a40c7c8..60ef9ee1b04 100644
--- a/htdocs/langs/sl_SI/contracts.lang
+++ b/htdocs/langs/sl_SI/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Potekla
ServiceStatusClosed=Zaključena
ServicesLegend=Legenda storitev
Contracts=Pogodbe
+ContractsAndLine=Contracts and line of contracts
Contract=Pogodba
NoContracts=Ni pogodb
MenuServices=Storitve
diff --git a/htdocs/langs/sl_SI/cron.lang b/htdocs/langs/sl_SI/cron.lang
index 298acce66f0..a6e87be5cfe 100644
--- a/htdocs/langs/sl_SI/cron.lang
+++ b/htdocs/langs/sl_SI/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 78f2fc71dba..8417f316e28 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Plačilni in ciljni bančni račun morata biti ra
ErrorBadThirdPartyName=Napačno ime partnerja
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Napačna koda kupca
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Obvezna koda kupca
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Koda kupca je že uporabljena
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript ne sme biti izklopljen, če želite da t
ErrorPasswordsMustMatch=Obe vneseni gesli se morata ujemati
ErrorContactEMail=Prišlo je do tehnične napake. Prosimo, obrnite se na administratorja na naslednji Email %s in mu sporočite kodo napake %s, Še bolje pa je, če priložite kopijo strani z napako.
ErrorWrongValueForField=Napačna vrednost v polju številka %s (vrednost '%s' ne ustreza pravilu %s)
-ErrorFieldValueNotIn=Napačna vrednost v polju številka%s (vrednost '%s' ni vrednost, ki je na voljo v polju %s tabele %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Napačna vrednost za %s številka polja (Vrednost '%s "ni %s obstoječe ref)
ErrorsOnXLines=Napake v %s vrsticah izvorne kode
ErrorFileIsInfectedWithAVirus=Antivirusni program ni mogel potrditi datoteke (datoteka je morda okužena)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index ca1de1fe210..05e51e48ef4 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Zadnji korak: Tukaj določite uporabniško ime in
ActivateModule=Vključite modul %s
ShowEditTechnicalParameters=Kliknite tukaj za prikaz/popravek naprednih parametrov (expertni način)
WarningUpgrade=Pozor:\nAli ste najprej naredili varnostno kopijo baze podatkov ?\nTo je zelo priporočeno: na primer zaradi nekaterih hroščev v sistemu baze podatkov (na primer mysql verzija 5.5.40), lahko med tem postopkom izgubite nekatere podatke ali tabele, zato je priporočeno imeti celotno kopijo vaše baze podatkov pred začetkom migracije.\n\nKliknite OK za začetek procesa migracije...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index fce08c4ae5f..a41f62aba48 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -141,6 +141,7 @@ Cancel=Razveljavi
Modify=Spremeni
Edit=Uredi
Validate=Potrdi
+ValidateAndApprove=Validate and Approve
ToValidate=Za potrditev
Save=Shrani
SaveAs=Shrani kot
@@ -158,6 +159,7 @@ Search=Išči
SearchOf=Iskanje
Valid=Veljaven
Approve=Potrdi
+Disapprove=Disapprove
ReOpen=Ponovno odpri
Upload=Dodaj datoteko
ToLink=Povezava
@@ -219,6 +221,7 @@ Cards=Kartice
Card=Kartica
Now=Zdaj
Date=Datum
+DateAndHour=Date and hour
DateStart=Začetni datum
DateEnd=Končni datum
DateCreation=Datum kreiranja
@@ -295,6 +298,7 @@ UnitPriceHT=Cena enote (neto)
UnitPriceTTC=Cena enote
PriceU=C.E.
PriceUHT=C.E. (neto)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=C.E.
Amount=Znesek
AmountInvoice=Znesek računa
@@ -521,6 +525,7 @@ DateFromTo=Od %s do %s
DateFrom=Od %s
DateUntil=Do %s
Check=Preveri
+Uncheck=Uncheck
Internal=Interno
External=Eksterno
Internals=Interni
@@ -688,6 +693,7 @@ PublicUrl=Javni URL
AddBox=Dodaj okvir
SelectElementAndClickRefresh=Izberi element in klikni osveži
PrintFile=Natisni datoteko %s
+ShowTransaction=Show transaction
# Week day
Monday=Ponedeljek
Tuesday=Torek
diff --git a/htdocs/langs/sl_SI/orders.lang b/htdocs/langs/sl_SI/orders.lang
index 876d57cf02b..eb4d92ac319 100644
--- a/htdocs/langs/sl_SI/orders.lang
+++ b/htdocs/langs/sl_SI/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Preklicano
StatusOrderDraft=Osnutek (potrebno potrditi)
StatusOrderValidated=Potrjeno
StatusOrderOnProcess=Naročeno - čaka na prevzem
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Obdelano
StatusOrderToBill=Za fakturiranje
StatusOrderToBill2=Za fakturiranje
@@ -58,6 +59,7 @@ MenuOrdersToBill=Naročila za fakturiranje
MenuOrdersToBill2=Naročila za fakturiranje
SearchOrder=Iskanje naročila
SearchACustomerOrder=Iskanje naročila kupca
+SearchASupplierOrder=Search a supplier order
ShipProduct=Pošlji izdelek
Discount=Popust
CreateOrder=Kreiraj naročilo
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 20246977b5e..7b22d4ec296 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -54,12 +54,13 @@ MaxSize=Največja velikost
AttachANewFile=Pripni novo datoteko/dokument
LinkedObject=Povezani objekti
Miscellaneous=Razno
-NbOfActiveNotifications=Število sporočil
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=To je testni mail.\nDve vrstici sta ločeni z carriage return.
PredefinedMailTestHtml=To je test mail (beseda test mora biti v krepkem tisku).
Dve vrstici sta ločeni z carriage return.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nŽelimo vas opozoriti, da račun __FACREF__ ni bil poravnan. Zato vam račun še enkrat pošiljamo v prilogi.\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nV prilogi je ponudba __PROPREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nV prilogi je potrditev naročila __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nV prilogi je naše naročilo __ORDERREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nV prilogi je račun __FACREF__\n\n__PERSONALIZED__S spoštovanjem\n\n__SIGNATURE__
diff --git a/htdocs/langs/sl_SI/productbatch.lang b/htdocs/langs/sl_SI/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/sl_SI/productbatch.lang
+++ b/htdocs/langs/sl_SI/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 1af1122f798..66b438442e1 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Tako za proizvode/storitve, kot za nabavne cene, so n
PriceExpressionEditorHelp4=Samo za cene proizvodov/storitev: #supplier_min_price#
Samo za nabavne cene: #supplier_quantity# in #supplier_tva_tx#
PriceMode=Način cene
PriceNumeric=Številka
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 114bd850d0f..86aa5c2da19 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Projekti v skupni rabi
PrivateProject=Privatni projekti
MyProjectsDesc=Ta pogled je omejen na projekte za katere ste vi kontaktna oseba (ne glede na vrsto).
ProjectsPublicDesc=To pogled predstavlja vse projekte, za katere imate dovoljenje za branje.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Ta pogled predstavlja vse projekte (vaše uporabniško dovoljenje vam omogoča ogled vseh).
MyTasksDesc=Ta pogled je omejen na projekte ali naloge, za katere ste kontaktna oseba (ne glede na vrsto).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Ta pogled predstavlja vse projekte in naloge, za katere imate dovoljenje za branje.
TasksDesc=Ta pogled predstavlja vse projekte in naloge (vaše uporabniško dovoljenje vam omogoča ogled vseh).
ProjectsArea=Področje projektov
@@ -29,6 +31,8 @@ NoProject=Nimate definiranega ali lastnega projekta
NbOpenTasks=Število odprtih nalog
NbOfProjects=Število projektov
TimeSpent=Porabljen čas
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Porabljen čas
RefTask=Referenčna naloga
LabelTask=Naziv naloge
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Seznam naročil pri dobaviteljih, povezanih
ListSupplierInvoicesAssociatedProject=Seznam računov dobaviteljev, povezanih s projektom
ListContractAssociatedProject=Seznam pogodb, povezanih s projektom
ListFichinterAssociatedProject=Seznam intervencij, povezanih s projektom
-ListTripAssociatedProject=Seznam potovanj in stroškov, povezanih s projektom
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Seznam aktivnosti, povezanih s projektom
ActivityOnProjectThisWeek=Aktivnosti na projektu v tem tednu
ActivityOnProjectThisMonth=Aktivnosti na projektu v tem mesecu
@@ -133,3 +137,6 @@ SearchAProject=Iskanje projekta
ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
ProjectDraft=Osnutek projekta
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sl_SI/salaries.lang b/htdocs/langs/sl_SI/salaries.lang
index 28358cd23ec..6ac11760aea 100644
--- a/htdocs/langs/sl_SI/salaries.lang
+++ b/htdocs/langs/sl_SI/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Plača
Salaries=Plače
Employee=Zaposleni
@@ -6,3 +8,6 @@ NewSalaryPayment=Novo izplačilo plače
SalaryPayment=Izplačilo plače
SalariesPayments=Izplačila plač
ShowSalaryPayment=Prikaži izplačilo plač
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/sl_SI/sendings.lang b/htdocs/langs/sl_SI/sendings.lang
index 527162ad3d9..5a318a13eb8 100644
--- a/htdocs/langs/sl_SI/sendings.lang
+++ b/htdocs/langs/sl_SI/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Naročena količina
QtyShipped=Poslana količina
QtyToShip=Količina za pošiljanje
QtyReceived=Prejeta količina
-KeepToShip=Zadrži pošiljanje
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Ostale pošiljke za to naročilo
DateSending=Datum pošiljanja naročila
DateSendingShort=Datum pošiljanja
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index 3f37e27fd3b..ff1eed42243 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Uravnotežena povprečna cena
PMPValueShort=UPC
EnhancedValueOfWarehouses=Vrednost skladišč
UserWarehouseAutoCreate=Avtomatsko ustvari zalogo, ko kreirate uporabnika
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Odposlana količina
QtyDispatchedShort=Odposlana količina
QtyToDispatchShort=Količina za odpošiljanje
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Skladiščee %s bo uporabljeno za zmanjšanje z
WarehouseForStockIncrease=Skladišče %s bo uporabljeno za povečanje zaloge
ForThisWarehouse=Za to skladišče
ReplenishmentStatusDesc=Seznam vseh proizvodov, ki imajo nižje stanje zaloge od želenega (ali nižje od opozorilne vrednosti, če je kvadratek "samo opozorilo" odkljukan) in predlog za kreiranje naročila pri dobavitelju za dopolnitev razlike.
-ReplenishmentOrdersDesc=To je seznam vseh odprtih naročil pri dobavitelju
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Obnovitve
NbOfProductBeforePeriod=Količina proizvoda %s na zalogi pred izbranim obdobjem (< %s)
NbOfProductAfterPeriod=Količina proizvoda %s na zalogi po izbranem obdobju (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Vsebina paketa
ShowWarehouse=Prikaži skladišče
MovementCorrectStock=Popravek količine zaloge za proizvod %s
MovementTransferStock=Skladiščni prenos proizvoda %s v drugo skladišče
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/sl_SI/suppliers.lang b/htdocs/langs/sl_SI/suppliers.lang
index a19e3dab7e5..ef34fc2ba1b 100644
--- a/htdocs/langs/sl_SI/suppliers.lang
+++ b/htdocs/langs/sl_SI/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Dobavitelji
-Supplier=Dobavitelj
AddSupplier=Ustvari dobavitelja
SupplierRemoved=Dobavitelj odstranjen
SuppliersInvoice=Računi dobavitelja
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Računi dobaviteljev in plačila
ExportDataset_fournisseur_3=Naročila pri dobaviteljih in vrstice naročila
ApproveThisOrder=Odobri to naročilo
ConfirmApproveThisOrder=Ali zares želite odobriti to naročilo ?
-DenyingThisOrder=Zavrni to naročilo
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Ali zares želite zavrniti to naročilo?
ConfirmCancelThisOrder=Ali zares želite preklicati to naročilo?
AddCustomerOrder=Kreirajte naročilo kupca
diff --git a/htdocs/langs/sl_SI/trips.lang b/htdocs/langs/sl_SI/trips.lang
index ae053137a54..9b9729b3d9e 100644
--- a/htdocs/langs/sl_SI/trips.lang
+++ b/htdocs/langs/sl_SI/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Pot
-Trips=Poti
-TripsAndExpenses=Poti in stroški
-TripsAndExpensesStatistics=Statistika poti in stroškov
-TripCard=Kartica poti
-AddTrip=Dodaj pot
-ListOfTrips=Seznam poti
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Seznam stroškov
-NewTrip=Nova pot
+NewTrip=New expense report
CompanyVisited=Obiskano podjetje/ustanova
Kilometers=Kilometri
FeesKilometersOrAmout=Količina kilometrov
-DeleteTrip=Izbriši pot
-ConfirmDeleteTrip=Ali zares želite izbrisati to pot ?
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
+ClassifyRefunded=Označi kot "Povrnjeno"
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
TF_OTHER=Ostalo
+TF_TRANSPORTATION=Transportation
TF_LUNCH=Kosilo
-TF_TRIP=Pot
-ListTripsAndExpenses=Seznam poti in stroškov
-ExpensesArea=Področje poti in stroškov
-SearchATripAndExpense=Iskanje poti in stroška
-ClassifyRefunded=Classify 'Refunded'
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 38634cbd497..9782c2ea27f 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
VersionRecommanded=Recommended
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/sq_AL/banks.lang b/htdocs/langs/sq_AL/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/sq_AL/banks.lang
+++ b/htdocs/langs/sq_AL/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/sq_AL/commercial.lang b/htdocs/langs/sq_AL/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/sq_AL/commercial.lang
+++ b/htdocs/langs/sq_AL/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/sq_AL/contracts.lang b/htdocs/langs/sq_AL/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/sq_AL/contracts.lang
+++ b/htdocs/langs/sq_AL/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/sq_AL/cron.lang b/htdocs/langs/sq_AL/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/sq_AL/cron.lang
+++ b/htdocs/langs/sq_AL/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/sq_AL/install.lang b/htdocs/langs/sq_AL/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/sq_AL/install.lang
+++ b/htdocs/langs/sq_AL/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/sq_AL/main.lang b/htdocs/langs/sq_AL/main.lang
index ea91cfb3438..c9794e8b2ed 100644
--- a/htdocs/langs/sq_AL/main.lang
+++ b/htdocs/langs/sq_AL/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/sq_AL/orders.lang b/htdocs/langs/sq_AL/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/sq_AL/orders.lang
+++ b/htdocs/langs/sq_AL/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/sq_AL/productbatch.lang b/htdocs/langs/sq_AL/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/sq_AL/productbatch.lang
+++ b/htdocs/langs/sq_AL/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sq_AL/salaries.lang b/htdocs/langs/sq_AL/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/sq_AL/salaries.lang
+++ b/htdocs/langs/sq_AL/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/sq_AL/sendings.lang b/htdocs/langs/sq_AL/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/sq_AL/sendings.lang
+++ b/htdocs/langs/sq_AL/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/sq_AL/stocks.lang b/htdocs/langs/sq_AL/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/sq_AL/stocks.lang
+++ b/htdocs/langs/sq_AL/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/sq_AL/suppliers.lang b/htdocs/langs/sq_AL/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/sq_AL/suppliers.lang
+++ b/htdocs/langs/sq_AL/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/sq_AL/trips.lang b/htdocs/langs/sq_AL/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/sq_AL/trips.lang
+++ b/htdocs/langs/sq_AL/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 953962457db..a0f32ed0aa5 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -15,7 +15,7 @@ JournalFinancial=Finansiella journaler
Exports=Export
Export=Export
Modelcsv=Modell av export
-OptionsDeactivatedForThisExportModel=For this export model, options are deactivated
+OptionsDeactivatedForThisExportModel=För denna exportmodell är tillval inaktiverade
Selectmodelcsv=Välj en modell av export
Modelcsv_normal=Klassisk export
Modelcsv_CEGID=Export mot CEGID Expert
@@ -68,7 +68,7 @@ Lineofinvoice=Line of faktura
VentilatedinAccount=Ventilerade framgångsrikt i redovisningskonto
NotVentilatedinAccount=Inte ventilerad i redovisningskonto
-ACCOUNTING_SEPARATORCSV=Column separator in export file
+ACCOUNTING_SEPARATORCSV=Kolumnseparator i exportfil
ACCOUNTING_LIMIT_LIST_VENTILATION=Antal element att vara uppdelning framgår av sidan (max rekommenderad: 50)
ACCOUNTING_LIST_SORT_VENTILATION_TODO=Börja sortering av nedbrytnings sidor "Måste uppdelning" av de senaste element
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index 07f6a21ef83..ae34d563120 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -8,6 +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
SessionId=Session ID
SessionSaveHandler=Handler för att spara sessioner
SessionSavePath=Lagring session lokalisering
@@ -294,7 +299,7 @@ DoNotUseInProduction=Använd inte i poroduktion
ThisIsProcessToFollow=Detta är inställd för att behandla:
StepNb=Steg %s
FindPackageFromWebSite=Hitta ett paket som ger funktionen du vill ha (till exempel om %s webbplats).
-DownloadPackageFromWebSite=Download package %s.
+DownloadPackageFromWebSite=Ladda hem paket %s.
UnpackPackageInDolibarrRoot=Packa upp paketet fil till Dolibarr s katalog %s rot
SetupIsReadyForUse=Installera är klar och Dolibarr är klar att användas med den nya komponenten.
NotExistsDirect=Den alternativa rotkatalogen är inte definierad.
@@ -304,7 +309,7 @@ YouCanSubmitFile=Välj modul:
CurrentVersion=Dolibarr nuvarande version
CallUpdatePage=Gå till sidan som uppdaterar databasen struktur och data: %s.
LastStableVersion=Senaste stabila version
-UpdateServerOffline=Update server offline
+UpdateServerOffline=Uppdatera server offline
GenericMaskCodes=Du kan ange någon numrering mask. I denna mask skulle följande taggar användas:
(000000) motsvarar ett antal som kommer att ökas på varje %s. Ange så många nollor som den önskade längden på disken. Räknaren kommer att fyllas ut med nollor från vänster för att få så många nollor som masken.
(000000 000) samma som tidigare men en kompensation som motsvarar det antal till höger om tecknet + tillämpas med början den första %s.
(000000 @ x) samma som tidigare, men räknaren återställs till noll när månaden x uppnås (x mellan 1 och 12). Om detta alternativ används och x är 2 eller högre, då sekvensen (yy) (mm) eller (ÅÅÅÅ) (mm) krävs också.
(Dd) dag (01 till 31).
(Mm) månad (01 till 12).
(Yy), (ÅÅÅÅ) eller (y) år under 2, 4 eller ett nummer.
GenericMaskCodes2={Cccc} klientkoden på n tecken
{Cccc000} klientkoden på n tecken följs av en räknare dedikerad för kunden. Denna räknare tillägnad kund återställs vid samma tidpunkt än den globala räknare.
{Tttt} Koden för tredjeparts typ på n tecken (se ordlistan-tredjeparts typer).
GenericMaskCodes3=Alla andra tecken i masken förblir intakt.
Blanksteg är inte tillåtna.
@@ -383,12 +388,12 @@ ExtrafieldSelectList = Välj från tabell
ExtrafieldSeparator=Avskiljare
ExtrafieldCheckBox=Kryssruta
ExtrafieldRadio=Radioknapp
-ExtrafieldCheckBoxFromList= Checkbox from table
+ExtrafieldCheckBoxFromList= Kryssruta från tabell
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
...
ExtrafieldParamHelpsellist=Parametrar lista kommer från en tabell
Syntax: tabellnamn: label_field: id_field :: filtrering
Exempel: c_typent: libelle: id :: filter
Filtret kan vara ett enkelt test (t.ex. aktiv = 1) för att visa endast aktiv värde
Om du vill filtrera på extrafields använder syntaxt extra.fieldcode = ... (där fältkoden är koden för Mig &)
För att få en lista beroende på en annan:
c_typent: libelle: id: parent_list_code | parent_column: filter
-ExtrafieldParamHelpchkbxlst=Parameters list comes from a table
Syntax : table_name:label_field:id_field::filter
Example : c_typent:libelle:id::filter
filter can be a simple test (eg active=1) to display only active value
if you want to filter on extrafields use syntaxt extra.fieldcode=... (where field code is the code of extrafield)
In order to have the list depending on another :
c_typent:libelle:id:parent_list_code|parent_column:filter
+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=Vissa länder tillämpar 2 eller 3 skatter på varje fakturarad. 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 (moms inte tillämpas på lokal skatt)
2: lokal skatt tillämpas på produkter och tjänster innan moms (moms beräknas på beloppet + localtax)
3: lokal skatt tillämpas på produkter utan moms (moms inte tillämpas på lokal skatt)
4: lokal skatt tillämpas på produkter innan moms (moms beräknas på beloppet + localtax)
5: lokal skatt tillämpas på tjänster utan moms (moms inte tillämpas på lokal skatt)
6: lokal skatt tillämpas på tjänster innan moms (moms beräknas på beloppet + localtax)
@@ -493,10 +498,16 @@ 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 Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Bokföring
Module1400Desc=Bokföring och redovisning (dubbel part)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategorier
Module1780Desc=Categorie ledning (produkter, leverantörer och kunder)
Module2000Name=FCKeditor
@@ -575,7 +586,7 @@ Permission67=Export insatser
Permission71=Läs medlemmar
Permission72=Skapa / modifiera medlemmar
Permission74=Ta bort medlemmar
-Permission75=Setup types of membership
+Permission75=Definera typer av medlemskap
Permission76=Exportera data seten
Permission78=Läs prenumerationer
Permission79=Skapa / ändra abonnemang
@@ -598,8 +609,8 @@ Permission106=Exportsend
Permission109=Ta bort sendings
Permission111=Läs finansiella räkenskaper
Permission112=Skapa / ändra / radera och jämför transaktioner
-Permission113=Setup financial accounts (create, manage categories)
-Permission114=Reconciliate transactions
+Permission113=Ställ upp finansiella konton (skapa, handha kategorier)
+Permission114=Avstämning av transaktioner
Permission115=Exporttransaktioner och kontoutdrag
Permission116=Överföringar mellan konton
Permission117=Hantera kontroller avsändning
@@ -631,7 +642,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=Beställ leverantör order
+Permission185=Order or cancel supplier orders
Permission186=Ta emot leverantör order
Permission187=Stäng leverantör order
Permission188=Avbryt leverantör order
@@ -711,6 +722,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
Permission1001=Läs lager
Permission1002=Skapa / ändra lager
Permission1003=Radera lager
@@ -764,7 +782,7 @@ Permission55001=Läs omröstningar
Permission55002=Skapa / ändra omröstningar
Permission59001=Läs kommersiella marginaler
Permission59002=Definiera kommersiella marginaler
-Permission59003=Read every user margin
+Permission59003=Läs varje användaremarginal
DictionaryCompanyType=Thirdparties typ
DictionaryCompanyJuridicalType=Juridiska sorters thirdparties
DictionaryProspectLevel=Prospect potentiella nivå
@@ -1025,6 +1043,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)
ExtraFieldsThirdParties=Kompletterande attribut (tredjeparts)
ExtraFieldsContacts=Kompletterande attribut (kontaktperson / adress)
ExtraFieldsMember=Kompletterande attribut (medlem)
@@ -1042,7 +1062,7 @@ SendingMailSetup=Inställning av sändningarna via e-post
SendmailOptionNotComplete=Varning, på vissa Linux-system, för att skicka e-post från e-post, sendmail utförande inställning måste conatins Alternativ-ba (parameter mail.force_extra_parameters i din php.ini-fil). Om vissa mottagare inte emot e-post, försök att redigera den här PHP parameter med mail.force_extra_parameters =-BA).
PathToDocuments=Sökväg till handlingar
PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Feature to send mails using method "PHP mail direct" will generate a mail message that might be not correctly parsed by some receiving mail servers. Result is that some mails can't be read by people hosted by those bugged platforms. It's case for some Internet providers (Ex: Orange in France). This is not a problem into Dolibarr nor into PHP but onto receiving mail server. You can however add option MAIN_FIX_FOR_BUGGED_MTA to 1 into setup - other to modify Dolibarr to avoid this. However, you may experience problem with other servers that respect strictly the SMTP standard. The other solution (recommended) is to use the method "SMTP socket library" that has no disadvantages.
+SendmailOptionMayHurtBuggedMTA=Funktion för att skicka e-post med hjälp av metoden "PHP mail direct" genererar ett e-postmeddelande som kanske inte tolkas korrekt av vissa e-postservrar. Resultatet är att viss epost inte kan läsas av användare som hostas på sådana system som tolkar fel. Det är fallet för vissa internetleverantörer (t.ex. Orange i Frankrike). Detta är inte ett Dolibarr- eller PHP-problem men fel på inkommande e-post server. Du kan sätta MAIN_FIX_FOR_BUGGED_MTA till 1 i "Setup - andra" för att Dolibarr ska undvika detta. Du kan dock uppleva problem med andra servrar som strikt följer SMTP standard. Den andra lösningen (Rekomenderad) är att använda metoden "SMTP socket library" som inte har några nackdelar.
TranslationSetup=Konfigurera översättning
TranslationDesc=Val av språk visas på skärmen kan ändras:
* Globalt från menyn Hem - Inställningar - Display
* För användaren endast från fliken Användar visning av användarkort (klicka på inloggning på toppen av skärmen).
TotalNumberOfActivatedModules=Totalt antal aktiverade funktionsmoduler:% s
@@ -1061,7 +1081,7 @@ BrowserIsOK=Du använder webbläsaren %s. Denna webbläsare är ok för säkerhe
BrowserIsKO=Du använder webbläsaren %s. Denna webbläsare är känt för att vara ett dåligt val för säkerhet, prestanda och tillförlitlighet. Vi rekommendera att du använder Firefox, Chrome, Opera eller Safari.
XDebugInstalled=Xdebug är laddad.
XCacheInstalled=Xcache är laddad.
-AddRefInList=Display customer/supplier ref into list (select list or combobox) and most of hyperlink. Third parties will appears with name "CC12345 - SC45678 - The big company coorp", instead of "The big company coorp".
+AddRefInList=Visa kund- / leverantörreferens i lista (välj lista eller combobox) och del av hyperlink. Tredjepart visas med namn "CC12345 - SC45678 - Stor AB" istället för "Stor AB".
FieldEdition=Edition av fält %s
FixTZ=Timezone fix
FillThisOnlyIfRequired=Exempel: +2 (fyll endast om tidszon offset problem är erfarna)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=En rad av produkt / tjänst med en nolla belopp anses
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
##### Orders #####
OrdersSetup=Beställ ledning setup
OrdersNumberingModules=Beställningar numrering moduler
@@ -1161,7 +1188,7 @@ ValidOrderAfterPropalClosed=Att godkänna beställningen efter förslaget närma
FreeLegalTextOnOrders=Fri text på order
WatermarkOnDraftOrders=Vattenstämpel på utkast till beställningar (ingen om tom)
ShippableOrderIconInList=Lägg en ikon i Order lista som anger om beställningen är shippable
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fråga om målbankkonto för order
##### Clicktodial #####
ClickToDialSetup=Klicka för att Dial modul setup
ClickToDialUrlDesc=Url anropas när ett klick på telefon picto görs. I URL kan du använda taggar
__PHONETO__ Som kommer att ersättas med telefonnumret för personen att ringa
__PHONEFROM__ Som ska ersättas med telefonnummer att ringa person (er)
__LOGIN__ Som ska ersättas med clicktodial inloggning (definierad på ditt användarnamn kort)
__PASS__ Som ska ersättas med ditt clicktodial lösenord (definierad på ditt användarnamn kort).
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode av typ UPC
BarcodeDescISBN=Barcode av typ ISBN
BarcodeDescC39=Streckkod av typen C39
BarcodeDescC128=Barcode av typ C128
-GenbarcodeLocation=Bar kodgenerering kommandoradsverktyg (som används av phpbarcode motor för vissa typer streckkod)
+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
BarcodeInternalEngine=Intern motor
BarCodeNumberManager=Manager för att automatiskt definiera streckkodsnummer
##### Prelevements #####
@@ -1397,7 +1424,7 @@ RSSUrlExample=En intressant RSS-flöde
MailingSetup=E-post modul setup
MailingEMailFrom=Avsändare Epost (från) för e-post skickas via e-post modul
MailingEMailError=Retur-e (fel-till) för e-post med fel
-MailingDelay=Seconds to wait after sending next message
+MailingDelay=Sekunder fördröjning efter sändning av nästa meddelande
##### Notification #####
NotificationSetup=EMail modul anmälan inställnings
NotificationEMailFrom=Avsändare Epost (från) för e-post som skickas till anmälningar
@@ -1407,9 +1434,9 @@ FixedEmailTarget=Fast e målet
SendingsSetup=Sända modul setup
SendingsReceiptModel=Att skicka kvitto modell
SendingsNumberingModules=Sänts numrering moduler
-SendingsAbility=Support shipment sheets for customer deliveries
+SendingsAbility=Stöd fraktsedlar för kundleveranser.
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=Free text on shipments
+FreeLegalTextOnShippings=Fritext på fraktsedlar
##### Deliveries #####
DeliveryOrderNumberingModules=Produkter leveranser kvitto numrering modul
DeliveryOrderModel=Produkter leveranser kvitto modell
@@ -1420,7 +1447,7 @@ AdvancedEditor=Avancerad redaktör
ActivateFCKeditor=Aktivera FCKeditor för:
FCKeditorForCompany=WYSIWYG skapande / upplaga av Companie beskrivning och notera
FCKeditorForProduct=WYSIWYG skapande / upplaga av produkter / tjänster: s beskrivning och anteckning
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formating when building PDF files.
+FCKeditorForProductDetails=WYSIWYG skapande / redigering av artikeldetaljrader för alla enheter (offertar, order, fakturor mm). Varning: Användning av detta alternativ är inte rekommenderat då det kan leda till problem med speciella tecken och sidformatering vid framställning av PDF-filer.
FCKeditorForMailing= WYSIWYG skapande / utgåva av försändelser
FCKeditorForUserSignature=WYSIWYG skapande / upplaga av signatur
FCKeditorForMail=WYSIWYG skapande / utgåva för alla mail (utom Outils-> mejla)
@@ -1501,9 +1528,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=Inaktivera lager minskning när en sälja görs från Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=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 batch management
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
@@ -1568,4 +1596,8 @@ SalariesSetup=Inställning av modul löner
SortOrder=Sorteringsordning
Format=Format
TypePaymentDesc=0: Kundbetalning typ, 1: Leverantörsbetalnings typ, 2: Både kunder och leverantörer betalnings typ
-IncludePath=Include path (defined into variable %s)
+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.
diff --git a/htdocs/langs/sv_SE/agenda.lang b/htdocs/langs/sv_SE/agenda.lang
index 8d888af7945..fce76b40e62 100644
--- a/htdocs/langs/sv_SE/agenda.lang
+++ b/htdocs/langs/sv_SE/agenda.lang
@@ -58,9 +58,9 @@ OrderSentByEMail=Kundorderprojekt %s via e-post
InvoiceSentByEMail=Kundfaktura %s via e-post
SupplierOrderSentByEMail=Leverantör beställa %s via e-post
SupplierInvoiceSentByEMail=Leverantörsfaktura %s via e-post
-ShippingSentByEMail=Shipment %s sent by EMail
-ShippingValidated= Shipment %s validated
-InterventionSentByEMail=Intervention %s sent by EMail
+ShippingSentByEMail=Leverans %s skickat per epost
+ShippingValidated= Leverans %s validerad
+InterventionSentByEMail=Ärende %s skickat per epost
NewCompanyToDolibarr= Tredje part har skapats
DateActionPlannedStart= Planerat startdatum
DateActionPlannedEnd= Planerat slutdatum
@@ -69,7 +69,7 @@ DateActionDoneEnd= Real slutdatum
DateActionStart= Startdatum
DateActionEnd= Slutdatum
AgendaUrlOptions1=Du kan också lägga till följande parametrar för att filtrera utgång:
-AgendaUrlOptions2=login=%s to restrict output to actions created by or assigned to user %s.
+AgendaUrlOptions2=login=%s för att begränsa utdata till händelser skapade av eller tilldelade användare %s.
AgendaUrlOptions3=Logina =%s att begränsa produktionen till åtgärder som ägs av en användare%s.
AgendaUrlOptions4=logint = %s att begränsa produktionen till handlande påverkade användarnas %s.
AgendaUrlOptionsProject=projekt = PROJECT_ID att begränsa produktionen till åtgärder i samband med projektet PROJECT_ID.
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index ad874db18e7..2f6dc103262 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -8,7 +8,7 @@ FinancialAccount=Konto
FinancialAccounts=Konton
BankAccount=Bankkonto
BankAccounts=Bankkonton
-ShowAccount=Show Account
+ShowAccount=Visa konto
AccountRef=Finansiell balans ref
AccountLabel=Finansiell balans etikett
CashAccount=Cash konto
@@ -33,7 +33,11 @@ AllTime=Från början
Reconciliation=Avstämning
RIB=Bankkontonummer
IBAN=IBAN-nummer
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT nummer
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Stående order
StandingOrder=Stående order
Withdrawals=Uttag
@@ -148,7 +152,7 @@ BackToAccount=Tillbaka till konto
ShowAllAccounts=Visa för alla konton
FutureTransaction=Transaktioner i Futur. Inget sätt att blidka.
SelectChequeTransactionAndGenerate=Välj / Filtret kontrollerar att inkludera i kontrollen insättning kvittot och klicka på "Skapa".
-InputReceiptNumber=Välj kontoutdrag samband med förlikningen. Använd en sorterbar numeriskt värde (t.ex., ÅÅÅÅMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Så småningom, ange en kategori där för att klassificera de register
ToConciliate=För att förena?
ThenCheckLinesAndConciliate=Kontrollera sedan linjerna som finns i kontoutdraget och klicka
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 58ce46d83f5..2228c0a85ef 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -1,16 +1,16 @@
# Dolibarr language file - Source file is en_US - bills
Bill=Faktura
Bills=Fakturor
-BillsCustomers=Customers invoices
-BillsCustomer=Customers invoice
-BillsSuppliers=Suppliers invoices
-BillsCustomersUnpaid=Unpaid customers invoices
+BillsCustomers=Kundfakturor
+BillsCustomer=Kundfaktura
+BillsSuppliers=Leverantörsfakturor
+BillsCustomersUnpaid=Obetalda kundfakturor
BillsCustomersUnpaidForCompany=Obetalda kundens fakturor för %s
BillsSuppliersUnpaid=Obetalda leverantörs fakturor
BillsSuppliersUnpaidForCompany=Obetald leverantörens fakturor för %s
BillsLate=Sena betalningar
-BillsStatistics=Customers invoices statistics
-BillsStatisticsSuppliers=Suppliers invoices statistics
+BillsStatistics=Kundfakturor statistik
+BillsStatisticsSuppliers=Leverantörsfakturor statistik
DisabledBecauseNotErasable=Inaktiverats på grund kan inte raderas
InvoiceStandard=Standard faktura
InvoiceStandardAsk=Standard faktura
@@ -389,7 +389,7 @@ DisabledBecausePayments=Inte möjlig eftersom det inte finns några betalningar
CantRemovePaymentWithOneInvoicePaid=Kan inte ta bort betalning eftersom det inte finns åtminstone på fakturan klassificeras betalt
ExpectedToPay=Förväntad utbetalning
PayedByThisPayment=Betalas av denna betalning
-ClosePaidInvoicesAutomatically=Classify "Paid" all standard, situation or replacement invoices entirely paid.
+ClosePaidInvoicesAutomatically=Klassificera "Betald" alla standard-, löpande och ersättningsfakturor som är fullständigt betalda.
ClosePaidCreditNotesAutomatically=Beteckna "Betalda" alla fullständigt återbetalda kreditnotor.
AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstående att betala kommer automatiskt stängd för status "betald".
ToMakePayment=Betala
@@ -412,19 +412,19 @@ TypeContact_invoice_supplier_external_BILLING=Leverantörsfaktura kontakt
TypeContact_invoice_supplier_external_SHIPPING=Leverantör Frakt Kontakta
TypeContact_invoice_supplier_external_SERVICE=Leverantör tjänst kontakt
# Situation invoices
-InvoiceFirstSituationAsk=First situation invoice
-InvoiceFirstSituationDesc=The situation invoices are tied to situations related to a progression, for example the progression of a construction. Each situation is tied to an invoice.
-InvoiceSituation=Situation invoice
-InvoiceSituationAsk=Invoice following the situation
-InvoiceSituationDesc=Create a new situation following an already existing one
-SituationAmount=Situation invoice amount(net)
-SituationDeduction=Situation subtraction
-Progress=Progress
-ModifyAllLines=Modify all lines
-CreateNextSituationInvoice=Create next situation
-NotLastInCycle=This invoice in not the last in cycle and must not be modified.
-DisabledBecauseNotLastInCycle=The next situation already exists.
-DisabledBecauseFinal=This situation is final.
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No opened situations
-InvoiceSituationLast=Final and general invoice
+InvoiceFirstSituationAsk=Första löpande faktura
+InvoiceFirstSituationDesc=Löpande fakturor avser delfakturor vid pågående arbeten, t.ex. vid ett bygge.
+InvoiceSituation=Löpande faktura
+InvoiceSituationAsk=Faktura på löpande räkning
+InvoiceSituationDesc=Skapa en avstämning / faktura på löpande räkning, följande en tidigare
+SituationAmount=Löpande faktura belopp (netto)
+SituationDeduction=Löpande räkning avdrag
+Progress=Framsteg
+ModifyAllLines=Ändra alla rader
+CreateNextSituationInvoice=Skapa nästa löpande faktura
+NotLastInCycle=Denna faktura är inte den sista i en serie och får inte ändras.
+DisabledBecauseNotLastInCycle=Påföljande avstämning finns redan.
+DisabledBecauseFinal=Denna avstämning är slutlig.
+CantBeLessThanMinPercent=Framsteget kan inte vara mindre än dess värde vid förra avstämningen.
+NoSituations=Inga öppnade löpande räkningar
+InvoiceSituationLast=Slutlig sammanställningsfaktura.
diff --git a/htdocs/langs/sv_SE/commercial.lang b/htdocs/langs/sv_SE/commercial.lang
index 4e4fd7f51aa..350e80a0cb9 100644
--- a/htdocs/langs/sv_SE/commercial.lang
+++ b/htdocs/langs/sv_SE/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Kontakta gjort
DateActionPlanned=Datum planerade åtgärder för
DateActionDone=Datum insatser görs
ActionAskedBy=Åtgärd bad
-ActionAffectedTo=Händelse som ägs av
+ActionAffectedTo=Event assigned to
ActionDoneBy=Åtgärder som utförs av
ActionUserAsk=Registrerats av
ErrorStatusCantBeZeroIfStarted=Om fältet "Datum gjort" är fylld, är arbetet igång (eller färdiga), så fältet "Status" kan inte 0%%.
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 9c425408904..f412350b869 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -29,7 +29,7 @@ ReportTurnover=Omsättning
PaymentsNotLinkedToInvoice=Betalningar inte kopplade till någon faktura, så inte är kopplade till någon tredje part
PaymentsNotLinkedToUser=Betalningar inte är kopplade till alla användare
Profit=Resultat
-AccountingResult=Accounting result
+AccountingResult=Bokföring resultat
Balance=Balans
Debit=Debet
Credit=Credit
diff --git a/htdocs/langs/sv_SE/contracts.lang b/htdocs/langs/sv_SE/contracts.lang
index 8fc4e33c6e3..3d72d8709f1 100644
--- a/htdocs/langs/sv_SE/contracts.lang
+++ b/htdocs/langs/sv_SE/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Utgångna
ServiceStatusClosed=Stängt
ServicesLegend=Tjänster legend
Contracts=Kontrakt
+ContractsAndLine=Contracts and line of contracts
Contract=Kontrakt
NoContracts=Inga kontrakt
MenuServices=Tjänster
diff --git a/htdocs/langs/sv_SE/cron.lang b/htdocs/langs/sv_SE/cron.lang
index dda29874c43..1bb38438cc9 100644
--- a/htdocs/langs/sv_SE/cron.lang
+++ b/htdocs/langs/sv_SE/cron.lang
@@ -14,8 +14,8 @@ URLToLaunchCronJobs=URL för att kontrollera och starta cron-jobb om det behövs
OrToLaunchASpecificJob=Eller för att kontrollera och starta ett specifikt arbete
KeyForCronAccess=Säkerhetsnyckel för URL för att lansera cron-jobb
FileToLaunchCronJobs=Kommandorad för att starta cron jobb
-CronExplainHowToRunUnix=On Unix environment you should use the following crontab entry to run the command line each 5 minutes
-CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
+CronExplainHowToRunUnix=I en Unix-miljö bör följande rad läggas i crontab så kommandot exekveras var 5:e minut.
+CronExplainHowToRunWin=I Microsoft(tm) Windows-miljö kan schemalagd aktivitet användas för att exekvera kommandoraden var 5:e minut
# Menu
CronJobs=Schemalagda jobb
CronListActive=Lista över aktiva / schemalagda jobb
@@ -84,3 +84,4 @@ CronType_command=Skalkommando
CronMenu=Cron
CronCannotLoadClass=Det går inte att läsa in klassen% s eller objekt% s
UseMenuModuleToolsToAddCronJobs=Gå in på menyn "Home - Moduler verktyg - Job list" för att se och redigera schemalagda jobb.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index d257d6e4f60..19b3f75848e 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -43,8 +43,8 @@ ECMDocsByContracts=Handlingar som är kopplade till kontrakt
ECMDocsByInvoices=Dokument med koppling till kunderna fakturor
ECMDocsByProducts=Dokument med koppling till produkter
ECMDocsByProjects=Handlingar som är kopplade till projekt
-ECMDocsByUsers=Documents linked to users
-ECMDocsByInterventions=Documents linked to interventions
+ECMDocsByUsers=Dokument länkade till användare
+ECMDocsByInterventions=Dokument länkade till ärenden
ECMNoDirectoryYet=Ingen katalog skapas
ShowECMSection=Visa katalog
DeleteSection=Ta bort katalog
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 06034972e09..2dfe10cfa08 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Källa och mål bankkonton måste vara olika.
ErrorBadThirdPartyName=Felaktigt värde för tredje part namn
ErrorProdIdIsMandatory=%s är obligatoriskt
ErrorBadCustomerCodeSyntax=Dålig syntax för kundkod
-ErrorBadBarCodeSyntax=Dålig syntax för streckkod
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Kunden som erfordras
ErrorBarCodeRequired=Streckkod krävs
ErrorCustomerCodeAlreadyUsed=Kund-kod som används redan
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript måste inte avaktiveras att ha denna fun
ErrorPasswordsMustMatch=Båda skrivit lösenord måste matcha varandra
ErrorContactEMail=Ett tekniskt fel uppstod. Vänligen kontakta administratören att följa e-%s en ge %s felkod i ditt meddelande, eller ännu bättre genom att lägga till en skärm kopia av denna sida.
ErrorWrongValueForField=Felaktigt värde för antalet %s området (värde "%s" inte matchar regex regel %s)
-ErrorFieldValueNotIn=Fel värde för %s fältnummer (värde "%s" är inte ett värde tillgängligt i fält %s av tabell %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Fel värde för %s fältnummer (värde "%s" är inte ett %s befintlig ref)
ErrorsOnXLines=Fel på %s källrader
ErrorFileIsInfectedWithAVirus=Antivirusprogrammet inte har kunnat validera (fil kan vara smittade av ett virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internt fel '%s'
ErrorPriceExpressionUnknown=Okänt fel '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Obligatoriska inställningsparametrarna har ännu inte definierat
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index 385ac6e854c..c5380d1f831 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -155,7 +155,8 @@ MigrationFinished=Migration färdiga
LastStepDesc=Sista steget: Definiera här login och lösenord som du planerar att använda för att ansluta till programmet. Tappa inte detta eftersom det är det konto för att administrera alla andra.
ActivateModule=Aktivera modul %s
ShowEditTechnicalParameters=Klicka här för att visa / redigera avancerade parametrar (expertläge)
-WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+WarningUpgrade=Varning:\nHar du säkerhetskopierat databasen?\nDet är starkt rekommenderat att säkerhetskopiera databasen. På grund av fel i databassystemen (t.ex. mysql version 5.5.40) kan tabeller gå förlorade. Det är därför rekommenderat att ta en full dump av databasen innan migreringen påbörjas.\n\nKlicka OK för att starta migreringen...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
@@ -207,7 +208,7 @@ MigrationProjectTaskTime=Uppdatera tid i sekunder
MigrationActioncommElement=Uppdatera uppgifter om åtgärder
MigrationPaymentMode=Datamigrering betalning mode
MigrationCategorieAssociation=Migreringskategorier
-MigrationEvents=Migration of events to add event owner into assignement table
+MigrationEvents=Överföring av händelser för att lägga till händelseägaren i uppdragslista
ShowNotAvailableOptions=Visa ej tillgängliga val
HideNotAvailableOptions=Dölj ej tillgängliga val
diff --git a/htdocs/langs/sv_SE/languages.lang b/htdocs/langs/sv_SE/languages.lang
index 6c909af19fd..031b70fc398 100644
--- a/htdocs/langs/sv_SE/languages.lang
+++ b/htdocs/langs/sv_SE/languages.lang
@@ -13,7 +13,7 @@ Language_de_AT=Tyska (Österrike)
Language_de_CH=Tyska (Schweiz)
Language_el_GR=Grekiska
Language_en_AU=Engelska (Australien)
-Language_en_CA=English (Canada)
+Language_en_CA=Engelska (Kanada)
Language_en_GB=Engelska (Storbritannien)
Language_en_IN=Engelska (Indien)
Language_en_NZ=Engelska (Nya Zeeland)
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index eaaca274910..2c1bb7d593e 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=yyyy-MM-dd
FormatDateShortJavaInput=yyyy-MM-dd
FormatDateShortJQuery=yy-mm-dd
FormatDateShortJQueryInput=yy-mm-dd
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=tt:mm
FormatHourShort=%H:%M
FormatHourShortDuration=%H:%M
FormatDateTextShort=%b %d %Y
@@ -62,7 +62,7 @@ ErrorFailedToSaveFile=Fel, kunde inte spara filen.
SetDate=Ställ in datum
SelectDate=Välj datum
SeeAlso=Se även %s
-SeeHere=See here
+SeeHere=Se hänvisning
BackgroundColorByDefault=Standard bakgrundsfärg
FileNotUploaded=Filen har inte laddats upp
FileUploaded=Filen har laddats upp
@@ -141,6 +141,7 @@ Cancel=Avbryt
Modify=Ändra
Edit=Redigera
Validate=Validera
+ValidateAndApprove=Validate and Approve
ToValidate=Att validera
Save=Spara
SaveAs=Spara som
@@ -158,6 +159,7 @@ Search=Sök
SearchOf=Sök
Valid=Giltig
Approve=Godkänn
+Disapprove=Disapprove
ReOpen=Öppnar igen
Upload=Skicka fil
ToLink=Länk
@@ -171,7 +173,7 @@ User=Användare
Users=Användare
Group=Grupp
Groups=Grupper
-NoUserGroupDefined=No user group defined
+NoUserGroupDefined=Ingen användargrupp är definerad
Password=Lösenord
PasswordRetype=Ange ditt lösenord
NoteSomeFeaturesAreDisabled=Observera att en hel del funktioner / moduler är inaktiverade i denna demonstration.
@@ -219,6 +221,7 @@ Cards=Kort
Card=Kort
Now=Nu
Date=Datum
+DateAndHour=Date and hour
DateStart=Startdatum
DateEnd=Slutdatum
DateCreation=Datum för skapande
@@ -261,7 +264,7 @@ days=dagar
Hours=Timmar
Minutes=Minuter
Seconds=Sekunder
-Weeks=Weeks
+Weeks=Veckor
Today=I dag
Yesterday=I går
Tomorrow=I morgon
@@ -295,6 +298,7 @@ UnitPriceHT=Pris per enhet (netto)
UnitPriceTTC=Pris per enhet
PriceU=Styckpris
PriceUHT=St.pris(net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=St.pris
Amount=Belopp
AmountInvoice=Fakturabelopp
@@ -521,6 +525,7 @@ DateFromTo=Från %s till %s
DateFrom=Från %s
DateUntil=Fram %s
Check=Kontrollera
+Uncheck=Uncheck
Internal=Interna
External=Extern
Internals=Interna
@@ -687,7 +692,8 @@ XMoreLines=%s rader osynliga
PublicUrl=Offentlig webbadress
AddBox=Lägg till låda
SelectElementAndClickRefresh=Välj ett element och klicka på uppdatera
-PrintFile=Print File %s
+PrintFile=Skriv ut fil %s
+ShowTransaction=Show transaction
# Week day
Monday=Måndag
Tuesday=Tisdag
diff --git a/htdocs/langs/sv_SE/orders.lang b/htdocs/langs/sv_SE/orders.lang
index 9cc8eb7d001..6b67e495d3f 100644
--- a/htdocs/langs/sv_SE/orders.lang
+++ b/htdocs/langs/sv_SE/orders.lang
@@ -16,20 +16,20 @@ SupplierOrder=Leverantör för
SuppliersOrders=Leverantörens order
SuppliersOrdersRunning=Nuvarande leverantörens order
CustomerOrder=Kundorder
-CustomersOrders=Customers orders
+CustomersOrders=Kundorder
CustomersOrdersRunning=Nuvarande kundens order
CustomersOrdersAndOrdersLines=Kundorder och ordning: s linjer
-OrdersToValid=Customers orders to validate
-OrdersToBill=Customers orders delivered
-OrdersInProcess=Customers orders in process
-OrdersToProcess=Customers orders to process
+OrdersToValid=Kundorder att validera
+OrdersToBill=Levererade kundorder
+OrdersInProcess=Kundorder under behandling
+OrdersToProcess=Kundorder att behandla
SuppliersOrdersToProcess=Leverantörens order att behandla
StatusOrderCanceledShort=Annullerad
StatusOrderDraftShort=Förslag
StatusOrderValidatedShort=Validerad
StatusOrderSentShort=I processen
StatusOrderSent=Sändning pågår
-StatusOrderOnProcessShort=Ordered
+StatusOrderOnProcessShort=Beställda
StatusOrderProcessedShort=Bearbetade
StatusOrderToBillShort=Till Bill
StatusOrderToBill2Short=Till Bill
@@ -41,7 +41,8 @@ StatusOrderReceivedAllShort=Allt fick
StatusOrderCanceled=Annullerad
StatusOrderDraft=Utkast (måste valideras)
StatusOrderValidated=Validerad
-StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcess=Beställda, väntar på inleverans
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Bearbetade
StatusOrderToBill=Till Bill
StatusOrderToBill2=Till Bill
@@ -50,14 +51,15 @@ StatusOrderRefused=Refused
StatusOrderReceivedPartially=Delvis fått
StatusOrderReceivedAll=Allt fick
ShippingExist=En sändning föreligger
-ProductQtyInDraft=Product quantity into draft orders
-ProductQtyInDraftOrWaitingApproved=Product quantity into draft or approved orders, not yet ordered
+ProductQtyInDraft=Produktmängd till beställningsutkast
+ProductQtyInDraftOrWaitingApproved=Produktmnängd till beställningsutkast eller godkända beställningar, ännu ej lagda
DraftOrWaitingApproved=Förslag eller godkänts ännu ej beställas
DraftOrWaitingShipped=Förslag eller godkännas ännu inte sändas
MenuOrdersToBill=Order till faktura
MenuOrdersToBill2=Fakturerbara order
SearchOrder=Sök ordning
SearchACustomerOrder=Sök en kundorder
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship produkt
Discount=Rabatt
CreateOrder=Skapa ordning
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index 326d05f3b36..3144d5f7412 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximal storlek
AttachANewFile=Bifoga en ny fil / dokument
LinkedObject=Länkat objekt
Miscellaneous=Diverse
-NbOfActiveNotifications=Antal anmälningar
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Detta är en test post. \nDet två linjerna är åtskilda av en vagnretur.\n\n__SIGNATURE__
PredefinedMailTestHtml=Detta är en test post (ordet Provningen skall i fetstil).
De två linjerna är åtskilda av en vagnretur.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Vi vill varna er att fakturan __FACREF__ tycks inte betalt. Så detta är fakturan i bilagan igen, som en påminnelse. __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ \nHär hittar du det kommersiella förslaget __PROPREF__\n__PERSONALIZED__mvh\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Här hittar ordern __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Här hittar du vår ordning __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Här hittar du fakturan __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
diff --git a/htdocs/langs/sv_SE/productbatch.lang b/htdocs/langs/sv_SE/productbatch.lang
index 97c10290bfe..df95cb13bea 100644
--- a/htdocs/langs/sv_SE/productbatch.lang
+++ b/htdocs/langs/sv_SE/productbatch.lang
@@ -1,16 +1,16 @@
# ProductBATCH language file - en_US - ProductBATCH
-ManageLotSerial=Use batch/serial number
-ProductStatusOnBatch=Yes (Batch/serial required)
-ProductStatusNotOnBatch=No (Batch/serial not used)
-ProductStatusOnBatchShort=Yes
-ProductStatusNotOnBatchShort=No
+ManageLotSerial=Använd batch- / serienummer
+ProductStatusOnBatch=Ja (batch- / serienr krävs)
+ProductStatusNotOnBatch=Nej (batch- / serienr används inte)
+ProductStatusOnBatchShort=Ja
+ProductStatusNotOnBatchShort=Nej
Batch=Batch / Serial
atleast1batchfield=Ät före-datum eller bäst före-datum eller batchnummer
batch_number=Batch / Serienummer
l_eatby=Ät efter datum
l_sellby=Sälj före-datum
DetailBatchNumber=Batch / Serial detaljer
-DetailBatchFormat=Batch / Serial: %s - E:%s - S:%s (Antal: %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Sats: %s
printEatby=Äter med:%s
printSellby=Sälj-med :%s
@@ -18,4 +18,4 @@ printQty=Antal: %d
AddDispatchBatchLine=Lägg en linje för Hållbarhet avsändning
BatchDefaultNumber=Odefinierat
WhenProductBatchModuleOnOptionAreForced=När modulen Batch / Serial är på, öka / minska aktieläget tvingas senaste val och kan inte redigeras. Andra alternativ kan definieras som du vill.
-ProductDoesNotUseBatchSerial=This product does not use batch/serial number
+ProductDoesNotUseBatchSerial=Denna artikel använder inte batch- / serienummer
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index cce8a3064cc..e8f20528c1c 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -22,16 +22,16 @@ ProductAccountancySellCode=Bokföring kod (sälja)
ProductOrService=Produkt eller tjänst
ProductsAndServices=Produkter och tjänster
ProductsOrServices=Produkter eller tjänster
-ProductsAndServicesOnSell=Products and Services for sale or for purchase
-ProductsAndServicesNotOnSell=Products and Services out of sale
+ProductsAndServicesOnSell=Produkter och tjänster till försäljning eller inköp
+ProductsAndServicesNotOnSell=Utgångna produkter och tjänster m.a.p. försäljning
ProductsAndServicesStatistics=Produkter och tjänster statistik
ProductsStatistics=Produkter statistik
-ProductsOnSell=Product for sale or for pruchase
-ProductsNotOnSell=Product out of sale and out of purchase
-ProductsOnSellAndOnBuy=Products for sale and for purchase
-ServicesOnSell=Services for sale or for purchase
-ServicesNotOnSell=Services out of sale
-ServicesOnSellAndOnBuy=Services for sale and for purchase
+ProductsOnSell=Produkter till försäljning eller inköp
+ProductsNotOnSell=Utgångna produkter m.a.p. försäljning och inköp
+ProductsOnSellAndOnBuy=Produkter till försäljning och inköp
+ServicesOnSell=Tjänster till försäljning eller inköp
+ServicesNotOnSell=Utgångna tjänster m.a.p. försäljning
+ServicesOnSellAndOnBuy=Tjänster till försäljning och inköp
InternalRef=Intern hänvisning
LastRecorded=Senaste produkter / tjänster att sälja in
LastRecordedProductsAndServices=Senaste %s inspelade produkter / tjänster
@@ -198,7 +198,7 @@ HelpAddThisServiceCard=Detta alternativ medger att skapa eller klona en tjänst
CurrentProductPrice=Nuvarande pris
AlwaysUseNewPrice=Använd alltid nuvarande pris för produkt / tjänst
AlwaysUseFixedPrice=Använd fast pris
-PriceByQuantity=Different prices by quantity
+PriceByQuantity=Olika priser m.a.p. mängd
PriceByQuantityRange=Pris för mängdgaffel
ProductsDashboard=Sammanfattning produkter / tjänster
UpdateOriginalProductLabel=Ändra ursprunglig märkning
@@ -234,9 +234,9 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Angivelse av typ och värde för str
BarCodeDataForProduct=Streckkodsinfo för produkt %s:
BarCodeDataForThirdparty=Streckkodsinfo för tredje part %s:
ResetBarcodeForAllRecords=Definiera streckkodsvärde för alla poster (detta kommer även att återställa streckkodsvärden som redan är definierade med nya värden)
-PriceByCustomer=Different price for each customer
+PriceByCustomer=Olika pris m.a.p. kund
PriceCatalogue=Unikt pris för produkt eller tjänst
-PricingRule=Rules for customer prices
+PricingRule=Regler för kundpriser
AddCustomerPrice=Lägg till pris per kund
ForceUpdateChildPriceSoc=Sätt samma pris på kunds filialer
PriceByCustomerLog=Pris per kundlogg
@@ -244,9 +244,13 @@ MinimumPriceLimit=Minimipris kan inte vara lägre än %s
MinimumRecommendedPrice=Minsta rekommenderade priset är : %s
PriceExpressionEditor=Pris uttryck redigerare
PriceExpressionSelected=Valda pris uttryck
-PriceExpressionEditorHelp1="price = 2 + 2" or "2 + 2" for setting the price. Use ; to separate expressions
-PriceExpressionEditorHelp2=You can access ExtraFields with variables like #options_myextrafieldkey#
-PriceExpressionEditorHelp3=In both product/service and supplier prices there are these variables available:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
-PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
+PriceExpressionEditorHelp1="pris = 2 + 2" eller "2 + 2" för att sätta pris. Använd ; för att skilja uttryck
+PriceExpressionEditorHelp2=För att använda ExtraFields använd variabler som #options_myextrafieldkey#
+PriceExpressionEditorHelp3=I både produkt- / tjänste- och leverantörspriser är följande variabler tillgängliga:
#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#
+PriceExpressionEditorHelp4=Endast i produkt- / tjänstepris: #supplier_min_price#
Endast i leverantörspris: #supplier_quantity# och #supplier_tva_tx#
PriceMode=Prisläge
PriceNumeric=Nummer
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index 664a33fd4d5..cdec5ad6557 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -3,13 +3,15 @@ RefProject=Ref. projekt
ProjectId=Projekt Id
Project=Projekt
Projects=Projekt
-ProjectStatus=Project status
+ProjectStatus=Projektstatus
SharedProject=Alla
PrivateProject=Kontakter av projekt
MyProjectsDesc=Denna syn är begränsad till projekt du en kontakt för (allt som är "typ").
ProjectsPublicDesc=Denna uppfattning presenterar alla projekt du har rätt att läsa.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Denna uppfattning presenterar alla projekt (din användarbehörighet tillåta dig att visa allt).
MyTasksDesc=Denna syn är begränsad till projekt eller uppdrag du en kontakt för (allt som är "typ").
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Denna uppfattning presenterar alla projekt och uppgifter som du får läsa.
TasksDesc=Denna uppfattning presenterar alla projekt och uppgifter (din användarbehörighet tillåta dig att visa allt).
ProjectsArea=Projekt område
@@ -29,6 +31,8 @@ NoProject=Inget projekt definieras eller ägs
NbOpenTasks=Nb i öppnade uppgifter
NbOfProjects=Nb av projekt
TimeSpent=Tid som tillbringas
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Tid
RefTask=Ref. uppgift
LabelTask=Label uppgift
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Lista över leverantörens order i samband m
ListSupplierInvoicesAssociatedProject=Lista över leverantörens fakturor i samband med projektet
ListContractAssociatedProject=Förteckning över avtal i samband med projektet
ListFichinterAssociatedProject=Lista över åtgärder i samband med projektet
-ListTripAssociatedProject=Förteckning över resor och kostnader i samband med projektet
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Förteckning över åtgärder i samband med projektet
ActivityOnProjectThisWeek=Aktivitet på projekt den här veckan
ActivityOnProjectThisMonth=Aktivitet på projekt denna månad
@@ -103,7 +107,7 @@ CloneContacts=Klon kontakter
CloneNotes=Klon anteckningar
CloneProjectFiles=Klon projekt fogade filer
CloneTaskFiles=Klon uppgift(er) anslöt filer (om uppgiften(s) klonad)
-CloneMoveDate=Update project/tasks dates from now ?
+CloneMoveDate=Uppdatera projekt- / uppgiftdatum från nu?
ConfirmCloneProject=Är du säker på att klona detta projekt?
ProjectReportDate=Ändra uppgift datum enligt projektets startdatum
ErrorShiftTaskDate=Omöjligt att flytta datum på uppgiften enligt nytt projekt startdatum
@@ -133,3 +137,6 @@ SearchAProject=Sök ett projekt
ProjectMustBeValidatedFirst=Projekt måste valideras först
ProjectDraft=Utkast projekt
FirstAddRessourceToAllocateTime=Associera en resurse att avsätta tid
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/sv_SE/salaries.lang b/htdocs/langs/sv_SE/salaries.lang
index f2fc8c20068..93545569c2f 100644
--- a/htdocs/langs/sv_SE/salaries.lang
+++ b/htdocs/langs/sv_SE/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Löneutbetalningar
ShowSalaryPayment=Visa löneutbetalning
THM=Genomsnitt timpris
TJM=Genomsnittlig dagligt pris
+CurrentSalary=Current salary
diff --git a/htdocs/langs/sv_SE/sendings.lang b/htdocs/langs/sv_SE/sendings.lang
index d723d2da074..1f32d5bebb4 100644
--- a/htdocs/langs/sv_SE/sendings.lang
+++ b/htdocs/langs/sv_SE/sendings.lang
@@ -4,8 +4,8 @@ Sending=Sändning
Sendings=Transporter
Shipment=Sändning
Shipments=Transporter
-ShowSending=Show Sending
-Receivings=Receipts
+ShowSending=Visa skickade
+Receivings=Kvitto
SendingsArea=Transporter område
ListOfSendings=Lista över transporter
SendingMethod=Frakt metod
@@ -15,7 +15,7 @@ SearchASending=Sök efter transport
StatisticsOfSendings=Statistik för transporter
NbOfSendings=Antal transporter
NumberOfShipmentsByMonth=Antal leveranser per månad
-SendingCard=Shipment card
+SendingCard=Fraktkort
NewSending=Ny leverans
CreateASending=Skapa en sändning
CreateSending=Skapa leverans
@@ -23,7 +23,7 @@ QtyOrdered=Antal beställda
QtyShipped=Antal sändas
QtyToShip=Antal till-fartyg
QtyReceived=Antal mottagna
-KeepToShip=Håll dig till fartyg
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Andra sändningar för denna beställning
DateSending=Datum skicka ordning
DateSendingShort=Datum skicka ordning
@@ -38,7 +38,7 @@ StatusSendingCanceledShort=Annullerad
StatusSendingDraftShort=Förslag
StatusSendingValidatedShort=Validerad
StatusSendingProcessedShort=Bearbetade
-SendingSheet=Shipment sheet
+SendingSheet=Packsedel
Carriers=Bärare
Carrier=Carrier
CarriersArea=Bärare område
@@ -59,15 +59,15 @@ SendShippingRef=Inlämning av leveransen %s
ActionsOnShipping=Evenemang på leverans
LinkToTrackYourPackage=Länk till spåra ditt paket
ShipmentCreationIsDoneFromOrder=För närvarande är skapandet av en ny leverans sker från ordern kortet.
-RelatedShippings=Related shipments
+RelatedShippings=Hänförliga leveranser
ShipmentLine=Transport linje
CarrierList=Lista över transportörer
-SendingRunning=Product from ordered customer orders
-SuppliersReceiptRunning=Product from ordered supplier orders
-ProductQtyInCustomersOrdersRunning=Product quantity into opened customers orders
-ProductQtyInSuppliersOrdersRunning=Product quantity into opened suppliers orders
-ProductQtyInShipmentAlreadySent=Product quantity from opended customer order already sent
-ProductQtyInSuppliersShipmentAlreadyRecevied=Product quantity from opened supplier order already received
+SendingRunning=Produkt från beställda kundorder
+SuppliersReceiptRunning=Produkt från beställda leverantörsorder
+ProductQtyInCustomersOrdersRunning=Produktkvantitet till öppnade kundorder
+ProductQtyInSuppliersOrdersRunning=Produktkvantitet till öppnade leverantörsorder
+ProductQtyInShipmentAlreadySent=Produktkvantitet från öppnade kundorder är redan skickade
+ProductQtyInSuppliersShipmentAlreadyRecevied=Produktkvantitet från öppnade leverantörsorder är redan skickade
# Sending methods
SendingMethodCATCH=Fångst av kunden
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index c8c742d154a..ac0a569d542 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -47,9 +47,10 @@ PMPValue=Vägda genomsnittliga priset
PMPValueShort=WAP
EnhancedValueOfWarehouses=Lagervärde
UserWarehouseAutoCreate=Skapa ett lager automatiskt när du skapar en användare
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Sänd kvantitet
-QtyDispatchedShort=Qty dispatched
-QtyToDispatchShort=Qty to dispatch
+QtyDispatchedShort=Antal skickade
+QtyToDispatchShort=Antal att skicka
OrderDispatch=Stock avsändning
RuleForStockManagementDecrease=Regel för lagerminskning
RuleForStockManagementIncrease=Regel för lagerökning
@@ -61,7 +62,7 @@ ReStockOnValidateOrder=Öka befintligt lager vid godkänd leverantörsorder
ReStockOnDispatchOrder=Öka befintligt lager vid manuell sändning till lager, efter mottagande av leverantörsorder
ReStockOnDeleteInvoice=Öka befintligt lager vid radering av faktura
OrderStatusNotReadyToDispatch=Beställningen har ännu inte / inte längre status som tillåter sändning av produkter till lager.
-StockDiffPhysicTeoric=Explanation for difference between physical and theoretical stock
+StockDiffPhysicTeoric=Förklaring för skillnad mellan verkligt och beräknat lagersaldo
NoPredefinedProductToDispatch=Inga fördefinierade produkter för det här objektet. Så ingen sändning till lager krävs.
DispatchVerb=Sändning
StockLimitShort=Gräns för varning
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Lager %s kommer att användas för lagerminskni
WarehouseForStockIncrease=Lager %s kommer att användas för lagerökning
ForThisWarehouse=För detta lager
ReplenishmentStatusDesc=Detta är en lista över allla produkter med lägre lagersaldo än önskat lager (eller lägre än larmvärde om "Endast larm" är markerad). Föreslagen åtgärd är att skapa leverantörsordrar för att fylla på lagren.
-ReplenishmentOrdersDesc=Detta är en lista över alla öppna leverantörsorder
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Påfyllningar
NbOfProductBeforePeriod=Antal av produkt %s i lager före vald period (< %s)
NbOfProductAfterPeriod=Antal av produkt %s i lager efter vald period (> %s)
@@ -118,15 +119,16 @@ MassMovement=Massrörelse
MassStockMovement=Mass lager rörelse
SelectProductInAndOutWareHouse=Välj produkt, antal, ursprungslager och mållager och klicka "%s". När det är gjort för alla lageröverföringar klicka på "%s".
RecordMovement=Spela in överföring
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Kvitton för denna beställning
StockMovementRecorded=Sparade lageröverföringar
RuleForStockAvailability=Regler om krav på lagerhållning
StockMustBeEnoughForInvoice=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i faktura
StockMustBeEnoughForOrder=Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i beställning
StockMustBeEnoughForShipment= Lagernivå måste vara tillräckligt för att lägga produkten / tjänsten i transporten
-MovementLabel=Label of movement
-InventoryCode=Movement or inventory code
-IsInPackage=Contained into package
-ShowWarehouse=Show warehouse
-MovementCorrectStock=Stock content correction for product %s
-MovementTransferStock=Stock transfer of product %s into another warehouse
+MovementLabel=Etikett för lagerrörelse
+InventoryCode=Lagerrörelse- eller inventeringskod
+IsInPackage=Ingår i förpackning
+ShowWarehouse=Visa lagret
+MovementCorrectStock=Lagerrättelse för produkt %s
+MovementTransferStock=Lagerförflyttning av produkt %s till ett annat lager
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/sv_SE/suppliers.lang b/htdocs/langs/sv_SE/suppliers.lang
index 5dd3f4020da..34e27b7955e 100644
--- a/htdocs/langs/sv_SE/suppliers.lang
+++ b/htdocs/langs/sv_SE/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Leverantörer
-Supplier=Leverantör
AddSupplier=Skapa en leverantör
SupplierRemoved=Leverantör bort
SuppliersInvoice=Leverantörer faktura
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Leverantörsfakturor och betalningar
ExportDataset_fournisseur_3=Leverantörs order och orderrader
ApproveThisOrder=Godkänna denna ordning
ConfirmApproveThisOrder=Är du säker på att du vill godkänna att %s?
-DenyingThisOrder=Att förneka denna beställning
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Är du säker på att du vill förneka detta syfte %s?
ConfirmCancelThisOrder=Är du säker på att du vill avbryta denna order %s?
AddCustomerOrder=Skapa kundorder
@@ -42,5 +41,5 @@ NoneOrBatchFileNeverRan=Ingen eller parti %s sprang inte nyligen
SentToSuppliers=Skickas till leverantörer
ListOfSupplierOrders=Lista över leverantörsorder
MenuOrdersSupplierToBill=Leverantörs order att fakturera
-NbDaysToDelivery=Delivery delay in days
-DescNbDaysToDelivery=The biggest delay is display among order product list
+NbDaysToDelivery=Leveransförsening, dagar
+DescNbDaysToDelivery=Den största förseningen visas med produktbeställningslista
diff --git a/htdocs/langs/sv_SE/trips.lang b/htdocs/langs/sv_SE/trips.lang
index 888f20ddd2d..758ffaa367b 100644
--- a/htdocs/langs/sv_SE/trips.lang
+++ b/htdocs/langs/sv_SE/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Resor
-TripsAndExpenses=Resor och kostnader
-TripsAndExpensesStatistics=Resor och kostnader statistik
-TripCard=Trip-kort
-AddTrip=Skapa resa
-ListOfTrips=Förteckning över resor
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Prislista för
-NewTrip=Ny resa
+NewTrip=New expense report
CompanyVisited=Företag / stiftelse besökt
Kilometers=Kilometer
FeesKilometersOrAmout=Belopp eller kilometer
-DeleteTrip=Radera resa
-ConfirmDeleteTrip=Är du säker på att du vill ta bort denna resa?
-TF_OTHER=Andra
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=Förteckning över resor och kostnader
-ExpensesArea=Resor och kostnader område
-SearchATripAndExpense=Sök en resa och kostnader
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Klassificerad 'Återbetalas'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Andra
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/sv_SE/withdrawals.lang b/htdocs/langs/sv_SE/withdrawals.lang
index ee0ceb8ecee..724d7766e0c 100644
--- a/htdocs/langs/sv_SE/withdrawals.lang
+++ b/htdocs/langs/sv_SE/withdrawals.lang
@@ -79,7 +79,7 @@ CreditDate=Krediter på
WithdrawalFileNotCapable=Det går inte att skapa uttags kvitto fil för ditt land %s (ditt land stöds inte)
ShowWithdraw=Visa Dra
IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Om faktura har minst ett uttag betalning som ännu inte behandlats, kommer det inte anges som betalas för att hantera uttag innan.
-DoStandingOrdersBeforePayments=This tab allows you to request a standing order. Once done, go into menu Bank->Withdrawal to manage the standing order. When standing order is closed, payment on invoice will be automatically recorded, and invoice closed if remainder to pay is null.
+DoStandingOrdersBeforePayments=Denna flik ger möjlighet att begära en stående order. Väl utförd, gå till meny Bank->Uttag för att ställa in stående order. När en stående order stängs kommer betalning på faktura att registreras automatiskt och fakturorna att stängas om restbelopp är noll.
WithdrawalFile=Utträde fil
SetToStatusSent=Ställ in på status "File Skickat"
ThisWillAlsoAddPaymentOnInvoice=Detta kommer också att gälla utbetalningar till fakturor och kommer att klassificera dem som "Paid"
diff --git a/htdocs/langs/sv_SE/workflow.lang b/htdocs/langs/sv_SE/workflow.lang
index efefbb03c97..fd2d15713bd 100644
--- a/htdocs/langs/sv_SE/workflow.lang
+++ b/htdocs/langs/sv_SE/workflow.lang
@@ -1,6 +1,6 @@
# Dolibarr language file - Source file is en_US - admin
WorkflowSetup=Arbetsflöde modul konfiguration
-WorkflowDesc=This module is designed to modify the behaviour of automatic actions into application. By default, workflow is opened (you make thing in order you want). You can activate the automatic actions that you are interesting in.
+WorkflowDesc=Denna modul ändrar beteendet av automatiska händelser i tillämpningar. Standardbeteende är att arbetsflöde öppnas (du gör saker i den ordning du vill). Automatiska händelser kan aktiveras för de händelser som önskas.
ThereIsNoWorkflowToModify=Det finns ingen arbetsflöde du kan ändra för modul du har aktiverat.
descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Skapa en kundorder automatiskt efter en kommersiell förslag undertecknas
descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Skapa en kundfaktura automatiskt efter en kommersiell förslag undertecknas
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 2460fb1167f..ed6d1b2709c 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=การพัฒนา
VersionUnknown=ไม่มีข้อมูล
VersionRecommanded=แนะนำ
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/th_TH/banks.lang b/htdocs/langs/th_TH/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/th_TH/banks.lang
+++ b/htdocs/langs/th_TH/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/th_TH/commercial.lang b/htdocs/langs/th_TH/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/th_TH/commercial.lang
+++ b/htdocs/langs/th_TH/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/th_TH/contracts.lang b/htdocs/langs/th_TH/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/th_TH/contracts.lang
+++ b/htdocs/langs/th_TH/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/th_TH/cron.lang b/htdocs/langs/th_TH/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/th_TH/cron.lang
+++ b/htdocs/langs/th_TH/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/th_TH/main.lang b/htdocs/langs/th_TH/main.lang
index e06e7c12e29..18fbfefd1dd 100644
--- a/htdocs/langs/th_TH/main.lang
+++ b/htdocs/langs/th_TH/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/th_TH/orders.lang b/htdocs/langs/th_TH/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/th_TH/orders.lang
+++ b/htdocs/langs/th_TH/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/th_TH/productbatch.lang b/htdocs/langs/th_TH/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/th_TH/productbatch.lang
+++ b/htdocs/langs/th_TH/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/th_TH/salaries.lang b/htdocs/langs/th_TH/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/th_TH/salaries.lang
+++ b/htdocs/langs/th_TH/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/th_TH/sendings.lang b/htdocs/langs/th_TH/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/th_TH/sendings.lang
+++ b/htdocs/langs/th_TH/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/th_TH/suppliers.lang b/htdocs/langs/th_TH/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/th_TH/suppliers.lang
+++ b/htdocs/langs/th_TH/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/th_TH/trips.lang b/htdocs/langs/th_TH/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/th_TH/trips.lang
+++ b/htdocs/langs/th_TH/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 221e8331c9f..17bc48b1142 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Deneysel
VersionDevelopment=Geliştirme
VersionUnknown=Bilinmeyen
VersionRecommanded=Önerilen
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Oturum Kimliği
SessionSaveHandler=Oturum kayıt yürütücüsü
SessionSavePath=Oturum kayıt konumu
@@ -493,10 +498,16 @@ Module600Name=Duyurlar
Module600Desc=Üçüncü parti kişilerine bazı Dolibarr iş etkinlikleriyle ilgili Eposta bildirimleri gönderin (her üçüncü parti için ayarlar tanımlanmıştır)
Module700Name=Bağışlar
Module700Desc=Bağış yönetimi
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis entegrasyonu
Module1400Name=Muhasebe
Module1400Desc=Muhasebe yönetimi (her iki parti için)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Kategoriler
Module1780Desc=Kategori yönetimi (ürünler, tedarikçiler ve müşteriler)
Module2000Name=FCKdüzenleyici (FCKeditor)
@@ -631,7 +642,7 @@ Permission181=Tedarikçi siparişi oku
Permission182=Tedarikçi siparişi oluştur/değiştir
Permission183=Tedarikçi siparişi doğrula
Permission184=Tedarikçi siparişi onayla
-Permission185=Tedarikçi siparişi ver
+Permission185=Order or cancel supplier orders
Permission186=Tedarikçi siparişi al
Permission187=Tedarikçi siparişi kapat
Permission188=Tedarikçi siparişi iptal et
@@ -711,6 +722,13 @@ Permission538=Hizmet dışaaktar
Permission701=Bağış oluştur/değiştir
Permission702=Bağış sil
Permission703=Bağış sil
+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
Permission1001=Stok oku
Permission1002=Depo oluştur/değiştir
Permission1003=Depo sil
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Proxy sunucusunu kullanacak parola
DefineHereComplementaryAttributes=Burada bütün öznitelikleri tanımlayın, yalnızca mevcut varsayılanları değil desteklenmenizi istediğiniz %s leri de.
ExtraFields=Tamamlayıcı öznitelikler
ExtraFieldsLines=Tamamlayıcı öznitelikler (satırlar)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Ek öznitelikler (üçüncüparti)
ExtraFieldsContacts=Ek öznitelikler (kişi/adres)
ExtraFieldsMember=Tamamlayıcı öznitelikler (üye)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Sıfır tutarında olan ürün/hizmet satırını bir
FreeLegalTextOnProposal=Teklifler üzerinde serbest metin
WatermarkOnDraftProposal=Taslak tekliflerde filigran (boşsa yoktur)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Teklif için banka hesabı iste
+##### 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
##### Orders #####
OrdersSetup=Sipariş yönetimi kurulumu
OrdersNumberingModules=Sipariş numaralandırma modülü
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barkod türü UPC
BarcodeDescISBN=Barkod türü ISBN
BarcodeDescC39=Barkod türü C39
BarcodeDescC128=Barkod türü C128
-GenbarcodeLocation=Bar kod oluşturma komut satırı aracı (phpbarcode motoru tarafından bazı barkod tipleri için kullanılır)
+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
BarcodeInternalEngine=İç motor
BarCodeNumberManager=Barkod sayılarını otomatik olarak tanımlayacak yönetici
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Satışlar için kullanılacak varsayılan genel üç
CashDeskBankAccountForSell=Nakit ödemeleri almak için kullanılan varsayılan hesap
CashDeskBankAccountForCheque= Ödemeleri çek ile almak için kullanılan varsayılan hesap
CashDeskBankAccountForCB= Nakit ödemeleri kredi kartıyla almak için kullanılan varsayılan hesap
-CashDeskDoNotDecreaseStock=Satış Noktasından satış yapıldığında stok eksiltilmesini engelle
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Depoyu stok azaltmada kullanmak için zorla ve sınırla
StockDecreaseForPointOfSaleDisabled=Satış Noktasından stok eksiltme engelli
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=Satış Noktasından satış yapılırken stok eksiltilmesini engellemediniz. Bu durumda depo gereklidir.
##### Bookmark #####
BookmarkSetup=Yerimi modülü kurulumu
@@ -1569,3 +1597,7 @@ SortOrder=Sıralama düzeni
Format=Biçim
TypePaymentDesc=0:Müşteri ödeme türü, 1:Tedarikçi ödeme türü, 2:Hem müşteri hem de tedarikçi ödeme türü
IncludePath=Yolu içerir (%s değişlende tanımlanır)
+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.
diff --git a/htdocs/langs/tr_TR/banks.lang b/htdocs/langs/tr_TR/banks.lang
index 45459c215f6..4f843b6a57b 100644
--- a/htdocs/langs/tr_TR/banks.lang
+++ b/htdocs/langs/tr_TR/banks.lang
@@ -33,7 +33,11 @@ AllTime=Başlangıç
Reconciliation=Uzlaşma
RIB=Banka Hesap Numarası
IBAN=IBAN numarası
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT numarası
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Ödeme talimatları
StandingOrder=Ödeme talimatı
Withdrawals=Para çekmeler
@@ -148,7 +152,7 @@ BackToAccount=Hesaba geri dön
ShowAllAccounts=Tüm hesaplar için göster
FutureTransaction=Gelecekteki işlem. Hiçbir şekilde uzlaştırılamaz.
SelectChequeTransactionAndGenerate=Çek tahsilat makbuzunun içereceği çekleri seç/süz ve “Oluştur” a tıkla.
-InputReceiptNumber=Uzlaşma ile ilgili banka hesap özetini seçin. Sıralanabilir bir sayısal değer kullanın (YYYYMM gibi)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Sonunda, kayıtları sınıflandırmak için bir kategori belirtin
ToConciliate=Uzlaştırılacak mı?
ThenCheckLinesAndConciliate=Sonra, banka hesap özetindeki kalemleri işaretleyin ve tıklayın
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index dc040a6d77c..88f8c321083 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -39,7 +39,7 @@ LastDoneTasks=Tamamlanan son %s görev
LastRecordedTasks=Son kaydedilen görevler
LastActionsToDo=Tamamlanmamış son %s en eski işlem
DoneAndToDoActionsFor=%s için tamamlanan ve yapılacak etkinlikler
-DoneAndToDoActions=Tamamlanan ve yapılacak görevler
+DoneAndToDoActions=Tamamlanan ve yapılacak etkinlikler
DoneActions=Tamamlanan etkinlikler
DoneActionsFor=%s için tamamlanan etkinlikler
ToDoActions=Tamamlanmamış etkinlikler
@@ -61,8 +61,8 @@ LastProspectContactInProcess=Kişi işlemde
LastProspectContactDone=Görüşme yapıldı
DateActionPlanned=Planlanan etkinlik tarihi
DateActionDone=Etkinliğin yapıldığı tarih
-ActionAskedBy=Etkinliği sunan
-ActionAffectedTo=Etkinlik sahibi
+ActionAskedBy=Etkinliği bildiren
+ActionAffectedTo=Event assigned to
ActionDoneBy=Etkinliği yapan
ActionUserAsk=Raporlayan
ErrorStatusCantBeZeroIfStarted=Eğer Yapıldığı tarih alanı doluysa, etkinlik başlamıştır (veya bitmiştir), bu durumda 'Durum' alanı 0%% olamaz.
@@ -81,7 +81,7 @@ ActionAC_SHIP=Sevkiyatı postayla gönder
ActionAC_SUP_ORD=Tedarikçi siparişini postayla gönder
ActionAC_SUP_INV=Tedarikçi faturasını postayla gönder
ActionAC_OTH=Diğer
-ActionAC_OTH_AUTO=Diğer otomatikman eklenen etkinlikler)
+ActionAC_OTH_AUTO=Diğer (otomatikman eklenen etkinlikler)
ActionAC_MANUAL=Elle eklenen etkinlikler
ActionAC_AUTO=Otomatikman eklenen etkinlikler
Stats=Satış istatistikleri
@@ -92,5 +92,5 @@ RecapAnnee=Yıl özeti
NoData=Veri yok
StatusProsp=Aday durumu
DraftPropals=Taslak teklifler
-SearchPropal=Bir teklif ara
+SearchPropal=Teklif ara
CommercialDashboard=Ticaret özeti
diff --git a/htdocs/langs/tr_TR/contracts.lang b/htdocs/langs/tr_TR/contracts.lang
index 69cb8b4606c..ef18a5fb522 100644
--- a/htdocs/langs/tr_TR/contracts.lang
+++ b/htdocs/langs/tr_TR/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Süresi dolmuş
ServiceStatusClosed=Kapalı
ServicesLegend=Hizmetler göstergesi
Contracts=Sözleşmeler
+ContractsAndLine=Contracts and line of contracts
Contract=Sözleşme
NoContracts=Sözleşme yok
MenuServices=Hizmetler
diff --git a/htdocs/langs/tr_TR/cron.lang b/htdocs/langs/tr_TR/cron.lang
index 7dc15f232c9..3a55dd2b134 100644
--- a/htdocs/langs/tr_TR/cron.lang
+++ b/htdocs/langs/tr_TR/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Kabuk komutu
CronMenu=Kron
CronCannotLoadClass=%s sınıfı ya da %s nesnesi yüklenemiyor
UseMenuModuleToolsToAddCronJobs=Planlı işleri görmek ve düzenlemek için "Giriş - Modül araçları - İş listesi" menüsüne gidin.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index e4e9eb9eb3c..269f6173807 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıd
ErrorBadThirdPartyName=Üçüncü parti adı için hatalı değer
ErrorProdIdIsMandatory=Bu %s zorunludur
ErrorBadCustomerCodeSyntax=Hatalı müşteri kodu
-ErrorBadBarCodeSyntax=Bar kodu için hatalı sözdizimi
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Müşteri kodu gereklidir
ErrorBarCodeRequired=Bar kod gerekli
ErrorCustomerCodeAlreadyUsed=Müşteri kodu zaten kullanılmış
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Bu özelliğin çalışması için Javascript engel
ErrorPasswordsMustMatch=Her iki yazdığınız şifrenin birbiriyle eşleşmesi gerekir
ErrorContactEMail=Teknik bir hata oluştu. Lütfen, aşağıdaki %s Eposta ile yöneticiye danışın, mesajınızda %s hata kodunu belirtin ve hatta bir ekran görünümünü de eklerseniz daha iyi olur.
ErrorWrongValueForField=%s alan numarası için yanlış değer ('%s' değeri '%s' regex kuralı ile uyuşmuyor)
-ErrorFieldValueNotIn=%s alan numarası için yanlış değer ('%s' değeri %s tablosunun %s alanı için uygun bir değer değildir)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Alan numarası %s için yanlış değer (değer '%s' bir %s ref mevcut değildir)
ErrorsOnXLines=% kaynak satırlarındaki hatalar
ErrorFileIsInfectedWithAVirus=Virüs koruma programı dosyayı doğrulayamıyor (dosyaya bir virüs bulaşmış olabilir)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=İç hata '%s'
ErrorPriceExpressionUnknown=Bilinmeyen hata '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Kaynak ve hedef depolar farklı olmalı
ErrorTryToMakeMoveOnProductRequiringBatchData=Hata, parti/seri bilgisi gerektiren ürün için parti/seri bilgisi olmadan stok hareketi yapılmaya çalışılıyor.
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index cd980985987..731c1b2d344 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Son adım: Burada yazılıma bağlanmayı düşün
ActivateModule=%s modülünü etkinleştir
ShowEditTechnicalParameters=Gelişmiş parametreleri (uzman modu) göstermek/düzenlemek için burayı tıklayın
WarningUpgrade=Uyarı:\nÖnce bir veritabanı yedeklemesi yaptınız mı?\nBu son derece önerilir: örneğin; veritabanı sistemindeki bazı hatalar nedeniyle (örneğin mysql sürüm 5.5.40) bu işlem sırasında bazı veriler ve tablolar kaybolabilir. Bu yüzden taşımaya başlamadan önce veritabanının tam bir dökümünün olması son derece önerilir.\n\nTaşıma işlemini başlatmak için Tamam'a tıklayın...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 204406547b2..36d6a87625e 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -141,6 +141,7 @@ Cancel=İptal
Modify=Değiştir
Edit=Düzenle
Validate=Doğrula
+ValidateAndApprove=Validate and Approve
ToValidate=Doğrulanacak
Save=Kaydet
SaveAs=Farklı kaydet
@@ -158,6 +159,7 @@ Search=Ara
SearchOf=Ara
Valid=Geçerli
Approve=Onayla
+Disapprove=Disapprove
ReOpen=Yeniden aç
Upload=Dosya gönder
ToLink=Bağlantı
@@ -219,6 +221,7 @@ Cards=Kartlar
Card=Kart
Now=Şimdi
Date=Tarih
+DateAndHour=Date and hour
DateStart=Başlama tarihi
DateEnd=Bitiş tarih
DateCreation=Oluşturma tarihi
@@ -295,6 +298,7 @@ UnitPriceHT=Birim fiyat (net)
UnitPriceTTC=Birim fiyat
PriceU=B.F.
PriceUHT=B.F. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=B.F.
Amount=Tutar
AmountInvoice=Fatura tutarı
@@ -521,6 +525,7 @@ DateFromTo=%s den %s e kadar
DateFrom=%s den
DateUntil=%s e Kadar
Check=Denetle
+Uncheck=Uncheck
Internal=İç
External=Dış
Internals=İçler
@@ -688,6 +693,7 @@ PublicUrl=Genel URL
AddBox=Kutu ekle
SelectElementAndClickRefresh=Bir öğe seçin ve Yenile'ye tıkla
PrintFile=%s Dosyasını Yazdır
+ShowTransaction=Show transaction
# Week day
Monday=Pazartesi
Tuesday=Salı
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index 17254bf7a3d..d203ffa5a23 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=İptal edilmiş
StatusOrderDraft=Taslak (doğrulanması gerekir)
StatusOrderValidated=Doğrulanmış
StatusOrderOnProcess=Sipariş edildi - Teslime hazır
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=İşlenmiş
StatusOrderToBill=Teslim edildi
StatusOrderToBill2=Faturalanacak
@@ -58,6 +59,7 @@ MenuOrdersToBill=Teslim edilen siparişler
MenuOrdersToBill2=Faturalanabilir siparişler
SearchOrder=Sipariş ara
SearchACustomerOrder=Müşteri siparişi ara
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ürünü sevket
Discount=İndirim
CreateOrder=Sipariş oluştur
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 666bfc89754..f8f84232e9d 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -54,12 +54,13 @@ MaxSize=Ençok boyut
AttachANewFile=Yeni bir dosya/belge ekle
LinkedObject=Bağlantılı nesne
Miscellaneous=Çeşitli
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayrılmıştır.
PredefinedMailTestHtml=Bu bir deneme postası (deneme sözcüğü koyu olmalı).
İki satır enter tuşu ile ayrılmıştır.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
diff --git a/htdocs/langs/tr_TR/productbatch.lang b/htdocs/langs/tr_TR/productbatch.lang
index e6fc79ade2c..24ea291a110 100644
--- a/htdocs/langs/tr_TR/productbatch.lang
+++ b/htdocs/langs/tr_TR/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Parti/Seri numarası
l_eatby=Son yenme tarihi
l_sellby=Son satış tarihi
DetailBatchNumber=Parti/Seri ayrıntıları
-DetailBatchFormat=Parti/Seri: %s - Y: %s - S: %s (Mik : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Parti: %s
printEatby=Son Yenme: %s
printSellby=Son satış: %s
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 2c3a9bf0d86..fdf8b1a3b98 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=Ürün/hizmet ve tedarikçi fiyatlarının her ikisin
PriceExpressionEditorHelp4=Ürün/hizmet fiyatında yalnızca: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Fiyat biçimi
PriceNumeric=Sayı
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index 208dad079bb..b9531646c0b 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Herkes
PrivateProject=Proje ilgilileri
MyProjectsDesc=Bu görünüm ilgilisi olduğunuz projelerle sınırlıdır (türü ne olursa olsun).
ProjectsPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri içerir.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Bu görünüm tüm projeleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
MyTasksDesc=Bu görünüm ilgilisi olduğunuz projelerle ya da görevlerle sınırlıdır (türü ne olursa olsun).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Bu görünüm okuma izininiz olan tüm projeleri ve görevleri içerir.
TasksDesc=Bu görünüm tüm projeleri ve görevleri içerir (size verilen kullanıcı izinleri her şeyi görmenizi sağlar).
ProjectsArea=Projeler alanı
@@ -29,6 +31,8 @@ NoProject=Tanımlı ya da sahip olunan hiçbir proje yok
NbOpenTasks=Açık görev sayısı
NbOfProjects=Proje sayısı
TimeSpent=Harcanan süre
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Harcanan süre
RefTask=Görev ref.
LabelTask=Görev etiketi
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Proje ile ilgili tedarikçi siparişlerinin
ListSupplierInvoicesAssociatedProject=Proje ile ilgili tedarikçi faturalarının listesi
ListContractAssociatedProject=Proje ile ilgili sözleşmelerin listesi
ListFichinterAssociatedProject=Proje ile ilgili müdahalelerin listesi
-ListTripAssociatedProject=Proje ile ilgili geziler ve giderlerin listesi
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Proje ile ilgili etkinliklerin listesi
ActivityOnProjectThisWeek=Projede bu haftaki etkinlik
ActivityOnProjectThisMonth=Projede bu ayki etkinlik
@@ -133,3 +137,6 @@ SearchAProject=Bir proje ara
ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
ProjectDraft=Taslak projeler
FirstAddRessourceToAllocateTime=Zaman ayırmak için bir kaynak ilişkilendirin
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 61c1db446e8..1d5aa85d140 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Ücret ödemeleri
ShowSalaryPayment=Ücret ödemesi göster
THM=Ortalama saat ücreti
TJM=Ortalama günlük ücret
+CurrentSalary=Current salary
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index c7b30cba846..9a202a374f2 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Sipariş mikt.
QtyShipped=Sevkedilen mikt.
QtyToShip=Sevk edilecek mikt.
QtyReceived=Alınan mikt.
-KeepToShip=Sevkiyat için tut
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Bu sipariş için diğer sevkiyatlar
DateSending=Sipariş gönderme tarihi
DateSendingShort=Sipariş gönderme tarihi
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 4e458e00129..8856d87badd 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Ağırlıklı ortalama fiyat
PMPValueShort=AOF
EnhancedValueOfWarehouses=Depolar değeri
UserWarehouseAutoCreate=Bir kullanıcı oluştururken otomatik olarak bir stok oluştur
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Sevkedilen miktar
QtyDispatchedShort=Dağıtılan mik
QtyToDispatchShort=Dağıtılacak mik
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=%s deposu stok eksiltme için kullanılacaktır
WarehouseForStockIncrease=%s deposu stok arttırma için kullanılacaktır
ForThisWarehouse=Bu depo için
ReplenishmentStatusDesc=Bu liste istenen stoktan daha az stoklu bütün ürünler içindir (ya da eğer onay kutusunda "yalnızca uyarı" işaretliyse, uyarı değerinden az olan) ve bu farkı kapatmanız için tedarikçi siparişi oluşturmanızı önerir.
-ReplenishmentOrdersDesc=Bu liste tüm açık tedarikçi siparişlerinindir
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=İkmal
NbOfProductBeforePeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) önceki miktarıdır
NbOfProductAfterPeriod=Stoktaki %s ürününün, seçilen dönemden (<%s) sonraki miktarıdır
@@ -130,3 +131,4 @@ IsInPackage=Pakette içerilir
ShowWarehouse=Depo göster
MovementCorrectStock=%s ürünü için stok içeriği düzeltmesi
MovementTransferStock=%s ürününün başka bir depoya stok aktarılması
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/tr_TR/suppliers.lang b/htdocs/langs/tr_TR/suppliers.lang
index 585a82d5f80..b4b16859cc1 100644
--- a/htdocs/langs/tr_TR/suppliers.lang
+++ b/htdocs/langs/tr_TR/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Tedarikçiler
-Supplier=Tedarikçi
AddSupplier=Bir tedarikçi oluştur
SupplierRemoved=Tedarikçi kaldırıldı
SuppliersInvoice=Tedarikçi faturası
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Tedarikçi faturaları ve ödemeleri
ExportDataset_fournisseur_3=Tedarikçi siparişleri ve sipariş satırları
ApproveThisOrder=Bu siparişi onayla
ConfirmApproveThisOrder=%s siparişini onaylamak istediğinizden emin misiniz?
-DenyingThisOrder=Bu siparişi reddet
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=%s siparişini reddetmek istediğinizden emin misiniz?
ConfirmCancelThisOrder=%s siparişini iptal etmek istediğinizden emin misiniz?
AddCustomerOrder=Müşteri siparişi oluştur
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index bd709af9859..30c0831f5ac 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Gezi
-Trips=Geziler
-TripsAndExpenses=Geziler ve giderler
-TripsAndExpensesStatistics=Gezi ve gider istatistikleri
-TripCard=Gezi kartı
-AddTrip=Gezi ekle
-ListOfTrips=Gezi listesi
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Ücretler listesi
-NewTrip=Yeni gezi
+NewTrip=New expense report
CompanyVisited=Ziyaret edilen firma/kuruluş
Kilometers=Kilometre
FeesKilometersOrAmout=Tutar ya da kilometre
-DeleteTrip=Gezi sil
-ConfirmDeleteTrip=Bu geziyi silmek istediğinizden emin misiniz?
-TF_OTHER=Diğer
-TF_LUNCH=Öğle yemeği
-TF_TRIP=Gezi
-ListTripsAndExpenses=Geziler ve giderler listesi
-ExpensesArea=Geziler ve giderler alanı
-SearchATripAndExpense=Bir gezi ve gider ara
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Sınıflandırma 'İade edildi'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Diğer
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Öğle yemeği
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index f9049def3dd..c244a6aacf4 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Експериментальна
VersionDevelopment=Розробча
VersionUnknown=Невизначена
VersionRecommanded=Рекомендована
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=ID Сессії
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index 31e70c2b72a..05b5f395001 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 38634cbd497..9782c2ea27f 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Experimental
VersionDevelopment=Development
VersionUnknown=Unknown
VersionRecommanded=Recommended
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Session ID
SessionSaveHandler=Handler to save sessions
SessionSavePath=Storage session localization
@@ -493,10 +498,16 @@ Module600Name=Notifications
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=Donations
Module700Desc=Donation management
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis integration
Module1400Name=Accounting
Module1400Desc=Accounting management (double parties)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Categories
Module1780Desc=Category management (products, suppliers and customers)
Module2000Name=WYSIWYG editor
@@ -631,7 +642,7 @@ Permission181=Read supplier orders
Permission182=Create/modify supplier orders
Permission183=Validate supplier orders
Permission184=Approve supplier orders
-Permission185=Order supplier orders
+Permission185=Order or cancel supplier orders
Permission186=Receive supplier orders
Permission187=Close supplier orders
Permission188=Cancel supplier orders
@@ -711,6 +722,13 @@ Permission538=Export services
Permission701=Read donations
Permission702=Create/modify donations
Permission703=Delete donations
+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
Permission1001=Read stocks
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Password to use the proxy server
DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
ExtraFields=Complementary attributes
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=A line of product/service with a zero amount is consid
FreeLegalTextOnProposal=Free text on commercial proposals
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Order management setup
OrdersNumberingModules=Orders numbering models
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Barcode of type UPC
BarcodeDescISBN=Barcode of type ISBN
BarcodeDescC39=Barcode of type C39
BarcodeDescC128=Barcode of type C128
-GenbarcodeLocation=Bar code generation command line tool (used by internal engine for some bar code types)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Default account to use to receive cash payments
CashDeskBankAccountForCheque= Default account to use to receive payments by cheque
CashDeskBankAccountForCB= Default account to use to receive payments by credit cards
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Bookmark module setup
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 10a5f5b3c14..a2306950fb4 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=Reconciliation
RIB=Bank Account Number
IBAN=IBAN number
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC/SWIFT number
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Standing orders
StandingOrder=Standing order
Withdrawals=Withdrawals
@@ -148,7 +152,7 @@ BackToAccount=Back to account
ShowAllAccounts=Show for all accounts
FutureTransaction=Transaction in futur. No way to conciliate.
SelectChequeTransactionAndGenerate=Select/filter checks to include into the check deposit receipt and click on "Create".
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/uz_UZ/commercial.lang b/htdocs/langs/uz_UZ/commercial.lang
index e7d2de76503..7acdc7bd7e6 100644
--- a/htdocs/langs/uz_UZ/commercial.lang
+++ b/htdocs/langs/uz_UZ/commercial.lang
@@ -9,9 +9,9 @@ Prospect=Prospect
Prospects=Prospects
DeleteAction=Delete an event/task
NewAction=New event/task
-AddAction=Add event/task
-AddAnAction=Add an event/task
-AddActionRendezVous=Add a Rendez-vous event
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event/task ?
CardAction=Event card
@@ -44,8 +44,8 @@ DoneActions=Completed events
DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
ToDoActionsFor=Incomplete events for %s
-SendPropalRef=Send commercial proposal %s
-SendOrderRef=Send order %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 57ba3bb15d8..d1be0e6513f 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
ServicesLegend=Services legend
Contracts=Contracts
+ContractsAndLine=Contracts and line of contracts
Contract=Contract
NoContracts=No contracts
MenuServices=Services
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 82f4574b223..28dfc7770b2 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index 497ddd814e4..700e6344d7d 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be differen
ErrorBadThirdPartyName=Bad value for third party name
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=Bad syntax for customer code
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Customer code required
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
ErrorPasswordsMustMatch=Both typed passwords must match each other
ErrorContactEMail=A technical error occured. Please, contact administrator to following email %s en provide the error code %s in your message, or even better by adding a screen copy of this page.
ErrorWrongValueForField=Wrong value for field number %s (value '%s' does not match regex rule %s)
-ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is not a %s existing ref)
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 5a494156672..dcd8df6e7db 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Last step: Define here login and password you plan
ActivateModule=Activate module %s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index ea5bebeaebf..f34681e8530 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -141,6 +141,7 @@ Cancel=Cancel
Modify=Modify
Edit=Edit
Validate=Validate
+ValidateAndApprove=Validate and Approve
ToValidate=To validate
Save=Save
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Search
SearchOf=Search
Valid=Valid
Approve=Approve
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Send file
ToLink=Link
@@ -219,6 +221,7 @@ Cards=Cards
Card=Card
Now=Now
Date=Date
+DateAndHour=Date and hour
DateStart=Date start
DateEnd=Date end
DateCreation=Creation date
@@ -295,6 +298,7 @@ UnitPriceHT=Unit price (net)
UnitPriceTTC=Unit price
PriceU=U.P.
PriceUHT=U.P. (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=U.P.
Amount=Amount
AmountInvoice=Invoice amount
@@ -521,6 +525,7 @@ DateFromTo=From %s to %s
DateFrom=From %s
DateUntil=Until %s
Check=Check
+Uncheck=Uncheck
Internal=Internal
External=External
Internals=Internal
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Monday
Tuesday=Tuesday
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index 34792ae1eb2..8efafa5e94e 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Canceled
StatusOrderDraft=Draft (needs to be validated)
StatusOrderValidated=Validated
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Processed
StatusOrderToBill=Delivered
StatusOrderToBill2=To bill
@@ -58,6 +59,7 @@ MenuOrdersToBill=Orders delivered
MenuOrdersToBill2=Billable orders
SearchOrder=Search order
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Discount
CreateOrder=Create Order
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index 88991888183..08747ea884b 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -54,12 +54,13 @@ MaxSize=Maximum size
AttachANewFile=Attach a new file/document
LinkedObject=Linked object
Miscellaneous=Miscellaneous
-NbOfActiveNotifications=Number of notifications
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=This is a test mail.\nThe two lines are separated by a carriage return.\n\n__SIGNATURE__
PredefinedMailTestHtml=This is a test mail (the word test must be in bold).
The two lines are separated by a carriage return.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 3a29639b12b..3a18cda69e7 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index b3c150d1687..0a12f4c64b7 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Everybody
PrivateProject=Contacts of project
MyProjectsDesc=This view is limited to projects you are a contact for (whatever is the type).
ProjectsPublicDesc=This view presents all projects you are allowed to read.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=This view presents all projects (your user permissions grant you permission to view everything).
MyTasksDesc=This view is limited to projects or tasks you are a contact for (whatever is the type).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=This view presents all projects and tasks you are allowed to read.
TasksDesc=This view presents all projects and tasks (your user permissions grant you permission to view everything).
ProjectsArea=Projects area
@@ -29,6 +31,8 @@ NoProject=No project defined or owned
NbOpenTasks=Nb of opened tasks
NbOfProjects=Nb of projects
TimeSpent=Time spent
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Time spent
RefTask=Ref. task
LabelTask=Label task
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=List of supplier's orders associated with th
ListSupplierInvoicesAssociatedProject=List of supplier's invoices associated with the project
ListContractAssociatedProject=List of contracts associated with the project
ListFichinterAssociatedProject=List of interventions associated with the project
-ListTripAssociatedProject=List of trips and expenses associated with the project
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=List of events associated with the project
ActivityOnProjectThisWeek=Activity on project this week
ActivityOnProjectThisMonth=Activity on project this month
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/uz_UZ/sendings.lang b/htdocs/langs/uz_UZ/sendings.lang
index 794c9019c86..b1ff55f71c1 100644
--- a/htdocs/langs/uz_UZ/sendings.lang
+++ b/htdocs/langs/uz_UZ/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Qty ordered
QtyShipped=Qty shipped
QtyToShip=Qty to ship
QtyReceived=Qty received
-KeepToShip=Keep to ship
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=Other shipments for this order
DateSending=Date sending order
DateSendingShort=Date sending order
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 9de2e5a4dbe..29706d17615 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Weighted average price
PMPValueShort=WAP
EnhancedValueOfWarehouses=Warehouses value
UserWarehouseAutoCreate=Create a warehouse automatically when creating a user
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Quantity dispatched
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index 7b4d4acb244..baf573c66ac 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Suppliers
-Supplier=Supplier
AddSupplier=Create a supplier
SupplierRemoved=Supplier removed
SuppliersInvoice=Suppliers invoice
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Supplier invoices and payments
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=Approve this order
ConfirmApproveThisOrder=Are you sure you want to approve order %s ?
-DenyingThisOrder=Denying this order
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Are you sure you want to deny this order %s ?
ConfirmCancelThisOrder=Are you sure you want to cancel this order %s ?
AddCustomerOrder=Create customer order
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index 4b0501a8346..ba36fc9b07b 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Trip
-Trips=Trips
-TripsAndExpenses=Trips and expenses
-TripsAndExpensesStatistics=Trips and expenses statistics
-TripCard=Trip card
-AddTrip=Add trip
-ListOfTrips=List of trips
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=List of fees
-NewTrip=New trip
+NewTrip=New expense report
CompanyVisited=Company/foundation visited
Kilometers=Kilometers
FeesKilometersOrAmout=Amount or kilometers
-DeleteTrip=Delete trip
-ConfirmDeleteTrip=Are you sure you want to delete this trip ?
-TF_OTHER=Other
-TF_LUNCH=Lunch
-TF_TRIP=Trip
-ListTripsAndExpenses=List of trips and expenses
-ExpensesArea=Trips and expenses area
-SearchATripAndExpense=Search a trip and expense
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Other
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Lunch
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index fb7efc64748..a88043962f5 100644
--- a/htdocs/langs/vi_VN/admin.lang
+++ b/htdocs/langs/vi_VN/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=Thử nghiệm
VersionDevelopment=Phát triển
VersionUnknown=Chưa rõ
VersionRecommanded=Khuyên dùng
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=Số thứ tự phiên làm việc
SessionSaveHandler=Quản lý lưu phiên làm việc
SessionSavePath=Chuyển ngữ phiên làm việc lưu trữ
@@ -493,10 +498,16 @@ Module600Name=Thông báo
Module600Desc=Gửi thông báo EMail trên một số sự kiện kinh doanh Dolibarr để liên hệ của bên thứ ba (thiết lập được xác định trên mỗi thirdparty)
Module700Name=Tài trợ
Module700Desc=Quản lý tài trợ
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis hội nhập
Module1400Name=Kế toán
Module1400Desc=Kế toán quản trị (đôi bên)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=Loại
Module1780Desc=Quản lý danh mục (sản phẩm, nhà cung cấp và khách hàng)
Module2000Name=Trình soạn thảo WYSIWYG
@@ -631,7 +642,7 @@ Permission181=Đọc đơn đặt hàng nhà cung cấp
Permission182=Tạo / chỉnh sửa đơn đặt hàng nhà cung cấp
Permission183=Xác nhận đơn đặt hàng nhà cung cấp
Permission184=Phê duyệt đơn đặt hàng nhà cung cấp
-Permission185=Đơn đặt hàng nhà cung cấp thứ tự
+Permission185=Order or cancel supplier orders
Permission186=Nhận đặt hàng cung cấp
Permission187=Đóng cửa các đơn đặt hàng nhà cung cấp
Permission188=Hủy bỏ đơn đặt hàng nhà cung cấp
@@ -711,6 +722,13 @@ Permission538=Xuất dữ liệu Dịch vụ
Permission701=Đọc thông tin Tài trợ
Permission702=Tạo / sửa đổi hiến
Permission703=Xóa tài trợ
+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
Permission1001=Đọc tồn kho
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=Mật khẩu để sử dụng máy chủ proxy
DefineHereComplementaryAttributes=Xác định đây tất cả các thuộc tính, không phải đã có sẵn theo mặc định, và bạn muốn được hỗ trợ cho%s.
ExtraFields=Thuộc tính bổ sung
ExtraFieldsLines=Thuộc tính bổ sung (dòng)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Thuộc tính bổ sung (của bên thứ ba)
ExtraFieldsContacts=Thuộc tính bổ sung (liên lạc / địa chỉ)
ExtraFieldsMember=Thuộc tính bổ sung (thành viên)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=Một dòng sản phẩm / dịch vụ với một s
FreeLegalTextOnProposal=Miễn phí văn bản trên đề xuất thương mại
WatermarkOnDraftProposal=Watermark về dự thảo đề xuất thương mại (nếu không có sản phẩm nào)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=Thiết lập quản lý đơn hàng
OrdersNumberingModules=Mô hình đánh số đơn hàng
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=Mã vạch UPC loại
BarcodeDescISBN=Barcode loại ISBN
BarcodeDescC39=Barcode loại C39
BarcodeDescC128=Barcode loại C128
-GenbarcodeLocation=Thanh công cụ dòng lệnh thế hệ mã (sử dụng động cơ nội bộ đối với một số loại mã vạch)
+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
BarcodeInternalEngine=Động cơ nội bộ
BarCodeNumberManager=Manager để tự động xác định số mã vạch
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=Tài khoản mặc định để sử dụng để nhận thanh toán bằng tiền mặt
CashDeskBankAccountForCheque= Tài khoản mặc định để sử dụng để nhận thanh toán bằng séc
CashDeskBankAccountForCB= Tài khoản mặc định để sử dụng để nhận thanh toán bằng thẻ tín dụng
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=Thiết lập mô-đun Bookmark
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Định dạng
TypePaymentDesc=0: Loại khách hàng thanh toán 1: Nhà cung cấp phương thức thanh toán, 2: Cả hai khách hàng và nhà cung cấp loại hình thanh toán
IncludePath=Include path (defined into variable %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.
diff --git a/htdocs/langs/vi_VN/banks.lang b/htdocs/langs/vi_VN/banks.lang
index 284f998d741..0c65a74d4cb 100644
--- a/htdocs/langs/vi_VN/banks.lang
+++ b/htdocs/langs/vi_VN/banks.lang
@@ -33,7 +33,11 @@ AllTime=Từ đầu
Reconciliation=Hòa giải
RIB=Số tài khoản ngân hàng
IBAN=Số IBAN
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=BIC / SWIFT số
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=Đứng đơn đặt hàng
StandingOrder=Lệnh chuyển tiền định
Withdrawals=Tiền thu hồi
@@ -148,7 +152,7 @@ BackToAccount=Trở lại vào tài khoản
ShowAllAccounts=Hiển thị cho tất cả tài khoản
FutureTransaction=Giao dịch trong futur. Không có cách nào để hoà giải.
SelectChequeTransactionAndGenerate=Chọn / kiểm tra bộ lọc để đưa vào nhận tiền gửi kiểm tra và bấm vào "Create".
-InputReceiptNumber=Chọn kê ngân hàng liên quan đến hoà giải. Sử dụng một giá trị số có thể phân loại (ví dụ như, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Cuối cùng, chỉ định một danh mục trong đó để phân loại các hồ sơ
ToConciliate=Hoà giải?
ThenCheckLinesAndConciliate=Sau đó, kiểm tra những dòng hiện trong báo cáo ngân hàng và nhấp
diff --git a/htdocs/langs/vi_VN/commercial.lang b/htdocs/langs/vi_VN/commercial.lang
index 438fc7048a3..d905b474831 100644
--- a/htdocs/langs/vi_VN/commercial.lang
+++ b/htdocs/langs/vi_VN/commercial.lang
@@ -62,7 +62,7 @@ LastProspectContactDone=Liên hệ với thực hiện
DateActionPlanned=Ngày lên kế hoạch cho sự 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=Tổ chức sự kiện thuộc sở hữu 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 %%.
diff --git a/htdocs/langs/vi_VN/contracts.lang b/htdocs/langs/vi_VN/contracts.lang
index e5d7db9f1bb..b1434177727 100644
--- a/htdocs/langs/vi_VN/contracts.lang
+++ b/htdocs/langs/vi_VN/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=Hết hạn
ServiceStatusClosed=Đóng
ServicesLegend=Dịch vụ truyền thuyết
Contracts=Hợp đồng
+ContractsAndLine=Contracts and line of contracts
Contract=Hợp đồng
NoContracts=Không có hợp đồng
MenuServices=Dịch vụ
diff --git a/htdocs/langs/vi_VN/cron.lang b/htdocs/langs/vi_VN/cron.lang
index e72c787d499..20956d32a97 100644
--- a/htdocs/langs/vi_VN/cron.lang
+++ b/htdocs/langs/vi_VN/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell lệnh
CronMenu=Cron
CronCannotLoadClass=Không thể tải lớp% s hoặc đối tượng% s
UseMenuModuleToolsToAddCronJobs=Đi vào menu "Trang chủ - module công cụ - danh sách công việc" để xem và chỉnh sửa các công việc theo lịch trình.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index ae106155037..2f1ec444337 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=Nguồn tài khoản ngân hàng và các mục t
ErrorBadThirdPartyName=Bad giá trị so với tên của bên thứ ba
ErrorProdIdIsMandatory=% S là bắt buộc
ErrorBadCustomerCodeSyntax=Bad cú pháp cho mã khách hàng
-ErrorBadBarCodeSyntax=Bad cú pháp mã vạch
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=Mã khách hàng yêu cầu
ErrorBarCodeRequired=Mã vạch yêu cầu
ErrorCustomerCodeAlreadyUsed=Mã số khách hàng đã sử dụng
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=Javascript không được vô hiệu hóa để l
ErrorPasswordsMustMatch=Cả hai mật khẩu gõ phải phù hợp với nhau
ErrorContactEMail=Một lỗi kỹ thuật xảy ra. Xin vui lòng liên hệ với quản trị viên để sau email% s en cung cấp các mã lỗi% s trong thông điệp của bạn, hoặc thậm chí tốt hơn bằng cách thêm một bản sao màn hình của trang này.
ErrorWrongValueForField=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phù hợp với quy tắc regex% s)
-ErrorFieldValueNotIn=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phải là một giá trị có sẵn vào lĩnh vực% s của bảng% s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=Giá trị sai số cho lĩnh vực% s (giá trị '% s' không phải là ref hiện% s)
ErrorsOnXLines=Lỗi được ghi nhận nguồn% s (s)
ErrorFileIsInfectedWithAVirus=Các chương trình chống virus đã không thể xác nhận các tập tin (tập tin có thể bị nhiễm bởi một loại virus)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# 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/install.lang b/htdocs/langs/vi_VN/install.lang
index efc226e1a58..168fcac4a45 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=Bước cuối cùng: Xác định đây đăng nh
ActivateModule=Kích hoạt module %s
ShowEditTechnicalParameters=Click vào đây để hiển thị các thông số tiên tiến / chỉnh sửa (chế độ chuyên môn)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 363fd296611..62ee8e2af29 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -141,6 +141,7 @@ Cancel=Hủy bỏ
Modify=Sửa đổi
Edit=Chỉnh sửa
Validate=Xác nhận
+ValidateAndApprove=Validate and Approve
ToValidate=Để xác nhận
Save=Lưu
SaveAs=Save As
@@ -158,6 +159,7 @@ Search=Tìm kiếm
SearchOf=Tìm kiếm
Valid=Hợp lệ
Approve=Phê duyệt
+Disapprove=Disapprove
ReOpen=Re-Open
Upload=Gửi tập tin
ToLink=Liên kết
@@ -219,6 +221,7 @@ Cards=Thẻ
Card=Thẻ
Now=Bây giờ
Date=Ngày
+DateAndHour=Date and hour
DateStart=Ngày bắt đầu
DateEnd=Ngày kết thúc
DateCreation=Ngày tạo
@@ -295,6 +298,7 @@ UnitPriceHT=Đơn giá (net)
UnitPriceTTC=Đơn giá
PriceU=UP
PriceUHT=UP (net)
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=UP
Amount=Số tiền
AmountInvoice=Lượng hóa đơn
@@ -521,6 +525,7 @@ DateFromTo=Từ %s đến %s
DateFrom=Từ% s
DateUntil=Cho đến% s
Check=Kiểm tra
+Uncheck=Uncheck
Internal=Nội bộ
External=Bên ngoài
Internals=Nội bộ
@@ -688,6 +693,7 @@ PublicUrl=URL công cộng
AddBox=Thêm vào hộp
SelectElementAndClickRefresh=Chọn một phần tử và nhấn Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=Thứ hai
Tuesday=Thứ ba
diff --git a/htdocs/langs/vi_VN/orders.lang b/htdocs/langs/vi_VN/orders.lang
index 735f5774e4f..16df451c547 100644
--- a/htdocs/langs/vi_VN/orders.lang
+++ b/htdocs/langs/vi_VN/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=Đã bị hủy
StatusOrderDraft=Nháp (cần phải được xác nhận)
StatusOrderValidated=Xác nhận
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=Đã xử lý
StatusOrderToBill=Đã giao hàng
StatusOrderToBill2=Thanh toán
@@ -58,6 +59,7 @@ MenuOrdersToBill=Đơn hàng đã giao
MenuOrdersToBill2=Billable orders
SearchOrder=Tìm kiếm đơn hàng
SearchACustomerOrder=Tìm kiếm một đơn đặt hàng
+SearchASupplierOrder=Search a supplier order
ShipProduct=Ship product
Discount=Giảm giá
CreateOrder=Tạo đơn hàng
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index a87e0bbfbcb..7bbe0059342 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -54,12 +54,13 @@ MaxSize=Kích thước tối đa
AttachANewFile=Đính kèm một tập tin mới / tài liệu
LinkedObject=Đối tượng liên quan
Miscellaneous=Linh tinh
-NbOfActiveNotifications=Số thông báo
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=Đây là một email thử nghiệm. Hai dòng được phân cách bằng một trở về vận chuyển. __SIGNATURE__
PredefinedMailTestHtml=Đây là một thư kiểm tra (kiểm tra từ phải được in đậm).
Hai dòng được phân cách bằng một trở về vận chuyển.
__SIGNATURE__
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__ Chúng tôi muốn cảnh báo bạn rằng __FACREF__ hóa đơn dường như không được payed. Vì vậy, đây là hóa đơn kèm một lần nữa, như một lời nhắc nhở. __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây đề nghị thương mại __PROPREF__ __PERSONALIZED__Sincerely __SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây thứ tự __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây để chúng tôi __ORDERREF__ __PERSONALIZED__Sincerely __SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__ Bạn sẽ tìm thấy ở đây các hóa đơn __FACREF__ __PERSONALIZED__Sincerely __SIGNATURE__
diff --git a/htdocs/langs/vi_VN/productbatch.lang b/htdocs/langs/vi_VN/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/vi_VN/productbatch.lang
+++ b/htdocs/langs/vi_VN/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index ec161d09574..4278c8abe94 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index d06e3d14f88..13576931acd 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -8,8 +8,10 @@ SharedProject=Mọi người
PrivateProject=Liên lạc về dự án
MyProjectsDesc=Phần xem này được giới hạn với từng dự án phụ thuộc vào phần bạn có liên hệ với (đối với bất kỳ loại dự án nào).
ProjectsPublicDesc=Phần xem này hiển thị tất cả các dự án mà bạn đã theo dõi.
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=Phần xem này hiển thị tất cả các dự án (quyền người dùng hiện tại của bạn được phép xem chi tiết mọi thứ).
MyTasksDesc=Phần xem này bị giới hạn với các dự án hoặc tác vụ mà bạn có mối liên hệ với (bất kỳ loại dự án nào).
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=Phần xem này hiển thị tất cả dự án và tác vụ mà bạn được phép theo dõi.
TasksDesc=Phần xem này hiển thị tất cả các dự án và tác vụ (quyền người dùng của bạn hiện đang cho phép bạn xem tất cả thông tin).
ProjectsArea=Khu vực dự án
@@ -29,6 +31,8 @@ NoProject=Không có dự án nào được định lược hoặc sở hữu
NbOpenTasks=Nb của tác vụ được mở
NbOfProjects=Nb của dự án
TimeSpent=Thời gian đã qua
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=Thời gian đã qua
RefTask=Tác vụ tham chiếu
LabelTask=Nhãn của tác vụ
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=Danh sách các đơn đặt hàng từ nhà
ListSupplierInvoicesAssociatedProject=Danh sách các hóa đơn của nhà cung cấp được gắn với dự án
ListContractAssociatedProject=Danh sách các hợp đồng được gắn với dự án
ListFichinterAssociatedProject=Danh sách các sự can thiệp được gắn với dự án
-ListTripAssociatedProject=Danh sách các chuyến đi và chi phí công tác gắn với dự án
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=Danh sách các hoạt động được gắn với dự án
ActivityOnProjectThisWeek=Các hoạt động của dự án trong tuần này
ActivityOnProjectThisMonth=Các hoạt động của dự án trong tháng này
@@ -133,3 +137,6 @@ SearchAProject=Tìm kiếm một dự án
ProjectMustBeValidatedFirst=Dự án phải được xác nhận đầu tiên
ProjectDraft=Dự thảo dự án
FirstAddRessourceToAllocateTime=Kết hợp một ressource để phân bổ thời gian
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/vi_VN/salaries.lang b/htdocs/langs/vi_VN/salaries.lang
index a709c52f7a5..0568daa4efe 100644
--- a/htdocs/langs/vi_VN/salaries.lang
+++ b/htdocs/langs/vi_VN/salaries.lang
@@ -10,3 +10,4 @@ SalariesPayments=Lương thanh toán
ShowSalaryPayment=Hiện thanh toán tiền lương
THM=Giá trung bình theo giờ
TJM=Giá trung bình hàng ngày
+CurrentSalary=Current salary
diff --git a/htdocs/langs/vi_VN/sendings.lang b/htdocs/langs/vi_VN/sendings.lang
index 94e807f91b5..c6581043f86 100644
--- a/htdocs/langs/vi_VN/sendings.lang
+++ b/htdocs/langs/vi_VN/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=Số lượng đặt hàng
QtyShipped=Số lượng vận chuyển
QtyToShip=Số lượng xuất xưởng
QtyReceived=Số lượng nhận được
-KeepToShip=Giữ tàu
+KeepToShip=Remain to ship
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
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index a78e65a63b8..656a87714c5 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=Giá bình quân gia quyền
PMPValueShort=WAP
EnhancedValueOfWarehouses=Các kho hàng giá trị
UserWarehouseAutoCreate=Tạo một kho tự động khi tạo một người sử dụng
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=Số lượng cử
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=Kho% s sẽ được sử dụng cho kho giảm
WarehouseForStockIncrease=Kho% s sẽ được sử dụng cho kho tăng
ForThisWarehouse=Đối với kho này
ReplenishmentStatusDesc=Đây là danh sách của tất cả các sản phẩm với một tồn kho thấp hơn so với tồn kho mong muốn (hoặc thấp hơn giá trị cảnh báo nếu hộp kiểm "cảnh báo chỉ" được chọn), và đề nghị bạn để tạo ra các đơn đặt hàng nhà cung cấp để lấp đầy sự khác biệt.
-ReplenishmentOrdersDesc=Đây là danh sách của tất cả các đơn đặt hàng nhà cung cấp mở
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Số lượng sản phẩm% s trong kho trước khi thời gian được lựa chọn (<% s)
NbOfProductAfterPeriod=Số lượng sản phẩm% s trong kho sau khi được lựa chọn thời gian (>% s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/vi_VN/suppliers.lang b/htdocs/langs/vi_VN/suppliers.lang
index 44feaea27fe..bd00d3e0e7b 100644
--- a/htdocs/langs/vi_VN/suppliers.lang
+++ b/htdocs/langs/vi_VN/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=Nhà cung cấp
-Supplier=Nhà cung cấp
AddSupplier=Tạo một nhà cung cấp
SupplierRemoved=Nhà cung cấp loại bỏ
SuppliersInvoice=Nhà cung cấp hóa đơn
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=Hoá đơn và các khoản thanh toán nhà cung c
ExportDataset_fournisseur_3=Đơn đặt hàng nhà cung cấp và các dòng lệnh
ApproveThisOrder=Chấp thuận đơn hàng này
ConfirmApproveThisOrder=Bạn Bạn có chắc chắn muốn chấp nhận để% s?
-DenyingThisOrder=Phủ nhận thứ tự này
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=Bạn có chắc chắn bạn muốn từ chối lệnh này% s?
ConfirmCancelThisOrder=Bạn có chắc chắn bạn muốn hủy bỏ lệnh này% s?
AddCustomerOrder=Tạo đơn đặt hàng
diff --git a/htdocs/langs/vi_VN/trips.lang b/htdocs/langs/vi_VN/trips.lang
index 98314aea027..10710992222 100644
--- a/htdocs/langs/vi_VN/trips.lang
+++ b/htdocs/langs/vi_VN/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=Chuyến đi
-Trips=Các chuyến đi
-TripsAndExpenses=Các chuyến đi và các chi phí
-TripsAndExpensesStatistics=Các chuyến đi và các chi phí thống kê
-TripCard=Thẻ đi
-AddTrip=Thêm chuyến đi
-ListOfTrips=Danh sách các chuyến đi
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=Danh sách phí
-NewTrip=Chuyến đi mới
+NewTrip=New expense report
CompanyVisited=Công ty / cơ sở thăm
Kilometers=Km
FeesKilometersOrAmout=Số tiền hoặc km
-DeleteTrip=Xóa đi
-ConfirmDeleteTrip=Bạn Bạn có chắc chắn muốn xóa chuyến đi này?
-TF_OTHER=Khác
-TF_LUNCH=Ăn trưa
-TF_TRIP=Chuyến đi
-ListTripsAndExpenses=Danh sách các chuyến đi và các chi phí
-ExpensesArea=Chi phí chuyến đi và khu vực
-SearchATripAndExpense=Tìm kiếm một chuyến đi và chi phí
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Phân loại 'hoàn trả'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=Khác
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=Ăn trưa
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index ed3f62b3a6c..150b021dcae 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=试验性
VersionDevelopment=开发
VersionUnknown=未知
VersionRecommanded=推荐项目
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=会话 ID
SessionSaveHandler=会话保存处理程序
SessionSavePath=存储会话本地化
@@ -493,10 +498,16 @@ Module600Name=通知
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=捐赠
Module700Desc=捐款的管理
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=Mantis
Module1200Desc=Mantis 整合
Module1400Name=会计
Module1400Desc=会计管理(双方)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=分类
Module1780Desc=分类的管理(产品、供应商和客户)
Module2000Name=所见即所得编辑器
@@ -631,7 +642,7 @@ Permission181=读取采购订单
Permission182=建立/修改采购订单
Permission183=确认供采购订单
Permission184=批准采购订单
-Permission185=整理采购订单
+Permission185=Order or cancel supplier orders
Permission186=接收采购订单
Permission187=关闭采购订单
Permission188=取消采购订单
@@ -711,6 +722,13 @@ Permission538=导出服务
Permission701=读取捐款资讯
Permission702=建立/修改捐款资讯
Permission703=删除捐款资讯
+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
Permission1001=读取库存资讯
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=使用代理服务器的密码
DefineHereComplementaryAttributes=此处定义所有默认安装中没有,但您又希望能在 %s 中使用的属性。
ExtraFields=自定义增补属性
ExtraFieldsLines=增补属性 (行列)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=增补属性 (往来单位)
ExtraFieldsContacts=增补属性 (联系人/地址)
ExtraFieldsMember=增补属性 (成员)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=定量为0的产品或服务项视为可选项*
FreeLegalTextOnProposal=报价单中的额外说明文本
WatermarkOnDraftProposal=为商业计划书草案添加水印(如果空)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=订单管理设置
OrdersNumberingModules=订单编号模块
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=通用产品条码(UPC)
BarcodeDescISBN=ISBN 书籍条码
BarcodeDescC39=Code 39 条码
BarcodeDescC128=Code 128 条码
-GenbarcodeLocation=条形码生成用的命令行工具 (内部引擎用来生成某些类型的条码)
+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
BarcodeInternalEngine=内部引擎
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=接收现金付款的默认帐户
CashDeskBankAccountForCheque= 接收支票付款的默认帐户
CashDeskBankAccountForCB= 接收信用卡支付的默认帐户
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=书签模块设置
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=格式
TypePaymentDesc=0:客户支付类型,1:供应商支付类型,2:客户和供应商的付款方式
IncludePath=Include path (defined into variable %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.
diff --git a/htdocs/langs/zh_CN/banks.lang b/htdocs/langs/zh_CN/banks.lang
index a5c26c5a4ac..906138fb720 100644
--- a/htdocs/langs/zh_CN/banks.lang
+++ b/htdocs/langs/zh_CN/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=和解
RIB=银行帐号
IBAN=IBAN号码
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=的BIC / SWIFT的号码
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=常年订单
StandingOrder=长期订单
Withdrawals=提款
@@ -148,7 +152,7 @@ BackToAccount=回到帐户
ShowAllAccounts=显示所有帐户
FutureTransaction=在FUTUR的交易。调解没有办法。
SelectChequeTransactionAndGenerate=选择/过滤器检查纳入支票存款收据,并单击“创建”。
-InputReceiptNumber=选择用于调解的银行对帐单。使用排序的数值(如YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=最后,指定一个范畴对其中的记录进行分类
ToConciliate=取得谅解?
ThenCheckLinesAndConciliate=然后按一下,连线检查银行对账单。
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 13a864bb130..6a88865a84e 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -9,9 +9,9 @@ Prospect=展望
Prospects=前途
DeleteAction=删除一个动作/任务
NewAction=新的行动/任务
-AddAction=新增行动/任务
-AddAnAction=添加一个动作/任务
-AddActionRendezVous=添加交会任务
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=会合
ConfirmDeleteAction=你确定要删除这个任务吗?
CardAction=行动卡
@@ -44,8 +44,8 @@ DoneActions=已完成的行动
DoneActionsFor=为%完成01-0014-03
ToDoActions=不完整的行动
ToDoActionsFor=不完全对%01-0014-03
-SendPropalRef=%s的发送商业建议
-SendOrderRef=发送命令%s的
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=不适用
StatusActionToDo=要做到
StatusActionDone=完成
@@ -62,7 +62,7 @@ LastProspectContactDone=联系工作
DateActionPlanned=日期行动计划
DateActionDone=日期行动完成
ActionAskedBy=行动问
-ActionAffectedTo=受影响的行动
+ActionAffectedTo=Event assigned to
ActionDoneBy=行动方面所做的
ActionUserAsk=记录
ErrorStatusCantBeZeroIfStarted=如果字段' 日期做 '是充满行动启动(或成品),所以外地的状态 '不能为0%%。
diff --git a/htdocs/langs/zh_CN/contracts.lang b/htdocs/langs/zh_CN/contracts.lang
index b5ccca60cad..6e3696d7cb2 100644
--- a/htdocs/langs/zh_CN/contracts.lang
+++ b/htdocs/langs/zh_CN/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=过期
ServiceStatusClosed=关闭
ServicesLegend=服务的传说
Contracts=合同
+ContractsAndLine=Contracts and line of contracts
Contract=合同
NoContracts=没有合同
MenuServices=服务
diff --git a/htdocs/langs/zh_CN/cron.lang b/htdocs/langs/zh_CN/cron.lang
index 6c5880d43a0..2cc313aad59 100644
--- a/htdocs/langs/zh_CN/cron.lang
+++ b/htdocs/langs/zh_CN/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index bae0d3f806d..e4adeba918d 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=源和目标的银行帐户必须是不同的。
ErrorBadThirdPartyName=坏第三者名义价值
ErrorProdIdIsMandatory=%s 是强制性的
ErrorBadCustomerCodeSyntax=坏客户代码的语法
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=客户代码需要
ErrorBarCodeRequired=需要条形码
ErrorCustomerCodeAlreadyUsed=客户代码已被使用
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=不能禁用JavaScript必须有此功能的工作
ErrorPasswordsMustMatch=这两种类型的密码必须相互匹配
ErrorContactEMail=一个技术性错误发生。请联系管理员,以下连接提供错误代码%s在您的邮件,甚至更好,加入了这个页面的屏幕拷贝的电子邮件%s。
ErrorWrongValueForField=s'的领域的一些错误值的%s(价值'%不匹配正则表达式规则%s)
-ErrorFieldValueNotIn=场数%s错误值(值'%s'是不是一个值到领域表%s %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=错场数%s值(值'%s'是不是一个的%s现有文献)
ErrorsOnXLines=%误差的源上线
ErrorFileIsInfectedWithAVirus=防病毒程序无法验证文件(文件可能被病毒感染)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=强制设置参数尚未定义
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index fa94910fb70..9b2b50d9249 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=最后一步 :此处定义的登录名和密码
ActivateModule=激活模块%s
ShowEditTechnicalParameters=点击此处显示/编辑高级参数(专家模式)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index e46b3e779e3..ecfa96b7692 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -141,6 +141,7 @@ Cancel=取消
Modify=修改
Edit=编辑
Validate=验证
+ValidateAndApprove=Validate and Approve
ToValidate=为了验证
Save=保存
SaveAs=另存为
@@ -158,6 +159,7 @@ Search=搜索
SearchOf=搜索
Valid=有效
Approve=批准
+Disapprove=Disapprove
ReOpen=重新开放
Upload=发送文件
ToLink=Link
@@ -219,6 +221,7 @@ Cards=牌
Card=卡
Now=现在
Date=日期
+DateAndHour=Date and hour
DateStart=开始日期
DateEnd=结束日期
DateCreation=创建日期
@@ -295,6 +298,7 @@ UnitPriceHT=单位价格(净值)
UnitPriceTTC=单价
PriceU=向上
PriceUHT=不含税价格
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=向上
Amount=金额
AmountInvoice=发票金额
@@ -521,6 +525,7 @@ DateFromTo=从%s到%s
DateFrom=第05期从%
DateUntil=直到%s的
Check=支票
+Uncheck=Uncheck
Internal=内部
External=外部
Internals=内部
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=星期一
Tuesday=星期二
diff --git a/htdocs/langs/zh_CN/orders.lang b/htdocs/langs/zh_CN/orders.lang
index 280b701742f..973b5713bb8 100644
--- a/htdocs/langs/zh_CN/orders.lang
+++ b/htdocs/langs/zh_CN/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=已取消
StatusOrderDraft=草案(需要验证)
StatusOrderValidated=已验证
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=已处理
StatusOrderToBill=已递送
StatusOrderToBill2=待付账
@@ -58,6 +59,7 @@ MenuOrdersToBill=已发货订单
MenuOrdersToBill2=Billable orders
SearchOrder=搜索订单
SearchACustomerOrder=搜索一个客户订单
+SearchASupplierOrder=Search a supplier order
ShipProduct=航运产品
Discount=折扣
CreateOrder=创建订单
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 87e6584b4d6..e775c8b18fb 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -54,12 +54,13 @@ MaxSize=最大尺寸
AttachANewFile=附加一个新的文件/文件
LinkedObject=链接对象
Miscellaneous=杂项
-NbOfActiveNotifications=号码的通知
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=这是一个测试邮件。\\ n该两行是由一个回车分隔。
PredefinedMailTestHtml=这是一个测试邮件(单词测试必须大胆)。
这两条线隔开,回车。
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/zh_CN/productbatch.lang b/htdocs/langs/zh_CN/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/zh_CN/productbatch.lang
+++ b/htdocs/langs/zh_CN/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index 5ee6af20ff5..2ac2df060d9 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index 7ce7b5665e7..b8326f1613d 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -8,8 +8,10 @@ SharedProject=每个人
PrivateProject=项目联系人
MyProjectsDesc=这种观点是有限的项目你是一个接触(不管是类型)。
ProjectsPublicDesc=这种观点提出了所有你被允许阅读的项目。
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=这种观点提出的所有项目(你的用户权限批准你认为一切)。
MyTasksDesc=这种观点是有限的项目或任务你是一个接触(不管是类型)。
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=这种观点提出的所有项目,您可阅读任务。
TasksDesc=这种观点提出的所有项目和任务(您的用户权限批准你认为一切)。
ProjectsArea=项目领域
@@ -29,6 +31,8 @@ NoProject=没有项目或拥有的定义
NbOpenTasks=铌打开任务
NbOfProjects=铌项目
TimeSpent=花费的时间
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=所花费的时间
RefTask=号。任务
LabelTask=标签任务
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=名单与项目相关的供应商的订单
ListSupplierInvoicesAssociatedProject=名单与项目相关的供应商的发票
ListContractAssociatedProject=名单与项目有关的合同
ListFichinterAssociatedProject=名单与项目相关的干预措施
-ListTripAssociatedProject=名单旅行和与项目有关的费用
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=名单与项目有关的行动
ActivityOnProjectThisWeek=对项目活动周
ActivityOnProjectThisMonth=本月初对项目活动
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/zh_CN/salaries.lang b/htdocs/langs/zh_CN/salaries.lang
index 6e5624fd475..1aab039ba50 100644
--- a/htdocs/langs/zh_CN/salaries.lang
+++ b/htdocs/langs/zh_CN/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=雇员
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/zh_CN/sendings.lang b/htdocs/langs/zh_CN/sendings.lang
index d498aa8ead8..2b316b2c21d 100644
--- a/htdocs/langs/zh_CN/sendings.lang
+++ b/htdocs/langs/zh_CN/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=订购数量
QtyShipped=出货数量
QtyToShip=出货数量
QtyReceived=收到的数量
-KeepToShip=保持对船舶
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=这个命令的其他货物
DateSending=为了发送日期
DateSendingShort=为了发送日期
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index b9a37e83685..f78f8468b67 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=加权平均价格
PMPValueShort=的WAP
EnhancedValueOfWarehouses=仓库价值
UserWarehouseAutoCreate=创建一个股票时自动创建一个用户
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=派出数量
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/zh_CN/suppliers.lang b/htdocs/langs/zh_CN/suppliers.lang
index e03729ca861..fb95ba7355c 100644
--- a/htdocs/langs/zh_CN/suppliers.lang
+++ b/htdocs/langs/zh_CN/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=供应商
-Supplier=供应商
AddSupplier=Create a supplier
SupplierRemoved=供应商删除
SuppliersInvoice=供应商发票
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=供应商发票和付款
ExportDataset_fournisseur_3=供应商的订单和订单行
ApproveThisOrder=批准这一命令
ConfirmApproveThisOrder=你确定要批准了这项命令?
-DenyingThisOrder=否认这种秩序
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=你确定要否认这个秩序?
ConfirmCancelThisOrder=您确定要取消此订单?
AddCustomerOrder=创建客户订单
diff --git a/htdocs/langs/zh_CN/trips.lang b/htdocs/langs/zh_CN/trips.lang
index 239e2d1265c..4962abe8c28 100644
--- a/htdocs/langs/zh_CN/trips.lang
+++ b/htdocs/langs/zh_CN/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=旅程
-Trips=旅游
-TripsAndExpenses=旅游和费用
-TripsAndExpensesStatistics=旅行和费用统计
-TripCard=旅卡
-AddTrip=添加行程
-ListOfTrips=旅行名单
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=费用清单
-NewTrip=新旅程
+NewTrip=New expense report
CompanyVisited=公司/基础访问
Kilometers=公里
FeesKilometersOrAmout=金额或公里
-DeleteTrip=删除行
-ConfirmDeleteTrip=你确定要删除此行?
-TF_OTHER=其他
-TF_LUNCH=午餐
-TF_TRIP=旅程
-ListTripsAndExpenses=旅行和费用清单
-ExpensesArea=与贸易有关的知识产权协定“和开支面积
-SearchATripAndExpense=寻找旅行和费用
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=其他
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=午餐
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index 7c22ab166f0..5ce0072aebb 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -8,6 +8,11 @@ VersionExperimental=實驗
VersionDevelopment=發展
VersionUnknown=未知
VersionRecommanded=推薦
+FileCheck=Files Integrity
+FilesMissing=Missing Files
+FilesUpdated=Updated Files
+FileCheckDolibarr=Check Dolibarr Files Integrity
+XmlNotFound=Xml File of Dolibarr Integrity Not Found
SessionId=會話ID
SessionSaveHandler=處理程序,以節省會議
SessionSavePath=本地化存儲會議
@@ -493,10 +498,16 @@ Module600Name=通知
Module600Desc=Send EMail notifications on some Dolibarr business events to third-party contacts (setup defined on each thirdparty)
Module700Name=捐贈
Module700Desc=捐款的管理
+Module770Name=Expense Report
+Module770Desc=Management and claim expense reports (transportation, meal, ...)
+Module1120Name=Supplier commercial proposal
+Module1120Desc=Request supplier commercial proposal and prices
Module1200Name=螂
Module1200Desc=螳螂一體化
Module1400Name=會計
Module1400Desc=會計管理(雙方)
+Module1520Name=Document Generation
+Module1520Desc=Mass mail document generation
Module1780Name=分類
Module1780Desc=分類的管理(產品,供應商和客戶)
Module2000Name=fckeditor的
@@ -631,7 +642,7 @@ Permission181=讀取供應商訂單
Permission182=建立/修改供應商訂單
Permission183=驗證供應商訂單
Permission184=核准供應商訂單
-Permission185=整理供應商訂單
+Permission185=Order or cancel supplier orders
Permission186=接收供應商訂單
Permission187=關閉供應商訂單
Permission188=取消供應商訂單
@@ -711,6 +722,13 @@ Permission538=出口服務
Permission701=閲讀捐款
Permission702=建立/修改捐款
Permission703=刪除捐款
+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
Permission1001=讀取庫存資訊
Permission1002=Create/modify warehouses
Permission1003=Delete warehouses
@@ -1025,6 +1043,8 @@ MAIN_PROXY_PASS=使用代理服務器的密碼
DefineHereComplementaryAttributes=請再這裡新增客制化欄位,以便讓 %s 模組可以支援顯示。
ExtraFields=新增客制化欄位
ExtraFieldsLines=Complementary attributes (lines)
+ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
+ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
ExtraFieldsThirdParties=Complementary attributes (thirdparty)
ExtraFieldsContacts=Complementary attributes (contact/address)
ExtraFieldsMember=Complementary attributes (member)
@@ -1152,6 +1172,13 @@ UseOptionLineIfNoQuantity=一個產品線/服務的,是作為一個選項視
FreeLegalTextOnProposal=可在下面輸入額外的建議書資訊
WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+##### 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
##### Orders #####
OrdersSetup=設定訂單管理模組
OrdersNumberingModules=訂單編號模組
@@ -1383,7 +1410,7 @@ BarcodeDescUPC=通用產品條碼(UPC)
BarcodeDescISBN=書籍條碼類型
BarcodeDescC39=Code 39 條碼
BarcodeDescC128=Code 128 條碼
-GenbarcodeLocation=條碼生成命令行工具(由phpbarcode引擎用於某些類型的條形碼)
+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
BarcodeInternalEngine=Internal engine
BarCodeNumberManager=Manager to auto define barcode numbers
##### Prelevements #####
@@ -1501,9 +1528,10 @@ CashDeskThirdPartyForSell=Default generic third party to use for sells
CashDeskBankAccountForSell=帳戶用於接收現金付款
CashDeskBankAccountForCheque= 帳戶用於接收支票付款
CashDeskBankAccountForCB= 帳戶用於接收信用卡支付現金
-CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale
+CashDeskDoNotDecreaseStock=Disable stock decrease when a sell is done from Point of Sale (if "no", stock decrease is done for each sell done from POS, whatever is option set into module Stock).
CashDeskIdWareHouse=Force and restrict warehouse to use for stock decrease
StockDecreaseForPointOfSaleDisabled=Stock decrease from Point Of Sale disabled
+StockDecreaseForPointOfSaleDisabledbyBatch=Stock decrease in POS is not compatible with batch management
CashDeskYouDidNotDisableStockDecease=You did not disable stock decrease when making a sell from Point Of Sale. So a warehouse is required.
##### Bookmark #####
BookmarkSetup=模組設置書籤
@@ -1569,3 +1597,7 @@ SortOrder=Sort order
Format=Format
TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
IncludePath=Include path (defined into variable %s)
+ExpenseReportsSetup=Setup of module Expense Reports
+TemplatePDFExpenseReports=Document templates to generate expense report document
+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.
diff --git a/htdocs/langs/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 7a6b5d7355f..93639850ef2 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -33,7 +33,11 @@ AllTime=From start
Reconciliation=和解
RIB=銀行帳號
IBAN=IBAN號碼
+IbanValid=IBAN is Valid
+IbanNotValid=IBAN is Not Valid
BIC=的BIC / SWIFT的號碼
+SwiftValid=BIC/SWIFT is Valid
+SwiftNotValid=BIC/SWIFT is Not Valid
StandingOrders=常年訂單
StandingOrder=長期訂單
Withdrawals=提款
@@ -148,7 +152,7 @@ BackToAccount=回到帳戶
ShowAllAccounts=顯示所有帳戶
FutureTransaction=在FUTUR的交易。調解沒有辦法。
SelectChequeTransactionAndGenerate=選擇/篩選器檢查納入支票存款收據,並單擊“創建”。
-InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value (such as, YYYYMM)
+InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
EventualyAddCategory=Eventually, specify a category in which to classify the records
ToConciliate=To conciliate?
ThenCheckLinesAndConciliate=Then, check the lines present in the bank statement and click
diff --git a/htdocs/langs/zh_TW/commercial.lang b/htdocs/langs/zh_TW/commercial.lang
index 465a6118291..bf96053a8ec 100644
--- a/htdocs/langs/zh_TW/commercial.lang
+++ b/htdocs/langs/zh_TW/commercial.lang
@@ -9,9 +9,9 @@ Prospect=展望
Prospects=潛在
DeleteAction=刪除一個動作/任務
NewAction=新的行動/任務
-AddAction=新增行動/任務
-AddAnAction=添加一個動作/任務
-AddActionRendezVous=添加交會任務
+AddAction=Create event/task
+AddAnAction=Create an event/task
+AddActionRendezVous=Create a Rendez-vous event
Rendez-Vous=會合
ConfirmDeleteAction=你確定要刪除這個任務嗎?
CardAction=行動卡
@@ -44,8 +44,8 @@ DoneActions=已完成的行動
DoneActionsFor=為%s完成01-0014-03
ToDoActions=不完整的行動
ToDoActionsFor=不完全對%01-0014-03
-SendPropalRef=%s的發送商業建議
-SendOrderRef=發送訂單 %s
+SendPropalRef=Submission of commercial proposal %s
+SendOrderRef=Submission of order %s
StatusNotApplicable=不適用
StatusActionToDo=要做到
StatusActionDone=完成
@@ -62,7 +62,7 @@ LastProspectContactDone=聯絡完成
DateActionPlanned=日期行動計劃
DateActionDone=日期行動完成
ActionAskedBy=行動問
-ActionAffectedTo=受影響的行動
+ActionAffectedTo=Event assigned to
ActionDoneBy=行動方面所做的
ActionUserAsk=記錄
ErrorStatusCantBeZeroIfStarted=如果字段' 日期做 '是充滿行動啟動(或成品),所以外地的狀態 '不能為0%%。
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index d513a4f4b35..63b5742cf83 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -19,6 +19,7 @@ ServiceStatusLateShort=過期
ServiceStatusClosed=關閉
ServicesLegend=服務的傳說
Contracts=合同
+ContractsAndLine=Contracts and line of contracts
Contract=合同
NoContracts=沒有合同
MenuServices=服務
diff --git a/htdocs/langs/zh_TW/cron.lang b/htdocs/langs/zh_TW/cron.lang
index c8e534528f5..a2b5296ad01 100644
--- a/htdocs/langs/zh_TW/cron.lang
+++ b/htdocs/langs/zh_TW/cron.lang
@@ -84,3 +84,4 @@ CronType_command=Shell command
CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Modules tools - Job list" to see and edit scheduled jobs.
+TaskDisabled=Task disabled
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 2f8a6e35c64..4245e06fb04 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -25,7 +25,7 @@ ErrorFromToAccountsMustDiffers=源和目標的銀行帳戶必須是不同的。
ErrorBadThirdPartyName=錯誤的客戶/供應商名稱
ErrorProdIdIsMandatory=The %s is mandatory
ErrorBadCustomerCodeSyntax=壞客戶代碼的語法
-ErrorBadBarCodeSyntax=Bad syntax for bar code
+ErrorBadBarCodeSyntax=Bad syntax for bar code. May be you set a bad barcode type or you defined a barcode mask for numbering that does not match value scanned.
ErrorCustomerCodeRequired=客戶代碼需要
ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=客戶代碼已被使用
@@ -79,7 +79,7 @@ ErrorModuleRequireJavascript=不能禁用JavaScript必須有此功能的工作
ErrorPasswordsMustMatch=這兩種類型的密碼必須相互匹配
ErrorContactEMail=一個技術性錯誤發生。請聯系管理員,以下連接提供錯誤代碼%s在您的郵件,甚至更好,加入了這個頁面的屏幕拷貝的電子郵件%s。
ErrorWrongValueForField=s'的領域的一些錯誤值的%s(價值'%不匹配正則表達式規則%s)
-ErrorFieldValueNotIn=場數%s錯誤值(值'%s'是不是一個值到領域表%s %s)
+ErrorFieldValueNotIn=Wrong value for field number %s (value '%s' is not a value available into field %s of table %s = %s)
ErrorFieldRefNotIn=錯場數%s值(值'%s'是不是一個的%s現有文獻)
ErrorsOnXLines=%誤差的源上線
ErrorFileIsInfectedWithAVirus=防病毒程序無法驗證文件(文件可能被病毒感染)
@@ -160,6 +160,7 @@ ErrorPriceExpressionInternal=Internal error '%s'
ErrorPriceExpressionUnknown=Unknown error '%s'
ErrorSrcAndTargetWarehouseMustDiffers=Source and target warehouses must differs
ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without batch/serial information, on a product requiring batch/serial information
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=All recorded receptions must first be verified before being allowed to do this action
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index 51a93e88a66..0d8db02acc2 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -156,6 +156,7 @@ LastStepDesc=最後一步 :此處定義的登錄名和密碼
ActivateModule=激活模塊%s
ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
WarningUpgrade=Warning:\nDid your run a database backup first ?\nThis is highly recommanded: for example, due to some bugs into databases systems (for example mysql version 5.5.40), some data or tables may be lost during this process, so it is highly recommanded to have a complete dump of your database before starting migration.\n\nClick OK to start migration process...
+ErrorDatabaseVersionForbiddenForMigration=Your database version is %s. It has a critical bug making data loss if you make structure change on your database, like it is required by the migration process. For his reason, migration will not be allowed until you upgrade your database to a higher fixed version (list of known bugged version: %s)
#########
# upgrade
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index dcc25276db5..825700c91da 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -141,6 +141,7 @@ Cancel=取消
Modify=修改
Edit=編輯
Validate=驗證
+ValidateAndApprove=Validate and Approve
ToValidate=為了驗證
Save=儲存
SaveAs=另存為
@@ -158,6 +159,7 @@ Search=搜尋
SearchOf=搜尋
Valid=有效
Approve=批準
+Disapprove=Disapprove
ReOpen=重新開放
Upload=發送文件
ToLink=Link
@@ -219,6 +221,7 @@ Cards=資訊卡
Card=資訊卡
Now=現在
Date=日期
+DateAndHour=Date and hour
DateStart=開始日期
DateEnd=結束日期
DateCreation=建立日期
@@ -295,6 +298,7 @@ UnitPriceHT=單位價格(凈值)
UnitPriceTTC=單價
PriceU=向上
PriceUHT=不含稅價格
+AskPriceSupplierUHT=P.U. HT Requested
PriceUTTC=向上
Amount=總額
AmountInvoice=發票金額
@@ -521,6 +525,7 @@ DateFromTo=從%s到%s
DateFrom=第05期從%s
DateUntil=直到%s的
Check=支票
+Uncheck=Uncheck
Internal=內部
External=非內部
Internals=內部
@@ -688,6 +693,7 @@ PublicUrl=Public URL
AddBox=Add box
SelectElementAndClickRefresh=Select an element and click Refresh
PrintFile=Print File %s
+ShowTransaction=Show transaction
# Week day
Monday=星期一
Tuesday=星期二
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 105a3209321..acf0e5c9696 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -42,6 +42,7 @@ StatusOrderCanceled=取消
StatusOrderDraft=草案(等待驗證)
StatusOrderValidated=驗證階段
StatusOrderOnProcess=Ordered - Standby reception
+StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
StatusOrderProcessed=處理完畢
StatusOrderToBill=等待帳單
StatusOrderToBill2=為了法案
@@ -58,6 +59,7 @@ MenuOrdersToBill=訂單To帳單
MenuOrdersToBill2=Billable orders
SearchOrder=搜尋訂單
SearchACustomerOrder=Search a customer order
+SearchASupplierOrder=Search a supplier order
ShipProduct=船舶產品
Discount=折扣
CreateOrder=創建訂單
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 227494058af..49b687412d6 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -54,12 +54,13 @@ MaxSize=檔案最大
AttachANewFile=附加一個新的檔案/文件
LinkedObject=鏈接對象
Miscellaneous=雜項
-NbOfActiveNotifications=號碼的通知
+NbOfActiveNotifications=Number of notifications (nb of recipient emails)
PredefinedMailTest=這是一個測試郵件。\\ n該兩行是由一個回車分隔。
PredefinedMailTestHtml=這是一個測試郵件(單詞測試必須大膽)。
這兩條線隔開,回車。
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nWe would like to warn you that the invoice __FACREF__ seems to not being payed. So this is the invoice in attachment again, as a reminder.\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nYou will find here the commercial proposal __PROPREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendAskPriceSupplier=__CONTACTCIVNAME__\n\nYou will find here the price request __ASKREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nYou will find here the order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nYou will find here our order __ORDERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nYou will find here the invoice __FACREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
diff --git a/htdocs/langs/zh_TW/productbatch.lang b/htdocs/langs/zh_TW/productbatch.lang
index 864782023a0..45263681965 100644
--- a/htdocs/langs/zh_TW/productbatch.lang
+++ b/htdocs/langs/zh_TW/productbatch.lang
@@ -10,7 +10,7 @@ batch_number=Batch/Serial number
l_eatby=Eat-by date
l_sellby=Sell-by date
DetailBatchNumber=Batch/Serial details
-DetailBatchFormat=Batch/Serial: %s - E:%s - S: %s (Qty : %d)
+DetailBatchFormat=Batch/Serial: %s - Eat by: %s - Sell by: %s (Qty : %d)
printBatch=Batch: %s
printEatby=Eat-by: %s
printSellby=Sell-by: %s
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index e18d6416532..60d05dae9f0 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -250,3 +250,7 @@ PriceExpressionEditorHelp3=In both product/service and supplier prices there are
PriceExpressionEditorHelp4=In product/service price only: #supplier_min_price#
In supplier prices only: #supplier_quantity# and #supplier_tva_tx#
PriceMode=Price mode
PriceNumeric=Number
+DefaultPrice=Default price
+ComposedProductIncDecStock=Increase/Decrease stock on parent change
+ComposedProduct=Sub-product
+MinSupplierPrice=Minimun supplier price
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 2970d7c4481..4c29cb68aad 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -8,8 +8,10 @@ SharedProject=每個人
PrivateProject=項目聯系人
MyProjectsDesc=這種觀點是有限的項目你是一個接觸(不管是類型)。
ProjectsPublicDesc=這種觀點提出了所有你被允許閱讀的項目。
+ProjectsPublicTaskDesc=This view presents all projects and tasks you are allowed to read.
ProjectsDesc=這種觀點提出的所有項目(你的用戶權限批準你認為一切)。
MyTasksDesc=這種觀點是有限的項目或任務你是一個接觸(不管是類型)。
+OnlyOpenedProject=Only opened projects are visible (projects with draft or closed status are not visible).
TasksPublicDesc=這種觀點提出的所有項目,您可閱讀任務。
TasksDesc=這種觀點提出的所有項目和任務(您的用戶權限批準你認為一切)。
ProjectsArea=項目領域
@@ -29,6 +31,8 @@ NoProject=沒有項目或擁有的定義
NbOpenTasks=鈮打開任務
NbOfProjects=鈮項目
TimeSpent=花費的時間
+TimeSpentByYou=Time spent by you
+TimeSpentByUser=Time spent by user
TimesSpent=所花費的時間
RefTask=任務編號
LabelTask=標簽任務
@@ -67,7 +71,7 @@ ListSupplierOrdersAssociatedProject=名單與項目相關的供應商的訂單
ListSupplierInvoicesAssociatedProject=名單與項目相關的供應商的發票
ListContractAssociatedProject=名單與項目有關的合同
ListFichinterAssociatedProject=名單與項目相關的幹預措施
-ListTripAssociatedProject=名單旅行和與項目有關的費用
+ListExpenseReportsAssociatedProject=List of expense reports associated with the project
ListActionsAssociatedProject=名單與項目有關的行動
ActivityOnProjectThisWeek=對項目活動周
ActivityOnProjectThisMonth=本月初對項目活動
@@ -133,3 +137,6 @@ SearchAProject=Search a project
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
FirstAddRessourceToAllocateTime=Associate a ressource to allocate time
+InputPerTime=Input per time
+InputPerDay=Input per day
+TimeAlreadyRecorded=Time spent already recorded for this task/day and user %s
diff --git a/htdocs/langs/zh_TW/salaries.lang b/htdocs/langs/zh_TW/salaries.lang
index edca71a1829..28c21adfad3 100644
--- a/htdocs/langs/zh_TW/salaries.lang
+++ b/htdocs/langs/zh_TW/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Accountancy code for salaries payments
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Salary
Salaries=Salaries
Employee=Employee
@@ -6,3 +8,6 @@ NewSalaryPayment=New salary payment
SalaryPayment=Salary payment
SalariesPayments=Salaries payments
ShowSalaryPayment=Show salary payment
+THM=Average hourly price
+TJM=Average daily price
+CurrentSalary=Current salary
diff --git a/htdocs/langs/zh_TW/sendings.lang b/htdocs/langs/zh_TW/sendings.lang
index 8cd48f0d71f..55380896853 100644
--- a/htdocs/langs/zh_TW/sendings.lang
+++ b/htdocs/langs/zh_TW/sendings.lang
@@ -23,7 +23,7 @@ QtyOrdered=訂購數量
QtyShipped=出貨數量
QtyToShip=出貨數量
QtyReceived=收到的數量
-KeepToShip=持續出貨
+KeepToShip=Remain to ship
OtherSendingsForSameOrder=此訂單的其他出貨清單
DateSending=出貨日期
DateSendingShort=出貨日期
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index a0973e97c5b..9c1b117b91e 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -47,6 +47,7 @@ PMPValue=加權平均價格
PMPValueShort=的WAP
EnhancedValueOfWarehouses=倉庫價值
UserWarehouseAutoCreate=當建立一個用戶時,自動建立一個倉庫
+IndependantSubProductStock=Product stock and subproduct stock are independant
QtyDispatched=派出數量
QtyDispatchedShort=Qty dispatched
QtyToDispatchShort=Qty to dispatch
@@ -110,7 +111,7 @@ WarehouseForStockDecrease=The warehouse %s will be used for stock decreas
WarehouseForStockIncrease=The warehouse %s will be used for stock increase
ForThisWarehouse=For this warehouse
ReplenishmentStatusDesc=This is list of all product with a stock lower than desired stock (or lower than alert value if checkbox "alert only" is checked), and suggest you to create supplier orders to fill the difference.
-ReplenishmentOrdersDesc=This is list of all opened supplier orders
+ReplenishmentOrdersDesc=This is list of all opened supplier orders including predefined products. Only opened orders with predefined products, so that may affect stocks, are visible here.
Replenishments=Replenishments
NbOfProductBeforePeriod=Quantity of product %s in stock before selected period (< %s)
NbOfProductAfterPeriod=Quantity of product %s in stock after selected period (> %s)
@@ -130,3 +131,4 @@ IsInPackage=Contained into package
ShowWarehouse=Show warehouse
MovementCorrectStock=Stock content correction for product %s
MovementTransferStock=Stock transfer of product %s into another warehouse
+WarehouseMustBeSelectedAtFirstStepWhenProductBatchModuleOn=Source warehouse must be defined here when batch module is on. It will be used to list wich lot/serial is available for product that required lot/serial data for movement. If you want to send products from different warehouses, just make the shipment into several steps.
diff --git a/htdocs/langs/zh_TW/suppliers.lang b/htdocs/langs/zh_TW/suppliers.lang
index 8ad3d74c0b0..b7f31a8d40a 100644
--- a/htdocs/langs/zh_TW/suppliers.lang
+++ b/htdocs/langs/zh_TW/suppliers.lang
@@ -1,6 +1,5 @@
# Dolibarr language file - Source file is en_US - suppliers
Suppliers=供應商
-Supplier=供應商
AddSupplier=Create a supplier
SupplierRemoved=供應商刪除
SuppliersInvoice=供應商的發票
@@ -30,7 +29,7 @@ ExportDataset_fournisseur_2=供應商發票和付款
ExportDataset_fournisseur_3=Supplier orders and order lines
ApproveThisOrder=批準這個訂單
ConfirmApproveThisOrder=你確定要批準這個訂單?
-DenyingThisOrder=否認這個訂單
+DenyingThisOrder=Deny this order
ConfirmDenyingThisOrder=你確定要否認這個訂單?
ConfirmCancelThisOrder=您確定要取消此訂單?
AddCustomerOrder=創建客戶訂單
diff --git a/htdocs/langs/zh_TW/trips.lang b/htdocs/langs/zh_TW/trips.lang
index 4d4375cbb3e..fc99f600d25 100644
--- a/htdocs/langs/zh_TW/trips.lang
+++ b/htdocs/langs/zh_TW/trips.lang
@@ -1,22 +1,126 @@
# Dolibarr language file - Source file is en_US - trips
-Trip=旅程
-Trips=旅遊
-TripsAndExpenses=旅遊和費用
-TripsAndExpensesStatistics=旅行和費用統計
-TripCard=旅卡
-AddTrip=添加行程
-ListOfTrips=旅行名單
+ExpenseReport=Expense report
+ExpenseReports=Expense reports
+Trip=Expense report
+Trips=Expense reports
+TripsAndExpenses=Expenses reports
+TripsAndExpensesStatistics=Expense reports statistics
+TripCard=Expense report card
+AddTrip=Create expense report
+ListOfTrips=List of expense report
ListOfFees=費用清單
-NewTrip=新旅程
+NewTrip=New expense report
CompanyVisited=公司/基礎訪問
Kilometers=公裏
FeesKilometersOrAmout=金額或公裏
-DeleteTrip=刪除行
-ConfirmDeleteTrip=你確定要刪除此行?
-TF_OTHER=其他
-TF_LUNCH=午餐
-TF_TRIP=旅程
-ListTripsAndExpenses=旅行和費用清單
-ExpensesArea=與貿易有關的知識產權協定“和開支面積
-SearchATripAndExpense=尋找旅行和費用
+DeleteTrip=Delete expense report
+ConfirmDeleteTrip=Are you sure you want to delete this expense report ?
+ListTripsAndExpenses=List of expense reports
+ListToApprove=Waiting for approval
+ExpensesArea=Expense reports area
+SearchATripAndExpense=Search an expense report
ClassifyRefunded=Classify 'Refunded'
+ExpenseReportWaitingForApproval=A new expense report has been submitted for approval
+ExpenseReportWaitingForApprovalMessage=A new expense report has been submitted and is waiting for approval.\n- User: %s\n- Period: %s\nClick here to validate: %s
+TripId=Id expense report
+AnyOtherInThisListCanValidate=Person to inform for validation.
+TripSociete=Information company
+TripSalarie=Informations user
+TripNDF=Informations expense report
+DeleteLine=Delete a ligne of the expense report
+ConfirmDeleteLine=Are you sure you want to delete this line ?
+PDFStandardExpenseReports=Standard template to generate a PDF document for expense report
+ExpenseReportLine=Expense report line
+TF_OTHER=其他
+TF_TRANSPORTATION=Transportation
+TF_LUNCH=午餐
+TF_METRO=Metro
+TF_TRAIN=Train
+TF_BUS=Bus
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Fuel
+TF_HOTEL=Hostel
+TF_TAXI=Taxi
+
+ErrorDoubleDeclaration=You have declared another expense report into a similar date range.
+ListTripsAndExpenses=List of expense reports
+AucuneNDF=No expense reports found for this criteria
+AucuneLigne=There is no expense report declared yet
+AddLine=Add a line
+AddLineMini=Add
+
+Date_DEBUT=Period date start
+Date_FIN=Period date end
+ModePaiement=Payment mode
+Note=Note
+Project=Project
+
+VALIDATOR=User to inform for approbation
+VALIDOR=Approved by
+AUTHOR=Recorded by
+AUTHORPAIEMENT=Paied by
+REFUSEUR=Denied by
+CANCEL_USER=Canceled by
+
+MOTIF_REFUS=Reason
+MOTIF_CANCEL=Reason
+
+DATE_REFUS=Deny date
+DATE_SAVE=Validation date
+DATE_VALIDE=Validation date
+DateApprove=Approving date
+DATE_CANCEL=Cancelation date
+DATE_PAIEMENT=Payment date
+
+Deny=Deny
+TO_PAID=Pay
+BROUILLONNER=Reopen
+SendToValid=Sent to approve
+ModifyInfoGen=Edit
+ValidateAndSubmit=Validate and submit for approval
+
+NOT_VALIDATOR=You are not allowed to approve this expense report
+NOT_AUTHOR=You are not the author of this expense report. Operation cancelled.
+
+RefuseTrip=Deny an expense report
+ConfirmRefuseTrip=Are you sure you want to deny this expense report ?
+
+ValideTrip=Approve expense report
+ConfirmValideTrip=Are you sure you want to approve this expense report ?
+
+PaidTrip=Pay an expense report
+ConfirmPaidTrip=Are you sure you want to change status of this expense report to "Paid" ?
+
+CancelTrip=Cancel an expense report
+ConfirmCancelTrip=Are you sure you want to cancel this expense report ?
+
+BrouillonnerTrip=Move back expense report to status "Draft"n
+ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft" ?
+
+SaveTrip=Validate expense report
+ConfirmSaveTrip=Are you sure you want to validate this expense report ?
+
+Synchro_Compta=NDF <-> Compte
+
+TripSynch=Synchronisation : Notes de frais <-> Compte courant
+TripToSynch=Notes de frais à intégrer dans la compta
+AucuneTripToSynch=Aucune note de frais n'est en statut "Payée".
+ViewAccountSynch=Voir le compte
+
+ConfirmNdfToAccount=Êtes-vous sûr de vouloir intégrer cette note de frais dans le compte courant?
+ndfToAccount=Note de frais - Intégration
+
+ConfirmAccountToNdf=Êtes-vous sûr de vouloir retirer cette note de frais du compte courant?
+AccountToNdf=Note de frais - Retrait
+
+LINE_NOT_ADDED=Ligne non ajoutée :
+NO_PROJECT=Aucun projet sélectionné.
+NO_DATE=Aucune date sélectionnée.
+NO_PRICE=Aucun prix indiqué.
+
+TripForValid=à Valider
+TripForPaid=à Payer
+TripPaid=Payée
+
+NoTripsToExportCSV=No expense report to export for this period.